Skip to content
Snippets Groups Projects
Commit a5907e53 authored by Ievgen Shakhsuvarov's avatar Ievgen Shakhsuvarov
Browse files

MAGETWO-86881: Misleading feedback when sending tracking information email #1245

 - Merge Pull Request magento-engcom/magento2ce#1245 from nmalevanec/magento2:5697
 - Merged commits:
   1. f03e6148
parents 83a9b9c9 f03e6148
No related merge requests found
......@@ -57,7 +57,9 @@ class Email extends \Magento\Backend\App\Action
$this->_objectManager->create(\Magento\Shipping\Model\ShipmentNotifier::class)
->notify($shipment);
$shipment->save();
$this->messageManager->addSuccess(__('You sent the shipment.'));
$this->messageManager->addSuccess(
__('An email confirming the order is underway has been sent to the customer.')
);
}
} catch (\Magento\Framework\Exception\LocalizedException $e) {
$this->messageManager->addError($e->getMessage());
......
......@@ -207,7 +207,7 @@ class EmailTest extends \PHPUnit\Framework\TestCase
->will($this->returnValue(true));
$this->messageManager->expects($this->once())
->method('addSuccess')
->with('You sent the shipment.');
->with('An email confirming the order is underway has been sent to the customer.');
$path = '*/*/view';
$arguments = ['shipment_id' => $shipmentId];
$this->prepareRedirect($path, $arguments, 0);
......
......@@ -28,7 +28,7 @@ Shipments,Shipments
"Cannot add tracking number.","Cannot add tracking number."
"You created the shipping label.","You created the shipping label."
"An error occurred while creating shipping label.","An error occurred while creating shipping label."
"You sent the shipment.","You sent the shipment."
"An email confirming the order is underway has been sent to the customer.","An email confirming the order is underway has been sent to the customer."
"Cannot send shipment information.","Cannot send shipment information."
"There are no shipping labels related to selected orders.","There are no shipping labels related to selected orders."
"New Shipment","New Shipment"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment