[ECP-9408] Fix handling Giftcard payments responses

Gateway/Http/Client/TransactionPayment.php

@@ -120,14 +120,20 @@ public function placeRequest(TransferInterface $transferObject): array
 
         $client = $this->adyenHelper->initializeAdyenClientWithClientConfig($clientConfig);
         $service = $this->adyenHelper->initializePaymentsApi($client);
-        $responseData = [];
+        $responseCollection = [];
+        $responseCollection['hasOnlyGiftCards'] = false;
 
         try {
-            list($requestData, $giftcardResponse) = $this->processGiftcards($requestData, $service);
+            list($requestData, $giftcardResponseCollection) = $this->processGiftcards($requestData, $service);
 
-            /** @var PaymentResponse $giftcardResponse */
-            if (isset($giftcardResponse) && $this->remainingOrderAmount === 0) {
-                return $giftcardResponse->toArray();
+            /** @var array $responseCollection */
+            if (!empty($giftcardResponseCollection)) {
+                $responseCollection = array_merge($responseCollection, $giftcardResponseCollection);
+
+                if ($this->remainingOrderAmount === 0) {
+                    $responseCollection['hasOnlyGiftCards'] = true;
+                    return  $responseCollection;
+                }
             }
 
             $requestData['applicationInfo'] = $this->adyenHelper->buildApplicationInfo($client);
@@ -151,21 +157,22 @@ public function placeRequest(TransferInterface $transferObject): array
             $paymentResponse->setMerchantReference($requestData["reference"]);
             $this->paymentResponseResourceModel->save($paymentResponse);
             $responseData = $response->toArray();
+            $responseCollection[] = $responseData;
 
             $this->adyenHelper->logResponse($responseData);
         } catch (AdyenException $e) {
             $this->adyenHelper->logAdyenException($e);
         }
 
-        return $responseData;
+        return $responseCollection;
     }
 
     /**
      * @param array $request
      * @param PaymentsApi $service
      * @param array $redeemedGiftcards
      * @param array $ordersResponse
-     * @return CheckoutPaymentResponse
+     * @return array
      * @throws AdyenException
      * @throws AlreadyExistsException
      */
@@ -174,7 +181,10 @@ private function handleGiftcardPayments(
         PaymentsApi $service,
         array $redeemedGiftcards,
         array $ordersResponse
-    ): CheckoutPaymentResponse {
+    ): array {
+
+        $giftCardResponseCollection = [];
+
         foreach ($redeemedGiftcards as $giftcard) {
             $stateData = json_decode($giftcard['state_data'], true);
 
@@ -202,20 +212,21 @@ private function handleGiftcardPayments(
             );
 
             $response = $service->payments(new PaymentRequest($giftcardPaymentRequest));
-            $this->adyenHelper->logResponse($response->toArray());
 
             /** @var PaymentResponse $paymentResponse */
             $paymentResponse = $this->paymentResponseFactory->create();
             $paymentResponse->setResponse(json_encode($response));
             $paymentResponse->setResultCode($response['resultCode']);
             $paymentResponse->setMerchantReference($request["reference"]);
-
             $this->paymentResponseResourceModel->save($paymentResponse);
 
             $this->remainingOrderAmount -= $deductedAmount;
+            $responseArray = $response->toArray();
+            $giftCardResponseCollection[] = $responseArray;
+            $this->adyenHelper->logResponse($responseArray);
         }
 
-        return $response;
+        return $giftCardResponseCollection;
     }
 
     /**
@@ -239,17 +250,17 @@ public function processGiftcards(array $request, PaymentsApi $service): array
                 $this->storeManager->getStore()->getId()
             );
 
-            $giftcardResponse = $this->handleGiftcardPayments($request, $service, $redeemedGiftcards, $ordersResponse);
+            $giftcardResponseCollection = $this->handleGiftcardPayments($request, $service, $redeemedGiftcards, $ordersResponse);
 
             $request['amount']['value'] = $this->remainingOrderAmount;
             $request['order'] = [
                 'pspReference' => $ordersResponse['pspReference'],
                 'orderData' => $ordersResponse['orderData']
             ];
         } else {
-            $giftcardResponse = null;
+            $giftcardResponseCollection = [];
         }
 
-        return array($request, $giftcardResponse);
+        return array($request, $giftcardResponseCollection);
     }
 }

Gateway/Response/CheckoutPaymentCommentHistoryHandler.php

@@ -11,51 +11,37 @@
 
 namespace Adyen\Payment\Gateway\Response;
 
+use Magento\Payment\Gateway\Helper\SubjectReader;
 use Magento\Payment\Gateway\Response\HandlerInterface;
 
 class CheckoutPaymentCommentHistoryHandler implements HandlerInterface
 {
     /**
      * @param array $handlingSubject
-     * @param array $response
+     * @param array $responseCollection
      * @return $this
      */
-    public function handle(array $handlingSubject, array $response)
+    public function handle(array $handlingSubject, array $responseCollection): self
     {
-        $readPayment = \Magento\Payment\Gateway\Helper\SubjectReader::readPayment($handlingSubject);
-
+        $readPayment = SubjectReader::readPayment($handlingSubject);
         $payment = $readPayment->getPayment();
-
         $comment = __("Adyen Result response:");
 
-        if (isset($response['resultCode'])) {
-            $responseCode = $response['resultCode'];
-        } else {
-            // try to get response from response key (used for modifications
-            if (isset($response['response'])) {
-                $responseCode = $response['response'];
-            } else {
-                $responseCode = "";
-            }
-        }
-
-        if (isset($response['pspReference'])) {
-            $pspReference = $response['pspReference'];
-        } else {
-            $pspReference = "";
-        }
+        foreach ($responseCollection as $response) {
+            $responseCode = $response['resultCode'] ?? $response['response'] ?? '';
 
-        if ($responseCode) {
-            $comment .= '<br /> ' . __('authResult:') . ' ' . $responseCode;
-            $payment->getOrder()->setAdyenResulturlEventCode($responseCode);
-        }
+            if (!empty($responseCode)) {
+                $comment .= '<br /> ' . __('authResult:') . ' ' . $responseCode;
+                $payment->getOrder()->setAdyenResulturlEventCode($responseCode);
+            }
 
-        if ($pspReference) {
-            $comment .= '<br /> ' . __('pspReference:') . ' ' . $pspReference;
+            if (isset($response['pspReference'])) {
+                $comment .= '<br /> ' . __('pspReference:') . ' ' . $response['pspReference'];
+            }
+            $comment .= '<br /> ';
         }
 
         $payment->getOrder()->addStatusHistoryComment($comment, $payment->getOrder()->getStatus());
-
         return $this;
     }
 }

Gateway/Response/CheckoutPaymentsDetailsHandler.php

@@ -32,7 +32,7 @@ public function __construct(
      * This is being used for all checkout methods (adyen hpp payment method)
      *
      */
-    public function handle(array $handlingSubject, array $response)
+    public function handle(array $handlingSubject, array $responseCollection)
     {
         $paymentDataObject = SubjectReader::readPayment($handlingSubject);
 
@@ -48,6 +48,9 @@ public function handle(array $handlingSubject, array $response)
             $payment->getOrder()->setCanSendNewEmailFlag(false);
         }
 
+        // for partial payments, non-giftcard payments will always be the last element in the collection
+        // for non-partial, there is only one response in the collection
+        $response = end($responseCollection);
         if (!empty($response['pspReference'])) {
             // set pspReference as transactionId
             $payment->setCcTransId($response['pspReference']);
@@ -57,7 +60,7 @@ public function handle(array $handlingSubject, array $response)
             $payment->setTransactionId($response['pspReference']);
         }
 
-        // do not close transaction so you can do a cancel() and void
+        // do not close transaction, so you can do a cancel() and void
         $payment->setIsTransactionClosed(false);
         $payment->setShouldCloseParentTransaction(false);
     }

Gateway/Response/VaultDetailsHandler.php

@@ -35,13 +35,16 @@ public function __construct(Vault $vaultHelper)
 
     /**
      * @param array $handlingSubject
-     * @param array $response
+     * @param array $responseCollection
      * @return void
-     * @throws LocalizedException
      */
-    public function handle(array $handlingSubject, array $response): void
+    public function handle(array $handlingSubject, array $responseCollection): void
     {
-        if (empty($response['additionalData'])) {
+        // for (non-) partial payments, the non-giftcard payment is always last.
+        $response = end($responseCollection);
+
+        // payments without additional data or only giftcards should be ignored.
+        if (empty($response['additionalData']) || $responseCollection['hasOnlyGiftCards']) {
             return;
         }