Merge release/6.9.1 into trunk

Automattic · Dec 7, 2023 · d0b1494 · d0b1494
2 parents 3ea1e90 + fe871e2
commit d0b1494
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 7 deletions.
diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,8 @@
 *** WooPayments Changelog ***
 
+= 6.9.1 - 2023-12-07 =
+* Fix - Display Klarna & Afterpay on the checkout for UK based stores
+
 = 6.9.0 - 2023-12-06 =
 * Add - Added cleanup code after Payment Processing - RPP.
 * Add - Adds new option to track dismissal of PO eligibility modal.

diff --git a/includes/payment-methods/class-afterpay-payment-method.php b/includes/payment-methods/class-afterpay-payment-method.php
@@ -50,7 +50,7 @@ public function __construct( $token_service ) {
 				], // Represents NZD 1 - 2,000 NZD.
 			],
 			'GBP' => [
-				'UK' => [
+				'GB' => [
 					'min' => 100,
 					'max' => 120000,
 				], // Represents GBP 1 - 1,200 GBP.

diff --git a/includes/payment-methods/class-klarna-payment-method.php b/includes/payment-methods/class-klarna-payment-method.php
@@ -40,7 +40,7 @@ public function __construct( $token_service ) {
 				],
 			],
 			'GBP' => [
-				'UK' => [
+				'GB' => [
 					'min' => 0,
 					'max' => 1150000,
 				],

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "woocommerce-payments",
-  "version": "6.9.0",
+  "version": "6.9.1",
   "main": "webpack.config.js",
   "author": "Automattic",
   "license": "GPL-3.0-or-later",

diff --git a/readme.txt b/readme.txt
@@ -4,7 +4,7 @@ Tags: woocommerce payments, apple pay, credit card, google pay, payment, payment
 Requires at least: 6.0
 Tested up to: 6.4
 Requires PHP: 7.3
-Stable tag: 6.9.0
+Stable tag: 6.9.1
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -94,6 +94,10 @@ Please note that our support for the checkout block is still experimental and th
 
 == Changelog ==
 
+= 6.9.1 - 2023-12-07 =
+* Fix - Display Klarna & Afterpay on the checkout for UK based stores
+
+
 = 6.9.0 - 2023-12-06 =
 * Add - Added cleanup code after Payment Processing - RPP.
 * Add - Adds new option to track dismissal of PO eligibility modal.

diff --git a/woocommerce-payments.php b/woocommerce-payments.php
@@ -12,7 +12,7 @@
  * WC tested up to: 8.3.1
  * Requires at least: 6.0
  * Requires PHP: 7.3
- * Version: 6.9.0
+ * Version: 6.9.1
  *
  * @package WooCommerce\Payments
  */