Update for removed payment ID fallback in formatted payment string (p…

…ronamic/wp-pronamic-pay-adyen#23).
pronamic · Jul 3, 2023 · 71147a6 · 71147a6
1 parent 2e9e139
commit 71147a6
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/DirectLink/Gateway.php b/src/DirectLink/Gateway.php
@@ -76,9 +76,15 @@ public function start( Payment $payment ) {
 		// General.
 		$ogone_data_general = new DataGeneralHelper( $ogone_data );
 
+		$order_id = $payment->format_string( $this->config->order_id );
+
+		if ( '' === $order_id ) {
+			$order_id = $payment->get_id();
+		}
+
 		$ogone_data_general
 			->set_psp_id( $this->client->psp_id )
-			->set_order_id( $payment->format_string( $this->config->order_id ) )
+			->set_order_id( $order_id )
 			->set_order_description( $payment->get_description() )
 			->set_param_plus( 'payment_id=' . $payment->get_id() )
 			->set_currency( $payment->get_total_amount()->get_currency()->get_alphabetic_code() )

diff --git a/src/OrderStandard/Gateway.php b/src/OrderStandard/Gateway.php
@@ -162,8 +162,14 @@ public function get_output_fields( Payment $payment ) {
 		// General.
 		$ogone_data_general = new DataGeneralHelper( $ogone_data );
 
+		$order_id = $payment->format_string( $this->config->order_id );
+
+		if ( '' === $order_id ) {
+			$order_id = $payment->get_id();
+		}
+
 		$ogone_data_general
-			->set_order_id( $payment->format_string( $this->config->order_id ) )
+			->set_order_id( $order_id )
 			->set_order_description( $payment->get_description() )
 			->set_param_plus( 'payment_id=' . $payment->get_id() )
 			->set_currency( $payment->get_total_amount()->get_currency()->get_alphabetic_code() )