From ac179c4b8580f5b052457dc7495f15485da4d39f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 20 Oct 2023 07:09:18 +0000 Subject: [PATCH 1/4] Update version and add changelog entries for release 6.6.2 --- 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 1c5c434ebee..57ea4c6072f 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,7 @@ *** WooPayments Changelog *** += 6.6.2 - 2023-10-20 = + = 6.6.1 - 2023-10-19 = * Fix - Fix Documents page loading on WooCommerce 8.2.0. * Fix - Stripe Link eligibility at checkout diff --git a/package-lock.json b/package-lock.json index 11ba4e9544d..8d84f829e0d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "woocommerce-payments", - "version": "6.6.1", + "version": "6.6.2", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "woocommerce-payments", - "version": "6.6.1", + "version": "6.6.2", "hasInstallScript": true, "license": "GPL-3.0-or-later", "dependencies": { diff --git a/package.json b/package.json index 86b7ddbab62..f2d4c8497af 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "woocommerce-payments", - "version": "6.6.1", + "version": "6.6.2", "main": "webpack.config.js", "author": "Automattic", "license": "GPL-3.0-or-later", diff --git a/readme.txt b/readme.txt index ce960de132b..fe37156d182 100644 --- a/readme.txt +++ b/readme.txt @@ -4,7 +4,7 @@ Tags: payment gateway, payment, apple pay, credit card, google pay, woocommerce Requires at least: 6.0 Tested up to: 6.2 Requires PHP: 7.3 -Stable tag: 6.6.1 +Stable tag: 6.6.2 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.6.2 - 2023-10-20 = + + = 6.6.1 - 2023-10-19 = * Fix - Fix Documents page loading on WooCommerce 8.2.0. * Fix - Stripe Link eligibility at checkout diff --git a/woocommerce-payments.php b/woocommerce-payments.php index 13d5e0175d0..7a7707ba89c 100644 --- a/woocommerce-payments.php +++ b/woocommerce-payments.php @@ -12,7 +12,7 @@ * WC tested up to: 7.8.0 * Requires at least: 6.0 * Requires PHP: 7.3 - * Version: 6.6.1 + * Version: 6.6.2 * * @package WooCommerce\Payments */ From 87c4e917e1d410c90dcf786de28961ee1456903a Mon Sep 17 00:00:00 2001 From: Radoslav Georgiev Date: Fri, 20 Oct 2023 13:48:51 +0300 Subject: [PATCH 2/4] Fix PSR container conflicts (#7525) Co-authored-by: Jessy P --- changelog/fix-psr-container-conflicts | 4 + composer.json | 3 +- composer.lock | 98 +++++++++---------- lib/composer.json | 7 +- lib/composer.lock | 87 ++++++++-------- .../Argument/ArgumentResolverTrait.php | 2 +- lib/packages/League/Container/Container.php | 2 +- .../Container/Definition/Definition.php | 2 +- .../DefinitionContainerInterface.php | 2 +- .../Exception/ContainerException.php | 2 +- .../Container/Exception/NotFoundException.php | 2 +- .../League/Container/ReflectionContainer.php | 2 +- .../Container/ContainerExceptionInterface.php | 12 +++ .../Psr/Container/ContainerInterface.php | 36 +++++++ .../Container/NotFoundExceptionInterface.php | 10 ++ src/Container.php | 22 ++++- .../DelegateContainer/LegacyContainer.php | 2 +- .../DelegateContainer/WooContainer.php | 3 +- 18 files changed, 187 insertions(+), 111 deletions(-) create mode 100644 changelog/fix-psr-container-conflicts create mode 100644 lib/packages/Psr/Container/ContainerExceptionInterface.php create mode 100644 lib/packages/Psr/Container/ContainerInterface.php create mode 100644 lib/packages/Psr/Container/NotFoundExceptionInterface.php diff --git a/changelog/fix-psr-container-conflicts b/changelog/fix-psr-container-conflicts new file mode 100644 index 00000000000..a9cd6cbb534 --- /dev/null +++ b/changelog/fix-psr-container-conflicts @@ -0,0 +1,4 @@ +Significance: patch +Type: fix + +Fix PSR container conflicts diff --git a/composer.json b/composer.json index 999b2cab67d..5f18d77c827 100644 --- a/composer.json +++ b/composer.json @@ -27,8 +27,7 @@ "automattic/jetpack-autoloader": "2.11.18", "automattic/jetpack-identity-crisis": "0.8.43", "automattic/jetpack-sync": "1.47.7", - "woocommerce/subscriptions-core": "6.3.0", - "psr/container": "^1.1" + "woocommerce/subscriptions-core": "6.3.0" }, "require-dev": { "composer/installers": "1.10.0", diff --git a/composer.lock b/composer.lock index 67b78b093c5..4733ecf1614 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f45536a544c784b5c85d2e507cb43d42", + "content-hash": "8129af4ef3d43b59f758a73688c5b91e", "packages": [ { "name": "automattic/jetpack-a8c-mc-stats", @@ -938,54 +938,6 @@ ], "time": "2021-01-14T11:07:16+00:00" }, - { - "name": "psr/container", - "version": "1.1.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", - "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", - "shasum": "" - }, - "require": { - "php": ">=7.2.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Psr\\Container\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "https://www.php-fig.org/" - } - ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", - "keywords": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" - ], - "support": { - "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/1.1.1" - }, - "time": "2021-03-05T17:36:06+00:00" - }, { "name": "woocommerce/subscriptions-core", "version": "6.3.0", @@ -3509,6 +3461,54 @@ ], "time": "2022-02-18T12:54:07+00:00" }, + { + "name": "psr/container", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/container.git", + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf", + "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf", + "shasum": "" + }, + "require": { + "php": ">=7.2.0" + }, + "type": "library", + "autoload": { + "psr-4": { + "Psr\\Container\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "https://www.php-fig.org/" + } + ], + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", + "keywords": [ + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" + ], + "support": { + "issues": "https://github.com/php-fig/container/issues", + "source": "https://github.com/php-fig/container/tree/1.1.1" + }, + "time": "2021-03-05T17:36:06+00:00" + }, { "name": "psr/log", "version": "1.1.4", diff --git a/lib/composer.json b/lib/composer.json index 5021123f4b9..823f8f1c240 100644 --- a/lib/composer.json +++ b/lib/composer.json @@ -4,7 +4,8 @@ "minimum-stability": "dev", "require-dev": { "league/container": "4.2", - "coenjacobs/mozart": "0.7.1" + "coenjacobs/mozart": "0.7.1", + "psr/container": "^1.1" }, "license": "GPL-3.0-or-later", "scripts": { @@ -20,9 +21,7 @@ "dep_namespace": "WCPay\\Vendor\\", "dep_directory": "/packages/", "packages": [ - "league/container" - ], - "excluded_packages":[ + "league/container", "psr/container" ], "classmap_directory": "/classmaps/", diff --git a/lib/composer.lock b/lib/composer.lock index f530136d9cc..f2f4bb4b335 100644 --- a/lib/composer.lock +++ b/lib/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "5f729373382094e28edcbed07d0c9f67", + "content-hash": "3aba07fadc9c18f4990a3cc73152afa8", "packages": [], "packages-dev": [ { @@ -243,26 +243,26 @@ }, { "name": "league/mime-type-detection", - "version": "1.11.0", + "version": "1.14.0", "source": { "type": "git", "url": "https://github.com/thephpleague/mime-type-detection.git", - "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd" + "reference": "b6a5854368533df0295c5761a0253656a2e52d9e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/ff6248ea87a9f116e78edd6002e39e5128a0d4dd", - "reference": "ff6248ea87a9f116e78edd6002e39e5128a0d4dd", + "url": "https://api.github.com/repos/thephpleague/mime-type-detection/zipball/b6a5854368533df0295c5761a0253656a2e52d9e", + "reference": "b6a5854368533df0295c5761a0253656a2e52d9e", "shasum": "" }, "require": { "ext-fileinfo": "*", - "php": "^7.2 || ^8.0" + "php": "^7.4 || ^8.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "^3.2", "phpstan/phpstan": "^0.12.68", - "phpunit/phpunit": "^8.5.8 || ^9.3" + "phpunit/phpunit": "^8.5.8 || ^9.3 || ^10.0" }, "type": "library", "autoload": { @@ -283,7 +283,7 @@ "description": "Mime-type detection for Flysystem", "support": { "issues": "https://github.com/thephpleague/mime-type-detection/issues", - "source": "https://github.com/thephpleague/mime-type-detection/tree/1.11.0" + "source": "https://github.com/thephpleague/mime-type-detection/tree/1.14.0" }, "funding": [ { @@ -295,32 +295,26 @@ "type": "tidelift" } ], - "time": "2022-04-17T13:12:02+00:00" + "time": "2023-10-17T14:13:20+00:00" }, { "name": "psr/container", - "version": "dev-master", + "version": "1.x-dev", "source": { "type": "git", "url": "https://github.com/php-fig/container.git", - "reference": "90db7b9ac2a2c5b849fcb69dde58f3ae182c68f5" + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/90db7b9ac2a2c5b849fcb69dde58f3ae182c68f5", - "reference": "90db7b9ac2a2c5b849fcb69dde58f3ae182c68f5", + "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea", + "reference": "513e0666f7216c7459170d56df27dfcefe1689ea", "shasum": "" }, "require": { "php": ">=7.4.0" }, - "default-branch": true, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.0.x-dev" - } - }, "autoload": { "psr-4": { "Psr\\Container\\": "src/" @@ -347,9 +341,9 @@ ], "support": { "issues": "https://github.com/php-fig/container/issues", - "source": "https://github.com/php-fig/container/tree/master" + "source": "https://github.com/php-fig/container/tree/1.1.2" }, - "time": "2022-07-19T17:36:59+00:00" + "time": "2021-11-05T16:50:12+00:00" }, { "name": "symfony/console", @@ -357,12 +351,12 @@ "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "b504a3d266ad2bb632f196c0936ef2af5ff6e273" + "reference": "f4f71842f24c2023b91237c72a365306f3c58827" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/b504a3d266ad2bb632f196c0936ef2af5ff6e273", - "reference": "b504a3d266ad2bb632f196c0936ef2af5ff6e273", + "url": "https://api.github.com/repos/symfony/console/zipball/f4f71842f24c2023b91237c72a365306f3c58827", + "reference": "f4f71842f24c2023b91237c72a365306f3c58827", "shasum": "" }, "require": { @@ -448,7 +442,7 @@ "type": "tidelift" } ], - "time": "2023-07-19T20:11:33+00:00" + "time": "2023-08-07T06:12:30+00:00" }, { "name": "symfony/deprecation-contracts", @@ -582,7 +576,7 @@ }, { "name": "symfony/polyfill-ctype", - "version": "dev-main", + "version": "1.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", @@ -645,7 +639,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/main" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" }, "funding": [ { @@ -665,7 +659,7 @@ }, { "name": "symfony/polyfill-intl-grapheme", - "version": "dev-main", + "version": "1.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-grapheme.git", @@ -727,7 +721,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/main" + "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.28.0" }, "funding": [ { @@ -747,7 +741,7 @@ }, { "name": "symfony/polyfill-intl-normalizer", - "version": "dev-main", + "version": "1.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-intl-normalizer.git", @@ -812,7 +806,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/main" + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.28.0" }, "funding": [ { @@ -832,7 +826,7 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "dev-main", + "version": "1.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", @@ -896,7 +890,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-mbstring/tree/main" + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" }, "funding": [ { @@ -916,7 +910,7 @@ }, { "name": "symfony/polyfill-php73", - "version": "dev-main", + "version": "1.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php73.git", @@ -976,7 +970,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php73/tree/main" + "source": "https://github.com/symfony/polyfill-php73/tree/v1.28.0" }, "funding": [ { @@ -996,7 +990,7 @@ }, { "name": "symfony/polyfill-php80", - "version": "dev-main", + "version": "1.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-php80.git", @@ -1060,7 +1054,7 @@ "shim" ], "support": { - "source": "https://github.com/symfony/polyfill-php80/tree/main" + "source": "https://github.com/symfony/polyfill-php80/tree/v1.28.0" }, "funding": [ { @@ -1080,21 +1074,22 @@ }, { "name": "symfony/service-contracts", - "version": "3.0.x-dev", + "version": "2.5.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/service-contracts.git", - "reference": "24ce74899f476f56d7e6c148c809afef0b7de19c" + "reference": "a2329596ddc8fd568900e3fc76cba42489ecc7f3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/service-contracts/zipball/24ce74899f476f56d7e6c148c809afef0b7de19c", - "reference": "24ce74899f476f56d7e6c148c809afef0b7de19c", + "url": "https://api.github.com/repos/symfony/service-contracts/zipball/a2329596ddc8fd568900e3fc76cba42489ecc7f3", + "reference": "a2329596ddc8fd568900e3fc76cba42489ecc7f3", "shasum": "" }, "require": { - "php": ">=8.0.2", - "psr/container": "^2.0" + "php": ">=7.2.5", + "psr/container": "^1.1", + "symfony/deprecation-contracts": "^2.1|^3" }, "conflict": { "ext-psr": "<1.1|>=2" @@ -1105,7 +1100,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "3.0-dev" + "dev-main": "2.5-dev" }, "thanks": { "name": "symfony/contracts", @@ -1142,7 +1137,7 @@ "standards" ], "support": { - "source": "https://github.com/symfony/service-contracts/tree/3.0" + "source": "https://github.com/symfony/service-contracts/tree/2.5" }, "funding": [ { @@ -1158,7 +1153,7 @@ "type": "tidelift" } ], - "time": "2023-01-01T08:36:10+00:00" + "time": "2023-04-21T15:04:16+00:00" }, { "name": "symfony/string", diff --git a/lib/packages/League/Container/Argument/ArgumentResolverTrait.php b/lib/packages/League/Container/Argument/ArgumentResolverTrait.php index 74ce1829b60..e47705daac4 100644 --- a/lib/packages/League/Container/Argument/ArgumentResolverTrait.php +++ b/lib/packages/League/Container/Argument/ArgumentResolverTrait.php @@ -7,7 +7,7 @@ use WCPay\Vendor\League\Container\DefinitionContainerInterface; use WCPay\Vendor\League\Container\Exception\{ContainerException, NotFoundException}; use WCPay\Vendor\League\Container\ReflectionContainer; -use Psr\Container\ContainerInterface; +use WCPay\Vendor\Psr\Container\ContainerInterface; use ReflectionFunctionAbstract; use ReflectionNamedType; diff --git a/lib/packages/League/Container/Container.php b/lib/packages/League/Container/Container.php index 7492f25dadf..7c166e74550 100644 --- a/lib/packages/League/Container/Container.php +++ b/lib/packages/League/Container/Container.php @@ -10,7 +10,7 @@ use WCPay\Vendor\League\Container\ServiceProvider\{ServiceProviderAggregate, ServiceProviderAggregateInterface, ServiceProviderInterface}; -use Psr\Container\ContainerInterface; +use WCPay\Vendor\Psr\Container\ContainerInterface; class Container implements DefinitionContainerInterface { diff --git a/lib/packages/League/Container/Definition/Definition.php b/lib/packages/League/Container/Definition/Definition.php index c414eb662ec..2f27dfe4ef4 100644 --- a/lib/packages/League/Container/Definition/Definition.php +++ b/lib/packages/League/Container/Definition/Definition.php @@ -12,7 +12,7 @@ }; use WCPay\Vendor\League\Container\ContainerAwareTrait; use WCPay\Vendor\League\Container\Exception\ContainerException; -use Psr\Container\ContainerInterface; +use WCPay\Vendor\Psr\Container\ContainerInterface; use ReflectionClass; class Definition implements ArgumentResolverInterface, DefinitionInterface diff --git a/lib/packages/League/Container/DefinitionContainerInterface.php b/lib/packages/League/Container/DefinitionContainerInterface.php index bbbc9d6302c..35dfd8c9b9c 100644 --- a/lib/packages/League/Container/DefinitionContainerInterface.php +++ b/lib/packages/League/Container/DefinitionContainerInterface.php @@ -7,7 +7,7 @@ use WCPay\Vendor\League\Container\Definition\DefinitionInterface; use WCPay\Vendor\League\Container\Inflector\InflectorInterface; use WCPay\Vendor\League\Container\ServiceProvider\ServiceProviderInterface; -use Psr\Container\ContainerInterface; +use WCPay\Vendor\Psr\Container\ContainerInterface; interface DefinitionContainerInterface extends ContainerInterface { diff --git a/lib/packages/League/Container/Exception/ContainerException.php b/lib/packages/League/Container/Exception/ContainerException.php index 3fafac188e8..bf708cfb9c0 100644 --- a/lib/packages/League/Container/Exception/ContainerException.php +++ b/lib/packages/League/Container/Exception/ContainerException.php @@ -4,7 +4,7 @@ namespace WCPay\Vendor\League\Container\Exception; -use Psr\Container\ContainerExceptionInterface; +use WCPay\Vendor\Psr\Container\ContainerExceptionInterface; use RuntimeException; class ContainerException extends RuntimeException implements ContainerExceptionInterface diff --git a/lib/packages/League/Container/Exception/NotFoundException.php b/lib/packages/League/Container/Exception/NotFoundException.php index 0fa330e14ab..bcb9ab16835 100644 --- a/lib/packages/League/Container/Exception/NotFoundException.php +++ b/lib/packages/League/Container/Exception/NotFoundException.php @@ -4,7 +4,7 @@ namespace WCPay\Vendor\League\Container\Exception; -use Psr\Container\NotFoundExceptionInterface; +use WCPay\Vendor\Psr\Container\NotFoundExceptionInterface; use InvalidArgumentException; class NotFoundException extends InvalidArgumentException implements NotFoundExceptionInterface diff --git a/lib/packages/League/Container/ReflectionContainer.php b/lib/packages/League/Container/ReflectionContainer.php index 86cf38306ad..cbd0e4e6b3b 100644 --- a/lib/packages/League/Container/ReflectionContainer.php +++ b/lib/packages/League/Container/ReflectionContainer.php @@ -7,7 +7,7 @@ use WCPay\Vendor\League\Container\Argument\{ArgumentResolverInterface, ArgumentResolverTrait}; use WCPay\Vendor\League\Container\Exception\ContainerException; use WCPay\Vendor\League\Container\Exception\NotFoundException; -use Psr\Container\ContainerInterface; +use WCPay\Vendor\Psr\Container\ContainerInterface; use ReflectionClass; use ReflectionFunction; use ReflectionMethod; diff --git a/lib/packages/Psr/Container/ContainerExceptionInterface.php b/lib/packages/Psr/Container/ContainerExceptionInterface.php new file mode 100644 index 00000000000..c5e801c584f --- /dev/null +++ b/lib/packages/Psr/Container/ContainerExceptionInterface.php @@ -0,0 +1,12 @@ +get( $id ); From 7fd438f6fe18ac8afa04781adbc2caf56ada0ad3 Mon Sep 17 00:00:00 2001 From: Daniel Mallory Date: Thu, 19 Oct 2023 14:41:37 +0100 Subject: [PATCH 3/4] Deprecate Sofort (#7480) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Ismael Martín Alabarce --- .../payment-methods/all_local_payments.svg | 172 ++++++++-------- .../images/payment-methods/local_payments.svg | 183 +++++++++--------- changelog/dev-sofort-deprecation | 4 + .../payment-methods-list/payment-method.scss | 19 +- .../payment-methods-list/payment-method.tsx | 154 +++++++++------ .../connect-account-page/payment-methods.tsx | 2 - client/connect-account-page/strings.tsx | 2 +- .../test/__snapshots__/index.test.tsx.snap | 18 +- client/payment-methods/delete-modal.tsx | 28 ++- .../__snapshots__/delete-modal.test.js.snap | 1 + ...s-wc-rest-payments-settings-controller.php | 4 +- 11 files changed, 320 insertions(+), 267 deletions(-) create mode 100644 changelog/dev-sofort-deprecation diff --git a/assets/images/payment-methods/all_local_payments.svg b/assets/images/payment-methods/all_local_payments.svg index 94f1b2ff2ad..c9a0b2fbd4e 100644 --- a/assets/images/payment-methods/all_local_payments.svg +++ b/assets/images/payment-methods/all_local_payments.svg @@ -1,142 +1,138 @@ - - - - - - - + + + + + + + - - + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - + + + + + + - + - - + + - - + + - + - + - - + + - + - + - - + + - + - + - - + + - + - + - - + + - + - + - - + + - - - - - + + - - + + - - + + - - + + diff --git a/assets/images/payment-methods/local_payments.svg b/assets/images/payment-methods/local_payments.svg index 4b1d690585b..67ff6345025 100644 --- a/assets/images/payment-methods/local_payments.svg +++ b/assets/images/payment-methods/local_payments.svg @@ -1,92 +1,93 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/changelog/dev-sofort-deprecation b/changelog/dev-sofort-deprecation new file mode 100644 index 00000000000..1eafc616f0b --- /dev/null +++ b/changelog/dev-sofort-deprecation @@ -0,0 +1,4 @@ +Significance: minor +Type: update + +Deprecate Sofort for any merchants who have not enabled it. Warn existing merchants about future deprecation. diff --git a/client/components/payment-methods-list/payment-method.scss b/client/components/payment-methods-list/payment-method.scss index c00b22fd91a..ae75df340a3 100644 --- a/client/components/payment-methods-list/payment-method.scss +++ b/client/components/payment-methods-list/payment-method.scss @@ -1,7 +1,20 @@ -.payment-method { +.payment-method__list-item { display: flex; + flex-direction: column; margin: 0; padding: 24px; + + &:not( :last-child ) { + box-shadow: inset 0 -1px 0 #e8eaeb; + } + + & .sofort__notice { + margin-top: 20px; + } +} + +.payment-method { + display: flex; background: #fff; justify-content: space-between; align-items: center; @@ -10,10 +23,6 @@ flex-wrap: nowrap; } - &:not( :last-child ) { - box-shadow: inset 0 -1px 0 #e8eaeb; - } - &__text { flex: 1 1 100%; order: 1; diff --git a/client/components/payment-methods-list/payment-method.tsx b/client/components/payment-methods-list/payment-method.tsx index 28385de1ad7..7f5bb405f37 100644 --- a/client/components/payment-methods-list/payment-method.tsx +++ b/client/components/payment-methods-list/payment-method.tsx @@ -23,6 +23,7 @@ import Chip from '../chip'; import LoadableCheckboxControl from '../loadable-checkbox'; import { getDocumentationUrlForDisabledPaymentMethod } from '../payment-method-disabled-tooltip'; import Pill from '../pill'; +import InlineNotice from '../inline-notice'; import './payment-method.scss'; interface PaymentMethodProps { @@ -127,6 +128,8 @@ const PaymentMethod = ( { upeCapabilityStatuses.PENDING_VERIFICATION, ].includes( status ); + const shouldDisplayNotice = id === 'sofort'; + const needsOverlay = ( isManualCaptureEnabled && ! isAllowingManualCapture ) || isSetupRequired || @@ -209,83 +212,108 @@ const PaymentMethod = ( { return (
  • -
    - -
    -
    -
    - -
    -
    - +
    +
    -
    -
    -
    - -
    -
    - { description } -
    +
    +
    + +
    +
    +
    - { accountFees && accountFees[ id ] && ( -
    - - +
    +
    + +
    +
    + { description } +
    +
    + { accountFees && accountFees[ id ] && ( +
    + - - { formatMethodFeesDescription( - accountFees[ id ] + - - -
    - ) } + > + + { formatMethodFeesDescription( + accountFees[ id ] + ) } + +     +     +
    + ) } +
    + { shouldDisplayNotice && ( + + + { __( + 'Support for Sofort is ending soon. ', + 'woocommerce-payments' + ) } + + { __( 'Learn more', 'woocommerce-payments' ) } + + + + ) }
    • ); }; diff --git a/client/connect-account-page/payment-methods.tsx b/client/connect-account-page/payment-methods.tsx index 6279e9217a5..12c7e9ac3ab 100644 --- a/client/connect-account-page/payment-methods.tsx +++ b/client/connect-account-page/payment-methods.tsx @@ -12,7 +12,6 @@ import DinersClub from 'assets/images/cards/diners.svg?asset'; import GooglePay from 'assets/images/cards/google-pay.svg?asset'; import JCB from 'assets/images/cards/jcb.svg?asset'; import MasterCard from 'assets/images/cards/mastercard.svg?asset'; -import Sofort from 'assets/images/payment-methods/sofort.svg?asset'; import UnionPay from 'assets/images/cards/unionpay.svg?asset'; import Visa from 'assets/images/cards/visa.svg?asset'; import WooPay from 'assets/images/payment-methods/woopay.svg?asset'; @@ -37,7 +36,6 @@ const PaymentMethods: React.FC = () => { DinersClub UnionPay JCB - Sofort Affirm AfterPay & more. diff --git a/client/connect-account-page/strings.tsx b/client/connect-account-page/strings.tsx index 253da597433..08c4aab5aee 100644 --- a/client/connect-account-page/strings.tsx +++ b/client/connect-account-page/strings.tsx @@ -18,7 +18,7 @@ export default { firstName ? ` ${ firstName }` : '' ), usp1: __( - 'Offer card payments, Apple Pay, Sofort, iDeal, Affirm, Afterpay, and accept in-person payments with the Woo mobile app.', + 'Offer card payments, Apple Pay, iDeal, Affirm, Afterpay, and accept in-person payments with the Woo mobile app.', 'woocommerce-payments' ), usp2: __( diff --git a/client/connect-account-page/test/__snapshots__/index.test.tsx.snap b/client/connect-account-page/test/__snapshots__/index.test.tsx.snap index e3a29ca11ad..188d8dd52ee 100644 --- a/client/connect-account-page/test/__snapshots__/index.test.tsx.snap +++ b/client/connect-account-page/test/__snapshots__/index.test.tsx.snap @@ -44,7 +44,7 @@ exports[`ConnectAccountPage should render correctly 1`] = ` fill-rule="evenodd" /> - Offer card payments, Apple Pay, Sofort, iDeal, Affirm, Afterpay, and accept in-person payments with the Woo mobile app. + Offer card payments, Apple Pay, iDeal, Affirm, Afterpay, and accept in-person payments with the Woo mobile app. - Sofort Affirm - Offer card payments, Apple Pay, Sofort, iDeal, Affirm, Afterpay, and accept in-person payments with the Woo mobile app. + Offer card payments, Apple Pay, iDeal, Affirm, Afterpay, and accept in-person payments with the Woo mobile app. - Sofort Affirm - Offer card payments, Apple Pay, Sofort, iDeal, Affirm, Afterpay, and accept in-person payments with the Woo mobile app. + Offer card payments, Apple Pay, iDeal, Affirm, Afterpay, and accept in-person payments with the Woo mobile app. - Sofort Affirm void; onCancel: () => void; } > = ( { id, label, icon: Icon, onConfirm, onCancel } ): JSX.Element => { + const shouldDisplayNotice = id === 'sofort'; + return ( { interpolateComponents( { mixedString: __( - 'You can add it again at any time in {{wooCommercePaymentsLink /}}', + 'You can add it again at any time in {{wooCommercePaymentsLink /}}.', 'woocommerce-payments' ), components: { @@ -77,6 +80,29 @@ const ConfirmPaymentMethodDeleteModal: React.FunctionComponent< { }, } ) }

    + { shouldDisplayNotice && ( + + + { __( + 'As of October 20th 2023, Sofort is no longer supported for merchants who are not already using it. This means that if you disable Sofort, you will not be able to re-enable it later. ', + 'woocommerce-payments' + ) } + + { __( 'Learn more', 'woocommerce-payments' ) } + + + + ) }     ); }; diff --git a/client/payment-methods/test/__snapshots__/delete-modal.test.js.snap b/client/payment-methods/test/__snapshots__/delete-modal.test.js.snap index 874e41c0ed6..0af44bf73a1 100644 --- a/client/payment-methods/test/__snapshots__/delete-modal.test.js.snap +++ b/client/payment-methods/test/__snapshots__/delete-modal.test.js.snap @@ -117,6 +117,7 @@ exports[`Activation Modal matches the snapshot 1`] = ` > WooPayments + .

    wcpay_gateway->get_form_fields(); + $wcpay_form_fields = $this->wcpay_gateway->get_form_fields(); + $available_upe_payment_methods = $this->wcpay_gateway->get_upe_available_payment_methods(); + /** * It might be possible that enabled payment methods settings have an invalid state. As an example, * if an account is switched to a new country and earlier country had PM's that are no longer valid; or if the PM is not available anymore. From 0968272d3c3609c30852aef2ac7b788bcc692600 Mon Sep 17 00:00:00 2001 From: botwoo Date: Fri, 20 Oct 2023 10:57:02 +0000 Subject: [PATCH 4/4] Amend changelog entries for release 6.6.2 --- changelog.txt | 2 ++ changelog/dev-sofort-deprecation | 4 ---- changelog/fix-psr-container-conflicts | 4 ---- readme.txt | 2 ++ 4 files changed, 4 insertions(+), 8 deletions(-) delete mode 100644 changelog/dev-sofort-deprecation delete mode 100644 changelog/fix-psr-container-conflicts diff --git a/changelog.txt b/changelog.txt index 57ea4c6072f..f8ba71dea7c 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,8 @@ *** WooPayments Changelog *** = 6.6.2 - 2023-10-20 = +* Fix - Fix PSR container conflicts +* Update - Deprecate Sofort for any merchants who have not enabled it. Warn existing merchants about future deprecation. = 6.6.1 - 2023-10-19 = * Fix - Fix Documents page loading on WooCommerce 8.2.0. diff --git a/changelog/dev-sofort-deprecation b/changelog/dev-sofort-deprecation deleted file mode 100644 index 1eafc616f0b..00000000000 --- a/changelog/dev-sofort-deprecation +++ /dev/null @@ -1,4 +0,0 @@ -Significance: minor -Type: update - -Deprecate Sofort for any merchants who have not enabled it. Warn existing merchants about future deprecation. diff --git a/changelog/fix-psr-container-conflicts b/changelog/fix-psr-container-conflicts deleted file mode 100644 index a9cd6cbb534..00000000000 --- a/changelog/fix-psr-container-conflicts +++ /dev/null @@ -1,4 +0,0 @@ -Significance: patch -Type: fix - -Fix PSR container conflicts diff --git a/readme.txt b/readme.txt index fe37156d182..8c9daa4629f 100644 --- a/readme.txt +++ b/readme.txt @@ -95,6 +95,8 @@ Please note that our support for the checkout block is still experimental and th == Changelog == = 6.6.2 - 2023-10-20 = +* Fix - Fix PSR container conflicts +* Update - Deprecate Sofort for any merchants who have not enabled it. Warn existing merchants about future deprecation. = 6.6.1 - 2023-10-19 =