[ECP-9623] Installment Feature Not Working with Saved Credit Cards (#2936)

* Installment Feature Not Working with Saved Credit Cards

* Updating unit tests

Author: khushboo-singhvi

Gateway/Request/RecurringVaultDataBuilder.php

@@ -20,6 +20,7 @@
 use Magento\Payment\Gateway\Helper\SubjectReader;
 use Magento\Payment\Gateway\Request\BuilderInterface;
 use Magento\Vault\Api\Data\PaymentTokenFactoryInterface;
+use Adyen\Payment\Observer\AdyenCcDataAssignObserver;
 
 class RecurringVaultDataBuilder implements BuilderInterface
 {
@@ -97,6 +98,14 @@ public function build(array $buildSubject): array
             );
         }
 
+        $numberOfInstallments = $payment->getAdditionalInformation(
+            AdyenCcDataAssignObserver::NUMBER_OF_INSTALLMENTS
+        );
+
+        if (!empty($numberOfInstallments)) {
+            $requestBody['installments']['value'] = (int) $numberOfInstallments;
+        }
+
         return [
             'body' => $requestBody
         ];

Test/Unit/Gateway/Request/RecurringVaultDataBuilderTest.php

@@ -25,6 +25,7 @@
 use Magento\Vault\Api\Data\PaymentTokenInterface;
 use Magento\Vault\Model\Method\Vault;
 use PHPUnit\Framework\MockObject\MockObject;
+use Adyen\Payment\Observer\AdyenCcDataAssignObserver;
 
 class RecurringVaultDataBuilderTest extends AbstractAdyenTestCase
 {
@@ -62,13 +63,14 @@ protected function tearDown(): void
      * @param $tokenDetails
      * @param $tokenType
      * @param $isInstantPurchase
+     * @param $numberOfInstallments
      *
      * @return void
      * @throws LocalizedException
      *
      * @dataProvider dataProvider
      */
-    public function testBuild($paymentMethodCode, $tokenDetails, $tokenType, $isInstantPurchase)
+    public function testBuild($paymentMethodCode, $tokenDetails, $tokenType, $isInstantPurchase, $numberOfInstallments)
     {
         $quoteId = 1;
         $storeId = 1;
@@ -98,8 +100,13 @@ public function testBuild($paymentMethodCode, $tokenDetails, $tokenType, $isInst
         $paymentMock->method('getMethodInstance')->willReturn($paymentMethodInstanceMock);
         $paymentMock->method('getExtensionAttributes')->willReturn($extensionAttributesMock);
         $paymentMock->method('getAdditionalInformation')
-            ->with('instant-purchase')
-            ->willReturn($isInstantPurchase);
+            ->willReturnCallback(function ($key) use ($isInstantPurchase, $numberOfInstallments) {
+                return match ($key) {
+                    'instant-purchase' => $isInstantPurchase,
+                    AdyenCcDataAssignObserver::NUMBER_OF_INSTALLMENTS => $numberOfInstallments,
+                    default => null,
+                };
+            });
 
         $buildSubject = [
             'payment' => $this->createConfiguredMock(PaymentDataObject::class, [
@@ -113,7 +120,8 @@ public function testBuild($paymentMethodCode, $tokenDetails, $tokenType, $isInst
         if ($tokenType === PaymentTokenFactoryInterface::TOKEN_TYPE_CREDIT_CARD && !$isInstantPurchase) {
             $this->stateDataHelperMock->expects($this->once())
                 ->method('getStateData')
-                ->with($quoteId);
+                ->with($quoteId)
+                ->willReturn([]);
         }
 
         $request = $this->recurringVaultDataBuilder->build($buildSubject);
@@ -127,47 +135,59 @@ public function testBuild($paymentMethodCode, $tokenDetails, $tokenType, $isInst
         } else {
             $this->assertArrayNotHasKey('additionalData', $request['body']);
         }
+
+        if (!empty($numberOfInstallments)) {
+            $this->assertArrayHasKey('installments', $request['body']);
+            $this->assertEquals(['value' => (int) $numberOfInstallments], $request['body']['installments']);
+        }
     }
 
     public static function dataProvider(): array
     {
         return [
             [
-                'paymentMethodCode' => 'adyen_cc_vault',
-                'tokenDetails' => '{"type":"visa","maskedCC":"1111","expirationDate":"3\/2030", "tokenType": "CardOnFile"}',
-                'tokenType' => 'card',
-                'isInstantPurchase' => false
+                'adyen_cc_vault',
+                '{"type":"visa","maskedCC":"1111","expirationDate":"3\/2030", "tokenType": "CardOnFile"}',
+                'card',
+                false,
+                '3'
             ],
             [
-                'paymentMethodCode' => 'adyen_cc_vault',
-                'tokenDetails' => '{"type":"visa","maskedCC":"1111","expirationDate":"3\/2030"}',
-                'tokenType' => 'card',
-                'isInstantPurchase' => false
+                'adyen_cc_vault',
+                '{"type":"visa","maskedCC":"1111","expirationDate":"3\/2030"}',
+                'card',
+                false,
+                null
             ],
             [
-                'paymentMethodCode' => 'adyen_cc_vault',
-                'tokenDetails' => '{"type":"visa","maskedCC":"1111","expirationDate":"3\/2030"}',
-                'tokenType' => 'card',
-                'isInstantPurchase' => true
+                'adyen_cc_vault',
+                '{"type":"visa","maskedCC":"1111","expirationDate":"3\/2030"}',
+                'card',
+                true,
+                null
             ],
             [
-                'paymentMethodCode' => 'adyen_klarna_vault',
-                'tokenDetails' => '{"type":"klarna", "tokenType": "CardOnFile"}',
-                'tokenType' => 'account',
-                'isInstantPurchase' => false
+                'adyen_klarna_vault',
+                '{"type":"klarna", "tokenType": "CardOnFile"}',
+                'account',
+                false,
+                null
             ],
             [
-                'paymentMethodCode' => 'adyen_klarna_vault',
-                'tokenDetails' => '{"type":"klarna"}',
-                'tokenType' => 'account',
-                'isInstantPurchase' => false
+                'adyen_klarna_vault',
+                '{"type":"klarna"}',
+                'account',
+                false,
+                null
             ],
             [
-                'paymentMethodCode' => 'adyen_klarna_vault',
-                'tokenDetails' => '{"type":"klarna"}',
-                'tokenType' => 'account',
-                'isInstantPurchase' => true
+                'adyen_klarna_vault',
+                '{"type":"klarna"}',
+                'account',
+                true,
+                null
             ]
         ];
     }
+
 }

view/frontend/web/js/view/payment/method-renderer/adyen-cc-vault-method.js

@@ -256,8 +256,9 @@ define([
                 additional_data: {
                     stateData: stateData,
                     public_hash: this.publicHash,
-                    numberOfInstallments: this.installment(),
-                    frontendType: 'default'
+                    'number_of_installments': self.installment(),
+                    frontendType: 'default',
+                    'cc_type': self.getCcCodeByAltCode(self.getCardType())
                 },
             };
         },