Merge pull request #39 from pronamic/38-countrycode-is-now-a-mandatory-configuration-property-set-it-during-the-adyencheckout-initialization

Since Adyen Web v6 the `countryCode` is a mandatory configuration property

Author: remcotolsma

js/dist/checkout-drop-in.asset.php

@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '60ba2b4d744e7a134224');
+<?php return array('dependencies' => array(), 'version' => '97fa7bb71b20b207f779');

src/Config.php

@@ -59,6 +59,13 @@ class Config extends GatewayConfig implements JsonSerializable {
 	 */
 	public $client_key;
 
+	/**
+	 * Country code.
+	 *
+	 * @var string
+	 */
+	public $country_code = '';
+
 	/**
 	 * Get API key.
 	 *
@@ -99,6 +106,7 @@ public function jsonSerialize(): object {
 			'merchant_account' => (string) $this->merchant_account,
 			'api_key'          => (string) $this->api_key,
 			'client_key'       => (string) $this->client_key,
+			'country_code'     => (string) $this->country_code,
 		];
 	}
 }

src/Gateway.php

@@ -334,6 +334,14 @@ public function payment_redirect( Payment $payment ) {
 			],
 			'clientKey'   => $this->config->client_key,
 			'amount'      => AmountTransformer::transform( $payment->get_total_amount() )->get_json(),
+			/**
+			 * Country code.
+			 *
+			 * Since Adyen Web v6 the `countryCode` is a mandatory configuration property.
+			 *
+			 * @link https://docs.adyen.com/online-payments/upgrade-your-integration/migrate-to-web-v6
+			 */
+			'countryCode' => Util::get_country_code( $payment ) ?? $this->config->country_code,
 		];
 
 		$checkout_configuration = (object) $checkout_configuration;

src/Integration.php

@@ -424,6 +424,17 @@ public function get_settings_fields() {
 			},
 		];
 
+		// Country code.
+		$fields[] = [
+			'section'  => 'general',
+			'meta_key' => '_pronamic_gateway_adyen_country_code',
+			'title'    => \__( 'Country code', 'pronamic_ideal' ),
+			'type'     => 'text',
+			'classes'  => [ 'regular-text', 'code' ],
+			'tooltip'  => \__( 'Country code used when it cannot be derived from the customer details.', 'pronamic_ideal' ),
+			'required' => true,
+		];
+
 		// Return fields.
 		return $fields;
 	}
@@ -457,6 +468,7 @@ public function get_config( $post_id ) {
 		$config->merchant_account         = $this->get_meta( $post_id, 'adyen_merchant_account' );
 		$config->client_key               = $this->get_meta( $post_id, 'adyen_client_key' );
 		$config->merchant_order_reference = $this->get_meta( $post_id, 'adyen_merchant_order_reference' );
+		$config->country_code             = $this->get_meta( $post_id, 'adyen_country_code' );
 
 		return $config;
 	}