Adds support for MSI if order contains products from different sources

flagshipcompany · Jul 3, 2019 · 8cb88b2 · 8cb88b2
1 parent 33c72d1
commit 8cb88b2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Controller/Adminhtml/PrepareShipment/Index.php b/Controller/Adminhtml/PrepareShipment/Index.php
@@ -363,12 +363,12 @@ protected function getPackingBoxes( $sourceCode ) : ?array {
         }
 
         foreach ($packings as $value) {
-            $packing = $value['source_code'] == $sourceCode ? $value : NULL;
+            $packing[] = $value['source_code'] == $sourceCode ? $value : NULL;
         }
 
         $packing = array_filter($packing,function($value){ return $value != NULL; });
 
-        $packing["dimensions"] = $this->getBoxWeight($packing);
+        $packing["dimensions"] = $this->getBoxWeight(reset($packing));
         $boxes[] = $packing;
 
         return $boxes;

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "flagshipcompany/flagship-for-magento",
   "description": "A module that allows you to ship with flagship",
   "type": "magento2-module",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "license": [
     "OSL-3.0",
     "AFL-3.0"

diff --git a/registration.php b/registration.php
@@ -10,4 +10,4 @@
 require BP.'/vendor/autoload.php';
 
 define('FLAGSHIP_MODULE','Magento');
-define('FLAGSHIP_MODULE_VERSION','1.0.23');
+define('FLAGSHIP_MODULE_VERSION','1.0.24');