Merge pull request #151 from Invertus/release_1.2.1

Release 1.2.1
Invertus · Mar 6, 2024 · 5fda3f3 · 5fda3f3
2 parents 5700a45 + d6dd9b2
commit 5fda3f3
Show file tree

Hide file tree

Showing 18 changed files with 89 additions and 37 deletions.
diff --git a/changelog.md b/changelog.md
@@ -153,4 +153,7 @@
 - BO : Additional improvements and fixes
 
 - ## [1.2.0] - *
-- BO : Added order creation after authorization functionality
+- BO : Added order creation after authorization functionality
+
+- ## [1.2.1] - *
+- FO : Increased compatibility with PrestaShop 1.6
diff --git a/controllers/front/notify.php b/controllers/front/notify.php
@@ -76,8 +76,12 @@ public function postProcess()
             $updateSaferPayOrderAction->run(new SaferPayOrder($saferPayOrderId), self::SAFERPAY_ORDER_AUTHORIZE_ACTION);
 
             // If order does not exist but assertion is valid that means order authorized or captured.
-            $orderId = Order::getIdByCartId($cartId);
-
+            if (method_exists('Order', 'getIdByCartId')) {
+                $orderId = Order::getIdByCartId($cartId);
+            } else {
+                // For PrestaShop 1.6 use the alternative method
+                $orderId = Order::getOrderByCartId($cartId);
+            }
             if (!$orderId) {
                 /** @var CheckoutProcessor $checkoutProcessor **/
                 $checkoutProcessor = $this->module->getService(CheckoutProcessor::class);
@@ -92,7 +96,12 @@ public function postProcess()
 
                 $checkoutProcessor->run($checkoutData);
 
-                $orderId = Order::getIdByCartId($cart->id);
+                if (method_exists('Order', 'getIdByCartId')) {
+                    $orderId = Order::getIdByCartId($cartId);
+                } else {
+                    // For PrestaShop 1.6 or lower, use the alternative method
+                    $orderId = Order::getOrderByCartId($cartId);
+                }
             }
 
             //TODO look into pipeline design pattern to use when object is modified in multiple places to avoid this issue.

diff --git a/controllers/front/return.php b/controllers/front/return.php
@@ -88,7 +88,12 @@ public function postProcess()
             $checkoutProcessor = $this->module->getService(CheckoutProcessor::class);
             $checkoutProcessor->run($checkoutData);
 
-            $orderId = \Order::getIdByCartId($cartId);
+            if (method_exists('Order', 'getIdByCartId')) {
+                $orderId = Order::getIdByCartId($cartId);
+            } else {
+                // For PrestaShop 1.6 use the alternative method
+                $orderId = Order::getOrderByCartId($cartId);
+            }
 
             $paymentBehaviourWithout3DS = (int) Configuration::get(SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D);
 
@@ -175,7 +180,14 @@ private function getSuccessControllerName($isBusinessLicence, $fieldToken)
         return $successController;
     }
 
-    private function executeTransaction(int $orderId, int $selectedCard)
+    /**
+     * @param int $orderId
+     * @param int $selectedCard
+     *
+     * @return \Invertus\SaferPay\DTO\Response\Assert\AssertBody
+     * @throws Exception
+     */
+    private function executeTransaction($orderId, $selectedCard)
     {
         /** @var SaferPayTransactionAuthorization $saferPayTransactionAuthorization */
         $saferPayTransactionAuthorization = $this->module->getService(SaferPayTransactionAuthorization::class);
@@ -189,14 +201,20 @@ private function executeTransaction(int $orderId, int $selectedCard)
         return $response;
     }
 
-    private function executePaymentPageAssertion(int $cartId, int $isBusinessLicence)
+    /**
+     * @param int $cartId
+     * @param int $isBusinessLicence
+     *
+     * @return \Invertus\SaferPay\DTO\Response\Assert\AssertBody|null
+     * @throws Exception
+     */
+    private function executePaymentPageAssertion($cartId, $isBusinessLicence)
     {
 
         /** @var SaferPayTransactionAssertion $transactionAssert */
         $transactionAssert = $this->module->getService(SaferPayTransactionAssertion::class);
         $assertionResponse = $transactionAssert->assert($cartId);
 
-
         return $assertionResponse;
     }
 }
diff --git a/controllers/front/validation.php b/controllers/front/validation.php
@@ -96,12 +96,19 @@ public function postProcess()
             $exceptionService = $this->module->getService(SaferPayExceptionService::class);
             $this->errors[] = $exceptionService->getErrorMessageForException($exception, $exceptionService->getErrorMessages());
 
+            if (method_exists('Order', 'getIdByCartId')) {
+                $orderId = Order::getIdByCartId($this->context->cart->id);
+            } else {
+                // For PrestaShop 1.6 use the alternative method
+                $orderId = Order::getOrderByCartId($this->context->cart->id);
+            }
+
             $redirectLink = $this->context->link->getModuleLink(
                 $this->module->name,
                 'fail',
                 [
                     'cartId' => $this->context->cart->id,
-                    'orderId' => Order::getIdByCartId($this->context->cart->id),
+                    'orderId' => $orderId,
                     'secureKey' => $this->context->cart->secure_key,
                     'moduleId' => $this->module->id,
                 ],

diff --git a/saferpayofficial.php b/saferpayofficial.php
@@ -40,7 +40,7 @@ public function __construct($name = null)
     {
         $this->name = 'saferpayofficial';
         $this->author = 'Invertus';
-        $this->version = '1.2.0';
+        $this->version = '1.2.1';
         $this->module_key = '3d3506c3e184a1fe63b936b82bda1bdf';
         $this->displayName = 'SaferpayOfficial';
         $this->description = 'Saferpay Payment module';
@@ -572,7 +572,7 @@ public function hookActionEmailSendBefore($params)
         $canSendOrderConfirmationEmail = $this->getService(\Invertus\SaferPay\Core\Order\Verification\CanSendOrderConfirmationEmail::class);
 
         if ($params['template'] === 'order_conf') {
-            return $canSendOrderConfirmationEmail->verify($order, (int) $order->current_state);
+            return $canSendOrderConfirmationEmail->verify((int) $order->current_state);
         }
 
         if ($params['template'] === 'new_order') {
@@ -615,7 +615,7 @@ public function hookActionOrderStatusUpdate($params = [])
         /** @var \Invertus\SaferPay\Core\Order\Verification\CanSendOrderConfirmationEmail $canSendOrderConfirmationEmail */
         $canSendOrderConfirmationEmail = $this->getService(\Invertus\SaferPay\Core\Order\Verification\CanSendOrderConfirmationEmail::class);
 
-        if ($canSendOrderConfirmationEmail->verify($order, (int) $orderStatus->id)) {
+        if ($canSendOrderConfirmationEmail->verify((int) $orderStatus->id)) {
             $mailService->sendOrderConfMail($order, (int) $orderStatus->id);
         }
     }

diff --git a/src/Core/Order/Verification/CanSendOrderConfirmationEmail.php b/src/Core/Order/Verification/CanSendOrderConfirmationEmail.php
@@ -31,7 +31,7 @@
 
 class CanSendOrderConfirmationEmail
 {
-    public function verify(\Order $order, $orderStatusId)
+    public function verify($orderStatusId)
     {
         if (!\Configuration::get(\Invertus\SaferPay\Config\SaferPayConfig::SAFERPAY_SEND_ORDER_CONFIRMATION)) {
             return false;

diff --git a/src/Entity/SaferPayOrder.php b/src/Entity/SaferPayOrder.php
@@ -35,6 +35,11 @@ class SaferPayOrder extends ObjectModel
      */
     public $id_order;
 
+    /**
+     * @var Int|null
+     */
+    public $id_cart;
+
     /**
      * @var Int
      */

diff --git a/src/EntityBuilder/SaferPayOrderBuilder.php b/src/EntityBuilder/SaferPayOrderBuilder.php
@@ -37,7 +37,12 @@ class SaferPayOrderBuilder
     //TODO to pass $body as InitializeBody.
     public function create($body, $cartId, $customerId, $isTransaction)
     {
-        $orderId = Order::getIdByCartId($cartId);
+        if (method_exists('Order', 'getIdByCartId')) {
+            $orderId = Order::getIdByCartId($cartId);
+        } else {
+            // For PrestaShop 1.6 use the alternative method
+            $orderId = Order::getOrderByCartId($cartId);
+        }
 
         $saferPayOrder = new SaferPayOrder();
         $saferPayOrder->token = $body->Token;

diff --git a/src/Exception/CouldNotProcessCheckout.php b/src/Exception/CouldNotProcessCheckout.php
@@ -23,13 +23,11 @@
 
 namespace Invertus\SaferPay\Exception;
 
-use Invertus\SaferPay\Exception\Restriction\SaferPayException;
-
 if (!defined('_PS_VERSION_')) {
     exit;
 }
 
-class CouldNotProcessCheckout extends  SaferPayException
+class CouldNotProcessCheckout extends SaferPayException
 {
     /**
      * @param int $cartId

diff --git a/src/Exception/Order/CouldNotChangeOrderStatus.php b/src/Exception/Order/CouldNotChangeOrderStatus.php
@@ -23,8 +23,6 @@
 
 namespace Invertus\SaferPay\Exception;
 
-use Invertus\SaferPay\Exception\Restriction\SaferPayException;
-
 if (!defined('_PS_VERSION_')) {
     exit;
 }

diff --git a/src/Exception/SaferPayException.php b/src/Exception/SaferPayException.php
@@ -21,9 +21,7 @@
  *@license   SIX Payment Services
  */
 
-namespace Invertus\SaferPay\Exception\Restriction;
-
-use Invertus\SaferPay\Exception\ExceptionCode;
+namespace Invertus\SaferPay\Exception;
 
 if (!defined('_PS_VERSION_')) {
     exit;
@@ -48,15 +46,10 @@ public function getContext()
         return $this->context;
     }
 
-    /**
-     * @param \Exception $exception
-     *
-     * @return static
-     */
-    public static function unknownError($exception)
+    public static function unknownError()
     {
         return new static(
-            'An unknown error error occurred. Please check system logs or contact Click to Pay support.',
+            'An unknown error error occurred. Please check system logs or contact support.',
             ExceptionCode::UNKNOWN_ERROR
         );
     }

diff --git a/src/Processor/CheckoutProcessor.php b/src/Processor/CheckoutProcessor.php
@@ -179,7 +179,7 @@ private function processCreateSaferPayOrder($initializeBody, $cartId, $customerI
         );
     }
 
-    private function processAuthorizedOrder(CheckoutData $data, Cart $cart): void
+    private function processAuthorizedOrder(CheckoutData $data, Cart $cart)
     {
         try {
             $saferPayOrder = new SaferPayOrder($this->saferPayOrderRepository->getIdByCartId($cart->id));
@@ -188,7 +188,15 @@ private function processAuthorizedOrder(CheckoutData $data, Cart $cart): void
                 $this->processCreateOrder($cart, $data->getPaymentMethod());
             }
 
-            $order = new Order(Order::getIdByCartId($cart->id));
+            if (method_exists('Order', 'getIdByCartId')) {
+                $orderId = Order::getIdByCartId($cart->id);
+                $order = new Order($orderId);
+            } else {
+                // For PrestaShop 1.6 use the alternative method
+                $orderId = Order::getOrderByCartId($cart->id);
+                $order = new Order($orderId);
+            }
+
             $saferPayOrder->id_order = $order->id;
 
             if ($data->getOrderStatus() === 'AUTHORIZED') {

diff --git a/src/Service/CartDuplicationService.php b/src/Service/CartDuplicationService.php
@@ -60,7 +60,13 @@ private function restoreCartRuleQuantity($cartId, $cartRuleId)
         $cartRule->quantity++;
         $cartRule->update();
 
-        $orderId = Order::getIdByCartId($cartId);
+        if (method_exists('Order', 'getIdByCartId')) {
+            $orderId = Order::getIdByCartId($cartId);
+        } else {
+            // For PrestaShop 1.6 or lower, use the alternative method
+            $orderId = Order::getOrderByCartId($cartId);
+        }
+
         $sql = 'DELETE FROM `' . _DB_PREFIX_ . 'order_cart_rule`
                     WHERE id_order = ' . (int) $orderId . '
                         AND id_cart_rule = ' . (int) $cartRuleId;

diff --git a/src/Service/Request/InitializeRequestObjectCreator.php b/src/Service/Request/InitializeRequestObjectCreator.php
@@ -70,8 +70,8 @@ public function create(
         $payment = $this->requestObjectCreator->createPayment($cart, $totalPrice);
         $payer = new Payer();
 
-        $languageCode = !empty($cart->getAssociatedLanguage()->iso_code)
-            ? $cart->getAssociatedLanguage()->iso_code
+        $languageCode = !empty(\Context::getContext()->language->iso_code)
+            ? \Context::getContext()->language->iso_code
             : 'en';
 
         $payer->setLanguageCode($languageCode);

diff --git a/src/Service/TransactionFlow/SaferPayTransactionAssertion.php b/src/Service/TransactionFlow/SaferPayTransactionAssertion.php
@@ -83,6 +83,7 @@ public function assert($cartId)
         );
 
         $saferPayOrder->transaction_id = $assertBody->getTransaction()->getId();
+        $saferPayOrder->id_cart = $cartId;
         $saferPayOrder->update();
 
         return $assertBody;

diff --git a/src/Service/TransactionFlow/SaferPayTransactionAuthorization.php b/src/Service/TransactionFlow/SaferPayTransactionAuthorization.php
@@ -104,6 +104,7 @@ public function authorize($cartId, $saveCard, $selectedCard)
         );
 
         $saferPayOrder->transaction_id = $assertBody->getTransaction()->getId();
+        $saferPayOrder->id_cart = $cartId;
         $saferPayOrder->update();
 
         return $assertBody;

diff --git a/tests/Unit/Service/SaferPayPaymentNotationTest.php b/tests/Unit/Service/SaferPayPaymentNotationTest.php
@@ -28,14 +28,14 @@
 class SaferPayPaymentNotationTest extends UnitTestCase
 {
     /** @dataProvider getPaymentMethodForDisplayDataProvider */
-    public function testGetForDisplay(string $paymentMethod, string $expectedResult)
+    public function testGetForDisplay($paymentMethod, $expectedResult)
     {
         $result = (new \Invertus\SaferPay\Service\SaferPayPaymentNotation)->getForDisplay($paymentMethod);
         $this->assertEquals($expectedResult, $result);
     }
 
     /** @dataProvider getPaymentMethodDataProvider */
-    public function testGetShortName(string $paymentMethod, string $expectedResult)
+    public function testGetShortName($paymentMethod, $expectedResult)
     {
         $result = (new \Invertus\SaferPay\Service\SaferPayPaymentNotation)->getShortName($paymentMethod);
         $this->assertEquals($expectedResult, $result);

diff --git a/views/templates/hook/front/payments.tpl b/views/templates/hook/front/payments.tpl
@@ -21,5 +21,5 @@
  *}
 
 {foreach $payments as $payment}
-	{$payment|escape:'htmlall':'UTF-8'}
+	{$payment|cleanHtml nofilter}
 {/foreach}
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,8 +23,6 @@ @@
     namespace Invertus\SaferPay\Exception;
-    use Invertus\SaferPay\Exception\Restriction\SaferPayException;
     if (!defined('_PS_VERSION_')) {
         exit;
     }
@@ Expand Down @@