diff --git a/app/code/community/Ess/M2ePro/Model/Ebay/Listing/Product/Variation/Resolver.php b/app/code/community/Ess/M2ePro/Model/Ebay/Listing/Product/Variation/Resolver.php index 647b0b9e..8009b604 100644 --- a/app/code/community/Ess/M2ePro/Model/Ebay/Listing/Product/Variation/Resolver.php +++ b/app/code/community/Ess/M2ePro/Model/Ebay/Listing/Product/Variation/Resolver.php @@ -650,8 +650,10 @@ protected function isVariationEqualWithCurrent(array $channelVariation, array $m $channelMpn = isset($channelVariation['details']['mpn']) ? $channelVariation['details']['mpn'] : null; $moduleMpn = isset($moduleVariation['details']['mpn']) ? $moduleVariation['details']['mpn'] : null; + /** @var Ess_M2ePro_Helper_Component_Ebay_Configuration $ebayConfiguration */ + $ebayConfiguration = Mage::helper('M2ePro/Component_Ebay_Configuration'); if ($channelMpn != $moduleMpn - && $this->componentEbayConfiguration->getIgnoreVariationMpnInResolver() === false + && $ebayConfiguration->getIgnoreVariationMpnInResolver() === false ) { return false; } diff --git a/app/code/community/Ess/M2ePro/Model/Walmart/Template/SellingFormat/Builder.php b/app/code/community/Ess/M2ePro/Model/Walmart/Template/SellingFormat/Builder.php index 52c75c75..6b1fd58a 100644 --- a/app/code/community/Ess/M2ePro/Model/Walmart/Template/SellingFormat/Builder.php +++ b/app/code/community/Ess/M2ePro/Model/Walmart/Template/SellingFormat/Builder.php @@ -108,9 +108,9 @@ public function getDefaultData() 'sale_time_start_date_value' => Mage::helper('M2ePro')->getCurrentGmtDate(false, 'Y-m-d'), 'sale_time_end_date_value' => Mage::helper('M2ePro')->getCurrentGmtDate(false, 'Y-m-d'), - 'item_weight_mode' => WalmartTemplateSellingFormat::WEIGHT_MODE_CUSTOM_VALUE, + 'item_weight_mode' => WalmartTemplateSellingFormat::WEIGHT_MODE_CUSTOM_ATTRIBUTE, 'item_weight_custom_value' => '', - 'item_weight_custom_attribute' => '', + 'item_weight_custom_attribute' => 'weight', 'price_vat_percent' => 0, diff --git a/app/code/community/Ess/M2ePro/composer.json b/app/code/community/Ess/M2ePro/composer.json index 6f595a61..a7326a7f 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.43.0", + "version": "6.43.3", "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 4421ee49..a9c38980 100644 --- a/app/code/community/Ess/M2ePro/etc/config.xml +++ b/app/code/community/Ess/M2ePro/etc/config.xml @@ -2,7 +2,7 @@ - 6.43.0 + 6.43.3 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 index 9887fd68..39718f30 100644 --- 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,12 +6,10 @@ * @license Commercial use is forbidden */ -class Ess_M2ePro_Sql_Upgrade_v6_42_0__v6_43_0_Config extends Ess_M2ePro_Model_Upgrade_Feature_AbstractConfig +class Ess_M2ePro_Sql_Upgrade_v6_43_0__v6_43_3_Config extends Ess_M2ePro_Model_Upgrade_Feature_AbstractConfig { public function getFeaturesList() { - return array( - '@y23_m06/IgnoreVariationMpnInResolverConfig', - ); + return array(); } } diff --git a/app/design/adminhtml/default/default/template/M2ePro/amazon/template/description/tabs/general.phtml b/app/design/adminhtml/default/default/template/M2ePro/amazon/template/description/tabs/general.phtml index 720d5d8e..3d28ea82 100644 --- a/app/design/adminhtml/default/default/template/M2ePro/amazon/template/description/tabs/general.phtml +++ b/app/design/adminhtml/default/default/template/M2ePro/amazon/template/description/tabs/general.phtml @@ -142,19 +142,6 @@ editForm = new varienForm('edit_form', 'getValidationUrl(); ?>'); - - // chrome hack - refreshNewAsinAccepted = function() { - setTimeout(function() { - var tabContent = $('amazonTemplateDescriptionEditTabs_general_content'); - if (!tabContent.visible()) { - refreshWorldwideIdMode(); - } else { - $('new_asin_accepted').simulate('change'); - } - }, 50); - }; - refreshNewAsinAccepted(); }); //----------------------------- diff --git a/app/design/adminhtml/default/default/template/M2ePro/walmart/configuration/general/form.phtml b/app/design/adminhtml/default/default/template/M2ePro/walmart/configuration/general/form.phtml index b04c174f..d7fd933b 100644 --- a/app/design/adminhtml/default/default/template/M2ePro/walmart/configuration/general/form.phtml +++ b/app/design/adminhtml/default/default/template/M2ePro/walmart/configuration/general/form.phtml @@ -140,7 +140,9 @@
- + diff --git a/composer.json b/composer.json index 6f595a61..a7326a7f 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.43.0", + "version": "6.43.3", "license": "proprietary", "keywords": ["ebay", "amazon", "walmart", "magento"], "homepage": "https://www.m2epro.com/",