Fix to work with mage 2.4

outeredge · Dec 14, 2022 · bc5bde8 · bc5bde8
1 parent a407442
commit bc5bde8
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/Controller/Adminhtml/Order/MassOrderShip.php b/Controller/Adminhtml/Order/MassOrderShip.php
@@ -108,22 +108,22 @@ public function execute()
                 }
             }
 
-            try {
-                // Save created shipment
-                $saveTransaction->save();
-
-                // Send email
-                if ($notify) {
-                    foreach ($shipmentArray as $shipment) {
-                        $this->shipmentNotifier->notify($shipment);
+            if (!empty($shipmentArray)) {
+                try {
+                    // Save created shipment
+                    $saveTransaction->save();
+
+                    // Send email
+                    if ($notify) {
+                        foreach ($shipmentArray as $shipment) {
+                            $this->shipmentNotifier->notify($shipment);
+                        }
                     }
-                }
-                if (!empty($shipmentArray)) {
                     $ordersIncrementIds = implode(",", array_keys($shipmentArray));
                     $this->messageManager->addSuccess(__("Shipment Succesfully Generated for orders: ".$ordersIncrementIds));
+                } catch (\Exception $e) {
+                    $this->messageManager->addError(__('Cannot ship order'. $e->getMessage()));
                 }
-            } catch (\Exception $e) {
-                $this->messageManager->addError(__('Cannot ship order'. $e->getMessage()));
             }
         }
         return $resultRedirect->setPath('sales/order/index', [], ['error' => true]);