Merge pull request #214 from Invertus/iframe-fail-redirect

Iframe fail redirection adjustments
Invertus · Oct 23, 2024 · 4b068c7 · 4b068c7
2 parents 845fe53 + 89ba3be
commit 4b068c7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/controllers/front/return.php b/controllers/front/return.php
@@ -56,10 +56,9 @@ public function postProcess()
         $order = new Order($this->getOrderId($cartId));
         $secureKey = Tools::getValue('secureKey');
         $selectedCard = Tools::getValue('selectedCard');
-
+        $paymentMethod = $order->id ? $order->payment : Tools::getValue('paymentMethod');
         $cart = new Cart($cartId);
-
-        $failController = $this->getFailController($order);
+        $failController = $this->getFailController($paymentMethod);
 
         if (!Validate::isLoadedObject($cart)) {
             $this->warning[] = $this->module->l('An unknown error error occurred. Please contact support', self::FILE_NAME);
@@ -380,7 +379,7 @@ private function createAndValidateOrder($assertResponseBody, $transactionStatus,
         }
     }
 
-    private function getFailController($order)
+    private function getFailController($orderPayment)
     {
         /** @var \Invertus\SaferPay\Provider\PaymentTypeProvider $paymentTypeProvider */
         $paymentTypeProvider = $this->module->getService(\Invertus\SaferPay\Provider\PaymentTypeProvider::class);
@@ -391,16 +390,16 @@ private function getFailController($order)
         $logger->debug('Getting fail controller', [
             'context' => [],
             'controller' => self::FILE_NAME,
-            'order_payment' => $order->payment,
+            'order_payment' => $orderPayment,
         ]);
 
-        $paymentRedirectType = $paymentTypeProvider->get($order->payment);
+        $paymentRedirectType = $paymentTypeProvider->get($orderPayment);
 
         if ($paymentRedirectType === PaymentType::IFRAME) {
             $logger->debug('Fail controller is FAIL_IFRAME', [
                 'context' => [],
                 'controller' => self::FILE_NAME,
-                'order_payment' => $order->payment,
+                'order_payment' => $orderPayment,
             ]);
 
             return ControllerName::FAIL_IFRAME;
@@ -409,7 +408,7 @@ private function getFailController($order)
         $logger->debug('Fail controller is FAIL', [
             'context' => [],
             'controller' => self::FILE_NAME,
-            'order_payment' => $order->payment,
+            'order_payment' => $orderPayment,
         ]);
 
         return ControllerName::FAIL;

diff --git a/src/Service/SaferPayInitialize.php b/src/Service/SaferPayInitialize.php
@@ -126,6 +126,7 @@ public function buildRequest(
                 'selectedCard' => $selectedCard,
                 'isBusinessLicence' => $isBusinessLicence,
                 'fieldToken' => $fieldToken,
+                'paymentMethod' => $paymentMethod,
             ],
             true
         );