OX6-164 - Fixed PayPal payments with REDIRECT status from auth

PAYONE-GmbH · Dec 2, 2024 · f8a3bef · f8a3bef
1 parent 463d2df
commit f8a3bef
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/extend/application/controllers/fcPayOneOrderView.php b/extend/application/controllers/fcPayOneOrderView.php
@@ -520,7 +520,13 @@ protected function _fcpoThrowException($sMessage)
      * @param void
      * @return void
      */
-    protected function _handlePayPalExpressCall($sPaymentId) {
+    protected function _handlePayPalExpressCall($sPaymentId)
+    {
+        if ($this->_oFcpoHelper->fcpoGetSessionVariable('blFcpoPayonePayPalExpressRetry') === true) {
+            $this->_oFcpoHelper->fcpoDeleteSessionVariable('blFcpoPayonePayPalExpressRetry');
+            $this->_oFcpoHelper->fcpoGetUtils()->redirect($this->_oFcpoHelper->fcpoGetConfig()->getCurrentShopUrl().'index.php?cl=thankyou', false);
+        }
+
         $sWorkorderId = $this->_oFcpoHelper->fcpoGetSessionVariable('fcpoWorkorderId');
         if ($sWorkorderId) {
             $oRequest = $this->_oFcpoHelper->getFactoryObject('fcporequest');

diff --git a/extend/application/models/fcPayOneOrder.php b/extend/application/models/fcPayOneOrder.php
@@ -1876,6 +1876,10 @@ protected function _fcpoFlagOrderPaymentAsRedirect($blFlaggedAsRedirect = true)
      */
     protected function _fcpoHandleAuthorizationRedirect($aResponse, $sRefNr, $sAuthorizationType, $sMode, $blReturnRedirectUrl) 
     {
+        if ($aResponse['status'] == 'REDIRECT' && in_array($this->oxorder__oxpaymenttype->value, [fcpopaypalhelper::PPE_EXPRESS, fcpopaypalhelper::PPE_V2_EXPRESS])) {
+            $this->_oFcpoHelper->fcpoSetSessionVariable('blFcpoPayonePayPalExpressRetry', true);
+        }
+
         $this->_fcpoFlagOrderPaymentAsRedirect();
         $oConfig = $this->_oFcpoHelper->fcpoGetConfig();
         $oUtils = $this->_oFcpoHelper->fcpoGetUtils();