6.23.2 (FINAL RELEASE)

m2epro · Jun 15, 2022 · d17cd2d · d17cd2d
1 parent 7825cb7
commit d17cd2d
Show file tree

Hide file tree

Showing 14 changed files with 91 additions and 27 deletions.
diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Wizard/Congratulation.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Wizard/Congratulation.php
@@ -13,9 +13,7 @@ class Ess_M2ePro_Block_Adminhtml_Wizard_Congratulation extends Mage_Adminhtml_Bl
     protected function _toHtml()
     {
         $content = Mage::helper('M2ePro')->__(
-            'This wizard was already finished.
-            Please <a href="%1%">Contact Us</a>, if it is need.',
-            Mage::helper('M2ePro/Module_Support')->getSupportUrl()
+            'Installation Wizard is completed. If you can\'t proceed, please contact us at <a href="mailto:[email protected]">[email protected]</a>.'
         );
 
         return <<<HTML

diff --git a/app/code/community/Ess/M2ePro/CHANGELOG b/app/code/community/Ess/M2ePro/CHANGELOG
@@ -1,4 +1,8 @@
-* 6.23.1 (13/06/2022) 
+* 6.23.2 (15/06/2022) 
+
+Common: [Improved] Some UI text updates [#3148]
+
+* 6.23.1 (13/06/2022)
 
 Common: [Fixed] Log type was not updated from "Channel Change" to "External Change" for Products in M2E Pro Listing [#3455]
 eBay: [Fixed] Multi-variation listings were disabled for some supported eBay categories [#3429]

diff --git a/app/code/community/Ess/M2ePro/Model/Config/Manager.php b/app/code/community/Ess/M2ePro/Model/Config/Manager.php
@@ -200,18 +200,33 @@ protected function deleteAllValues($group)
 
     //########################################
 
+    /**
+     * @throws Ess_M2ePro_Model_Exception_Logic
+     */
     protected function prepareGroup($group)
     {
         if (empty($group)) {
-            return false;
+            throw new Ess_M2ePro_Model_Exception_Logic('Configuration group cannot be empty.');
+        }
+
+        $group = trim($group);
+        if ($group === '/') {
+            return $group;
         }
 
         return '/'.strtolower(trim($group, '/')).'/';
     }
 
+    /**
+     * @throws Ess_M2ePro_Model_Exception_Logic
+     */
     protected function prepareKey($key)
     {
-        return strtolower($key);
+        if (empty($key)) {
+            throw new Ess_M2ePro_Model_Exception_Logic('Configuration key cannot be empty.');
+        }
+
+        return strtolower(trim($key));
     }
 
     //########################################

diff --git a/app/code/community/Ess/M2ePro/Model/Cron/Task/Walmart/Order/Receive.php b/app/code/community/Ess/M2ePro/Model/Cron/Task/Walmart/Order/Receive.php
@@ -145,7 +145,7 @@ protected function receiveWalmartOrdersData(Ess_M2ePro_Model_Account $account)
             $orders[] = $responseData['items'];
             $breakDate = $fromDate;
 
-            if (Mage::helper('M2ePro/Module')->isTestingManualEnvironment()) {
+            if ($fromDate > $toDate) {
                 break;
             }
         } while (!empty($responseData['items']));

diff --git a/app/code/community/Ess/M2ePro/Model/Upgrade/Modifier/Config.php b/app/code/community/Ess/M2ePro/Model/Upgrade/Modifier/Config.php
@@ -96,7 +96,7 @@ public function insert($group, $key, $value = null, $notice = null)
     /**
      * @param string $field
      * @param string $value
-     * @param string $where
+     * @param string|array $where
      * @return int
      * @throws Ess_M2ePro_Model_Exception_Setup
      * @throws Zend_Db_Adapter_Exception
@@ -141,7 +141,7 @@ public function delete($group, $key = null)
 
     /**
      * @param string $value
-     * @param string $where
+     * @param string|array $where
      * @return int
      */
     public function updateGroup($value, $where)
@@ -151,7 +151,7 @@ public function updateGroup($value, $where)
 
     /**
      * @param string $value
-     * @param string $where
+     * @param string|array $where
      * @return int
      */
     public function updateKey($value, $where)
@@ -161,7 +161,7 @@ public function updateKey($value, $where)
 
     /**
      * @param string $value
-     * @param string $where
+     * @param string|array $where
      * @return int
      */
     public function updateValue($value, $where)

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.23.1",
+  "version": "6.23.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.23.1</version>
+            <version>6.23.2</version>
         </Ess_M2ePro>
     </modules>
     <default>

diff --git a/app/code/community/Ess/M2ePro/sql/Update/y22_m06/FixMistakenConfigs.php b/app/code/community/Ess/M2ePro/sql/Update/y22_m06/FixMistakenConfigs.php
@@ -0,0 +1,34 @@
+<?php
+
+// @codingStandardsIgnoreFile
+
+class Ess_M2ePro_Sql_Update_y22_m06_FixMistakenConfigs extends
+    Ess_M2ePro_Model_Upgrade_Feature_AbstractFeature
+{
+    public function execute()
+    {
+        $configKeys = array('is_disabled', 'environment');
+        foreach ($configKeys as $configKey) {
+            $this->fixMistakenConfig($configKey);
+        }
+    }
+
+    private function fixMistakenConfig($configKey)
+    {
+        $entity = $this->_installer->getMainConfigModifier()->getEntity('//', $configKey);
+
+        if ($entity->getValue() === null) {
+            return;
+        }
+
+        $updated = $this->_installer->getMainConfigModifier()->updateValue($entity->getValue(), array(
+                '`group` = ?' => '/',
+                '`key` = ?' => $configKey
+            )
+        );
+
+        if ($updated > 0) {
+            $entity->delete();
+        }
+    }
+}
diff --git a/app/code/community/Ess/M2ePro/sql/Upgrade/v6_23_1__v6_23_2/Config.php b/app/code/community/Ess/M2ePro/sql/Upgrade/v6_23_1__v6_23_2/Config.php
@@ -0,0 +1,17 @@
+<?php
+
+/*
+ * @author     M2E Pro Developers Team
+ * @copyright  M2E LTD
+ * @license    Commercial use is forbidden
+ */
+
+class Ess_M2ePro_Sql_Upgrade_v6_23_1__v6_23_2_Config extends Ess_M2ePro_Model_Upgrade_Feature_AbstractConfig
+{
+    public function getFeaturesList()
+    {
+        return array(
+            '@y22_m06/FixMistakenConfigs'
+        );
+    }
+}
diff --git a/app/design/adminhtml/default/default/template/M2ePro/amazon/account/tabs/order.phtml b/app/design/adminhtml/default/default/template/M2ePro/amazon/account/tabs/order.phtml
@@ -834,9 +834,7 @@
         <div class="hor-scroll">
 
             <div id="block_notice_amazon_accounts_orders_status" class="block_notices_module" title="<?php echo Mage::helper('M2ePro')->__('Order Status Mapping'); ?>">
-                <?php echo Mage::helper('M2ePro')->__('In this Block you can configure Mapping between Amazon Order state and Magento Order Statuses.
-                Depending on the state of Amazon Order you can either manually determine certain Statuses for Magento Order and enable automatic Shipment and Invoice
-                creation by selecting appropriate check-boxes, or use predefined default Settings. (i.e. Amazon: Order is Shipped -> Magento Order is Complete).<br/>'); ?>
+                <?php echo Mage::helper('M2ePro')->__('Set the correspondence between Amazon and Magento order statuses. The status of your Magento order will be updated based on these settings.'); ?>
             </div>
             <table class="form-list" cellspacing="0" cellpadding="0">
 

diff --git a/app/design/adminhtml/default/default/template/M2ePro/configuration/components.phtml b/app/design/adminhtml/default/default/template/M2ePro/configuration/components.phtml
@@ -46,13 +46,12 @@ HTML;
 <div id="block_notice_configuration_module_channel" class="block_notices_module"
      title="<?php echo Mage::helper('M2ePro')->__('Module & Channels'); ?>">
     <p><?php echo Mage::helper('M2ePro')->__('
-                Here you can manage the Module and Automatic Synchronization running, enable Channels you want to sell 
-                on. Total sales will be counted through eBay, Walmart, and Amazon accounts connected to the M2E Pro 
-                subscription. If you want to stop the service for a certain account, please delete it from your 
-                subscription on <a href="%url_1%" target="_blank">Clients</a>. 
-                Read the <a href="%url_2%" target="_blank">article</a> for more details.',
-            Mage::helper('M2ePro/Module_Support')->getClientsPortalUrl(),
-            Mage::helper('M2ePro/Module_Support')->getDocumentationUrl(null, null, 'x/qVoJAg')
+                Here you can manage the Module and Automatic Synchronization running.
+
+		If you enable Channels you want to sell on.
+		Total sales will be counted through eBay, Walmart, and Amazon accounts connected to the M2E Pro subscription.
+		If you want to stop the service for a certain account, please delete it from your subscription on <a href="%url_1%" target="_blank">Clients</a>.',
+            Mage::helper('M2ePro/Module_Support')->getClientsPortalUrl()
         ); ?>
     </p>
 </div>

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
@@ -660,7 +660,7 @@
 
             <div id="block_notice_ebay_accounts_magento_orders_statuses" class="block_notices_module" title="<?php echo Mage::helper('M2ePro')->__('Order Status Mapping'); ?>">
                 <?php echo Mage::helper('M2ePro')->__(
-                'Match stages in the eBay Order process to Order Statuses in Magento. You can also choose whether to create invoices and shipment notifications automatically.'
+                'Set the correspondence between eBay and Magento order statuses. The status of your Magento order will be updated based on these settings.'
                 ); ?>
             </div>
             <table class="form-list" cellspacing="0" cellpadding="0">

diff --git a/app/design/adminhtml/default/default/template/M2ePro/walmart/account/tabs/order.phtml b/app/design/adminhtml/default/default/template/M2ePro/walmart/account/tabs/order.phtml
@@ -515,8 +515,7 @@
 
             <div id="block_notice_walmart_accounts_orders_status" class="block_notices_module" title="<?php echo Mage::helper('M2ePro')->__('Order Status Mapping'); ?>">
                 <?php echo Mage::helper('M2ePro')->__(
-                    'Set the correspondence between Walmart and Magento Order statuses.<br>
-                    M2E Pro supports an automatic generation of Invoices and Shipments. Enable the options next to the related Order statuses.<br/>'
+                    'Set the correspondence between Walmart and Magento order statuses. The status of your Magento order will be updated based on these settings.'
                 ); ?>
             </div>
             <table class="form-list" cellspacing="0" cellpadding="0">

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