back office compatibility with prestashop 9

mollie · Dec 17, 2024 · 10b7229 · 10b7229
1 parent 9dc0c4a
commit 10b7229
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/create_zip.yml b/.github/workflows/create_zip.yml
@@ -23,11 +23,9 @@ jobs:
       - name: Build module ZIP
         run: |
           composer install --no-dev --optimize-autoloader --classmap-authoritative
-          composer global require humbug/php-scoper --no-progress --no-interaction
-          ~/.composer/vendor/bin/php-scoper add-prefix && cp -r build/vendor/* vendor/
           composer dump-autoload --no-dev --optimize --classmap-authoritative
           cp .github/.htaccess vendor/.htaccess
-          rm -rf .git .docker .editorconfig .github tests .php-cs-fixer.php Makefile cypress .docker cypress.config.js cypress.env.json docker-compose*.yml .gitignore bin codeception.yml package-lock.json package.json .php_cs.dist .php-cs-fixer.dist .php-cs-fixer.dist.php php-scoper.inc.php
+          rm -rf .git .docker .editorconfig .github tests .php-cs-fixer.php Makefile cypress .docker cypress.config.js cypress.env.json docker-compose*.yml .gitignore bin codeception.yml package-lock.json package.json .php_cs.dist .php-cs-fixer.dist .php-cs-fixer.dist.php
           mv .env.dist .env
           mkdir ${{ env.MODULE_NAME }}
           rsync -Rr ./ ./${{ env.MODULE_NAME }}

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -85,10 +85,8 @@ jobs:
       - name: Build module ZIP
         run: |
           composer install --no-dev --optimize-autoloader --classmap-authoritative
-          composer global require humbug/php-scoper --no-progress --no-interaction
-          ~/.composer/vendor/bin/php-scoper add-prefix && cp -r build/vendor/* vendor/
           composer dump-autoload --no-dev --optimize --classmap-authoritative
-          rm -rf .git .github tests .php-cs-fixer.php Makefile cypress* docker-compose*.yml package.json package-lock.json .docker php-scoper.inc.php
+          rm -rf .git .github tests .php-cs-fixer.php Makefile cypress* docker-compose*.yml package.json package-lock.json .docker
           mkdir ${{ env.MODULE_NAME }}
           rsync -Rr ./ ./${{ env.MODULE_NAME }}
           shopt -s extglob

diff --git a/controllers/admin/AdminMollieAjaxController.php b/controllers/admin/AdminMollieAjaxController.php
@@ -32,6 +32,9 @@ class AdminMollieAjaxController extends ModuleAdminController
     public function postProcess()
     {
         $action = Tools::getValue('action');
+
+        $this->context->smarty->assign('bootstrap', true);
+
         switch ($action) {
             case 'togglePaymentMethod':
                 $this->togglePaymentMethod();

diff --git a/mollie.php b/mollie.php
@@ -521,7 +521,7 @@ public function hookDisplayAdminOrder($params)
             'errorDisplay' => Configuration::get(Mollie\Config\Config::MOLLIE_DISPLAY_ERRORS),
         ]);
 
-        return $this->display(__FILE__, 'order_info.tpl');
+        return $this->display($this->getLocalPath(), 'views/templates/hook/order_info.tpl');
     }
 
     /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -521,7 +521,7 @@ public function hookDisplayAdminOrder($params) @@
                 'errorDisplay' => Configuration::get(Mollie\Config\Config::MOLLIE_DISPLAY_ERRORS),
             ]);
-            return $this->display(__FILE__, 'order_info.tpl');
+            return $this->display($this->getLocalPath(), 'views/templates/hook/order_info.tpl');
         }
         /**
@@ Expand Down @@