6.50.0 (FINAL RELEASE)

m2epro · Oct 31, 2023 · 9d6be1f · 9d6be1f
1 parent 43ffeea
commit 9d6be1f
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 9 deletions.
diff --git a/app/code/community/Ess/M2ePro/Model/Amazon/Listing/Product/Action/Type/Relist/Validator.php b/app/code/community/Ess/M2ePro/Model/Amazon/Listing/Product/Action/Type/Relist/Validator.php
@@ -30,8 +30,8 @@ public function validate()
 
         if ($this->getAmazonListingProduct()->isAfnChannel()) {
             $this->addMessage(
-                'Relist Action for FBA Items is impossible as their Quantity is unknown. You can run
-                Revise Action for such Items, but the Quantity value will be ignored.'
+                'AFN Items cannot be Relisted through M2E Pro as their Quantity is managed by Amazon.
+                You may run Revise to update the Product detail, but the Quantity update will be ignored.'
             );
 
             return false;
@@ -65,4 +65,4 @@ public function validate()
     }
 
     //########################################
-}
+}
diff --git a/app/code/community/Ess/M2ePro/Model/Amazon/Listing/Product/Action/Type/Stop/Validator.php b/app/code/community/Ess/M2ePro/Model/Amazon/Listing/Product/Action/Type/Stop/Validator.php
@@ -38,8 +38,8 @@ public function validate()
                 $this->getListingProduct()->isDeleted(true);
             } else {
                 $this->addMessage(
-                    'Stop Action for FBA Items is impossible as their Quantity is unknown. You can run
-                    Revise Action for such Items, but the Quantity value will be ignored.'
+                    'AFN Items cannot be Stopped through M2E Pro as their Quantity is managed by Amazon.
+                    You may run Revise to update the Product detail, but the Quantity update will be ignored.'
                 );
             }
 
@@ -68,4 +68,4 @@ public function validate()
     }
 
     //########################################
-}
+}
diff --git a/app/code/community/Ess/M2ePro/Model/Ebay/Order/Builder.php b/app/code/community/Ess/M2ePro/Model/Ebay/Order/Builder.php
@@ -481,6 +481,15 @@ protected function canCreateOrUpdateOrder()
             }
         }
 
+        /**
+         * Don't create combined order without payment
+         */
+        if ($this->isCombined()
+            && $this->getData('payment_status') === Ess_M2ePro_Model_Ebay_Order::PAYMENT_STATUS_NOT_SELECTED
+        ) {
+            return false;
+        }
+
         if ($this->getData('order_status') == OrderHelper::EBAY_ORDER_STATUS_CANCELLED &&
             $this->_order->getId() &&
             !$this->_order->getChildObject()->isCanceled()) {

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.49.0",
+  "version": "6.50.0",
   "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.49.0</version>
+            <version>6.50.0</version>
         </Ess_M2ePro>
     </modules>
     <default>

diff --git a/app/code/community/Ess/M2ePro/sql/Upgrade/v6_49_0__v6_50_0/Config.php b/app/code/community/Ess/M2ePro/sql/Upgrade/v6_49_0__v6_50_0/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_49_0__v6_50_0_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.49.0",
+  "version": "6.50.0",
   "license": "proprietary",
   "keywords": ["ebay", "amazon", "walmart", "magento"],
   "homepage": "https://www.m2epro.com/",