Merge pull request #65 from logeecom/master

Release version 3.2.23
packlink-dev · Feb 19, 2025 · 401769c · 401769c
2 parents 1d119b2 + 281934f
commit 401769c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/PluginInstallation/3.2.23/packlink.zip b/PluginInstallation/3.2.23/packlink.zip
diff --git a/PluginInstallation/CHANGELOG.md b/PluginInstallation/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/).
 
+## [3.2.23](https://github.com/packlink-dev/prestashop_module/compare/v3.2.22...v3.2.23)
+### Changed
+- Restored shop context and Shop ID in install() to fix ps_mbo incompatibility.
+
 ## [3.2.22](https://github.com/packlink-dev/prestashop_module/compare/v3.2.21...v3.2.22)
 ### Changed
 - Fix double change of order status when webhook is received

diff --git a/src/composer.json b/src/composer.json
@@ -2,7 +2,7 @@
   "name": "packlink/prestashop",
   "description": "Packlink Shipping PrestaShop plugin",
   "type": "library",
-  "version": "3.2.22",
+  "version": "3.2.23",
   "repositories": [
     {
       "type": "vcs",

diff --git a/src/packlink.php b/src/packlink.php
@@ -46,7 +46,7 @@ public function __construct()
         $this->module_key = 'a7a3a395043ca3a09d703f7d1c74a107';
         $this->name = 'packlink';
         $this->tab = 'shipping_logistics';
-        $this->version = '3.2.22';
+        $this->version = '3.2.23';
         $this->author = $this->l('Packlink Shipping S.L.');
         $this->need_instance = 0;
         $this->ps_versions_compliancy = array('min' => '1.6.0.14', 'max' => _PS_VERSION_);
@@ -73,13 +73,14 @@ public function install()
     {
         $installer = new \Packlink\PrestaShop\Classes\Utility\PacklinkInstaller($this);
         $previousShopContext = Shop::getContext();
+        $previousShopContextId = Shop::getContextShopID();
         Shop::setContext(Shop::CONTEXT_ALL);
 
         $result = $installer->initializePlugin() && parent::install() && $installer->addControllersAndHooks();
 
         \Packlink\PrestaShop\Classes\BusinessLogicServices\CleanupTaskSchedulerService::scheduleTaskCleanupTask();
 
-        Shop::setContext($previousShopContext);
+        Shop::setContext($previousShopContext, $previousShopContextId);
 
         return $result;
     }