PIPRES-489/PrestaShop 9 compatibility

.github/workflows/test.yml

@@ -97,4 +97,4 @@ jobs:
         uses: actions/upload-artifact@v3
         with:
           name: ${{ env.MODULE_NAME }}
-          path: ./
+          path: ./

config/services.yml

@@ -100,3 +100,15 @@ services:
     - '@subscription_options_data_provider'
     - 'subscription_options': 'Mollie\Subscription\Form\Options\SubscriptionOptionsType'
     - 'SubscriptionOptions'
+
+  Mollie\Subscription\Controller\Symfony\SubscriptionFAQController:
+    class: Mollie\Subscription\Controller\Symfony\SubscriptionFAQController
+    public: true
+    autoconfigure: true
+    autowire: true  # Optional, but useful for dependency injection
+
+  Mollie\Subscription\Controller\Symfony\SubscriptionController:
+    class: Mollie\Subscription\Controller\Symfony\SubscriptionController
+    public: true
+    autowire: true
+    autoconfigure: true

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

@@ -327,7 +327,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('Could not return ajax response', [
                 'context' => [

controllers/admin/AdminMollieSettingsController.php

@@ -165,8 +165,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

@@ -168,7 +168,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,

controllers/front/return.php

@@ -103,7 +103,7 @@ public function initContent()
             // any paid payments for this cart?
 
             if (false === $data['mollie_info']) {
-                $data['mollie_info'] = $paymentMethodRepo->getPaymentBy('order_id', (int) Order::getOrderByCartId($idCart));
+                $data['mollie_info'] = $paymentMethodRepo->getPaymentBy('order_id', (int) Order::getIdByCartId($idCart));
             }
             if (false === $data['mollie_info']) {
                 $data['mollie_info'] = [];
@@ -220,7 +220,7 @@ protected function processGetStatus()
         }
 
         /* @phpstan-ignore-next-line */
-        $orderId = (int) Order::getOrderByCartId((int) $cart->id);
+        $orderId = (int) Order::getIdByCartId((int) $cart->id);
         /** @phpstan-ignore-line */
         $order = new Order((int) $orderId);
 

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');
     }
 
     /**
@@ -701,7 +701,7 @@ public function hookActionEmailSendBefore($params)
         }
 
         $cart = new Cart($params['cart']->id);
-        $orderId = Order::getOrderByCartId($cart->id);
+        $orderId = Order::getIdByCartId($cart->id);
         $order = new Order($orderId);
 
         if (!Validate::isLoadedObject($order)) {

src/Application/CommandHandler/CreateApplePayOrderHandler.php

@@ -105,7 +105,7 @@ public function handle(CreateApplePayOrder $command): array
 
         // we need to wait for webhook to create the order. That's why we wait here for few seconds and check if order is created
         $proc = function () use ($command) {
-            $orderId = Order::getOrderByCartId($command->getCartId());
+            $orderId = Order::getIdByCartId($command->getCartId());
             /* @phpstan-ignore-next-line */
             if (!$orderId) {
                 throw new OrderCreationException('Order was not created in webhook', OrderCreationException::ORDER_IS_NOT_CREATED);
@@ -146,7 +146,7 @@ public function handle(CreateApplePayOrder $command): array
             [
                 'id_cart' => (int) $cart->id,
                 'id_module' => (int) $this->module->id,
-                'id_order' => Order::getOrderByCartId($cart->id),
+                'id_order' => Order::getIdByCartId($cart->id),
                 'key' => $cart->secure_key,
             ]
         );

src/Handler/Order/OrderCreationHandler.php

@@ -141,7 +141,7 @@ public function createOrder($apiPayment, int $cartId, bool $isAuthorizablePaymen
 
         $paymentFeeData = $this->paymentFeeProvider->getPaymentFee($paymentMethod, (float) $originalAmount);
 
-        if (Order::getOrderByCartId((int) $cartId)) {
+        if (Order::getIdByCartId((int) $cartId)) {
             return 0;
         }
 
@@ -159,7 +159,7 @@ public function createOrder($apiPayment, int $cartId, bool $isAuthorizablePaymen
             );
 
             /* @phpstan-ignore-next-line */
-            $orderId = (int) Order::getOrderByCartId((int) $cartId);
+            $orderId = (int) Order::getIdByCartId((int) $cartId);
 
             $this->createRecurringOrderEntity(new Order($orderId), $paymentMethod->id_method);
 
@@ -199,7 +199,7 @@ public function createOrder($apiPayment, int $cartId, bool $isAuthorizablePaymen
         );
 
         /* @phpstan-ignore-next-line */
-        $orderId = (int) Order::getOrderByCartId((int) $cartId);
+        $orderId = (int) Order::getIdByCartId((int) $cartId);
 
         $this->orderPaymentFeeHandler->addOrderPaymentFee($orderId, $apiPayment);
 
@@ -231,7 +231,7 @@ public function createBankTransferOrder($paymentData, Cart $cart)
             $cart->secure_key
         );
 
-        $orderId = Order::getOrderByCartId($cart->id);
+        $orderId = Order::getIdByCartId($cart->id);
         $order = new Order($orderId);
 
         $environment = (int) Configuration::get(Mollie\Config\Config::MOLLIE_ENVIRONMENT);