SL-219 Saving cards

controllers/front/successIFrame.php

@@ -62,37 +62,6 @@ public function postProcess()
 
             $this->redirectWithNotifications($this->getOrderLink());
         }
-
-        try {
-            Tools::redirect($this->getOrderConfirmationLink($cartId, $moduleId, $orderId, $secureKey));
-        } catch (Exception $e) {
-            PrestaShopLogger::addLog(
-                sprintf(
-                    '%s has caught an error: %s',
-                    __CLASS__,
-                    $e->getMessage()
-                ),
-                1,
-                null,
-                null,
-                null,
-                true
-            );
-
-            Tools::redirect(
-                $this->context->link->getModuleLink(
-                    $this->module->name,
-                    ControllerName::FAIL_IFRAME,
-                    [
-                        'cartId' => $cartId,
-                        'secureKey' => $secureKey,
-                        'orderId' => $orderId,
-                        \Invertus\SaferPay\Config\SaferPayConfig::IS_BUSINESS_LICENCE => true,
-                    ],
-                    true
-                )
-            );
-        }
     }
 
     public function initContent()

src/Api/Request/AuthorizationService.php

@@ -31,6 +31,7 @@
 use Invertus\SaferPay\EntityBuilder\SaferPayAssertBuilder;
 use Invertus\SaferPay\EntityBuilder\SaferPayCardAliasBuilder;
 use Invertus\SaferPay\Exception\Api\SaferPayApiException;
+use Invertus\SaferPay\Repository\SaferPayCardAliasRepository;
 use Invertus\SaferPay\Service\Response\AssertResponseObjectCreator;
 
 if (!defined('_PS_VERSION_')) {
@@ -61,16 +62,20 @@ class AuthorizationService
      */
     private $aliasBuilder;
 
+    private $aliasRepository;
+
     public function __construct(
         ApiRequest $apiRequest,
         AssertResponseObjectCreator $assertResponseObjectCreator,
         SaferPayAssertBuilder $assertBuilder,
-        SaferPayCardAliasBuilder $aliasBuilder
+        SaferPayCardAliasBuilder $aliasBuilder,
+        SaferPayCardAliasRepository $aliasRepository
     ) {
         $this->apiRequest = $apiRequest;
         $this->assertResponseObjectCreator = $assertResponseObjectCreator;
         $this->assertBuilder = $assertBuilder;
         $this->aliasBuilder = $aliasBuilder;
+        $this->aliasRepository = $aliasRepository;
     }
 
     public function authorize(AuthorizationRequest $authorizationRequest)
@@ -103,6 +108,13 @@ public function createObjectsFromAuthorizationResponse(
         $assertBody = $this->assertResponseObjectCreator->createAssertObject($responseBody);
         $this->assertBuilder->createAssert($assertBody, $saferPayOrderId);
         $isPaymentSafe = $assertBody->getLiability()->getLiabilityShift();
+        $allSavedCards = array_column($this->aliasRepository->getSavedCardsNumbersByCustomerId($customerId), 'card_number');
+        $currentCard = $assertBody->getPaymentMeans()->getDisplayText();
+
+        if (in_array($currentCard, $allSavedCards)) {
+            return $assertBody;
+        }
+
         if ((int) $selectedCardOption === SaferPayConfig::CREDIT_CARD_OPTION_SAVE && $isPaymentSafe) {
             $this->aliasBuilder->createCardAlias($assertBody, $customerId);
         }

src/Repository/SaferPayCardAliasRepository.php

@@ -32,6 +32,13 @@
 
 class SaferPayCardAliasRepository
 {
+    /**
+     * @param $userId
+     * @param $paymentMethod
+     * @param $currentDate
+     *
+     * @return array
+     */
     public function getSavedValidCardsByUserIdAndPaymentMethod($userId, $paymentMethod, $currentDate)
     {
         $query = new DbQuery();
@@ -41,9 +48,13 @@ public function getSavedValidCardsByUserIdAndPaymentMethod($userId, $paymentMeth
         $query->where('payment_method = "' . pSQL($paymentMethod) . '"');
         $query->where('valid_till > "' . pSQL($currentDate) . '"');
 
-        return Db::getInstance()->executeS($query);
+        return (array) Db::getInstance()->executeS($query) ?? [];
     }
 
+    /**
+     * @param $id
+     * @return false|string
+     */
     public function getSavedCardAliasFromId($id)
     {
         $query = new DbQuery();
@@ -54,6 +65,11 @@ public function getSavedCardAliasFromId($id)
         return Db::getInstance()->getValue($query);
     }
 
+    /**
+     * @param $customerId
+     * @param $aliasId
+     * @return false|string
+     */
     public function getSavedCardIdByCustomerIdAndAliasId($customerId, $aliasId)
     {
         $query = new DbQuery();
@@ -65,13 +81,31 @@ public function getSavedCardIdByCustomerIdAndAliasId($customerId, $aliasId)
         return Db::getInstance()->getValue($query);
     }
 
+    /**
+     * @param $customerId
+     * @return array
+     */
     public function getSavedCardsByCustomerId($customerId)
     {
         $query = new DbQuery();
         $query->select('*');
         $query->from('saferpay_card_alias');
         $query->where('id_customer = "' . (int) $customerId . '"');
 
-        return Db::getInstance()->executeS($query);
+        return Db::getInstance()->executeS($query) ?? [];
+    }
+
+    /**
+     * @param $customerId
+     * @return array
+     */
+    public function getSavedCardsNumbersByCustomerId($customerId)
+    {
+        $query = new DbQuery();
+        $query->select('`card_number`');
+        $query->from('saferpay_card_alias');
+        $query->where('id_customer = "' . (int) $customerId . '"');
+
+        return Db::getInstance()->executeS($query) ?? [];
     }
 }