6.44.0 (FINAL RELEASE)

m2epro · Aug 8, 2023 · 76bfbf3 · 76bfbf3
1 parent 985f760
commit 76bfbf3
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 11 deletions.
diff --git a/...mmunity/Ess/M2ePro/Block/Adminhtml/Amazon/Account/Edit/Tabs/InvoicesAndShipments/Form.php b/...mmunity/Ess/M2ePro/Block/Adminhtml/Amazon/Account/Edit/Tabs/InvoicesAndShipments/Form.php
@@ -57,6 +57,22 @@ protected function _prepareForm()
                 )
             );
 
+            $tooltipMessage = Mage::helper('M2ePro')->__(
+                'Learn how to set up automatic invoice uploading in this <a href="%url%" target="_blank">article</a>.',
+                Mage::helper('M2ePro/Module_Support')->getSupportUrl('/support/solutions/articles/9000219394')
+            );
+            $tooltipHtml = <<<TOOLTIP_HTML
+<span>
+    <img class="tool-tip-image"
+     style="vertical-align: middle;" src="{$this->getSkinUrl('M2ePro/images/tool-tip-icon.png')}" />
+    <span class="tool-tip-message" style="display:none; text-align: left; width: 120px;">
+        <img src="{$this->getSkinUrl('M2ePro/images/help.png')}" />
+        <span>$tooltipMessage</span>
+    </span>
+</span>
+TOOLTIP_HTML;
+
+
             $fieldset->addField(
                 'invoice_generation',
                 'select',
@@ -71,16 +87,10 @@ protected function _prepareForm()
                         AmazonAccount::INVOICE_GENERATION_BY_AMAZON    =>
                             Mage::helper('M2ePro')->__('I want Amazon to generate VAT Invoices'),
                         AmazonAccount::INVOICE_GENERATION_BY_EXTENSION =>
-                            Mage::helper('M2ePro')->__('I will upload my own Invoices'),
+                            Mage::helper('M2ePro')->__('M2E Pro will generate and upload invoices'),
                     ),
                     'value'              => '',
-                    'after_element_html' => <<<HTML
-<tr>
-    <td colspan="6" style="padding: 10px 0">
-        <hr style="border: 1px solid silver; border-bottom: none;">
-    </td>
-</tr>
-HTML
+                    'after_element_html' => $tooltipHtml
 
                 )
             );

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

diff --git a/app/code/community/Ess/M2ePro/sql/Upgrade/v6_43_5__v6_44_0/Config.php b/app/code/community/Ess/M2ePro/sql/Upgrade/v6_43_5__v6_44_0/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_43_5__v6_44_0_Config extends Ess_M2ePro_Model_Upgrade_Feature_AbstractConfig
+{
+    public function getFeaturesList()
+    {
+        return array();
+    }
+}
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.5",
+  "version": "6.44.0",
   "license": "proprietary",
   "keywords": ["ebay", "amazon", "walmart", "magento"],
   "homepage": "https://www.m2epro.com/",