[ECP-9534] Fix success page displayed if payment is canceled

Controller/Return/Index.php

@@ -152,11 +152,6 @@ protected function validateRedirectResponse(array $redirectResponse): bool
             // Make paymentsDetails call to validate the payment
             $request["details"] = $redirectResponse;
             $paymentsDetailsResponse = $this->paymentsDetailsHelper->initiatePaymentDetails($order, $request);
-
-            if ($this->isResponseAlreadyProcessed($order, $paymentsDetailsResponse)) {
-                $this->adyenLogger->addAdyenResult('Duplicate response detected. Skipping processing.');
-                return true;
-            }
         } catch (Exception $e) {
             $paymentsDetailsResponse['error'] = $e->getMessage();
         }
@@ -195,27 +190,6 @@ private function getOrder(string $incrementId = null): Order
         return $order;
     }
 
-    private function isResponseAlreadyProcessed(Order $order, array $paymentsDetailsResponse): bool
-    {
-        $pspReference = $paymentsDetailsResponse['pspReference'] ?? null;
-        $merchantReference = $paymentsDetailsResponse['merchantReference'] ?? null;
-
-        if (!$pspReference || !$merchantReference) {
-            return false;
-        }
-
-        $history = $order->getStatusHistories();
-
-        foreach ($history as $status) {
-            $comment = $status->getComment();
-            if (str_contains($comment, $pspReference) !== false) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
     /**
      * @return void
      * @throws Exception

Test/Unit/Controller/Return/IndexTest.php

@@ -136,8 +136,7 @@ private static function testDataProvider(): array
                 'orderId' => PHP_INT_MAX,
                 'expectedException' => null,
                 'multishipping' => false,
-                'orderStatusHistory' => ['Payment received'],
-                'isDuplicate' => false
+                'orderStatusHistory' => ['Payment received']
             ],
             [
                 'redirectResponse' => [
@@ -154,8 +153,7 @@ private static function testDataProvider(): array
                 'orderId' => 'ORDER123',
                 'expectedException' => null,
                 'multishipping' => false,
-                'orderStatusHistory' => ['PSP reference: PSP123456789'],
-                'isDuplicate' => true
+                'orderStatusHistory' => ['PSP reference: PSP123456789']
             ],
         ];
     }
@@ -171,8 +169,7 @@ public function testExecute(
         $orderId,
         $expectedException,
         $multishipping,
-        $orderStatusHistory,
-        $isDuplicate
+        $orderStatusHistory
     ) {
         // Set up order status history
         $orderStatusHistoryCollectionMock = $this->createMock(OrderStatusHistoryCollection::class);
@@ -209,24 +206,13 @@ public function testExecute(
         $this->orderEntityMock->method('getIncrementId')->willReturn($orderId);
         $this->paymentsDetailsHelperMock->method('initiatePaymentDetails')
             ->willReturn($paymentsDetailsResponse);
+        $this->adyenLoggerMock->expects($this->once())
+            ->method('addAdyenResult')
+            ->with('Processing redirect response');
+        $this->paymentResponseHandlerMock->expects($this->once())
+            ->method('handlePaymentsDetailsResponse')
+            ->willReturn($responseHandlerResult);
 
-        if ($isDuplicate) {
-            $this->adyenLoggerMock->expects($this->exactly(2))
-                ->method('addAdyenResult')
-                ->withConsecutive(
-                    ['Processing redirect response'],
-                    ['Duplicate response detected. Skipping processing.']
-                );
-            $this->paymentResponseHandlerMock->expects($this->never())
-                ->method('handlePaymentsDetailsResponse');
-        } else {
-            $this->adyenLoggerMock->expects($this->once())
-                ->method('addAdyenResult')
-                ->with('Processing redirect response');
-            $this->paymentResponseHandlerMock->expects($this->once())
-                ->method('handlePaymentsDetailsResponse')
-                ->willReturn($responseHandlerResult);
-        }
 
         $this->indexControllerMock->execute();
     }