Fix Express Checkout flow on create

PrestaShopCorp · Oct 4, 2024 · bd77f40 · bd77f40
1 parent 0ee6d0f
commit bd77f40
Showing 1 changed file with 22 additions and 0 deletions.
diff --git a/controllers/front/create.php b/controllers/front/create.php
@@ -104,6 +104,28 @@ public function postProcess()
             $isCardFields = isset($bodyValues['isCardFields']) && $bodyValues['isCardFields'];
             $isExpressCheckout = (isset($bodyValues['isExpressCheckout']) && $bodyValues['isExpressCheckout']) || empty($this->context->cart->id_address_delivery);
 
+            if ($isExpressCheckout) {
+                $psCheckoutCartCollection = new PrestaShopCollection(PsCheckoutCart::class);
+                $psCheckoutCartCollection->where('id_cart', '=', (int) $cartId);
+                $psCheckoutCartCollection->where('isExpressCheckout', '=', '1');
+                $psCheckoutCartCollection->where('paypal_status', 'IN', [PsCheckoutCart::STATUS_CREATED, PsCheckoutCart::STATUS_APPROVED, PsCheckoutCart::STATUS_PAYER_ACTION_REQUIRED]);
+                $psCheckoutCartCollection->where('date_upd', '>', date('Y-m-d H:i:s', strtotime('-1 hour')));
+                $psCheckoutCartCollection->orderBy('date_upd', 'desc');
+                /** @var PsCheckoutCart|false $psCheckoutCart */
+                $psCheckoutCart = $psCheckoutCartCollection->getFirst();
+                if ($psCheckoutCart) {
+                    $this->exitWithResponse([
+                        'status' => true,
+                        'httpCode' => 200,
+                        'body' => [
+                            'orderID' => $psCheckoutCart->paypal_order,
+                        ],
+                        'exceptionCode' => null,
+                        'exceptionMessage' => null,
+                    ]);
+                }
+            }
+
             /** @var CommandBusInterface $commandBus */
             $commandBus = $this->module->getService('ps_checkout.bus.command');
             $commandBus->handle(new CreatePayPalOrderCommand($cartId, $fundingSource, $isCardFields, $isExpressCheckout, $vaultId, $favorite, $vault));