6.24.1 (FINAL RELEASE)

m2epro · Jul 5, 2022 · c903a0d · c903a0d
1 parent d4bbc93
commit c903a0d
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 7 deletions.
diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Order/Item/Product/Options/Mapping.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Order/Item/Product/Options/Mapping.php
@@ -108,8 +108,8 @@ protected function _beforeToHtml()
         } else {
             foreach ($magentoVariations as $magentoVariation) {
                 $magentoOptionLabel = array_shift($magentoVariation['labels']);
-                if ($magentoValueLabel === '' || $magentoValueLabel === null) {
-                    $magentoValueLabel = Mage::helper('M2ePro')->__('N/A');
+                if ($magentoOptionLabel === '' || $magentoOptionLabel === null) {
+                    $magentoOptionLabel = Mage::helper('M2ePro')->__('N/A');
                 }
 
                 $magentoOption = array(

diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Support.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Support.php
@@ -43,7 +43,7 @@ public function __construct()
         );
 
         if ($this->_referrer === null) {
-            $url = Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'spaces/m1/overview');
+            $url = Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'x/rNqMAg');
         } else if ($this->_referrer == Ess_M2ePro_Helper_View_Ebay::NICK) {
             $url = Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(Ess_M2ePro_Helper_View_Ebay::NICK);
         } else if ($this->_referrer == Ess_M2ePro_Helper_View_Amazon::NICK) {

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

diff --git a/app/code/community/Ess/M2ePro/sql/Upgrade/v6_24_0__v6_24_1/Config.php b/app/code/community/Ess/M2ePro/sql/Upgrade/v6_24_0__v6_24_1/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_24_0__v6_24_1_Config extends Ess_M2ePro_Model_Upgrade_Feature_AbstractConfig
+{
+    public function getFeaturesList()
+    {
+        return array();
+    }
+}
diff --git a/app/design/adminhtml/default/default/template/M2ePro/ebay/account/tabs/order.phtml b/app/design/adminhtml/default/default/template/M2ePro/ebay/account/tabs/order.phtml
@@ -178,7 +178,7 @@
                             <span id="magento_orders_listings_other_product_mode_note" <?php if ($formData['magento_orders_settings']['listing_other']['product_mode'] == Ess_M2ePro_Model_Ebay_Account::MAGENTO_ORDERS_LISTINGS_OTHER_PRODUCT_MODE_IGNORE) echo 'style="display: none;"'; ?>><?php echo Mage::helper('M2ePro')->__(
                                 '<br/><b>Note:</b> M2E Pro will create only Simple Magento Products. For Channel variational items it will create a Simple Product for each variation.
                                 Please note that the Create Product and Order option is not meant for the creation of full-fledged products in your Magento catalog. <a href="%url%" target="_blank">See why</a>',
-                                Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'spaces/m1/pages/34167509/Order+Import#Product-Is-Listed-By-Any-Other-Software')
+                                Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'x/1VoJAg#Product-Is-Listed-By-Any-Other-Software')
                             ) ?></span>
                         </p>
                         <?php $canShowBlock = $formData['magento_orders_settings']['listing_other']['product_mode'] == Ess_M2ePro_Model_Ebay_Account::MAGENTO_ORDERS_LISTINGS_OTHER_PRODUCT_MODE_IMPORT; ?>

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