Skip to content

Commit b2894e4

Browse files
author
Oleksii Korshenko
authored
MAGETWO-86036: [Port 2.3-develop] Remove unused if statement in order invoice save #12888
2 parents 71e57a6 + a2aa34d commit b2894e4

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

app/code/Magento/Sales/Controller/Adminhtml/Order/Invoice/Save.php

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -191,14 +191,7 @@ public function execute()
191191
}
192192
$transactionSave->save();
193193

194-
if (isset($shippingResponse) && $shippingResponse->hasErrors()) {
195-
$this->messageManager->addError(
196-
__(
197-
'The invoice and the shipment have been created. ' .
198-
'The shipping label cannot be created now.'
199-
)
200-
);
201-
} elseif (!empty($data['do_shipment'])) {
194+
if (!empty($data['do_shipment'])) {
202195
$this->messageManager->addSuccess(__('You created the invoice and shipment.'));
203196
} else {
204197
$this->messageManager->addSuccess(__('The invoice has been created.'));

app/code/Magento/Sales/i18n/en_US.csv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,6 @@ Sales,Sales
233233
"You can't create an invoice without products.","You can't create an invoice without products."
234234
"New Invoice","New Invoice"
235235
"We can't save the invoice right now.","We can't save the invoice right now."
236-
"The invoice and the shipment have been created. The shipping label cannot be created now.","The invoice and the shipment have been created. The shipping label cannot be created now."
237236
"You created the invoice and shipment.","You created the invoice and shipment."
238237
"The invoice has been created.","The invoice has been created."
239238
"We can't send the invoice email right now.","We can't send the invoice email right now."

0 commit comments

Comments
 (0)