6.39.1 (FINAL RELEASE)

m2epro · May 10, 2023 · 411256b · 411256b
1 parent 4f2e882
commit 411256b
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 10 deletions.
diff --git a/app/code/community/Ess/M2ePro/Model/Amazon/Account/Server/Update.php b/app/code/community/Ess/M2ePro/Model/Amazon/Account/Server/Update.php
@@ -11,10 +11,10 @@ class Ess_M2ePro_Model_Amazon_Account_Server_Update
     /**
      * @param Ess_M2ePro_Model_Amazon_Account $account
      * @param string $oAuthCode
-     *
+     * @param string $merchantId
      * @return void
      */
-    public function process(Ess_M2ePro_Model_Amazon_Account $account, $oAuthCode)
+    public function process(Ess_M2ePro_Model_Amazon_Account $account, $oAuthCode, $merchantId)
     {
         /** @var Ess_M2ePro_Model_Amazon_Connector_Dispatcher $dispatcher */
         $dispatcher = Mage::getModel('M2ePro/Amazon_Connector_Dispatcher');
@@ -28,7 +28,7 @@ public function process(Ess_M2ePro_Model_Amazon_Account $account, $oAuthCode)
                 'account_server_hash' => $account->getServerHash(),
                 'oauth_code' => $oAuthCode,
                 'marketplace_id' => $account->getMarketplace()->getNativeId(),
-                'merchant_id' => $account->getMerchantId(),
+                'merchant_id' => $merchantId,
             )
         );
 

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

diff --git a/app/code/community/Ess/M2ePro/controllers/Adminhtml/Amazon/AccountController.php b/app/code/community/Ess/M2ePro/controllers/Adminhtml/Amazon/AccountController.php
@@ -270,7 +270,11 @@ public function afterGetTokenAction()
             );
         }
 
-        return $this->processExistingAccount((int)$params['account_id'], (string)$params['spapi_oauth_code']);
+        return $this->processExistingAccount(
+            (int)$params['account_id'],
+            (string)$params['spapi_oauth_code'],
+            (string)$params['selling_partner_id']
+        );
     }
 
     /**
@@ -344,9 +348,10 @@ protected function processNewAccount($sellingPartnerId, $spApiOAuthCode, $title,
     /**
      * @param int $accountId
      * @param string $spApiOAuthCode
-     * @return Ess_M2ePro_Adminhtml_Amazon_AccountController|Mage_Adminhtml_Controller_Action
+     * @param string $sellingPartnerId
+     * @return Ess_M2ePro_Adminhtml_Amazon_AccountController|Mage_Adminhtml_Controller_Action|null
      */
-    private function processExistingAccount($accountId, $spApiOAuthCode)
+    private function processExistingAccount($accountId, $spApiOAuthCode, $sellingPartnerId)
     {
         try {
             /** @var Ess_M2ePro_Model_Account $account */
@@ -356,7 +361,8 @@ private function processExistingAccount($accountId, $spApiOAuthCode)
             $serverUpdateAccount = Mage::getModel('M2ePro/Amazon_Account_Server_Update');
             $serverUpdateAccount->process(
                 $account->getChildObject(),
-                $spApiOAuthCode
+                $spApiOAuthCode,
+                $sellingPartnerId
             );
         } catch (Exception $exception) {
             Mage::helper('M2ePro/Module_Exception')->process($exception);

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.39.0</version>
+            <version>6.39.1</version>
         </Ess_M2ePro>
     </modules>
     <default>

diff --git a/app/code/community/Ess/M2ePro/sql/Upgrade/v6_39_0__v6_39_1/Config.php b/app/code/community/Ess/M2ePro/sql/Upgrade/v6_39_0__v6_39_1/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_39_0__v6_39_1_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.39.0",
+  "version": "6.39.1",
   "license": "proprietary",
   "keywords": ["ebay", "amazon", "walmart", "magento"],
   "homepage": "https://www.m2epro.com/",