Merge branch 'release/4.1.0'

CHANGELOG.md

@@ -7,6 +7,9 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## [Unreleased][unreleased]
 -
 
+## [4.1.0] - 2022-04-11
+- No longer use core gateweay mode.
+
 ## [4.0.0] - 2022-01-11
 ### Changed
 - Updated to https://github.com/pronamic/wp-pay-core/releases/tag/4.0.0.
@@ -65,7 +68,8 @@ This projects adheres to [Semantic Versioning](http://semver.org/) and [Keep a C
 ## 1.0.0 - 2016-07-06
 - First release.
 
-[unreleased]: https://github.com/wp-pay-gateways/ems-e-commerce/compare/4.0.0...HEAD
+[unreleased]: https://github.com/wp-pay-gateways/ems-e-commerce/compare/4.1.0...HEAD
+[4.1.0]: https://github.com/wp-pay-gateways/ems-e-commerce/compare/4.0.0...4.1.0
 [4.0.0]: https://github.com/wp-pay-gateways/ems-e-commerce/compare/3.0.1...4.0.0
 [3.0.1]: https://github.com/wp-pay-gateways/ems-e-commerce/compare/3.0.0...3.0.1
 [3.0.0]: https://github.com/wp-pay-gateways/ems-e-commerce/compare/2.1.2...3.0.0

composer.json

@@ -29,7 +29,13 @@
 		}
 	},
 	"config": {
-		"sort-packages": true
+		"sort-packages": true,
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true,
+			"bamarni/composer-bin-plugin": true,
+			"roots/wordpress-core-installer": true,
+			"composer/installers": true
+		}
 	},
 	"require": {
 		"php": ">=5.6.20",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ems-e-commerce",
-  "version": "4.0.0",
+  "version": "4.1.0",
   "description": "EMS e-Commerce Gateway driver for the WordPress payment processing library.",
   "repository": {
     "type": "git",

src/Client.php

@@ -98,7 +98,7 @@ class Client {
 	/**
 	 * Payment method
 	 *
-	 * @var array
+	 * @var string
 	 */
 	private $payment_method;
 
@@ -319,7 +319,7 @@ public function set_order_id( $order_id ) {
 	/**
 	 * Get payment ID
 	 *
-	 * @return int
+	 * @return string
 	 */
 	public function get_payment_id() {
 		return $this->payment_id;
@@ -328,7 +328,7 @@ public function get_payment_id() {
 	/**
 	 * Set payment ID
 	 *
-	 * @param int $payment_id Payment ID.
+	 * @param string $payment_id Payment ID.
 	 * @return void
 	 */
 	public function set_payment_id( $payment_id ) {
@@ -343,7 +343,7 @@ public function set_payment_id( $payment_id ) {
 	 */
 	public function get_transaction_datetime( $create_new = false ) {
 		if ( null === $this->transaction_datetime || $create_new ) {
-			$this->transaction_datetime = new DateTime( null, new DateTimeZone( 'UTC' ) );
+			$this->transaction_datetime = new DateTime( 'now', new DateTimeZone( 'UTC' ) );
 		}
 
 		return $this->transaction_datetime;
@@ -362,7 +362,7 @@ public function set_transaction_datetime( DateTime $datetime ) {
 	/**
 	 * Get data
 	 *
-	 * @return array
+	 * @return array<string, string>
 	 */
 	public function get_data() {
 		// Required fields for payment request.
@@ -396,7 +396,7 @@ public function get_data() {
 			'responseSuccessURL'         => $this->get_return_url(),
 			'transactionNotificationURL' => $this->get_notification_url(),
 			'idealIssuerID'              => $this->get_issuer_id(),
-			'ems_notify_payment_id'      => $this->get_payment_id(),
+			'ems_notify_payment_id'      => (string) $this->get_payment_id(),
 		);
 
 		// @link http://briancray.com/2009/04/25/remove-null-values-php-arrays/
@@ -450,7 +450,7 @@ public function get_hash() {
 	/**
 	 * Compute hash
 	 *
-	 * @param array $values Values to compute hash for.
+	 * @param string[] $values Values to compute hash for.
 	 * @return string
 	 */
 	public static function compute_hash( $values ) {
@@ -464,7 +464,7 @@ public static function compute_hash( $values ) {
 	 * Get fields
 	 *
 	 * @since 1.0.0
-	 * @return array
+	 * @return array<string, string>
 	 */
 	public function get_fields() {
 		$fields = $this->get_data();

src/Config.php

@@ -15,6 +15,13 @@
  * @since 1.0.0
  */
 class Config extends GatewayConfig {
+	/**
+	 * Action URL.
+	 * 
+	 * @var string
+	 */
+	private $action_url;
+
 	/**
 	 * Store name.
 	 *
@@ -35,4 +42,30 @@ class Config extends GatewayConfig {
 	 * @var string|null
 	 */
 	public $order_id;
+
+	/**
+	 * Construct config.
+	 */
+	public function __construct() {
+		$this->action_url = Client::ACTION_URL_PRODUCTION;
+	}
+
+	/**
+	 * Get action URL.
+	 * 
+	 * @return string
+	 */
+	public function get_action_url() {
+		return $this->action_url;
+	}
+
+	/**
+	 * Set action URL.
+	 * 
+	 * @param string $action_url Action URL.
+	 * @return void
+	 */
+	public function set_action_url( $action_url ) {
+		$this->action_url = $action_url;
+	}
 }

src/Gateway.php

@@ -25,6 +25,13 @@ class Gateway extends Core_Gateway {
 	 */
 	protected $client;
 
+	/**
+	 * Config.
+	 *
+	 * @var Config
+	 */
+	protected $config;
+
 	/**
 	 * Constructs and initializes an EMS e-Commerce gateway
 	 *
@@ -34,20 +41,16 @@ class Gateway extends Core_Gateway {
 	public function __construct( Config $config ) {
 		parent::__construct( $config );
 
+		$this->config = $config;
+
 		$this->set_method( self::METHOD_HTML_FORM );
 
 		// Client.
 		$this->client = new Client();
 
-		$action_url = Client::ACTION_URL_PRODUCTION;
-
-		if ( self::MODE_TEST === $config->mode ) {
-			$action_url = Client::ACTION_URL_TEST;
-		}
-
-		$this->client->set_action_url( $action_url );
-		$this->client->set_storename( $config->storename );
-		$this->client->set_secret( $config->secret );
+		$this->client->set_action_url( $config->get_action_url() );
+		$this->client->set_storename( (string) $config->storename );
+		$this->client->set_secret( (string) $config->secret );
 	}
 
 	/**
@@ -82,16 +85,16 @@ public function start( Payment $payment ) {
 	 * Get the output HTML
 	 *
 	 * @param Payment $payment Payment.
-	 * @return array
+	 * @return array<string, string>
 	 *
 	 * @see     Core_Gateway::get_output_html()
 	 * @since   1.0.0
 	 * @version 2.0.4
 	 */
 	public function get_output_fields( Payment $payment ) {
-		$this->client->set_payment_id( (int) $payment->get_id() );
+		$this->client->set_payment_id( (string) $payment->get_id() );
 		$this->client->set_currency_numeric_code( (string) $payment->get_total_amount()->get_currency()->get_numeric_code() );
-		$this->client->set_order_id( $payment->format_string( $this->config->order_id ) );
+		$this->client->set_order_id( $payment->format_string( (string) $this->config->order_id ) );
 		$this->client->set_return_url( home_url( '/' ) );
 		$this->client->set_notification_url( home_url( '/' ) );
 		$this->client->set_amount( $payment->get_total_amount() );
@@ -116,7 +119,9 @@ public function get_output_fields( Payment $payment ) {
 			$payment_method = $payment->get_payment_method();
 		}
 
-		$this->client->set_payment_method( $payment_method );
+		if ( null !== $payment_method ) {
+			$this->client->set_payment_method( $payment_method );
+		}
 
 		return $this->client->get_fields();
 	}

src/Integration.php

@@ -15,23 +15,28 @@
  * @since 1.0.0
  */
 class Integration extends AbstractGatewayIntegration {
+	/**
+	 * Action URL.
+	 * 
+	 * @var string
+	 */
+	private $action_url;
+
 	/**
 	 * Construct EMS e-Commerce integration.
 	 *
-	 * @param array $args Arguments.
+	 * @param array<string, mixed> $args Arguments.
 	 */
 	public function __construct( $args = array() ) {
 		$args = wp_parse_args(
 			$args,
 			array(
 				'id'            => 'ems-ecommerce',
 				'name'          => 'EMS e-Commerce',
+				'action_url'    => Client::ACTION_URL_PRODUCTION,
 				'provider'      => 'ems',
 				'product_url'   => null,
-				'dashboard_url' => array(
-					\__( 'test', 'pronamic_ideal' ) => 'https://test.ipg-online.com/vt/login',
-					\__( 'live', 'pronamic_ideal' ) => 'https://www.ipg-online.com/vt/login',
-				),
+				'dashboard_url' => 'https://www.ipg-online.com/vt/login',
 				'supports'      => array(
 					'webhook',
 					'webhook_log',
@@ -43,6 +48,8 @@ public function __construct( $args = array() ) {
 
 		parent::__construct( $args );
 
+		$this->action_url = $args['action_url'];
+
 		// Actions
 		$function = array( __NAMESPACE__ . '\Listener', 'listen' );
 
@@ -140,9 +147,10 @@ public function get_settings_fields() {
 	public function get_config( $post_id ) {
 		$config = new Config();
 
+		$config->set_action_url( $this->action_url );
+
 		$config->storename = get_post_meta( $post_id, '_pronamic_gateway_ems_ecommerce_storename', true );
 		$config->secret    = get_post_meta( $post_id, '_pronamic_gateway_ems_ecommerce_secret', true );
-		$config->mode      = get_post_meta( $post_id, '_pronamic_gateway_mode', true );
 		$config->order_id  = get_post_meta( $post_id, '_pronamic_gateway_ems_ecommerce_order_id', true );
 
 		return $config;