From e66fe5cf087fba6dcd949cec06dedfba55c38e2f Mon Sep 17 00:00:00 2001 From: M2E Pro Date: Thu, 17 Aug 2023 14:44:58 +0000 Subject: [PATCH] 6.44.2 (FINAL RELEASE) --- .../Ebay/Template/Shipping/Edit/Form/Data.php | 5 -- .../Product/Action/DataBuilder/Shipping.php | 3 -- .../Ess/M2ePro/Model/Ebay/Marketplace.php | 8 ---- .../community/Ess/M2ePro/Model/Ebay/Order.php | 10 ---- .../Ess/M2ePro/Model/Ebay/Order/Proxy.php | 1 - .../M2ePro/Model/Ebay/Template/Shipping.php | 14 ------ .../Model/Ebay/Template/Shipping/Builder.php | 4 -- .../Model/Ebay/Template/Shipping/Diff.php | 1 - .../Ess/M2ePro/Model/Magento/Payment.php | 2 +- .../Ess/M2ePro/Model/Magento/Product.php | 7 ++- app/code/community/Ess/M2ePro/composer.json | 2 +- .../Amazon/Listing/ProductAddController.php | 1 + .../Ebay/Listing/ProductAddController.php | 1 + .../Walmart/Listing/ProductAddController.php | 1 + app/code/community/Ess/M2ePro/etc/config.xml | 2 +- .../community/Ess/M2ePro/sql/Install/Ebay.php | 47 +++++++++---------- .../Update/y23_m08/RemoveCashOnDelivery.php | 15 ++++++ .../sql/Upgrade/v6_44_1__v6_44_2/Config.php | 17 +++++++ .../default/template/M2ePro/ebay/order.phtml | 11 ----- .../ebay/template/shipping/form/data.phtml | 20 -------- composer.json | 2 +- js/M2ePro/Ebay/Template/Shipping.js | 18 ------- 22 files changed, 67 insertions(+), 125 deletions(-) create mode 100644 app/code/community/Ess/M2ePro/sql/Update/y23_m08/RemoveCashOnDelivery.php create mode 100644 app/code/community/Ess/M2ePro/sql/Upgrade/v6_44_1__v6_44_2/Config.php diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Ebay/Template/Shipping/Edit/Form/Data.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Ebay/Template/Shipping/Edit/Form/Data.php index e9ce4439d..302523260 100644 --- a/app/code/community/Ess/M2ePro/Block/Adminhtml/Ebay/Template/Shipping/Edit/Form/Data.php +++ b/app/code/community/Ess/M2ePro/Block/Adminhtml/Ebay/Template/Shipping/Edit/Form/Data.php @@ -550,11 +550,6 @@ public function canDisplayInternationalShippingRateTable() return $this->getMarketplace()->getChildObject()->isInternationalShippingRateTableEnabled(); } - public function canDisplayCashOnDeliveryCost() - { - return $this->getMarketplace()->getChildObject()->isCashOnDeliveryEnabled(); - } - public function canDisplayNorthAmericaCrossBorderTradeOption() { $marketplace = $this->getMarketplace(); diff --git a/app/code/community/Ess/M2ePro/Model/Ebay/Listing/Product/Action/DataBuilder/Shipping.php b/app/code/community/Ess/M2ePro/Model/Ebay/Listing/Product/Action/DataBuilder/Shipping.php index 489588b6c..ee44eb91a 100644 --- a/app/code/community/Ess/M2ePro/Model/Ebay/Listing/Product/Action/DataBuilder/Shipping.php +++ b/app/code/community/Ess/M2ePro/Model/Ebay/Listing/Product/Action/DataBuilder/Shipping.php @@ -42,9 +42,6 @@ public function getData() $this->getShippingTemplate()->isLocalShippingCalculatedEnabled()) { $data['dispatch_time'] = $this->getShippingSource()->getDispatchTime(); - // there are permissions by marketplace (interface management) - $data['cash_on_delivery_cost'] = $this->getShippingTemplate()->getCashOnDeliveryCost(); - // there are permissions by marketplace (interface management) if ($this->getShippingTemplate()->isCrossBorderTradeNorthAmerica()) { $data['cross_border_trade'] = self::CROSS_BORDER_TRADE_NORTH_AMERICA; diff --git a/app/code/community/Ess/M2ePro/Model/Ebay/Marketplace.php b/app/code/community/Ess/M2ePro/Model/Ebay/Marketplace.php index f734be807..02d76f694 100644 --- a/app/code/community/Ess/M2ePro/Model/Ebay/Marketplace.php +++ b/app/code/community/Ess/M2ePro/Model/Ebay/Marketplace.php @@ -126,14 +126,6 @@ public function isManagedPaymentsEnabled() return (bool)(int)$this->getData('is_managed_payments'); } - /** - * @return bool - */ - public function isCashOnDeliveryEnabled() - { - return (bool)(int)$this->getData('is_cash_on_delivery'); - } - /** * @return bool */ diff --git a/app/code/community/Ess/M2ePro/Model/Ebay/Order.php b/app/code/community/Ess/M2ePro/Model/Ebay/Order.php index ae60b8e91..9a565ad4c 100644 --- a/app/code/community/Ess/M2ePro/Model/Ebay/Order.php +++ b/app/code/community/Ess/M2ePro/Model/Ebay/Order.php @@ -326,16 +326,6 @@ public function getShippingDateTo() return $this->getData('shipping_date_to'); } - /** - * @return float - */ - public function getCashOnDeliveryCost() - { - $shippingDetails = $this->getShippingDetails(); - return isset($shippingDetails['cash_on_delivery_cost']) - ? (float)$shippingDetails['cash_on_delivery_cost'] : 0.0; - } - /** * @return Ess_M2ePro_Model_Ebay_Order_ShippingAddress */ diff --git a/app/code/community/Ess/M2ePro/Model/Ebay/Order/Proxy.php b/app/code/community/Ess/M2ePro/Model/Ebay/Order/Proxy.php index 8e9161022..4ea7d9d4c 100644 --- a/app/code/community/Ess/M2ePro/Model/Ebay/Order/Proxy.php +++ b/app/code/community/Ess/M2ePro/Model/Ebay/Order/Proxy.php @@ -255,7 +255,6 @@ public function getPaymentData() 'payment_method' => $paymentMethodTitle, 'channel_order_id' => $this->_order->getEbayOrderId(), 'channel_final_fee' => $this->convertPrice($this->_order->getFinalFee()), - 'cash_on_delivery_cost' => $this->convertPrice($this->_order->getCashOnDeliveryCost()), 'transactions' => $this->getPaymentTransactions(), 'tax_id' => $this->_order->getBuyerTaxId(), ); diff --git a/app/code/community/Ess/M2ePro/Model/Ebay/Template/Shipping.php b/app/code/community/Ess/M2ePro/Model/Ebay/Template/Shipping.php index 14d239e4e..991c0b080 100644 --- a/app/code/community/Ess/M2ePro/Model/Ebay/Template/Shipping.php +++ b/app/code/community/Ess/M2ePro/Model/Ebay/Template/Shipping.php @@ -714,20 +714,6 @@ public function getExcludedLocations() return is_array($excludedLocations) ? $excludedLocations : array(); } - /** - * @return float|null - */ - public function getCashOnDeliveryCost() - { - $tempData = $this->getData('cash_on_delivery_cost'); - - if (!empty($tempData)) { - return (float)$tempData; - } - - return null; - } - // --------------------------------------- /** diff --git a/app/code/community/Ess/M2ePro/Model/Ebay/Template/Shipping/Builder.php b/app/code/community/Ess/M2ePro/Model/Ebay/Template/Shipping/Builder.php index 92452d0d6..ad2332028 100644 --- a/app/code/community/Ess/M2ePro/Model/Ebay/Template/Shipping/Builder.php +++ b/app/code/community/Ess/M2ePro/Model/Ebay/Template/Shipping/Builder.php @@ -120,9 +120,6 @@ protected function prepareData() $data['excluded_locations'] = $this->_rawData['excluded_locations']; } - $key = 'cash_on_delivery_cost'; - $data[$key] = (isset($this->_rawData[$key]) && $this->_rawData[$key] != '') ? $this->_rawData[$key] : null; - $modes = array( 'local_shipping_mode', 'local_shipping_discount_promotional_mode', @@ -340,7 +337,6 @@ public function getDefaultData() 'dispatch_time_mode' => Shipping::DISPATCH_TIME_MODE_VALUE, 'dispatch_time_value' => 1, 'dispatch_time_attribute' => '', - 'cash_on_delivery_cost' => null, 'global_shipping_program' => 0, 'cross_border_trade' => Shipping::CROSS_BORDER_TRADE_NONE, 'excluded_locations' => Mage::helper('M2ePro')->jsonEncode(array()), diff --git a/app/code/community/Ess/M2ePro/Model/Ebay/Template/Shipping/Diff.php b/app/code/community/Ess/M2ePro/Model/Ebay/Template/Shipping/Diff.php index 908d01e11..fa877be35 100644 --- a/app/code/community/Ess/M2ePro/Model/Ebay/Template/Shipping/Diff.php +++ b/app/code/community/Ess/M2ePro/Model/Ebay/Template/Shipping/Diff.php @@ -40,7 +40,6 @@ public function isShippingDifferent() 'international_shipping_discount_promotional_mode', 'international_shipping_discount_combined_profile_id', 'excluded_locations', - 'cash_on_delivery_cost', 'cross_border_trade', 'local_shipping_rate_table_mode', 'local_shipping_rate_table', diff --git a/app/code/community/Ess/M2ePro/Model/Magento/Payment.php b/app/code/community/Ess/M2ePro/Model/Magento/Payment.php index 6b2de5326..140a61e70 100644 --- a/app/code/community/Ess/M2ePro/Model/Magento/Payment.php +++ b/app/code/community/Ess/M2ePro/Model/Magento/Payment.php @@ -31,7 +31,7 @@ public function assignData($data) 'payment_method' => $data['payment_method'], 'channel_order_id' => $data['channel_order_id'], 'channel_final_fee' => $data['channel_final_fee'], - 'cash_on_delivery_cost' => $data['cash_on_delivery_cost'], + 'cash_on_delivery_cost' => isset($data['cash_on_delivery_cost']) ? $data['cash_on_delivery_cost'] : null, 'transactions' => $data['transactions'], 'tax_id' => isset($data['tax_id']) ? $data['tax_id'] : null, ); diff --git a/app/code/community/Ess/M2ePro/Model/Magento/Product.php b/app/code/community/Ess/M2ePro/Model/Magento/Product.php index 5f8ae8b11..45ece4752 100644 --- a/app/code/community/Ess/M2ePro/Model/Magento/Product.php +++ b/app/code/community/Ess/M2ePro/Model/Magento/Product.php @@ -955,7 +955,12 @@ public function getBundleDefaultQty($productId) foreach ($items as $item) { if ((int)$item->getId() === (int)$productId) { - return $item->getSelectionQty(); + $qty = (int)$item->getSelectionQty(); + if ($qty > 0) { + return $qty; + } + + return 1; } } diff --git a/app/code/community/Ess/M2ePro/composer.json b/app/code/community/Ess/M2ePro/composer.json index 8a689ab1f..ed5c66e61 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.44.1", + "version": "6.44.2", "license": "proprietary", "keywords": ["ebay", "amazon", "walmart", "magento"], "homepage": "https://www.m2epro.com/", diff --git a/app/code/community/Ess/M2ePro/controllers/Adminhtml/Amazon/Listing/ProductAddController.php b/app/code/community/Ess/M2ePro/controllers/Adminhtml/Amazon/Listing/ProductAddController.php index f986996ae..fd504f276 100644 --- a/app/code/community/Ess/M2ePro/controllers/Adminhtml/Amazon/Listing/ProductAddController.php +++ b/app/code/community/Ess/M2ePro/controllers/Adminhtml/Amazon/Listing/ProductAddController.php @@ -478,6 +478,7 @@ public function getCategoriesJsonAction() ); $treeBlock->setSelectedIds($selectedProductsIds); + $this->getResponse()->setHeader('Content-Type', 'application/json'); $this->getResponse()->setBody( $treeBlock->getCategoryChildrenJson($this->getRequest()->getParam('category')) ); diff --git a/app/code/community/Ess/M2ePro/controllers/Adminhtml/Ebay/Listing/ProductAddController.php b/app/code/community/Ess/M2ePro/controllers/Adminhtml/Ebay/Listing/ProductAddController.php index 4ec48f230..954e80547 100644 --- a/app/code/community/Ess/M2ePro/controllers/Adminhtml/Ebay/Listing/ProductAddController.php +++ b/app/code/community/Ess/M2ePro/controllers/Adminhtml/Ebay/Listing/ProductAddController.php @@ -280,6 +280,7 @@ public function getCategoriesJsonAction() $treeBlock = $this->getLayout()->createBlock('M2ePro/adminhtml_ebay_listing_product_sourceCategories_tree'); $treeBlock->setSelectedIds($selectedProductsIds); + $this->getResponse()->setHeader('Content-Type', 'application/json'); $this->getResponse()->setBody( $treeBlock->getCategoryChildrenJson($this->getRequest()->getParam('category')) ); diff --git a/app/code/community/Ess/M2ePro/controllers/Adminhtml/Walmart/Listing/ProductAddController.php b/app/code/community/Ess/M2ePro/controllers/Adminhtml/Walmart/Listing/ProductAddController.php index e9a831c0e..535589277 100644 --- a/app/code/community/Ess/M2ePro/controllers/Adminhtml/Walmart/Listing/ProductAddController.php +++ b/app/code/community/Ess/M2ePro/controllers/Adminhtml/Walmart/Listing/ProductAddController.php @@ -527,6 +527,7 @@ public function getCategoriesJsonAction() ); $treeBlock->setSelectedIds($selectedProductsIds); + $this->getResponse()->setHeader('Content-Type', 'application/json'); $this->getResponse()->setBody( $treeBlock->getCategoryChildrenJson($this->getRequest()->getParam('category')) ); diff --git a/app/code/community/Ess/M2ePro/etc/config.xml b/app/code/community/Ess/M2ePro/etc/config.xml index 85141d318..b09a9f804 100644 --- a/app/code/community/Ess/M2ePro/etc/config.xml +++ b/app/code/community/Ess/M2ePro/etc/config.xml @@ -2,7 +2,7 @@ - 6.44.1 + 6.44.2 diff --git a/app/code/community/Ess/M2ePro/sql/Install/Ebay.php b/app/code/community/Ess/M2ePro/sql/Install/Ebay.php index 91f76c1c2..2480c356b 100644 --- a/app/code/community/Ess/M2ePro/sql/Install/Ebay.php +++ b/app/code/community/Ess/M2ePro/sql/Install/Ebay.php @@ -466,7 +466,6 @@ public function execute() `is_english_measurement_system` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0, `is_metric_measurement_system` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0, `is_managed_payments` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0, - `is_cash_on_delivery` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0, `is_global_shipping_program` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0, `is_charity` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0, `is_return_description` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0, @@ -474,7 +473,6 @@ public function execute() `is_ktype` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0, PRIMARY KEY (`marketplace_id`), INDEX `is_calculated_shipping` (`is_calculated_shipping`), - INDEX `is_cash_on_delivery` (`is_cash_on_delivery`), INDEX `is_managed_payments` (`is_managed_payments`), INDEX `is_charity` (`is_charity`), INDEX `is_english_measurement_system` (`is_english_measurement_system`), @@ -926,7 +924,6 @@ public function execute() `local_shipping_mode` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0, `local_shipping_discount_promotional_mode` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0, `local_shipping_discount_combined_profile_id` TEXT DEFAULT NULL, - `cash_on_delivery_cost` VARCHAR(255) DEFAULT NULL, `international_shipping_mode` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0, `international_shipping_discount_promotional_mode` TINYINT(2) UNSIGNED NOT NULL DEFAULT 0, `international_shipping_discount_combined_profile_id` TEXT DEFAULT NULL, @@ -1087,28 +1084,28 @@ public function execute() (22, 216, 'Singapore', 'Singapore', 'ebay.com.sg', 0, 20, 'Asia / Pacific', 'ebay', NOW(), NOW()); INSERT INTO `{$this->_installer->getTable('m2epro_ebay_marketplace')}` VALUES - (1, 'USD', 'us', 'en_US', 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 0, 1, 0, 1, 1, 0, 0, 0), - (2, 'CAD', 'ca', 'en_CA', 1, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 0, 0), - (3, 'GBP', 'gb', 'en_GB', 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1), - (4, 'AUD', 'au', 'en_AU', 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 0, 0, 1), - (5, 'EUR', 'at', 'de_AT', 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 1, 0, 0), - (6, 'EUR', 'be', 'nl_BE', 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0), - (7, 'EUR', 'fr', 'fr_FR', 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1), - (8, 'EUR', 'de', 'de_DE', 1, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1), - (9, 'USD', 'us', 'en_US', 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 0), - (10, 'EUR', 'it', 'it_IT', 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1), - (11, 'EUR', 'be', 'fr_BE', 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0), - (12, 'EUR', 'nl', 'nl_NL', 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0), - (13, 'EUR', 'es', 'es_ES', 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1), - (14, 'CHF', 'ch', 'fr_CH', 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0), - (15, 'HKD', 'hk', 'zh_HK', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0), - (16, 'INR', 'in', 'hi_IN', 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0), - (17, 'EUR', 'ie', 'en_IE', 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0), - (18, 'MYR', 'my', 'ms_MY', 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0), - (19, 'CAD', 'ca', 'fr_CA', 0, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0), - (20, 'PHP', 'ph', 'fil_PH', 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0), - (21, 'PLN', 'pl', 'pl_PL', 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0), - (22, 'SGD', 'sg', 'zh_SG', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0); + (1, 'USD', 'us', 'en_US', 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1, 0, 0, 0), + (2, 'CAD', 'ca', 'en_CA', 1, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 0, 0), + (3, 'GBP', 'gb', 'en_GB', 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1), + (4, 'AUD', 'au', 'en_AU', 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1), + (5, 'EUR', 'at', 'de_AT', 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0), + (6, 'EUR', 'be', 'nl_BE', 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0), + (7, 'EUR', 'fr', 'fr_FR', 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1), + (8, 'EUR', 'de', 'de_DE', 1, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1), + (9, 'USD', 'us', 'en_US', 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0), + (10, 'EUR', 'it', 'it_IT', 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1), + (11, 'EUR', 'be', 'fr_BE', 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0), + (12, 'EUR', 'nl', 'nl_NL', 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0), + (13, 'EUR', 'es', 'es_ES', 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1), + (14, 'CHF', 'ch', 'fr_CH', 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0), + (15, 'HKD', 'hk', 'zh_HK', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0), + (16, 'INR', 'in', 'hi_IN', 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0), + (17, 'EUR', 'ie', 'en_IE', 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0), + (18, 'MYR', 'my', 'ms_MY', 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0), + (19, 'CAD', 'ca', 'fr_CA', 0, 1, 1, 1, 0, 1, 0, 1, 1, 0, 1, 1, 0, 0, 1, 0, 0, 0), + (20, 'PHP', 'ph', 'fil_PH', 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0), + (21, 'PLN', 'pl', 'pl_PL', 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0), + (22, 'SGD', 'sg', 'zh_SG', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0); SQL ); diff --git a/app/code/community/Ess/M2ePro/sql/Update/y23_m08/RemoveCashOnDelivery.php b/app/code/community/Ess/M2ePro/sql/Update/y23_m08/RemoveCashOnDelivery.php new file mode 100644 index 000000000..b61f573f3 --- /dev/null +++ b/app/code/community/Ess/M2ePro/sql/Update/y23_m08/RemoveCashOnDelivery.php @@ -0,0 +1,15 @@ +_installer->getTableModifier('ebay_marketplace') + ->dropColumn('is_cash_on_delivery'); + $this->_installer->getTableModifier('ebay_template_shipping') + ->dropColumn('cash_on_delivery_cost'); + } +} \ No newline at end of file diff --git a/app/code/community/Ess/M2ePro/sql/Upgrade/v6_44_1__v6_44_2/Config.php b/app/code/community/Ess/M2ePro/sql/Upgrade/v6_44_1__v6_44_2/Config.php new file mode 100644 index 000000000..a9aee0a6a --- /dev/null +++ b/app/code/community/Ess/M2ePro/sql/Upgrade/v6_44_1__v6_44_2/Config.php @@ -0,0 +1,17 @@ +getChildHtml('item_edit'); - order->getChildObject()->getCashOnDeliveryCost() > 0): ?> - - __('Cash On Delivery Cost');?>: - - - formatPrice($this->order->getChildObject()->getCurrency(), round($this->order->getChildObject()->getCashOnDeliveryCost(), 2)); ?> - - - - - diff --git a/app/design/adminhtml/default/default/template/M2ePro/ebay/template/shipping/form/data.phtml b/app/design/adminhtml/default/default/template/M2ePro/ebay/template/shipping/form/data.phtml index 13794f734..86ea95eb1 100644 --- a/app/design/adminhtml/default/default/template/M2ePro/ebay/template/shipping/form/data.phtml +++ b/app/design/adminhtml/default/default/template/M2ePro/ebay/template/shipping/form/data.phtml @@ -870,26 +870,6 @@ $missingAttributes = $this->getMissingAttributes(); - canDisplayCashOnDeliveryCost()): ?> - - - - - - -

- __('Required when using COD Payment Method.'); ?> -

- - - - diff --git a/composer.json b/composer.json index 8a689ab1f..ed5c66e61 100644 --- 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.44.1", + "version": "6.44.2", "license": "proprietary", "keywords": ["ebay", "amazon", "walmart", "magento"], "homepage": "https://www.m2epro.com/", diff --git a/js/M2ePro/Ebay/Template/Shipping.js b/js/M2ePro/Ebay/Template/Shipping.js index 9aef3d0ed..8475b347c 100644 --- a/js/M2ePro/Ebay/Template/Shipping.js +++ b/js/M2ePro/Ebay/Template/Shipping.js @@ -196,7 +196,6 @@ window.EbayTemplateShipping = Class.create(Common, { // --------------------------------------- EbayTemplateShippingObj.updateMeasurementVisibility(); - EbayTemplateShippingObj.updateCashOnDeliveryCostVisibility(); EbayTemplateShippingObj.updateCrossBorderTradeVisibility(); EbayTemplateShippingObj.updateRateTableVisibility('local'); EbayTemplateShippingObj.updateLocalHandlingCostVisibility(); @@ -736,23 +735,6 @@ window.EbayTemplateShipping = Class.create(Common, { // --------------------------------------- - updateCashOnDeliveryCostVisibility: function() { - if (!$('cash_on_delivery_cost_cv_tr')) { - return; - } - - if (EbayTemplateShippingObj.isLocalShippingModeFlat() - || EbayTemplateShippingObj.isLocalShippingModeCalculated() - ) { - $('cash_on_delivery_cost_cv_tr').show(); - } else { - $('cash_on_delivery_cost_cv_tr').hide(); - $('cash_on_delivery_cost').value = ''; - } - }, - - // --------------------------------------- - packageSizeChange: function() { var self = EbayTemplateShippingObj;