PIPRES-489 PrestaShop 9 compatibility

.github/workflows/E2E_On_PR.yml

@@ -36,7 +36,7 @@ jobs:
       DB_PASSWD: ${{ secrets.DB_PASSWD }}
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.0.0
+        uses: actions/checkout@v4
       - run: wget https://bin.equinox.io/c/4VmDzA7iaHb/ngrok-stable-linux-amd64.zip
         shell: bash
       - run: unzip -qq -o ngrok-stable-linux-amd64.zip

.github/workflows/deploy.yml

@@ -9,7 +9,7 @@ jobs:
         runs-on: ubuntu-latest
         steps:
             - name: Checkout repository
-              uses: actions/checkout@v2
+              uses: actions/checkout@v4
             - name: build
                 # IF YOU EDIT THIS, DON'T FORGET TO EDIT release.yml
               run: |
@@ -32,7 +32,7 @@ jobs:
                   find . -maxdepth 1 -type f -exec rm "{}" \;
                   cd mollie && rm -rf mollie
             - name: Archive production artifacts
-              uses: actions/upload-artifact@v2
+              uses: actions/upload-artifact@v4
               with:
                   name: mollie
                   path: |

.github/workflows/midnight_status_check.yml

@@ -18,18 +18,18 @@ jobs:
     steps:
 
       - name: Checkout
-        uses: actions/checkout@v2.0.0
+        uses: actions/checkout@v4
 
       - name: NPM install
         run: npm ci
 
       - name: Run Cypress on PS16, PS17, PS177
         run: npx cypress run --env demousername=${{ secrets.DEMO_USER }},demopassword=${{ secrets.DEMO_PASS }},FO_username=${{ secrets.MOLLIE_FO_USR }},FO_password=${{ secrets.MOLLIE_FO_PSW }},mollie_test_api_key=${{ secrets.MOLLIE_TEST_API_KEY }},mollie_test_profile_id=${{ secrets.MOLLIE_TEST_PROFILE_ID }}
         #--parallel --record --key fe20a60a-0ac6-4956-a6e8-911aad86cb03
-  
+
       - name: Archive videos and screenshots
         if: ${{ always() }}
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: videos_screenshots
           retention-days: 1

.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.0.0
+        uses: actions/checkout@v4
 
       - name: Run PHP-CS-Fixer
         uses: prestashopcorp/github-action-php-cs-fixer@master
@@ -22,13 +22,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4.0.0
+        uses: actions/checkout@v4
 
       - name: Install composer
         run: composer i
 
       - name: Cache composer folder
-        uses: actions/cache@v4.0.0
+        uses: actions/cache@v4
         with:
           path: ~/.composer/cache
           key: php-composer-cache
@@ -46,16 +46,16 @@ jobs:
         presta-versions: [ '1.7.6.8', '1.7.7.0', 'nightly-apache' ]
     steps:
       - name: Checkout
-        uses: actions/checkout@v2.0.0
+        uses: actions/checkout@v4
 
       - name: Cache vendor folder
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: vendor
           key: php-${{ hashFiles('composer.lock') }}
 
       - name: Cache composer folder
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.composer/cache
           key: php-composer-cache

.github/workflows/upgrading_check.yml

@@ -17,7 +17,7 @@ jobs:
             ModuleUpgradeTest: 'make VERSION=1785 upgrading-module-test-1785'
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4
 
       - name: Install composer
         run: composer update

config/services.yml

@@ -100,3 +100,19 @@ services:
     - '@subscription_options_data_provider'
     - 'subscription_options': 'Mollie\Subscription\Form\Options\SubscriptionOptionsType'
     - 'SubscriptionOptions'
+
+  Mollie\Subscription\Controller\Symfony\SubscriptionFAQController:
+    class: Mollie\Subscription\Controller\Symfony\SubscriptionFAQController
+    arguments:
+      - '@service_container'  # Inject the service container for PS 9.0
+      - '@twig'
+    tags:
+      - { name: 'controller.service_arguments' }
+
+  Mollie\Subscription\Controller\Symfony\SubscriptionController:
+    class: Mollie\Subscription\Controller\Symfony\SubscriptionController
+    arguments:
+      - '@service_container'  # Inject the service container for PS 9.0
+      - '@twig'
+    tags:
+      - { name: 'controller.service_arguments' }

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();
@@ -80,7 +83,7 @@ private function togglePaymentMethod()
         }
         $method->update();
 
-        $this->ajaxDie(json_encode(
+        $this->ajaxRender(json_encode(
             [
                 'success' => true,
                 'paymentStatus' => (int) $method->enabled,
@@ -100,7 +103,7 @@ private function resendPaymentMail()
 
         $response = $molliePaymentMailService->sendSecondChanceMail($orderId);
 
-        $this->ajaxDie(json_encode($response));
+        $this->ajaxRender(json_encode($response));
     }
 
     /**
@@ -119,7 +122,7 @@ private function testApiKeys()
         $apiKeysTestInfo = $apiTestFeedbackBuilder->buildParams();
 
         $this->context->smarty->assign($apiKeysTestInfo);
-        $this->ajaxDie(json_encode(
+        $this->ajaxRender(json_encode(
             [
                 'template' => $this->context->smarty->fetch($this->module->getLocalPath() . 'views/templates/admin/api_test_results.tpl'),
             ]
@@ -141,7 +144,7 @@ private function validateLogo()
         $returnText = '';
         // Check image format
         if ('jpg' !== $imageFileType && 'png' !== $imageFileType) {
-            $returnText = $this->l('Upload a .jpg or .png file.');
+            $returnText = $this->module->l('Upload a .jpg or .png file.');
             $isUploaded = 0;
         }
 
@@ -151,7 +154,7 @@ private function validateLogo()
                 $returnText = basename($_FILES['fileToUpload']['name']);
             } else {
                 $isUploaded = 0;
-                $returnText = $this->l('Something went wrong when uploading your logo.');
+                $returnText = $this->module->l('Something went wrong when uploading your logo.');
             }
         }
 

controllers/admin/AdminMollieLogsController.php

@@ -326,7 +326,7 @@ protected function ajaxResponse($value = null, $controller = null, $method = nul
         $logger = $this->module->getService(LoggerInterface::class);
 
         try {
-            $this->ajaxDie($value, $controller, $method);
+            $this->ajaxRender($value, $controller, $method);
         } catch (\Exception $exception) {
             $logger->error(sprintf('%s - Could not return ajax response', self::FILE_NAME), [
                 'context' => [

controllers/admin/AdminMollieSettingsController.php

@@ -174,8 +174,8 @@ public function postProcess()
 
         Media::addJsDef([
             'description_message' => addslashes($this->module->l('Enter a description')),
-            'min_amount_message' => addslashes($this->l('You have entered incorrect min amount')),
-            'max_amount_message' => addslashes($this->l('You have entered incorrect max amount')),
+            'min_amount_message' => addslashes($this->module->l('You have entered incorrect min amount')),
+            'max_amount_message' => addslashes($this->module->l('You have entered incorrect max amount')),
 
             'payment_api' => addslashes(Mollie\Config\Config::MOLLIE_PAYMENTS_API),
             'ajaxUrl' => addslashes($this->context->link->getAdminLink('AdminMollieAjax')),

controllers/front/applePayDirectAjax.php

@@ -79,7 +79,7 @@ private function getApplePaySession()
         );
         $response = $handler->handle($command);
 
-        $this->ajaxDie(json_encode($response));
+        $this->ajaxRender(json_encode($response));
     }
 
     private function updateShippingMethod()
@@ -94,7 +94,7 @@ private function updateShippingMethod()
         );
         $response = $handler->handle($command);
 
-        $this->ajaxDie(json_encode($response));
+        $this->ajaxRender(json_encode($response));
     }
 
     private function updateAppleShippingContact()
@@ -142,7 +142,7 @@ private function updateAppleShippingContact()
             ];
         }
 
-        $this->ajaxDie(json_encode($result));
+        $this->ajaxRender(json_encode($result));
     }
 
     private function createApplePayOrder()
@@ -167,21 +167,21 @@ private function createApplePayOrder()
         );
         $response = $handler->handle($command);
         if (!$response['success']) {
-            $this->ajaxDie(json_encode($response));
+            $this->ajaxRender(json_encode($response));
         }
 
         //we need to recover created order with customer settings so that we can show order confirmation page
         OrderRecoverUtility::recoverCreatedOrder($this->context, $cart->id_customer);
 
-        $this->ajaxDie(json_encode($response));
+        $this->ajaxRender(json_encode($response));
     }
 
     private function getTotalApplePayCartPrice()
     {
         $cartId = Tools::getValue('cartId');
         $cart = new Cart($cartId);
 
-        $this->ajaxDie(json_encode(
+        $this->ajaxRender(json_encode(
             [
                 'total' => $cart->getOrderTotal(),
             ]

controllers/front/bancontactAjax.php

@@ -82,7 +82,7 @@ private function createTransaction()
         );
         $newPayment = $this->module->getApiClient()->payments->create($paymentData->jsonSerialize(), ['include' => 'details.qrCode']);
 
-        $this->ajaxDie(json_encode(
+        $this->ajaxRender(json_encode(
             [
                 'qr_code' => $newPayment->details->qrCode->src,
             ]
@@ -96,7 +96,7 @@ private function checkForPaidTransaction()
         $cart = Context::getContext()->cart;
 
         $proc = function () use ($cart) {
-            $orderId = Order::getOrderByCartId($cart->id);
+            $orderId = Order::getIdByCartId($cart->id);
             /* @phpstan-ignore-next-line */
             if (!$orderId) {
                 throw new OrderCreationException('Order was not created in webhook', OrderCreationException::ORDER_IS_NOT_CREATED);
@@ -115,15 +115,15 @@ private function checkForPaidTransaction()
                 ]
             );
         } catch (RetryOverException $e) {
-            $this->ajaxDie(json_encode(
+            $this->ajaxRender(json_encode(
                 [
                     'success' => false,
                 ]
             ));
         }
 
         if (!$orderId) {
-            $this->ajaxDie(json_encode(
+            $this->ajaxRender(json_encode(
                 [
                     'success' => false,
                 ]
@@ -143,7 +143,7 @@ private function checkForPaidTransaction()
         );
         OrderRecoverUtility::recoverCreatedOrder($this->context, $cart->id_customer);
 
-        $this->ajaxDie(json_encode(
+        $this->ajaxRender(json_encode(
             [
                 'success' => true,
                 'redirectUrl' => $successUrl,

controllers/front/fail.php

@@ -68,7 +68,7 @@ public function init()
 
         $redirectLink = 'index.php?controller=history';
 
-        $orderId = (int) Order::getOrderByCartId((int) $this->id_cart); /* @phpstan-ignore-line */
+        $orderId = (int) Order::getIdByCartId((int) $this->id_cart); /* @phpstan-ignore-line */
 
         $this->id_order = $orderId;
         $this->secure_key = Tools::getValue('secureKey');

controllers/front/payment.php

@@ -166,7 +166,7 @@ public function initContent()
 
         try {
             if ($method === PaymentMethod::BANKTRANSFER) {
-                $orderId = Order::getOrderByCartId($cart->id);
+                $orderId = Order::getIdByCartId($cart->id);
                 $order = new Order($orderId);
                 $paymentMethodRepository->addOpenStatusPayment(
                     $cart->id,