ECP-8327 Allow saving multiple statedata - Returning JsonResponse for…

… the else part
Adyen · Jan 4, 2024 · 438dfc4 · 438dfc4
1 parent 1ab236a
commit 438dfc4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/Controller/StoreApi/OrderApi/OrderApiController.php b/src/Controller/StoreApi/OrderApi/OrderApiController.php
@@ -186,14 +186,15 @@ public function giftcardStateData(SalesChannelContext $context, Request $request
      * @param Request $request
      * @return JsonResponse
      */
-    public function deleteGiftCardStateData(SalesChannelContext $context, Request $request)
+    public function deleteGiftCardStateData(SalesChannelContext $context, Request $request): JsonResponse
     {
         $stateData = json_decode($request->request->get('stateData', ''), true);
-        if (!empty($stateData)) {
+        if (is_array($stateData) && array_key_exists('id', $stateData)) {
             $Id = $stateData['id'];
             $this->paymentStateDataService->deletePaymentStateData($Id);
             return new JsonResponse(['token' => $context->getToken()]);
         }
+        //return exception
         else
             return new JsonResponse('StateData is not available.');
     }

diff --git a/src/Handlers/AbstractPaymentMethodHandler.php b/src/Handlers/AbstractPaymentMethodHandler.php
@@ -813,7 +813,7 @@ public function handleAdyenOrderPayment(
         // order has been created, use state data from db as the first payment
         $transactionId = $transaction->getOrderTransaction()->getId();
         $storedStateData = $this->getStoredStateData($salesChannelContext, $transactionId);
-        if (!$storedStateData) {
+        if (is_null($storedStateData)) {
             $message = sprintf(
                 "There was an error with the giftcard payment. Order number: %s; Missing: giftcard data",
                 $transaction->getOrder()->getOrderNumber()