Skip to content

Commit 3b90ad7

Browse files
Merge forwardport of #12091 to 2.3-develop branch
Applied pull request patch https://github.com/magento/magento2/pull/12091.patch (created by @lazyguru) based on commit(s): 1. 48a0415
2 parents c223484 + 8703b3d commit 3b90ad7

File tree

1 file changed

+1
-1
lines changed
  • app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment

1 file changed

+1
-1
lines changed

app/code/Magento/Shipping/Controller/Adminhtml/Order/Shipment/Save.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ public function execute()
108108
}
109109

110110
$isNeedCreateLabel = isset($data['create_shipping_label']) && $data['create_shipping_label'];
111+
$responseAjax = new \Magento\Framework\DataObject();
111112

112113
try {
113114
$this->shipmentLoader->setOrderId($this->getRequest()->getParam('order_id'));
@@ -143,7 +144,6 @@ public function execute()
143144
$shipment->register();
144145

145146
$shipment->getOrder()->setCustomerNoteNotify(!empty($data['send_email']));
146-
$responseAjax = new \Magento\Framework\DataObject();
147147

148148
if ($isNeedCreateLabel) {
149149
$this->labelGenerator->create($shipment, $this->_request);

0 commit comments

Comments
 (0)