From 43ffeea858e8ed822e9f741c6dddd61affac3fbc Mon Sep 17 00:00:00 2001
From: M2E Pro <m2epro@users.noreply.github.com>
Date: Fri, 20 Oct 2023 15:30:35 +0000
Subject: [PATCH] 6.49.0 (FINAL RELEASE)

---
 app/code/community/Ess/M2ePro/composer.json   |  2 +-
 app/code/community/Ess/M2ePro/etc/config.xml  |  2 +-
 .../community/Ess/M2ePro/sql/Install/Ebay.php |  4 ++--
 .../Update/y23_m10/EnableEbayShippingRate.php | 19 +++++++++++++++++++
 .../sql/Upgrade/v6_48_0__v6_49_0/Config.php   | 17 +++++++++++++++++
 composer.json                                 |  2 +-
 6 files changed, 41 insertions(+), 5 deletions(-)
 create mode 100644 app/code/community/Ess/M2ePro/sql/Update/y23_m10/EnableEbayShippingRate.php
 create mode 100644 app/code/community/Ess/M2ePro/sql/Upgrade/v6_48_0__v6_49_0/Config.php

diff --git a/app/code/community/Ess/M2ePro/composer.json b/app/code/community/Ess/M2ePro/composer.json
index a121ecb4..acce52b4 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.48.0",
+  "version": "6.49.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 7bfba7b3..62897ccb 100644
--- 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.48.0</version>
+            <version>6.49.0</version>
         </Ess_M2ePro>
     </modules>
     <default>
diff --git a/app/code/community/Ess/M2ePro/sql/Install/Ebay.php b/app/code/community/Ess/M2ePro/sql/Install/Ebay.php
index 2480c356..264e1dec 100644
--- a/app/code/community/Ess/M2ePro/sql/Install/Ebay.php
+++ b/app/code/community/Ess/M2ePro/sql/Install/Ebay.php
@@ -1090,13 +1090,13 @@ public function execute()
     (4, 'AUD', 'au', 'en_AU', 1, 1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 1, 0, 0, 1),
     (5, 'EUR', 'at', 'de_AT', 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0),
     (6, 'EUR', 'be', 'nl_BE', 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0),
-    (7, 'EUR', 'fr', 'fr_FR', 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1),
+    (7, 'EUR', 'fr', 'fr_FR', 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1),
     (8, 'EUR', 'de', 'de_DE', 1, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1),
     (9, 'USD', 'us', 'en_US', 1, 0, 1, 1, 0, 1, 0, 0, 1, 0, 1, 0, 1, 1, 1, 0, 1, 0),
     (10, 'EUR', 'it', 'it_IT', 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1),
     (11, 'EUR', 'be', 'fr_BE', 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0),
     (12, 'EUR', 'nl', 'nl_NL', 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0),
-    (13, 'EUR', 'es', 'es_ES', 1, 0, 0, 0, 1, 1, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1),
+    (13, 'EUR', 'es', 'es_ES', 1, 0, 0, 0, 1, 1, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 0, 1),
     (14, 'CHF', 'ch', 'fr_CH', 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0),
     (15, 'HKD', 'hk', 'zh_HK', 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0),
     (16, 'INR', 'in', 'hi_IN', 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0),
diff --git a/app/code/community/Ess/M2ePro/sql/Update/y23_m10/EnableEbayShippingRate.php b/app/code/community/Ess/M2ePro/sql/Update/y23_m10/EnableEbayShippingRate.php
new file mode 100644
index 00000000..a533168c
--- /dev/null
+++ b/app/code/community/Ess/M2ePro/sql/Update/y23_m10/EnableEbayShippingRate.php
@@ -0,0 +1,19 @@
+<?php
+
+// @codingStandardsIgnoreFile
+
+class Ess_M2ePro_Sql_Update_y23_m10_EnableEbayShippingRate extends
+    Ess_M2ePro_Model_Upgrade_Feature_AbstractFeature
+{
+    public function execute()
+    {
+        $this->_installer->getConnection()->update(
+            $this->_installer->getFullTableName('m2epro_ebay_marketplace'),
+            array(
+                'is_local_shipping_rate_table' => 1,
+                'is_international_shipping_rate_table' => 1,
+            ),
+            array('marketplace_id IN (?)' => array(7, 13))
+        );
+    }
+}
diff --git a/app/code/community/Ess/M2ePro/sql/Upgrade/v6_48_0__v6_49_0/Config.php b/app/code/community/Ess/M2ePro/sql/Upgrade/v6_48_0__v6_49_0/Config.php
new file mode 100644
index 00000000..e96de7af
--- /dev/null
+++ b/app/code/community/Ess/M2ePro/sql/Upgrade/v6_48_0__v6_49_0/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_48_0__v6_49_0_Config extends Ess_M2ePro_Model_Upgrade_Feature_AbstractConfig
+{
+    public function getFeaturesList()
+    {
+        return array(
+            '@y23_m10/EnableEbayShippingRate',
+        );
+    }
+}
diff --git a/composer.json b/composer.json
index a121ecb4..acce52b4 100644
--- 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.48.0",
+  "version": "6.49.0",
   "license": "proprietary",
   "keywords": ["ebay", "amazon", "walmart", "magento"],
   "homepage": "https://www.m2epro.com/",