[ECP-9408] Fix response collection array parameter

Adyen · Sep 5, 2024 · 0a6e08e · 0a6e08e
1 parent b493dd0
commit 0a6e08e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/Gateway/Http/Client/TransactionPayment.php b/Gateway/Http/Client/TransactionPayment.php
@@ -120,14 +120,15 @@ public function placeRequest(TransferInterface $transferObject): array
 
         $client = $this->adyenHelper->initializeAdyenClientWithClientConfig($clientConfig);
         $service = $this->adyenHelper->initializePaymentsApi($client);
-
+        $responseCollection = [];
+        $responseCollection['hasOnlyGiftCards'] = false;
 
         try {
-            list($requestData, $responseCollection) = $this->processGiftcards($requestData, $service);
-            $responseCollection['hasOnlyGiftCards'] = false;
+            list($requestData, $giftcardResponseCollection) = $this->processGiftcards($requestData, $service);
 
             /** @var array $responseCollection */
-            if (!empty($responseCollection)) {
+            if (!empty($giftcardResponseCollection)) {
+                $responseCollection = $giftcardResponseCollection;
 
                 if ($this->remainingOrderAmount === 0) {
                     $responseCollection['hasOnlyGiftCards'] = true;

diff --git a/Gateway/Validator/CheckoutResponseValidator.php b/Gateway/Validator/CheckoutResponseValidator.php
@@ -65,11 +65,14 @@ public function validate(array $validationSubject): ResultInterface
         // Assign the remaining items to $commandSubject
         $commandSubject = $validationSubject;
 
-        if(empty($responseCollection)) {
+        if (empty($responseCollection)) {
             throw new ValidatorException(__("No responses were provided"));
         }
 
+        // hasOnlyGiftCards is needed later but cannot be processed as a response
+        unset($responseCollection['hasOnlyGiftCards']);
         foreach ($responseCollection as $thisResponse) {
+
             $responseSubject = array_merge($commandSubject, ['response' => $thisResponse]);
             $this->validateResponse($responseSubject);
         }