Merge pull request #137 from pooliestudios/paypal-redirect-fix

paypal redirect fix
PAYONE-GmbH · Apr 25, 2023 · 90541c7 · 90541c7
2 parents 8a3ad74 + 0c04431
commit 90541c7
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git a/src/Payone/Gateway/RedirectGatewayBase.php b/src/Payone/Gateway/RedirectGatewayBase.php
@@ -68,6 +68,10 @@ public function process_redirect( $order_id, $transaction_class ) {
 			$order->save_meta_data();
 			$order->save();
 
+			if ( WC()->session ) {
+				WC()->session->set( 'order_key', $order->get_order_key() );
+			}
+
 			// Perform the redirect if we need to
 			if ( $response->is_redirect() ) {
 				return [

diff --git a/src/Payone/Plugin.php b/src/Payone/Plugin.php
@@ -454,11 +454,23 @@ private function process_callback_after_redirect() {
 		$gateway = self::get_gateway_for_order( $order );
 
 		$logged_in_user_id = wp_get_current_user()->ID;
+		$session_order_key = null;
+		if ( WC()->session ) {
+			$session_order_key = WC()->session->get( 'order_key' );
+		}
+
+		$redirect_allowed = false;
 		if ( $logged_in_user_id ) {
 			$order_user = $order->get_user();
 			if ( $order_user && $order->get_user()->ID === $logged_in_user_id ) {
-				return $gateway->process_payment( $order_id );
+				$redirect_allowed = true;
 			}
+		} elseif ( $session_order_key && $session_order_key === $order->get_order_key() ) {
+			$redirect_allowed = true;
+		}
+
+		if ( $redirect_allowed ) {
+			return $gateway->process_payment( $order_id );
 		}
 
 		wp_redirect( wc_get_checkout_url() );