6.43.3 (FINAL RELEASE)

m2epro · Jul 31, 2023 · 17a1465 · 17a1465
1 parent 5e9e91c
commit 17a1465
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 24 deletions.
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
@@ -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
@@ -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
@@ -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
@@ -2,7 +2,7 @@
 <config>
     <modules>
         <Ess_M2ePro>
-            <version>6.43.0</version>
+            <version>6.43.3</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,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/.../adminhtml/default/default/template/M2ePro/amazon/template/description/tabs/general.phtml b/.../adminhtml/default/default/template/M2ePro/amazon/template/description/tabs/general.phtml
@@ -142,19 +142,6 @@
         <?php } ?>
 
         editForm = new varienForm('edit_form', '<?php echo $this->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/...design/adminhtml/default/default/template/M2ePro/walmart/configuration/general/form.phtml b/...design/adminhtml/default/default/template/M2ePro/walmart/configuration/general/form.phtml
@@ -140,7 +140,9 @@
                 <table class="form-list" cellspacing="0" cellpadding="0">
                     <tr>
                         <td class="label">
-                            <label for="product_id_mode"><?php echo Mage::helper('M2ePro')->__('Product ID') ?>:</label>
+                            <label for="product_id_mode">
+                                <?php echo Mage::helper('M2ePro')->__('Product ID') ?>: <span class="required">*</span>
+                            </label>
                         </td>
                         <td class="value">
                             <input type="hidden" id="product_id_custom_attribute" name="product_id_custom_attribute" value="<?php echo $this->getConfigurationHelper()->getProductIdCustomAttribute();?>"/>

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.0",
+  "version": "6.43.3",
   "license": "proprietary",
   "keywords": ["ebay", "amazon", "walmart", "magento"],
   "homepage": "https://www.m2epro.com/",