PSPAYPAL-798 - Take Over 793

OXID-eSales · Oct 18, 2024 · d5c52e5 · d5c52e5
1 parent 394ec3d
commit d5c52e5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Controller/ProxyController.php b/src/Controller/ProxyController.php
@@ -168,7 +168,11 @@ public function cancelPayPalPayment()
     {
         PayPalSession::unsetPayPalOrderId();
         Registry::getSession()->getBasket()->setPayment(null);
-        Registry::getUtils()->redirect(Registry::getConfig()->getShopSecureHomeURL() . 'cl=payment', false, 301);
+        $redirect = Registry::getRequest()->getRequestParameter('redirect');
+        if ($redirect === "1" ) {
+            Registry::getUtils()->redirect(Registry::getConfig()->getShopSecureHomeURL() . 'cl=payment', false, 301);
+        }
+        exit;
     }
 
     /**

diff --git a/src/Core/ViewConfig.php b/src/Core/ViewConfig.php
@@ -142,7 +142,7 @@ public function getPayPalPuiFlowId(): string
      */
     public function getCancelPayPalPaymentUrl(): string
     {
-        return $this->getSslSelfLink() . 'cl=oscpaypalproxy&fnc=cancelPayPalPayment';
+        return $this->getSslSelfLink() . 'cl=oscpaypalproxy&fnc=cancelPayPalPayment&redirect=1';
     }
 
     /**