SW-454: handle second redirect after authorization when shipping cost…

…s increase
PAYONE-GmbH · Dec 18, 2024 · b5f222e · b5f222e
1 parent ff145b9
commit b5f222e
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/Frontend/MoptPaymentPayone/Controllers/Frontend/MoptPaymentEcsv2.php b/Frontend/MoptPaymentPayone/Controllers/Frontend/MoptPaymentEcsv2.php
@@ -106,6 +106,17 @@ public function paypalv2expressAction()
         $userData = $this->payoneUserHelper->getUserData();
         $paymentConfig = $this->moptPayone__main->getPayoneConfig($paymentId);
 
+        $moptPaymentReference = $session['moptPaymentReference'];
+        if (!empty($moptPaymentReference)) {
+            $this->forward(
+                'finishOrder',
+                'MoptPaymentPayone',
+                null,
+                array('txid' => $session->txId, 'hash' => $session->moptPaymentReference)
+            );
+            return;
+        }
+
         if ($paymentConfig['paypalExpressUseDefaultShipping']) {
             $amount = $this->payoneUserHelper->getBasketAmount($userData) + $shippingCosts;
         } else {
@@ -151,6 +162,7 @@ public function paypalv2expressabortAction()
             ->get('errorMessageUserAbort');
         unset($session->moptPaypalv2ExpressWorkorderId);
         unset($session->moptBasketChanged);
+        unset($session->moptPaymentReference);
 
         $this->redirect(array('controller' => 'checkout', 'action' => 'cart'));
     }
@@ -161,6 +173,7 @@ public function paypalv2expresserrorAction()
         $session->moptPayoneUserHelperErrorMessage = $this->moptPayone__paymentHelper->moptGetErrorMessageFromErrorCodeViaSnippet(false, $this->request->getParam('errorCode'));
         unset($session->moptPaypalv2ExpressWorkorderId);
         unset($session->moptBasketChanged);
+        unset($session->moptPaymentReference);
         $this->redirect(array('controller' => 'checkout', 'action' => 'cart'));
     }
 }