6.21.2 (FINAL RELEASE)

m2epro · Apr 13, 2022 · 74bfba5 · 74bfba5
1 parent 9fd51ee
commit 74bfba5
Show file tree

Hide file tree

Showing 13 changed files with 89 additions and 80 deletions.
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();
+            $url = Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'spaces/m1/overview');
         } 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/CHANGELOG b/app/code/community/Ess/M2ePro/CHANGELOG
@@ -1,4 +1,9 @@
-* 6.21.1 (05/04/2022) 
+* 6.21.2 (13/04/2022) 
+
+Common: [Improved] Some UI text updates [#3486]
+eBay: [Fixed] Fatal error occurred when moving products from Unmanaged Listing to the M2E Pro Listing [#3436]
+
+* 6.21.1 (05/04/2022)
 
 Common [Fixed] Unable to set a decimal value in the "VAT Rate" field in the Selling Policy [#3100]
 eBay [Fixed] Incorrect mapping of floating-point variations when creating a Magento Order [#3108]

diff --git a/app/code/community/Ess/M2ePro/Helper/Module/Exception.php b/app/code/community/Ess/M2ePro/Helper/Module/Exception.php
@@ -157,9 +157,9 @@ public function getFatalErrorDetailedInfo($error, $traceInfo)
     {
         $info = $this->getFatalInfo($error, 'Fatal Error');
         $info .= $traceInfo;
-        $info .= $this->getCurrentUserActionInfo();
         $info .= $this->getAdditionalActionInfo();
-        $info .= Mage::helper('M2ePro/Module_Support')->getSummaryInfo();
+        $info .= Mage::helper('M2ePro/Module_Log')->platformInfo();
+        $info .= Mage::helper('M2ePro/Module_Log')->moduleInfo();
 
         return $info;
     }
@@ -168,9 +168,9 @@ public function getExceptionDetailedInfo(Exception $exception)
     {
         $info = $this->getExceptionInfo($exception, get_class($exception));
         $info .= $this->getExceptionStackTraceInfo($exception);
-        $info .= $this->getCurrentUserActionInfo();
         $info .= $this->getAdditionalActionInfo();
-        $info .= Mage::helper('M2ePro/Module_Support')->getSummaryInfo();
+        $info .= Mage::helper('M2ePro/Module_Log')->platformInfo();
+        $info .= Mage::helper('M2ePro/Module_Log')->moduleInfo();
 
         return $info;
     }
@@ -318,25 +318,6 @@ public function getFatalStackTraceInfo($stackTrace)
 
     // ---------------------------------------
 
-    protected function getCurrentUserActionInfo()
-    {
-        // @codingStandardsIgnoreStart
-        $server = print_r(Mage::app()->getRequest()->getServer(), true);
-        $get = print_r(Mage::app()->getRequest()->getQuery(), true);
-        $post = print_r(Mage::app()->getRequest()->getPost(), true);
-        // @codingStandardsIgnoreEnd
-
-        $actionInfo = <<<ACTION
--------------------------------- ACTION INFO -------------------------------------
-SERVER: {$server}
-GET: {$get}
-POST: {$post}
-
-ACTION;
-
-        return $actionInfo;
-    }
-
     protected function getAdditionalActionInfo()
     {
         $currentStoreId = Mage::app()->getStore()->getId();

diff --git a/app/code/community/Ess/M2ePro/Helper/Module/Log.php b/app/code/community/Ess/M2ePro/Helper/Module/Log.php
@@ -210,5 +210,35 @@ public function setViewMode($sessionName, $mode)
         return Mage::helper('M2ePro/Data_Session')->setValue($sessionName, $mode);
     }
 
+    public function platformInfo()
+    {
+        $platformInfo = array(
+            'edition' => Mage::helper('M2ePro/Magento')->getEditionName(),
+            'version' => Mage::helper('M2ePro/Magento')->getVersion()
+        );
+
+        return <<<DATA
+-------------------------------- PLATFORM INFO -----------------------------------
+Edition: {$platformInfo['edition']}
+Version: {$platformInfo['version']}
+
+DATA;
+    }
+
+    public function moduleInfo()
+    {
+        $moduleInfo = array(
+            'name'    => Mage::helper('M2ePro/Module')->getName(),
+            'version' => Mage::helper('M2ePro/Module')->getPublicVersion()
+        );
+
+        return <<<DATA
+-------------------------------- MODULE INFO -------------------------------------
+Name: {$moduleInfo['name']}
+Version: {$moduleInfo['version']}
+
+DATA;
+    }
+
     //########################################
-}
+}
diff --git a/app/code/community/Ess/M2ePro/Helper/Module/Logger.php b/app/code/community/Ess/M2ePro/Helper/Module/Logger.php
@@ -15,7 +15,6 @@ public function process($logData, $class = 'undefined', $sendToServer = true)
         try {
             $info  = $this->getLogMessage($logData, $class);
             $info .= $this->getStackTraceInfo();
-            $info .= $this->getCurrentUserActionInfo();
 
             $this->systemLog($class, null, $info);
 
@@ -26,7 +25,8 @@ public function process($logData, $class = 'undefined', $sendToServer = true)
                 return;
             }
 
-            $info .= Mage::helper('M2ePro/Module_Support')->getSummaryInfo();
+            $info .= Mage::helper('M2ePro/Module_Log')->platformInfo();
+            $info .= Mage::helper('M2ePro/Module_Log')->moduleInfo();
 
             $this->send($info, $class);
 
@@ -79,25 +79,6 @@ protected function getStackTraceInfo()
         return $stackTraceInfo;
     }
 
-    protected function getCurrentUserActionInfo()
-    {
-        // @codingStandardsIgnoreStart
-        $server = print_r(Mage::app()->getRequest()->getServer(), true);
-        $get = print_r(Mage::app()->getRequest()->getQuery(), true);
-        $post = print_r(Mage::app()->getRequest()->getPost(), true);
-        // @codingStandardsIgnoreEnd
-
-        $actionInfo = <<<ACTION
--------------------------------- ACTION INFO -------------------------------------
-SERVER: {$server}
-GET: {$get}
-POST: {$post}
-
-ACTION;
-
-        return $actionInfo;
-    }
-
     //########################################
 
     protected function send($logData, $type)

diff --git a/app/code/community/Ess/M2ePro/Helper/Server.php b/app/code/community/Ess/M2ePro/Helper/Server.php
@@ -27,7 +27,7 @@ public function getEndpoint()
             }
         }
 
-        return $this->getCurrentBaseUrl().'index.php';
+        return $this->getCurrentBaseUrl() . '/index.php';
     }
 
     public function switchEndpoint()
@@ -62,18 +62,21 @@ public function getApplicationKey()
 
     //########################################
 
-    public function getCurrentBaseUrl()
-    {
-        return $this->getBaseUrlByIndex($this->getCurrentIndex());
-    }
-
     public function getCurrentHostName()
     {
         return $this->getHostNameByIndex($this->getCurrentIndex());
     }
 
     // ---------------------------------------
 
+    protected function getCurrentBaseUrl()
+    {
+        $dbBaseUrl = $this->getBaseUrlByIndex($this->getCurrentIndex());
+        $dbBaseUrl = str_replace('index.php', '', $dbBaseUrl);
+
+        return rtrim($dbBaseUrl, '/');
+    }
+
     protected function getDefaultIndex()
     {
         $index = (int)Mage::helper('M2ePro/Module')->getConfig()->getGroupValue(

diff --git a/app/code/community/Ess/M2ePro/Model/Ebay/Template/StoreCategory/Builder.php b/app/code/community/Ess/M2ePro/Model/Ebay/Template/StoreCategory/Builder.php
@@ -12,21 +12,17 @@ class Ess_M2ePro_Model_Ebay_Template_StoreCategory_Builder extends Ess_M2ePro_Mo
 
     protected function prepareData()
     {
-        $data = array();
-
-        $keys = array(
+        $allowedKeys = array_flip(array(
             'account_id',
             'category_mode',
             'category_id',
             'category_attribute',
             'category_path'
-        );
+        ));
 
-        foreach ($keys as $key) {
-            isset($this->_rawData[$key]) && $data[$key] = $this->_rawData[$key];
-        }
-
-        return $data;
+        return array_filter(
+            array_intersect_key($this->_rawData, $allowedKeys)
+        );
     }
 
     public function getDefaultData()

diff --git a/app/code/community/Ess/M2ePro/Model/Servicing/Task/Settings.php b/app/code/community/Ess/M2ePro/Model/Servicing/Task/Settings.php
@@ -102,7 +102,7 @@ protected function updateServersBaseUrls(array $data)
                 $connectorObj = $dispatcherObject->getConnector(
                     'server', 'check', 'state',
                     array(
-                       'base_url' => $change['baseurl'].'index.php',
+                       'base_url' => $this->cleaningBaseUrl($change['baseurl']) . '/index.php',
                        'hostname' => $change['hostname'],
                     )
                 );
@@ -123,6 +123,13 @@ protected function updateServersBaseUrls(array $data)
         }
     }
 
+    protected function cleaningBaseUrl($baseUrl)
+    {
+        $baseUrl = str_replace('index.php', '', $baseUrl);
+
+        return rtrim($baseUrl, '/');
+    }
+
     protected function updateDefaultServerBaseUrlIndex(array $data)
     {
         if (!isset($data['default_server_baseurl_index']) || (int)$data['default_server_baseurl_index'] <= 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.21.1",
+  "version": "6.21.2",
   "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.21.1</version>
+            <version>6.21.2</version>
         </Ess_M2ePro>
     </modules>
     <default>

diff --git a/app/code/community/Ess/M2ePro/sql/Upgrade/v6_21_1__v6_21_2/Config.php b/app/code/community/Ess/M2ePro/sql/Upgrade/v6_21_1__v6_21_2/Config.php
@@ -0,0 +1,19 @@
+<?php
+
+/*
+ * @author     M2E Pro Developers Team
+ * @copyright  M2E LTD
+ * @license    Commercial use is forbidden
+ */
+
+class Ess_M2ePro_Sql_Upgrade_v6_21_1__v6_21_2_Config extends Ess_M2ePro_Model_Upgrade_Feature_AbstractConfig
+{
+    //########################################
+
+    public function getFeaturesList()
+    {
+        return array();
+    }
+
+    //########################################
+}
diff --git a/app/design/adminhtml/default/default/template/M2ePro/listing/product/rule.phtml b/app/design/adminhtml/default/default/template/M2ePro/listing/product/rule.phtml
@@ -46,19 +46,6 @@ $hideParam === null && $hideParam = true;
                                         <option value="1" <?php if ($hideParam == 1): ?>selected="selected"<?php endif; ?>><?php echo Mage::helper('M2ePro')->__('Yes'); ?></option>
                                     </select>
                                 </td>
-                                <td>
-                                    <img src="<?php echo $this->getSkinUrl('M2ePro/images/tool-tip-icon.png'); ?>"
-                                         class="tool-tip-image"
-                                         style="display: block; margin: 2px 0 0 6px;">
-                                    <span class="tool-tip-message tip-left" style="left: 650px; display: none; width: 200px;">
-                                        <img src="<?php echo $this->getSkinUrl('M2ePro/images/help.png'); ?>">
-                                        <span>
-                                            <?php echo Mage::helper('M2ePro')->__(
-                                                '<b>Note:</b> the Products from current Listing are not shown also.'
-                                            ); ?>
-                                        </span>
-                                    </span>
-                                </td>
                             </tr>
                         </table>
                     </div>
@@ -68,4 +55,4 @@ $hideParam === null && $hideParam = true;
         </div>
     </div>
 
-</div>
+</div>
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.21.1",
+  "version": "6.21.2",
   "license": "proprietary",
   "keywords": ["ebay", "amazon", "walmart", "magento"],
   "homepage": "https://www.m2epro.com/",