From 8a84fa0bf57512fa0170edd84c0f0e21987c5f6d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 7 Dec 2023 15:36:26 +0000 Subject: [PATCH 1/3] Update version and add changelog entries for release 6.9.1 --- changelog.txt | 2 ++ package-lock.json | 4 ++-- package.json | 2 +- readme.txt | 5 ++++- woocommerce-payments.php | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/changelog.txt b/changelog.txt index 5c506b70c8d..76da1391473 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,7 @@ *** WooPayments Changelog *** += 6.9.1 - 2023-12-07 = + = 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/package-lock.json b/package-lock.json index 3dcb176adcb..ff4e80d88e2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "woocommerce-payments", - "version": "6.9.0", + "version": "6.9.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "woocommerce-payments", - "version": "6.9.0", + "version": "6.9.1", "hasInstallScript": true, "license": "GPL-3.0-or-later", "dependencies": { diff --git a/package.json b/package.json index 8ad150e193e..905e6bbbe01 100644 --- 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 index 1f28867184a..c5718daa993 100644 --- 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,9 @@ Please note that our support for the checkout block is still experimental and th == Changelog == += 6.9.1 - 2023-12-07 = + + = 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 index 153fb20b234..e135eef1a56 100644 --- 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 */ From ead063fff7ddab163bd971e484decfe08ad22f4b Mon Sep 17 00:00:00 2001 From: Timur Karimov Date: Thu, 7 Dec 2023 16:40:05 +0100 Subject: [PATCH 2/3] Display Klarna & Afterpay on the checkout for UK based stores (#7852) Co-authored-by: Timur Karimov --- changelog/fix-klarna-afterpay-availability-in-uk | 4 ++++ includes/payment-methods/class-afterpay-payment-method.php | 2 +- includes/payment-methods/class-klarna-payment-method.php | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 changelog/fix-klarna-afterpay-availability-in-uk diff --git a/changelog/fix-klarna-afterpay-availability-in-uk b/changelog/fix-klarna-afterpay-availability-in-uk new file mode 100644 index 00000000000..e5b8910cf0b --- /dev/null +++ b/changelog/fix-klarna-afterpay-availability-in-uk @@ -0,0 +1,4 @@ +Significance: minor +Type: fix + +Display Klarna & Afterpay on the checkout for UK based stores diff --git a/includes/payment-methods/class-afterpay-payment-method.php b/includes/payment-methods/class-afterpay-payment-method.php index 5cc180b55c7..628ca444075 100644 --- 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 index 607dfc16f7a..0300a2dfd74 100644 --- 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, ], From fe871e2a6385ef8946a240b0f6f53c66f53cdc5f Mon Sep 17 00:00:00 2001 From: botwoo Date: Thu, 7 Dec 2023 15:41:36 +0000 Subject: [PATCH 3/3] Amend changelog entries for release 6.9.1 --- changelog.txt | 1 + changelog/fix-klarna-afterpay-availability-in-uk | 4 ---- readme.txt | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 changelog/fix-klarna-afterpay-availability-in-uk diff --git a/changelog.txt b/changelog.txt index 76da1391473..18c98319d74 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,7 @@ *** 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. diff --git a/changelog/fix-klarna-afterpay-availability-in-uk b/changelog/fix-klarna-afterpay-availability-in-uk deleted file mode 100644 index e5b8910cf0b..00000000000 --- a/changelog/fix-klarna-afterpay-availability-in-uk +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: fix - -Display Klarna & Afterpay on the checkout for UK based stores diff --git a/readme.txt b/readme.txt index c5718daa993..e7f21908b84 100644 --- a/readme.txt +++ b/readme.txt @@ -95,6 +95,7 @@ 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 =