Merge branch 'develop' into update/remove-feature-flag-payment-overvi…

…ew-widget
Automattic · Aug 13, 2024 · e467a8f · e467a8f
2 parents 537a384 + 788d571
commit e467a8f
Show file tree

Hide file tree

Showing 133 changed files with 4,912 additions and 1,768 deletions.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -81,15 +81,15 @@ Docker can be used to setup a local development environment:
 
 * Ensure Docker is installed ([Docker Desktop](https://www.docker.com/products/docker-desktop) is a good option for developers)
 * Follow the steps above in the Development section to build the project's JavaScript
-* From the root of this project, run `docker-compose up -d`
+* From the root of this project, run `docker compose up -d`
 * Once <http://localhost:8082> displays the WordPress install screen, run `./bin/docker-setup.sh`
 * The fully configured site can now be accessed on <http://localhost:8082>
 * The prompt to run the setup wizard can be dismissed unless there is something specific you would like to configure
 
 To shutdown:
 
-* Use `docker-compose down` to stop the running containers
-* The state of the environment will be persisted in `docker/wordpress` and `docker/data`. To restart the environment simply run `docker-compose up` again. To start afresh, delete these folders and let `docker-compose up` re-create them.
+* Use `docker compose down` to stop the running containers
+* The state of the environment will be persisted in `docker/wordpress` and `docker/data`. To restart the environment simply run `docker compose up` again. To start afresh, delete these folders and let `docker compose up` re-create them.
 
 IDE setup:
 

diff --git a/assets/images/bnpl_announcement_afterpay.png b/assets/images/bnpl_announcement_afterpay.png
diff --git a/assets/images/bnpl_announcement_clearpay.png b/assets/images/bnpl_announcement_clearpay.png
diff --git a/bin/check-test-coverage.sh b/bin/check-test-coverage.sh
@@ -12,12 +12,12 @@ fi
 
 echo "Installing the test environment..."
 
-docker-compose exec -u www-data wordpress \
+docker compose exec -u www-data wordpress \
 	/var/www/html/wp-content/plugins/woocommerce-payments/bin/install-wp-tests.sh
 
 echo "Checking coverage..."
 
-docker-compose exec -u www-data wordpress \
+docker compose exec -u www-data wordpress \
 	php -d xdebug.remote_autostart=on \
 	/var/www/html/wp-content/plugins/woocommerce-payments/vendor/bin/phpunit \
 	--configuration "/var/www/html/wp-content/plugins/woocommerce-payments/$CONFIGURATION_FILE" \

diff --git a/bin/cli.sh b/bin/cli.sh
@@ -11,4 +11,4 @@ fi
 
 command=${command:-bash}
 
-docker-compose exec -u ${user} wordpress ${command}
+docker compose exec -u ${user} wordpress ${command}
diff --git a/bin/run-tests.sh b/bin/run-tests.sh
@@ -15,21 +15,21 @@ done
 
 echo "Installing the test environment..."
 
-docker-compose exec -u www-data wordpress \
+docker compose exec -u www-data wordpress \
 	/var/www/html/wp-content/plugins/woocommerce-payments/bin/install-wp-tests.sh
 
 if $WATCH_FLAG; then
 	echo "Running the tests on watch mode..."
 
 	# Change directory to WooCommerce Payments' root in order to have access to .phpunit-watcher.yml
-	docker-compose exec -u www-data wordpress bash -c \
+	docker compose exec -u www-data wordpress bash -c \
 		"cd /var/www/html/wp-content/plugins/woocommerce-payments && \
 		php -d xdebug.remote_autostart=on \
 		./vendor/bin/phpunit-watcher watch --configuration ./phpunit.xml.dist $*"
 else
 	echo "Running the tests..."
 
-	docker-compose exec -u www-data wordpress \
+	docker compose exec -u www-data wordpress \
 		php -d xdebug.remote_autostart=on \
 		/var/www/html/wp-content/plugins/woocommerce-payments/vendor/bin/phpunit \
 		--configuration /var/www/html/wp-content/plugins/woocommerce-payments/phpunit.xml.dist \

diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,10 @@
 *** WooPayments Changelog ***
 
+= 8.0.2 - 2024-08-07 =
+* Fix - Add opt-in checks to prevent blocking customers using other payment methods.
+* Fix - Fix error in Express Checkout Element use with coupons.
+* Fix - Only enable Direct Checkout when WooPayments gateway is enabled.
+
 = 8.0.1 - 2024-07-31 =
 * Fix - Reverts changes related to Direct Checkout that broke the PayPal extension.
 

diff --git a/changelog/Update URLs and anchors. b/changelog/Update URLs and anchors.
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: PR updates URLs but does not resolve any 404 errors or other functionality. Very little changes that an end-user will notice.
+
+
diff --git a/changelog/add-get-button-styles-by-selectors b/changelog/add-get-button-styles-by-selectors
@@ -0,0 +1,4 @@
+Significance: patch
+Type: add
+
+Add button rules to appearance
diff --git a/changelog/add-get-link-styles-by-selectors b/changelog/add-get-link-styles-by-selectors
@@ -0,0 +1,4 @@
+Significance: patch
+Type: add
+
+Add link rules to appearance
diff --git a/changelog/as-fix-error-cart-block b/changelog/as-fix-error-cart-block
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Fix uncaught error on the block based Cart page when WooPayments is disabled.
diff --git a/changelog/as-fix-track-event b/changelog/as-fix-track-event
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Do not enqueue Cart scripts if WooPayments is not enabled
diff --git a/changelog/chore-remove-bnpl-april-announcement b/changelog/chore-remove-bnpl-april-announcement
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: chore: remove BNPL April announcement
+
+
diff --git a/changelog/chore-rename-test b/changelog/chore-rename-test
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: chore: rename test file
+
+
diff --git a/changelog/dev-bump-wc-version-9-2-0 b/changelog/dev-bump-wc-version-9-2-0
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Bump WC tested up to version to 9.2.0
diff --git a/changelog/fix-3075-add-better-error-message-when-mandate-is-wrong b/changelog/fix-3075-add-better-error-message-when-mandate-is-wrong
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Added better error message when mandate is invalid.
diff --git a/changelog/fix-9103-payments-settings-originated-onboarding-flow b/changelog/fix-9103-payments-settings-originated-onboarding-flow
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix onboarding redirect loop when starting from Woo Settings Payments.
diff --git a/changelog/fix-9145-tokenized-cart-customer-id-mismatch b/changelog/fix-9145-tokenized-cart-customer-id-mismatch
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: Fix for unreleased tokenized cart feature
+
+
diff --git a/changelog/fix-9205-use-docker-compose-v2-commands b/changelog/fix-9205-use-docker-compose-v2-commands
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Migrate to Docker Compose V2 for test runner environment setup scripts
diff --git a/changelog/fix-9214-missing-null-check b/changelog/fix-9214-missing-null-check
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: Added a simple null check for an edge case.
+
+
diff --git a/changelog/fix-remove-console-warns b/changelog/fix-remove-console-warns
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Remove unnecessary console.warn statements added in #9121.
diff --git a/changelog/fix-tokenized-cart-prbs-entities b/changelog/fix-tokenized-cart-prbs-entities
@@ -0,0 +1,5 @@
+Significance: patch
+Type: fix
+Comment: fix: tokenized cart PRB products w/ special characters
+
+
diff --git a/changelog/revert-ipp-missing-failure-webhooks b/changelog/revert-ipp-missing-failure-webhooks
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: This change reverts a previously merged PR that needs to wait for changes in the mobile app.
+
+
diff --git a/changelog/update-9193-outdated-express-checkout-notification b/changelog/update-9193-outdated-express-checkout-notification
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+Update outdated express checkout settings notification.
diff --git a/client/bnpl-announcement/index.js b/client/bnpl-announcement/index.js
diff --git a/client/bnpl-announcement/style.scss b/client/bnpl-announcement/style.scss
diff --git a/client/cart/blocks/index.js b/client/cart/blocks/index.js
@@ -6,7 +6,7 @@ import { getUPEConfig } from 'wcpay/utils/checkout';
 
 const { registerPlugin } = window.wp.plugins;
 
-const paymentMethods = getUPEConfig( 'paymentMethodsConfig' );
+const paymentMethods = getUPEConfig( 'paymentMethodsConfig' ) || {};
 
 const BNPL_PAYMENT_METHODS = {
 	AFFIRM: 'affirm',

diff --git a/client/checkout/api/test/index.test.js b/client/checkout/api/test/index.test.js
@@ -40,6 +40,8 @@ const mockAppearance = {
 		'.Text': {},
 		'.Text--redirect': {},
 		'.Heading': {},
+		'.Button': {},
+		'.Link': {},
 	},
 	theme: 'stripe',
 	variables: {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -11,4 +11,4 @@ fi

		command=${command:-bash}

		docker-compose exec -u ${user} wordpress ${command}
		docker compose exec -u ${user} wordpress ${command}