6.43.4 (FINAL RELEASE)

m2epro · Aug 2, 2023 · ee07916 · ee07916
1 parent 17a1465
commit ee07916
Show file tree

Hide file tree

Showing 9 changed files with 69 additions and 6 deletions.
diff --git a/app/code/community/Ess/M2ePro/Model/Listing/Product/QtyCalculator.php b/app/code/community/Ess/M2ePro/Model/Listing/Product/QtyCalculator.php
@@ -191,7 +191,14 @@ protected function getClearVariationValue(Ess_M2ePro_Model_Listing_Product_Varia
                     continue;
                 }
 
-                $optionsQtyArray[$option->getProductId()][] = $this->getOptionBaseValue($option);
+                $qty = $this->getOptionBaseValue($option);
+                $bundleDefaultQty = $this
+                    ->getMagentoProduct()
+                    ->getBundleDefaultQty($option->getProductId());
+
+                $qty /= $bundleDefaultQty;
+
+                $optionsQtyArray[$option->getProductId()][] = $qty;
             }
 
             foreach ($optionsQtyArray as $optionQty) {

diff --git a/app/code/community/Ess/M2ePro/Model/Magento/Product.php b/app/code/community/Ess/M2ePro/Model/Magento/Product.php
@@ -945,6 +945,23 @@ public function getQty($lifeMode = false)
         );
     }
 
+    public function getBundleDefaultQty($productId)
+    {
+        $product = $this->getProduct();
+        $productInstance = $this->getTypeInstance();
+        $optionCollection = $productInstance->getOptionsCollection($product);
+        $selectionsCollection = $productInstance->getSelectionsCollection($optionCollection->getAllIds(), $product);
+        $items = $selectionsCollection->getItems();
+
+        foreach ($items as $item) {
+            if ((int)$item->getId() === (int)$productId) {
+                return $item->getSelectionQty();
+            }
+        }
+
+        return 1;
+    }
+
     public function setQty($value)
     {
         $this->getStockItem()->setQty($value)->save();

diff --git a/app/code/community/Ess/M2ePro/Model/Order/Reserve.php b/app/code/community/Ess/M2ePro/Model/Order/Reserve.php
@@ -231,6 +231,13 @@ protected function performAction($action, $newState)
 
                 $productsExistCount++;
 
+                if ($item->getMagentoProduct()->isBundleType()) {
+                    $bundleDefaultQty = $item
+                        ->getMagentoProduct()
+                        ->getBundleDefaultQty($magentoProduct->getProductId());
+                    $qty *= $bundleDefaultQty;
+                }
+
                 if (!isset($stockItems[$productId])) {
                     $stockItems[$productId] = $magentoProduct->getStockItem();
                 }

diff --git a/app/code/community/Ess/M2ePro/composer.json b/app/code/community/Ess/M2ePro/composer.json
@@ -2,7 +2,7 @@
   "name": "m2epro/magento1-extension",
   "description": "M2E Pro is a Magento trusted (TM), award-winning extension, which allows merchants of all sizes to fully integrate Magento based system(s) into eBay/Amazon/Walmart platforms.",
   "type": "magento-module",
-  "version": "6.43.3",
+  "version": "6.43.4",
   "license": "proprietary",
   "keywords": ["ebay", "amazon", "walmart", "magento"],
   "homepage": "https://www.m2epro.com/",

diff --git a/app/code/community/Ess/M2ePro/etc/config.xml b/app/code/community/Ess/M2ePro/etc/config.xml
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Ess_M2ePro>
-            <version>6.43.3</version>
+            <version>6.43.4</version>
         </Ess_M2ePro>
     </modules>
     <default>

diff --git a/app/code/community/Ess/M2ePro/sql/Upgrade/v6_42_0__v6_43_0/Config.php b/app/code/community/Ess/M2ePro/sql/Upgrade/v6_42_0__v6_43_0/Config.php
@@ -6,10 +6,12 @@
  * @license    Commercial use is forbidden
  */
 
-class Ess_M2ePro_Sql_Upgrade_v6_43_0__v6_43_3_Config extends Ess_M2ePro_Model_Upgrade_Feature_AbstractConfig
+class Ess_M2ePro_Sql_Upgrade_v6_42_0__v6_43_0_Config extends Ess_M2ePro_Model_Upgrade_Feature_AbstractConfig
 {
     public function getFeaturesList()
     {
-        return array();
+        return array(
+            '@y23_m06/IgnoreVariationMpnInResolverConfig',
+        );
     }
 }
diff --git a/app/code/community/Ess/M2ePro/sql/Upgrade/v6_43_0__v6_43_3/Config.php b/app/code/community/Ess/M2ePro/sql/Upgrade/v6_43_0__v6_43_3/Config.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @author     M2E Pro Developers Team
+ * @copyright  M2E LTD
+ * @license    Commercial use is forbidden
+ */
+
+class Ess_M2ePro_Sql_Upgrade_v6_43_0__v6_43_3_Config extends Ess_M2ePro_Model_Upgrade_Feature_AbstractConfig
+{
+    public function getFeaturesList()
+    {
+        return array();
+    }
+}
diff --git a/app/code/community/Ess/M2ePro/sql/Upgrade/v6_43_3__v6_43_4/Config.php b/app/code/community/Ess/M2ePro/sql/Upgrade/v6_43_3__v6_43_4/Config.php
@@ -0,0 +1,15 @@
+<?php
+
+/**
+ * @author     M2E Pro Developers Team
+ * @copyright  M2E LTD
+ * @license    Commercial use is forbidden
+ */
+
+class Ess_M2ePro_Sql_Upgrade_v6_43_3__v6_43_4_Config extends Ess_M2ePro_Model_Upgrade_Feature_AbstractConfig
+{
+    public function getFeaturesList()
+    {
+        return array();
+    }
+}
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
   "name": "m2epro/magento1-extension",
   "description": "M2E Pro is a Magento trusted (TM), award-winning extension, which allows merchants of all sizes to fully integrate Magento based system(s) into eBay/Amazon/Walmart platforms.",
   "type": "magento-module",
-  "version": "6.43.3",
+  "version": "6.43.4",
   "license": "proprietary",
   "keywords": ["ebay", "amazon", "walmart", "magento"],
   "homepage": "https://www.m2epro.com/",