Cancel payment only if it's possible

webgriffe · Oct 18, 2023 · 2277fec · 2277fec
1 parent 6862ed6
commit 2277fec
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/Controller/CancelLastPayPalPaymentAction.php b/src/Controller/CancelLastPayPalPaymentAction.php
@@ -49,10 +49,12 @@ public function __invoke(Request $request): Response
         $payment = $order->getLastPayment();
 
         $paymentStateMachine = $this->stateMachineFactory->get($payment, PaymentTransitions::GRAPH);
-        $paymentStateMachine->apply(PaymentTransitions::TRANSITION_CANCEL);
+        if ($paymentStateMachine->can(PaymentTransitions::TRANSITION_CANCEL)) {
+            $paymentStateMachine->apply(PaymentTransitions::TRANSITION_CANCEL);
 
-        $this->orderPaymentProcessor->process($order);
-        $this->objectManager->flush();
+            $this->orderPaymentProcessor->process($order);
+            $this->objectManager->flush();
+        }
 
         return new Response('', Response::HTTP_NO_CONTENT);
     }

diff --git a/src/Controller/CancelPayPalPaymentAction.php b/src/Controller/CancelPayPalPaymentAction.php
@@ -50,12 +50,14 @@ public function __invoke(Request $request): Response
         $order = $payment->getOrder();
 
         $paymentStateMachine = $this->stateMachineFactory->get($payment, PaymentTransitions::GRAPH);
-        $paymentStateMachine->apply(PaymentTransitions::TRANSITION_CANCEL);
+        if ($paymentStateMachine->can(PaymentTransitions::TRANSITION_CANCEL)) {
+            $paymentStateMachine->apply(PaymentTransitions::TRANSITION_CANCEL);
 
-        $this->orderPaymentProcessor->process($order);
-        $this->objectManager->flush();
+            $this->orderPaymentProcessor->process($order);
+            $this->objectManager->flush();
 
-        $this->flashBag->add('success', 'sylius.pay_pal.payment_cancelled');
+            $this->flashBag->add('success', 'sylius.pay_pal.payment_cancelled');
+        }
 
         return new Response('', Response::HTTP_NO_CONTENT);
     }