SL-252 Hosted iframe fix

controllers/front/return.php

@@ -24,9 +24,11 @@
 use Invertus\SaferPay\Api\Enum\TransactionStatus;
 use Invertus\SaferPay\Config\SaferPayConfig;
 use Invertus\SaferPay\Controller\AbstractSaferPayController;
+use Invertus\SaferPay\Core\Payment\DTO\CheckoutData;
 use Invertus\SaferPay\DTO\Response\Assert\AssertBody;
 use Invertus\SaferPay\Enum\ControllerName;
 use Invertus\SaferPay\Exception\Api\SaferPayApiException;
+use Invertus\SaferPay\Processor\CheckoutProcessor;
 use Invertus\SaferPay\Service\SaferPayOrderStatusService;
 use Invertus\SaferPay\Service\TransactionFlow\SaferPayTransactionAssertion;
 use Invertus\SaferPay\Service\TransactionFlow\SaferPayTransactionAuthorization;
@@ -43,19 +45,97 @@ public function postProcess()
     {
         $cartId = (int) Tools::getValue('cartId');
         $order = new Order($this->getOrderId($cartId));
+        $secureKey = Tools::getValue('secureKey');
+        $cart = new Cart($cartId);
 
-        if (!$order->id) {
-            return;
+        if (!Validate::isLoadedObject($cart)) {
+            $this->warning[] = $this->module->l('An unknown error error occurred. Please contact support', self::FILENAME);
+            $this->redirectWithNotifications($this->getRedirectionToControllerUrl('fail'));
         }
 
+        if ($cart->secure_key !== $secureKey) {
+            $this->warning[] = $this->module->l('Error. Insecure cart', self::FILENAME);
+            $this->redirectWithNotifications($this->getRedirectionToControllerUrl('fail'));
+        }
+
+        /** @var SaferPayTransactionAssertion $transactionAssert */
+        $transactionAssert = $this->module->getService(SaferPayTransactionAssertion::class);
+
         try {
-            /** @var SaferPayTransactionAssertion $transactionAssert */
-            $transactionAssert = $this->module->getService(SaferPayTransactionAssertion::class);
-            $transactionResponse = $transactionAssert->assert($cartId, false);
+            $assertResponseBody = $transactionAssert->assert($cartId);
+            $transactionStatus = $assertResponseBody->getTransaction()->getStatus();
+        } catch (Exception $e) {
+            \PrestaShopLogger::addLog($e->getMessage());
+            $this->warning[] = $this->module->l('An error occurred. Please contact support', self::FILENAME);
+            $this->redirectWithNotifications($this->getRedirectionToControllerUrl('fail'));
+        }
+
+        /**
+         * NOTE: This flow is for hosted iframe payment method
+         */
+        if (Tools::getValue('isBusinessLicence')) {
+            try {
+                /** @var CheckoutProcessor $checkoutProcessor * */
+                $checkoutProcessor = $this->module->getService(CheckoutProcessor::class);
+
+                $checkoutData = CheckoutData::create(
+                    (int)$cartId,
+                    $assertResponseBody->getPaymentMeans()->getBrand()->getPaymentMethod(),
+                    (int)Configuration::get(SaferPayConfig::IS_BUSINESS_LICENCE)
+                );
+                $checkoutData->setOrderStatus($transactionStatus);
+
+                $checkoutProcessor->run($checkoutData);
+
+                $orderId = $this->getOrderId($cartId);
+
+                $order = new Order($orderId);
+                if (!$assertResponseBody->getLiability()->getLiabilityShift() &&
+                    in_array($order->payment, SaferPayConfig::SUPPORTED_3DS_PAYMENT_METHODS) &&
+                    (int)Configuration::get(SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D) === SaferPayConfig::PAYMENT_BEHAVIOR_WITHOUT_3D_CANCEL
+                ) {
+                    /** @var SaferPayOrderStatusService $orderStatusService */
+                    $orderStatusService = $this->module->getService(SaferPayOrderStatusService::class);
+                    $orderStatusService->cancel($order);
+                }
+
+                //NOTE to get latest information possible and not override new information.
+                $order = new Order($orderId);
 
+                $paymentMethod = $assertResponseBody->getPaymentMeans()->getBrand()->getPaymentMethod();// if payment does not support order capture, it means it always auto-captures it (at least with accountToAccount payment),
+
+                // so in this case if status comes back "captured" we just update the order state accordingly
+                if (!SaferPayConfig::supportsOrderCapture($paymentMethod) &&
+                    $transactionStatus === TransactionStatus::CAPTURED
+                ) {
+                    /** @var SaferPayOrderStatusService $orderStatusService */
+                    $orderStatusService = $this->module->getService(SaferPayOrderStatusService::class);
+                    $orderStatusService->setComplete($order);
+
+                    return;
+                }
+
+                if (SaferPayConfig::supportsOrderCapture($paymentMethod) &&
+                    (int)Configuration::get(SaferPayConfig::PAYMENT_BEHAVIOR) === SaferPayConfig::DEFAULT_PAYMENT_BEHAVIOR_CAPTURE &&
+                    $transactionStatus !== TransactionStatus::CAPTURED
+                ) {
+                    /** @var SaferPayOrderStatusService $orderStatusService */
+                    $orderStatusService = $this->module->getService(SaferPayOrderStatusService::class);
+                    $orderStatusService->capture($order);
+
+                    return;
+                }
+            } catch (Exception $e) {
+                \PrestaShopLogger::addLog($e->getMessage());
+                $this->warning[] = $this->module->l('An error occurred. Please contact support', self::FILENAME);
+                $this->redirectWithNotifications($this->getRedirectionToControllerUrl('fail'));
+            }
+        }
+
+        try {
             /** @var SaferPayOrderStatusService $orderStatusService */
             $orderStatusService = $this->module->getService(SaferPayOrderStatusService::class);
-            if ($transactionResponse->getTransaction()->getStatus() === TransactionStatus::PENDING) {
+            if ($assertResponseBody->getTransaction()->getStatus() === TransactionStatus::PENDING) {
                 $orderStatusService->setPending($order);
             }
         } catch (SaferPayApiException $e) {
@@ -189,4 +269,24 @@ private function getOrderId($cartId)
             return Order::getOrderByCartId($cartId);
         }
     }
+
+    /**
+     * @param string $controllerName
+     *
+     * @return string
+     */
+    private function getRedirectionToControllerUrl($controllerName)
+    {
+        return $this->context->link->getModuleLink(
+            $this->module->name,
+            $controllerName,
+            [
+                'cartId' => $this->context->cart->id,
+                'orderId' => Order::getOrderByCartId($this->context->cart->id),
+                'secureKey' => $this->context->cart->secure_key,
+                'moduleId' => $this->module->id,
+            ],
+            true
+        );
+    }
 }

src/DTO/Request/Initialize/InitializeRequest.php

@@ -222,11 +222,14 @@ public function getAsArray()
                 'AddressSource' => $this->deliveryAddressForm->getAddressSource(),
                 'MandatoryFields' => $this->deliveryAddressForm->getMandatoryFields(),
             ],
-            'CardForm' => [
-                'HolderName' => SaferPayConfig::SAFERPAY_CARDFORM_HOLDERNAME_REQUIRENCE,
-            ],
         ];
 
+        if ($this->getPaymentMeansField() === []) {
+            $return['CardForm'] = [
+                'HolderName' => SaferPayConfig::SAFERPAY_CARDFORM_HOLDERNAME_REQUIRENCE,
+            ];
+        }
+
         if ($this->notification !== null) {
             $return['Notification'] = [
                 'MerchantEmails' => [$this->notification->getMerchantEmail()],

views/templates/front/credit_cards.tpl

@@ -51,7 +51,7 @@
             </tr>
             </thead>
             {foreach $rows as $row}
-                {$row|escape:'htmlall':'UTF-8' nofilter}
+                {$row escape:'htmlall':'UTF-8'|nofilter}
             {/foreach}
         </table>
     </div>