Merge pull request #168 from saucal/feature/jp-region-codes

adjustment for region codes of JP region
woocommerce · May 24, 2022 · 99f4f1d · 99f4f1d
2 parents ae929f1 + ea631f1
commit 99f4f1d
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 2 deletions.
diff --git a/includes/class-wc-gateway-amazon-payments-advanced-abstract.php b/includes/class-wc-gateway-amazon-payments-advanced-abstract.php
@@ -10,6 +10,63 @@
  */
 abstract class WC_Gateway_Amazon_Payments_Advanced_Abstract extends WC_Payment_Gateway {
 
+	/**
+	 * ISO region codes for JAPAN mapped to Japanese.
+	 *
+	 * Used to pass the region in Japanese to the Amazon API.
+	 *
+	 * Specifically requested by Amazon's JP Team.
+	 */
+	const JP_REGION_CODE_MAP = array(
+		'JP01' => '北海道',
+		'JP02' => '青森県',
+		'JP03' => '岩手県',
+		'JP04' => '宮城県',
+		'JP05' => '秋田県',
+		'JP06' => '山形県',
+		'JP07' => '福島県',
+		'JP08' => '茨城県',
+		'JP09' => '栃木県',
+		'JP10' => '群馬県',
+		'JP11' => '埼玉県',
+		'JP12' => '千葉県',
+		'JP13' => '東京都',
+		'JP14' => '神奈川県',
+		'JP15' => '新潟県',
+		'JP16' => '富山県',
+		'JP17' => '石川県',
+		'JP18' => '福井県',
+		'JP19' => '山梨県',
+		'JP20' => '長野県',
+		'JP21' => '岐阜県',
+		'JP22' => '静岡県',
+		'JP23' => '愛知県',
+		'JP24' => '三重県',
+		'JP25' => '滋賀県',
+		'JP26' => '京都府',
+		'JP27' => '大阪府',
+		'JP28' => '兵庫県',
+		'JP29' => '奈良県',
+		'JP30' => '和歌山県',
+		'JP31' => '鳥取県',
+		'JP32' => '島根県',
+		'JP33' => '岡山県',
+		'JP34' => '広島県',
+		'JP35' => '山口県',
+		'JP36' => '徳島県',
+		'JP37' => '香川県',
+		'JP38' => '愛媛県',
+		'JP39' => '高知県',
+		'JP40' => '福岡県',
+		'JP41' => '佐賀県',
+		'JP42' => '長崎県',
+		'JP43' => '熊本県',
+		'JP44' => '大分県',
+		'JP45' => '宮崎県',
+		'JP46' => '鹿児島県',
+		'JP47' => '沖縄県',
+	);
+
 	/**
 	 * Amazon Private Key
 	 *

diff --git a/includes/class-wc-gateway-amazon-payments-advanced.php b/includes/class-wc-gateway-amazon-payments-advanced.php
@@ -2813,14 +2813,21 @@ public function update_address_details_for_classic( $payload, $checkout_session_
 		$phone_number = $order->get_shipping_phone();
 		$phone_number = $phone_number ? $phone_number : $order->get_billing_phone();
 
+		$shipping_state   = $order->get_shipping_state();
+		$shipping_country = $order->get_shipping_country( 'edit' );
+
+		if ( 'JP' === strtoupper( $shipping_country ) && 'JP' === strtoupper( WC_Amazon_Payments_Advanced_API::get_region() ) && isset( self::JP_REGION_CODE_MAP[ $shipping_state ] ) ) {
+			$shipping_state = self::JP_REGION_CODE_MAP[ $shipping_state ];
+		}
+
 		$payload['addressDetails'] = array(
 			'name'          => rawurlencode( $order->get_shipping_first_name() . ' ' . $order->get_shipping_last_name() ),
 			'addressLine1'  => rawurlencode( $order->get_shipping_address_1() ),
 			'addressLine2'  => rawurlencode( $order->get_shipping_address_2() ),
 			'city'          => rawurlencode( $order->get_shipping_city() ),
-			'stateOrRegion' => rawurlencode( $order->get_shipping_state() ),
+			'stateOrRegion' => rawurlencode( $shipping_state ),
 			'postalCode'    => rawurlencode( $order->get_shipping_postcode() ),
-			'countryCode'   => $order->get_shipping_country( 'edit' ),
+			'countryCode'   => $shipping_country,
 			'phoneNumber'   => rawurlencode( $phone_number ),
 		);