From 76bfbf357136c108b871b855830ff004811729c6 Mon Sep 17 00:00:00 2001 From: M2E Pro Date: Tue, 8 Aug 2023 08:55:37 +0000 Subject: [PATCH] 6.44.0 (FINAL RELEASE) --- .../Edit/Tabs/InvoicesAndShipments/Form.php | 26 +++++++++++++------ app/code/community/Ess/M2ePro/composer.json | 2 +- app/code/community/Ess/M2ePro/etc/config.xml | 2 +- .../sql/Upgrade/v6_43_5__v6_44_0/Config.php | 15 +++++++++++ composer.json | 2 +- 5 files changed, 36 insertions(+), 11 deletions(-) create mode 100644 app/code/community/Ess/M2ePro/sql/Upgrade/v6_43_5__v6_44_0/Config.php diff --git a/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Account/Edit/Tabs/InvoicesAndShipments/Form.php b/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Account/Edit/Tabs/InvoicesAndShipments/Form.php index a456e6fe..a7c6693e 100644 --- a/app/code/community/Ess/M2ePro/Block/Adminhtml/Amazon/Account/Edit/Tabs/InvoicesAndShipments/Form.php +++ b/app/code/community/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 article.', + Mage::helper('M2ePro/Module_Support')->getSupportUrl('/support/solutions/articles/9000219394') + ); + $tooltipHtml = << + + + +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 + 'after_element_html' => $tooltipHtml ) ); diff --git a/app/code/community/Ess/M2ePro/composer.json b/app/code/community/Ess/M2ePro/composer.json index c78d6dd2..3c1031b5 100644 --- 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 index 82067612..66cfeb49 100644 --- a/app/code/community/Ess/M2ePro/etc/config.xml +++ b/app/code/community/Ess/M2ePro/etc/config.xml @@ -2,7 +2,7 @@ - 6.43.5 + 6.44.0 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 new file mode 100644 index 00000000..bc59b98a --- /dev/null +++ b/app/code/community/Ess/M2ePro/sql/Upgrade/v6_43_5__v6_44_0/Config.php @@ -0,0 +1,15 @@ +