Fixed payment controller access and redirection

PrestaShopCorp · Oct 31, 2024 · 87f1481 · 87f1481
1 parent a7b2026
commit 87f1481
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/controllers/front/payment.php b/controllers/front/payment.php
@@ -51,7 +51,7 @@ class Ps_CheckoutPaymentModuleFrontController extends AbstractFrontController
 
     public function checkAccess()
     {
-        return $this->context->customer && $this->context->customer->isLogged() && $this->context->cart;
+        return $this->context->customer && $this->context->cart;
     }
 
     public function initContent()
@@ -89,17 +89,17 @@ public function postProcess()
 
             $payPalOrder = $payPalOrderRepository->getPayPalOrderById($this->paypalOrderId);
 
-            if ($payPalOrder->getIdCart() !== $this->context->cart->id) {
-                $this->redirectToOrderPage();
-            }
-
             $orders = new PrestaShopCollection(Order::class);
             $orders->where('id_cart', '=', $payPalOrder->getIdCart());
 
             if ($orders->count()) {
                 $this->redirectToOrderHistoryPage();
             }
 
+            if ($payPalOrder->getIdCart() !== $this->context->cart->id) {
+                $this->redirectToOrderPage();
+            }
+
             /** @var GetPayPalOrderForOrderConfirmationQueryResult $payPalOrderQueryResult */
             $payPalOrderQueryResult = $commandBus->handle(new GetPayPalOrderForOrderConfirmationQuery($this->paypalOrderId->getValue()));
             $payPalOrderFromCache = $payPalOrderQueryResult->getOrderPayPal();

diff --git a/src/PayPal/Order/PaypalOrderDataProvider.php b/src/PayPal/Order/PaypalOrderDataProvider.php
@@ -158,7 +158,7 @@ public function isTokenSaved()
 
     public function getPaymentTokenIdentifier()
     {
-        if ($this->payPalOrder) {
+        if ($this->payPalOrder && isset($this->payPalOrder->getPaymentSource()[$this->payPalOrder->getFundingSource()])) {
             $paymentSource = $this->payPalOrder->getPaymentSource()[$this->payPalOrder->getFundingSource()];
 
             if ($this->payPalOrder->getFundingSource() === 'card') {