From 9d6be1f7235aca54deefb3750b24c4886bf03126 Mon Sep 17 00:00:00 2001 From: M2E Pro Date: Tue, 31 Oct 2023 15:49:30 +0000 Subject: [PATCH] 6.50.0 (FINAL RELEASE) --- .../Product/Action/Type/Relist/Validator.php | 6 +++--- .../Product/Action/Type/Stop/Validator.php | 6 +++--- .../Ess/M2ePro/Model/Ebay/Order/Builder.php | 9 +++++++++ app/code/community/Ess/M2ePro/composer.json | 2 +- app/code/community/Ess/M2ePro/etc/config.xml | 2 +- .../sql/Upgrade/v6_49_0__v6_50_0/Config.php | 15 +++++++++++++++ composer.json | 2 +- 7 files changed, 33 insertions(+), 9 deletions(-) create mode 100644 app/code/community/Ess/M2ePro/sql/Upgrade/v6_49_0__v6_50_0/Config.php 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 index 4056ae4d0..51186f73f 100644 --- 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() } //######################################## -} \ No newline at end of file +} 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 index fde5e57b2..83e411118 100644 --- 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() } //######################################## -} \ No newline at end of file +} diff --git a/app/code/community/Ess/M2ePro/Model/Ebay/Order/Builder.php b/app/code/community/Ess/M2ePro/Model/Ebay/Order/Builder.php index 58b11d0d0..1506e01cb 100644 --- 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 index acce52b4a..5b770cc2e 100644 --- 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 index 62897ccbf..f4aafd490 100644 --- a/app/code/community/Ess/M2ePro/etc/config.xml +++ b/app/code/community/Ess/M2ePro/etc/config.xml @@ -2,7 +2,7 @@ - 6.49.0 + 6.50.0 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 new file mode 100644 index 000000000..128423d7f --- /dev/null +++ b/app/code/community/Ess/M2ePro/sql/Upgrade/v6_49_0__v6_50_0/Config.php @@ -0,0 +1,15 @@ +