Use return url with key from payment

pronamic · Nov 5, 2015 · 94a151e · 94a151e
1 parent 503294e
commit 94a151e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 18 deletions.
diff --git a/src/DirectLink/Gateway.php b/src/DirectLink/Gateway.php
@@ -87,11 +87,9 @@ public function start( Pronamic_Pay_PaymentDataInterface $data, Pronamic_Pay_Pay
 				->set_http_user_agent( Pronamic_WP_Pay_Server::get( 'HTTP_USER_AGENT' ) )
 				->set_window( 'MAINW' );
 
-			$url = add_query_arg( 'payment', $payment->get_id(), home_url( '/' ) );
-
-			$ogone_data->set_field( 'ACCEPTURL', $url );
-			$ogone_data->set_field( 'DECLINEURL', $url );
-			$ogone_data->set_field( 'EXCEPTIONURL', $url );
+			$ogone_data->set_field( 'ACCEPTURL', $payment->get_return_url() );
+			$ogone_data->set_field( 'DECLINEURL', $payment->get_return_url() );
+			$ogone_data->set_field( 'EXCEPTIONURL', $payment->get_return_url() );
 			$ogone_data->set_field( 'PARAMPLUS', '' );
 			$ogone_data->set_field( 'COMPLUS', '' );
 		}
@@ -114,7 +112,7 @@ public function start( Pronamic_Pay_PaymentDataInterface $data, Pronamic_Pay_Pay
 			$this->error = $error;
 		} else {
 			$payment->set_transaction_id( $result->pay_id );
-			$payment->set_action_url( add_query_arg( 'payment', $payment->get_id(), home_url( '/' ) ) );
+			$payment->set_action_url( $payment->get_return_url() );
 			$payment->set_status( Pronamic_WP_Pay_Gateways_Ogone_Statuses::transform( $result->status ) );
 
 			if ( ! empty( $result->html_answer ) ) {

diff --git a/src/OrderStandard/Gateway.php b/src/OrderStandard/Gateway.php
@@ -109,13 +109,11 @@ public function start( Pronamic_Pay_PaymentDataInterface $data, Pronamic_Pay_Pay
 		// URL's
 		$ogone_url_helper = new Pronamic_WP_Pay_Gateways_Ogone_DataUrlHelper( $ogone_data );
 
-		$url = add_query_arg( 'payment', $payment->get_id(), home_url( '/' ) );
-
 		$ogone_url_helper
-			->set_accept_url( add_query_arg( 'status', 'accept', $url ) )
-			->set_cancel_url( add_query_arg( 'status', 'cancel', $url ) )
-			->set_decline_url( add_query_arg( 'status', 'decline', $url ) )
-			->set_exception_url( add_query_arg( 'status', 'exception', $url ) );
+			->set_accept_url( add_query_arg( 'status', 'accept', $payment->get_return_url() ) )
+			->set_cancel_url( add_query_arg( 'status', 'cancel', $payment->get_return_url() ) )
+			->set_decline_url( add_query_arg( 'status', 'decline', $payment->get_return_url() ) )
+			->set_exception_url( add_query_arg( 'status', 'exception', $payment->get_return_url() ) );
 	}
 
 	/////////////////////////////////////////////////

diff --git a/src/OrderStandardEasy/Gateway.php b/src/OrderStandardEasy/Gateway.php
@@ -72,13 +72,11 @@ public function start( Pronamic_Pay_PaymentDataInterface $data, Pronamic_Pay_Pay
 		// URL's
 		$ogone_url_helper = new Pronamic_WP_Pay_Gateways_Ogone_DataUrlHelper( $ogone_data );
 
-		$url = add_query_arg( 'payment', $payment->get_id(), home_url( '/' ) );
-
 		$ogone_url_helper
-			->set_accept_url( add_query_arg( 'status', Pronamic_WP_Pay_Statuses::SUCCESS, $url ) )
-			->set_cancel_url( add_query_arg( 'status', Pronamic_WP_Pay_Statuses::CANCELLED, $url ) )
-			->set_decline_url( add_query_arg( 'status', Pronamic_WP_Pay_Statuses::FAILURE, $url ) )
-			->set_exception_url( add_query_arg( 'status', Pronamic_WP_Pay_Statuses::FAILURE, $url ) )
+			->set_accept_url( add_query_arg( 'status', Pronamic_WP_Pay_Statuses::SUCCESS, $payment->get_return_url() ) )
+			->set_cancel_url( add_query_arg( 'status', Pronamic_WP_Pay_Statuses::CANCELLED, $payment->get_return_url() ) )
+			->set_decline_url( add_query_arg( 'status', Pronamic_WP_Pay_Statuses::FAILURE, $payment->get_return_url() ) )
+			->set_exception_url( add_query_arg( 'status', Pronamic_WP_Pay_Statuses::FAILURE, $payment->get_return_url() ) )
 			->set_back_url( home_url( '/' ) )
 			->set_home_url( home_url( '/' ) );
 	}