Mark order payment as canceled upon exceptional Adyen API response

ISSUE: CS-3178
Adyen · May 25, 2022 · f77edd8 · f77edd8
1 parent b2e280b
commit f77edd8
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/Controllers/Frontend/Adyen.php b/Controllers/Frontend/Adyen.php
@@ -77,6 +77,8 @@ public function ajaxDoPaymentAction(): void
                     'content' => $ex->getMessage(),
                 ]
             ));
+
+            $this->basketService->cancelAndRestoreByOrderNumber($context->getOrder()->getNumber());
         }
     }
 
@@ -230,11 +232,21 @@ private function getShopperInfo(): array
      */
     private function handlePaymentData($paymentInfo): void
     {
-        if (PaymentResultCode::exists((string) ($paymentInfo['resultCode'] ?? ''))) {
+        $rawResultCode = (string) ($paymentInfo['resultCode'] ?? '');
+        if (!PaymentResultCode::exists($rawResultCode)) {
+            $this->handlePaymentDataError($paymentInfo);
             return;
         }
 
-        $this->handlePaymentDataError($paymentInfo);
+        $resultCode = PaymentResultCode::load((string) ($paymentInfo['resultCode'] ?? ''));
+        if (
+            !$resultCode->equals(PaymentResultCode::authorised()) &&
+            !$resultCode->equals(PaymentResultCode::identifyShopper()) &&
+            !$resultCode->equals(PaymentResultCode::challengeShopper()) &&
+            !$resultCode->equals(PaymentResultCode::redirectShopper())
+        ) {
+            $this->handlePaymentDataError($paymentInfo);
+        }
     }
 
     /**