From 70b696f825831746bec0550da2dbb3212e093ac1 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 20 Oct 2024 12:10:01 +0000 Subject: [PATCH 1/3] Update version and add changelog entries for release 8.4.0 --- changelog.txt | 20 +++++++++++++++++ changelog/add-stripe-floating-labels | 4 ---- changelog/add-support-for-woo-button-controls | 4 ---- .../add-test-mode-badge-classic-checkout | 4 ---- changelog/as-fix-unnecessary-css-import | 4 ---- ...ore-remove-woopayments-dev-test-mode-calls | 4 ---- changelog/dev-bump-wc-tested-up-to-version | 4 ---- ...v-use-official-docker-hub-phpmyadmin-image | 4 ---- ...-on-prod-when-user-is-deleted-on-localhost | 4 ---- .../fix-9142-classname-optional-default-null | 4 ---- ...x-9518-apple-pay-button-on-blocks-checkout | 4 ---- changelog/fix-9548-woopay-auto-enable | 4 ---- .../fix-9553-use-tax-inclusive-prices-pmme | 4 ---- .../fix-9559-tooltip-link-color-contrast | 4 ---- ...dme-correction-playwright-update-snapshots | 5 ----- changelog/fix-add-svn-script | 5 ----- changelog/fix-convert-rgba-text-color | 4 ---- .../fix-e2e-save-settings-button-disabled | 5 ----- ...multiple-instances-of-wc-payments-in-tests | 4 ---- changelog/fix-test-mode-badge-credit-card | 4 ---- changelog/fix-woopay-theming-border-styles | 4 ---- ...woopay-user-creation-in-shortcode-checkout | 4 ---- changelog/fix-wrong-utils-path | 4 ---- .../update-9540-payment-task-onboarding-flow | 4 ---- package-lock.json | 4 ++-- package.json | 2 +- readme.txt | 22 ++++++++++++++++++- woocommerce-payments.php | 2 +- 28 files changed, 45 insertions(+), 100 deletions(-) delete mode 100644 changelog/add-stripe-floating-labels delete mode 100644 changelog/add-support-for-woo-button-controls delete mode 100644 changelog/add-test-mode-badge-classic-checkout delete mode 100644 changelog/as-fix-unnecessary-css-import delete mode 100644 changelog/chore-remove-woopayments-dev-test-mode-calls delete mode 100644 changelog/dev-bump-wc-tested-up-to-version delete mode 100644 changelog/dev-use-official-docker-hub-phpmyadmin-image delete mode 100644 changelog/fix-5384-prevent-pm-detach-on-prod-when-user-is-deleted-on-localhost delete mode 100644 changelog/fix-9142-classname-optional-default-null delete mode 100644 changelog/fix-9518-apple-pay-button-on-blocks-checkout delete mode 100644 changelog/fix-9548-woopay-auto-enable delete mode 100644 changelog/fix-9553-use-tax-inclusive-prices-pmme delete mode 100644 changelog/fix-9559-tooltip-link-color-contrast delete mode 100644 changelog/fix-9562-readme-correction-playwright-update-snapshots delete mode 100644 changelog/fix-add-svn-script delete mode 100644 changelog/fix-convert-rgba-text-color delete mode 100644 changelog/fix-e2e-save-settings-button-disabled delete mode 100644 changelog/fix-multiple-instances-of-wc-payments-in-tests delete mode 100644 changelog/fix-test-mode-badge-credit-card delete mode 100644 changelog/fix-woopay-theming-border-styles delete mode 100644 changelog/fix-woopay-user-creation-in-shortcode-checkout delete mode 100644 changelog/fix-wrong-utils-path delete mode 100644 changelog/update-9540-payment-task-onboarding-flow diff --git a/changelog.txt b/changelog.txt index 5ac9ccad3d1..2bc166dbb97 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,25 @@ *** WooPayments Changelog *** += 8.4.0 - 2024-10-23 = +* Add - Add test mode badge to classic checkout and add payment method. +* Add - Using Floating Labels with Stripe Appearance API for Blocks Checkout +* Fix - Converting text color rgba to hex to prevent Stripe warning +* Fix - Fix the color contrast of links within tooltips to improve readability. +* Fix - Pass container styling data to WooPay +* Fix - Prevented detaching payment methods from live Stripe accounts when working in non-production environments. +* Fix - Rendering Test Model badge only for Credit Card +* Fix - Stop enqueuing woopay-express-button.css to prevent 404 errors +* Fix - The amounts used by the PMMEs will match the displayed price of the product regardless of the tax settings. +* Fix - WooPay user registration via classic checkout +* Update - Add support for the style controls for the WooPay button +* Update - chore: remove deprecated is_in_dev_mode() and is_in_test_mode() methods +* Update - Payments task onboarding flows skip the Connect page. +* Dev - Bump WC tested up to version to 9.3.3. +* Dev - fix: prevent multiple instances of WC_Payments_Apple_Pay_Registration +* Dev - Fixed wrong utils path that would prevent checkout with WooPay OTP +* Dev - Migrate WizardTaskItem and CollapsibleBody components to TypeScript, making the className prop optional. +* Dev - Use official `phpmyadmin` Docker Hub container image + = 8.3.1 - 2024-10-16 = * Fix - Auto-enabled WooPay for new accounts. * Fix - Load Stripe with merchant account's key when checking payment method availability. diff --git a/changelog/add-stripe-floating-labels b/changelog/add-stripe-floating-labels deleted file mode 100644 index c82d0361748..00000000000 --- a/changelog/add-stripe-floating-labels +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: add - -Using Floating Labels with Stripe Appearance API for Blocks Checkout diff --git a/changelog/add-support-for-woo-button-controls b/changelog/add-support-for-woo-button-controls deleted file mode 100644 index 4e46b384b5d..00000000000 --- a/changelog/add-support-for-woo-button-controls +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: update - -Add support for the style controls for the WooPay button diff --git a/changelog/add-test-mode-badge-classic-checkout b/changelog/add-test-mode-badge-classic-checkout deleted file mode 100644 index 7bc0f1ad648..00000000000 --- a/changelog/add-test-mode-badge-classic-checkout +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: add - -Add test mode badge to classic checkout and add payment method. diff --git a/changelog/as-fix-unnecessary-css-import b/changelog/as-fix-unnecessary-css-import deleted file mode 100644 index e6fdf701c72..00000000000 --- a/changelog/as-fix-unnecessary-css-import +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: fix - -Stop enqueuing woopay-express-button.css to prevent 404 errors diff --git a/changelog/chore-remove-woopayments-dev-test-mode-calls b/changelog/chore-remove-woopayments-dev-test-mode-calls deleted file mode 100644 index 0215265352c..00000000000 --- a/changelog/chore-remove-woopayments-dev-test-mode-calls +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: update - -chore: remove deprecated is_in_dev_mode() and is_in_test_mode() methods diff --git a/changelog/dev-bump-wc-tested-up-to-version b/changelog/dev-bump-wc-tested-up-to-version deleted file mode 100644 index fc508162aec..00000000000 --- a/changelog/dev-bump-wc-tested-up-to-version +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: dev - -Bump WC tested up to version to 9.3.3. diff --git a/changelog/dev-use-official-docker-hub-phpmyadmin-image b/changelog/dev-use-official-docker-hub-phpmyadmin-image deleted file mode 100644 index 240b76dd52b..00000000000 --- a/changelog/dev-use-official-docker-hub-phpmyadmin-image +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: dev - -Use official `phpmyadmin` Docker Hub container image diff --git a/changelog/fix-5384-prevent-pm-detach-on-prod-when-user-is-deleted-on-localhost b/changelog/fix-5384-prevent-pm-detach-on-prod-when-user-is-deleted-on-localhost deleted file mode 100644 index a39adc06bb1..00000000000 --- a/changelog/fix-5384-prevent-pm-detach-on-prod-when-user-is-deleted-on-localhost +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: fix - -Prevented detaching payment methods from live Stripe accounts when working in non-production environments. diff --git a/changelog/fix-9142-classname-optional-default-null b/changelog/fix-9142-classname-optional-default-null deleted file mode 100644 index bfcb783f576..00000000000 --- a/changelog/fix-9142-classname-optional-default-null +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: dev - -Migrate WizardTaskItem and CollapsibleBody components to TypeScript, making the className prop optional. diff --git a/changelog/fix-9518-apple-pay-button-on-blocks-checkout b/changelog/fix-9518-apple-pay-button-on-blocks-checkout deleted file mode 100644 index ec6970b90e3..00000000000 --- a/changelog/fix-9518-apple-pay-button-on-blocks-checkout +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: fix - -Load Stripe with merchant account's key when checking payment method availability. diff --git a/changelog/fix-9548-woopay-auto-enable b/changelog/fix-9548-woopay-auto-enable deleted file mode 100644 index dbbf05c6bea..00000000000 --- a/changelog/fix-9548-woopay-auto-enable +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: fix - -Auto-enabled WooPay for new accounts. diff --git a/changelog/fix-9553-use-tax-inclusive-prices-pmme b/changelog/fix-9553-use-tax-inclusive-prices-pmme deleted file mode 100644 index 9c76e73ddfa..00000000000 --- a/changelog/fix-9553-use-tax-inclusive-prices-pmme +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: fix - -The amounts used by the PMMEs will match the displayed price of the product regardless of the tax settings. diff --git a/changelog/fix-9559-tooltip-link-color-contrast b/changelog/fix-9559-tooltip-link-color-contrast deleted file mode 100644 index 64e3986e2e8..00000000000 --- a/changelog/fix-9559-tooltip-link-color-contrast +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: fix - -Fix the color contrast of links within tooltips to improve readability. diff --git a/changelog/fix-9562-readme-correction-playwright-update-snapshots b/changelog/fix-9562-readme-correction-playwright-update-snapshots deleted file mode 100644 index 846b832a05f..00000000000 --- a/changelog/fix-9562-readme-correction-playwright-update-snapshots +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: dev -Comment: Update Playwright README with correct instructions for updating snapshots – not user-facing. - - diff --git a/changelog/fix-add-svn-script b/changelog/fix-add-svn-script deleted file mode 100644 index 7da3bf73cf3..00000000000 --- a/changelog/fix-add-svn-script +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: dev -Comment: fix: add GH action SVN dependency - - diff --git a/changelog/fix-convert-rgba-text-color b/changelog/fix-convert-rgba-text-color deleted file mode 100644 index 3c5b8f8c52e..00000000000 --- a/changelog/fix-convert-rgba-text-color +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: fix - -Converting text color rgba to hex to prevent Stripe warning diff --git a/changelog/fix-e2e-save-settings-button-disabled b/changelog/fix-e2e-save-settings-button-disabled deleted file mode 100644 index 8e93eb9a0e8..00000000000 --- a/changelog/fix-e2e-save-settings-button-disabled +++ /dev/null @@ -1,5 +0,0 @@ -Significance: patch -Type: dev -Comment: fix: e2e tests w/ save settings button disabled. - - diff --git a/changelog/fix-multiple-instances-of-wc-payments-in-tests b/changelog/fix-multiple-instances-of-wc-payments-in-tests deleted file mode 100644 index aa57d16233a..00000000000 --- a/changelog/fix-multiple-instances-of-wc-payments-in-tests +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: dev - -fix: prevent multiple instances of WC_Payments_Apple_Pay_Registration diff --git a/changelog/fix-test-mode-badge-credit-card b/changelog/fix-test-mode-badge-credit-card deleted file mode 100644 index dfb2537989d..00000000000 --- a/changelog/fix-test-mode-badge-credit-card +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: fix - -Rendering Test Model badge only for Credit Card diff --git a/changelog/fix-woopay-theming-border-styles b/changelog/fix-woopay-theming-border-styles deleted file mode 100644 index c3b92530afe..00000000000 --- a/changelog/fix-woopay-theming-border-styles +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: fix - -Pass container styling data to WooPay diff --git a/changelog/fix-woopay-user-creation-in-shortcode-checkout b/changelog/fix-woopay-user-creation-in-shortcode-checkout deleted file mode 100644 index 4c501ea1add..00000000000 --- a/changelog/fix-woopay-user-creation-in-shortcode-checkout +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: fix - -WooPay user registration via classic checkout diff --git a/changelog/fix-wrong-utils-path b/changelog/fix-wrong-utils-path deleted file mode 100644 index aaf2afcc9a2..00000000000 --- a/changelog/fix-wrong-utils-path +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: dev - -Fixed wrong utils path that would prevent checkout with WooPay OTP diff --git a/changelog/update-9540-payment-task-onboarding-flow b/changelog/update-9540-payment-task-onboarding-flow deleted file mode 100644 index c4674a67377..00000000000 --- a/changelog/update-9540-payment-task-onboarding-flow +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: update - -Payments task onboarding flows skip the Connect page. diff --git a/package-lock.json b/package-lock.json index 56cfed2cfa8..8f0358c6674 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "woocommerce-payments", - "version": "8.3.1", + "version": "8.4.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "woocommerce-payments", - "version": "8.3.1", + "version": "8.4.0", "hasInstallScript": true, "license": "GPL-3.0-or-later", "dependencies": { diff --git a/package.json b/package.json index 629b9ceee87..952111032f4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "woocommerce-payments", - "version": "8.3.1", + "version": "8.4.0", "main": "webpack.config.js", "author": "Automattic", "license": "GPL-3.0-or-later", diff --git a/readme.txt b/readme.txt index 1bc07f50c25..76ff51ccda2 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.6 Requires PHP: 7.3 -Stable tag: 8.3.1 +Stable tag: 8.4.0 License: GPLv2 or later License URI: http://www.gnu.org/licenses/gpl-2.0.html @@ -94,6 +94,26 @@ Please note that our support for the checkout block is still experimental and th == Changelog == += 8.4.0 - 2024-10-23 = +* Add - Add test mode badge to classic checkout and add payment method. +* Add - Using Floating Labels with Stripe Appearance API for Blocks Checkout +* Fix - Converting text color rgba to hex to prevent Stripe warning +* Fix - Fix the color contrast of links within tooltips to improve readability. +* Fix - Pass container styling data to WooPay +* Fix - Prevented detaching payment methods from live Stripe accounts when working in non-production environments. +* Fix - Rendering Test Model badge only for Credit Card +* Fix - Stop enqueuing woopay-express-button.css to prevent 404 errors +* Fix - The amounts used by the PMMEs will match the displayed price of the product regardless of the tax settings. +* Fix - WooPay user registration via classic checkout +* Update - Add support for the style controls for the WooPay button +* Update - chore: remove deprecated is_in_dev_mode() and is_in_test_mode() methods +* Update - Payments task onboarding flows skip the Connect page. +* Dev - Bump WC tested up to version to 9.3.3. +* Dev - fix: prevent multiple instances of WC_Payments_Apple_Pay_Registration +* Dev - Fixed wrong utils path that would prevent checkout with WooPay OTP +* Dev - Migrate WizardTaskItem and CollapsibleBody components to TypeScript, making the className prop optional. +* Dev - Use official `phpmyadmin` Docker Hub container image + = 8.3.1 - 2024-10-16 = * Fix - Auto-enabled WooPay for new accounts. * Fix - Load Stripe with merchant account's key when checking payment method availability. diff --git a/woocommerce-payments.php b/woocommerce-payments.php index 5f240fb7202..7283bb20728 100644 --- a/woocommerce-payments.php +++ b/woocommerce-payments.php @@ -11,7 +11,7 @@ * WC tested up to: 9.3.3 * Requires at least: 6.0 * Requires PHP: 7.3 - * Version: 8.3.1 + * Version: 8.4.0 * Requires Plugins: woocommerce * * @package WooCommerce\Payments From ebca2f4bd12cf5fd1db6ee35328a9786e9619dab Mon Sep 17 00:00:00 2001 From: Daniel Guerra <15204776+danielmx-dev@users.noreply.github.com> Date: Tue, 22 Oct 2024 22:54:03 +0300 Subject: [PATCH 2/3] Omit Test Mode badge in the Change payment method form (#9615) --- ...mit-test-mode-badge-in-change-payment-form | 4 + client/checkout/classic/style.scss | 83 ++++++++++--------- includes/class-wc-payment-gateway-wcpay.php | 6 +- 3 files changed, 52 insertions(+), 41 deletions(-) create mode 100644 changelog/fix-omit-test-mode-badge-in-change-payment-form diff --git a/changelog/fix-omit-test-mode-badge-in-change-payment-form b/changelog/fix-omit-test-mode-badge-in-change-payment-form new file mode 100644 index 00000000000..eff6afc6766 --- /dev/null +++ b/changelog/fix-omit-test-mode-badge-in-change-payment-form @@ -0,0 +1,4 @@ +Significance: minor +Type: fix + +Omit the test mode badge in the change payment method form for subscriptions. diff --git a/client/checkout/classic/style.scss b/client/checkout/classic/style.scss index aa8df8b1676..5b452accc83 100644 --- a/client/checkout/classic/style.scss +++ b/client/checkout/classic/style.scss @@ -39,53 +39,56 @@ max-height: 24px !important; } - li.payment_method_woocommerce_payments { - display: grid; - grid-template-columns: 0fr 0fr 1fr; - grid-template-rows: max-content; - - > input[name='payment_method'] { - align-self: center; - } - > label { - grid-column: 3; + &.wc_payment_methods, + &.woocommerce-PaymentMethods { + li.payment_method_woocommerce_payments { display: grid; - grid-template-columns: 0fr auto; + grid-template-columns: 0fr 0fr 1fr; grid-template-rows: max-content; - grid-gap: 0; - margin-bottom: 0; - - > .label-title-container { - grid-area: 1 / 2 / 2 / 3; - } - .payment-method-title { - margin-right: 8px; + > input[name='payment_method'] { + align-self: center; } - - .test-mode.badge { - display: inline-block; - background-color: #fff2d7; - border-radius: 4px; - padding: 4px 6px; - font-size: 12px; - font-weight: 400; - line-height: 16px; - color: #4d3716; - vertical-align: middle; + > label { + grid-column: 3; + display: grid; + grid-template-columns: 0fr auto; + grid-template-rows: max-content; + grid-gap: 0; + margin-bottom: 0; + + > .label-title-container { + grid-area: 1 / 2 / 2 / 3; + } + + .payment-method-title { + margin-right: 8px; + } + + .test-mode.badge { + display: inline-block; + background-color: #fff2d7; + border-radius: 4px; + padding: 4px 6px; + font-size: 12px; + font-weight: 400; + line-height: 16px; + color: #4d3716; + vertical-align: middle; + } + + img { + float: none; + grid-area: 1 / 4 / 2 / 5; + align-self: baseline; + justify-self: end; + margin-left: 1em; + } } - - img { - float: none; - grid-area: 1 / 4 / 2 / 5; - align-self: baseline; - justify-self: end; - margin-left: 1em; + > div.payment_box { + grid-area: 2 / 1 / 3 / 4; } } - > div.payment_box { - grid-area: 2 / 1 / 3 / 4; - } } } diff --git a/includes/class-wc-payment-gateway-wcpay.php b/includes/class-wc-payment-gateway-wcpay.php index f795a7514b7..d1fe2b1cca6 100644 --- a/includes/class-wc-payment-gateway-wcpay.php +++ b/includes/class-wc-payment-gateway-wcpay.php @@ -580,7 +580,11 @@ public function init_hooks() { public function get_title() { $title = parent::get_title(); - if ( Payment_Method::CARD === $this->stripe_id && ( is_checkout() || is_add_payment_method_page() ) ) { + if ( + Payment_Method::CARD === $this->stripe_id && + ( is_checkout() || is_add_payment_method_page() ) && + ! isset( $_GET['change_payment_method'] ) // phpcs:ignore WordPress.Security.NonceVerification + ) { if ( WC_Payments::mode()->is_test() ) { $test_mode_badge = '' . __( 'Test Mode', 'woocommerce-payments' ) . ''; } else { From e4b68149333584b69d51d8ff0b0514eb57c2f3bf Mon Sep 17 00:00:00 2001 From: botwoo Date: Wed, 23 Oct 2024 15:08:29 +0000 Subject: [PATCH 3/3] Amend changelog entries for release 8.4.0 --- changelog.txt | 1 + changelog/fix-omit-test-mode-badge-in-change-payment-form | 4 ---- readme.txt | 1 + 3 files changed, 2 insertions(+), 4 deletions(-) delete mode 100644 changelog/fix-omit-test-mode-badge-in-change-payment-form diff --git a/changelog.txt b/changelog.txt index 2bc166dbb97..3e68c78c9f1 100644 --- a/changelog.txt +++ b/changelog.txt @@ -5,6 +5,7 @@ * Add - Using Floating Labels with Stripe Appearance API for Blocks Checkout * Fix - Converting text color rgba to hex to prevent Stripe warning * Fix - Fix the color contrast of links within tooltips to improve readability. +* Fix - Omit the test mode badge in the change payment method form for subscriptions. * Fix - Pass container styling data to WooPay * Fix - Prevented detaching payment methods from live Stripe accounts when working in non-production environments. * Fix - Rendering Test Model badge only for Credit Card diff --git a/changelog/fix-omit-test-mode-badge-in-change-payment-form b/changelog/fix-omit-test-mode-badge-in-change-payment-form deleted file mode 100644 index eff6afc6766..00000000000 --- a/changelog/fix-omit-test-mode-badge-in-change-payment-form +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: fix - -Omit the test mode badge in the change payment method form for subscriptions. diff --git a/readme.txt b/readme.txt index 76ff51ccda2..cc050c3699e 100644 --- a/readme.txt +++ b/readme.txt @@ -99,6 +99,7 @@ Please note that our support for the checkout block is still experimental and th * Add - Using Floating Labels with Stripe Appearance API for Blocks Checkout * Fix - Converting text color rgba to hex to prevent Stripe warning * Fix - Fix the color contrast of links within tooltips to improve readability. +* Fix - Omit the test mode badge in the change payment method form for subscriptions. * Fix - Pass container styling data to WooPay * Fix - Prevented detaching payment methods from live Stripe accounts when working in non-production environments. * Fix - Rendering Test Model badge only for Credit Card