Merge branch 'develop' into fix/woopay-direct-checkout-guest-subscrip…

…tions
Automattic · Dec 16, 2024 · f385e67 · f385e67
2 parents 5e270fb + db8947f
commit f385e67
Show file tree

Hide file tree

Showing 274 changed files with 3,646 additions and 5,289 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -10,7 +10,3 @@ vendor/*
 release/*
 tests/e2e/docker*
 tests/e2e/deps*
-
-# We'll delete the directory and its contents as part of https://github.com/Automattic/woocommerce-payments/issues/9722 .
-# ignoring it because we're temporariily cleaning it up.
-client/tokenized-payment-request
diff --git a/.github/workflows/php-compatibility.yml b/.github/workflows/php-compatibility.yml
@@ -1,8 +1,7 @@
 name: PHP Compatibility
 
 on:
-  #pull_request # Workflow disabled temporarily until PHP Compatibility fixes are in place
-  workflow_dispatch
+  pull_request
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}

diff --git a/.gitignore b/.gitignore
@@ -97,3 +97,6 @@ tests/e2e-pw/playwright/.cache/
 tests/e2e-pw/tests/e2e-pw/.auth/*
 # Slate docs
 docs/rest-api/build/*
+
+# Jurassic Tube files
+bin/jurassictube/
diff --git a/bin/docker-setup.sh b/bin/docker-setup.sh
@@ -27,11 +27,11 @@ cli()
 set +e
 # Wait for containers to be started up before the setup.
 # The db being accessible means that the db container started and the WP has been downloaded and the plugin linked
-cli wp db check --path=/var/www/html --quiet > /dev/null
+cli wp db check --skip_ssl --path=/var/www/html --quiet > /dev/null
 while [[ $? -ne 0 ]]; do
 	echo "Waiting until the service is ready..."
 	sleep 5
-	cli wp db check --path=/var/www/html --quiet > /dev/null
+	cli wp db check --skip_ssl --path=/var/www/html --quiet > /dev/null
 done
 
 # If the plugin is already active then return early

diff --git a/bin/jurassic-tube-setup.sh b/bin/jurassic-tube-setup.sh
@@ -3,29 +3,32 @@
 # Exit if any command fails.
 set -e
 
-echo "Checking if ${PWD}/docker/bin/jt directory exists..."
+# Define Jurassic Tube directory using bin directory
+JT_DIR="${PWD}/bin/jurassictube"
 
-if [ -d "${PWD}/docker/bin/jt" ]; then
-    echo "${PWD}/docker/bin/jt already exists."
+echo "Checking if ${JT_DIR} directory exists..."
+
+if [ -d "${JT_DIR}" ]; then
+    echo "${JT_DIR} already exists."
 else
-    echo "Creating ${PWD}/docker/bin/jt directory..."
-    mkdir -p "${PWD}/docker/bin/jt"
+    echo "Creating ${JT_DIR} directory..."
+    mkdir -p "${JT_DIR}"
 fi
 
-echo "Downloading the latest version of the installer script..."
+echo "Checking if the installer is present and downloading it if not..."
 echo 
 
 # Download the installer (if it's not already present):
-if [ ! -f "${PWD}/docker/bin/jt/installer.sh" ]; then
-    # Download the installer script:
-    curl "https://jurassic.tube/get-installer.php?env=wcpay" -o ${PWD}/docker/bin/jt/installer.sh && chmod +x ${PWD}/docker/bin/jt/installer.sh
+if [ ! -f "${JT_DIR}/installer.sh" ]; then
+    echo "Downloading the standalone installer..."
+    curl "https://jurassic.tube/installer-standalone.sh" -o "${JT_DIR}/installer.sh" && chmod +x "${JT_DIR}/installer.sh"
 fi
 
 echo "Running the installation script..."
 echo 
 
 # Run the installer script
-source $PWD/docker/bin/jt/installer.sh
+"${JT_DIR}/installer.sh"
 
 echo
 read -p "Go to https://jurassic.tube/ in a browser, paste your public key which was printed above into the box, and click 'Add Public Key'. Press enter to continue"
@@ -40,8 +43,24 @@ echo
 read -p "Please enter your Automattic/WordPress.com username: " username
 echo 
 
-${PWD}/docker/bin/jt/config.sh username ${username}
-${PWD}/docker/bin/jt/config.sh subdomain ${subdomain}
+if [ ! -f "${JT_DIR}/config.env" ]; then
+    touch "${JT_DIR}/config.env"
+else
+    > "${JT_DIR}/config.env"
+fi
+
+# Find the WordPress container section and get its port
+PORT=$(docker ps | grep woocommerce_payments_wordpress | sed -En "s/.*0:([0-9]+).*/\1/p")
+
+# Use default if extraction failed
+if [ -z "$PORT" ]; then
+    PORT=8082  # Default fallback
+    echo "Could not extract WordPress container port, using default: ${PORT}"
+fi
+
+echo "username=${username}" >> "${JT_DIR}/config.env"
+echo "subdomain=${subdomain}" >> "${JT_DIR}/config.env"
+echo "localhost=localhost:${PORT}" >> "${JT_DIR}/config.env"
 
 echo "Setup complete!"
 echo "Use the command: npm run tube:start from the root directory of your WC Payments project to start running Jurassic Tube."

diff --git a/changelog.txt b/changelog.txt
@@ -1,5 +1,38 @@
 *** WooPayments Changelog ***
 
+= 8.6.0 - 2024-12-04 =
+* Add - Add Bank reference key column in Payout reports. This will help reconcile WooPayments Payouts with bank statements.
+* Add - Display credit card brand icons on order received page.
+* Fix - Add support to load stripe js asynchronously when it is not immediately available in the global scope.
+* Fix - Add the missing "Download" column heading label and toggle menu option to the Payments → Documents list view table.
+* Fix - Ensure ECE button load events are triggered for multiple buttons on the same page.
+* Fix - Ensure ECE is displayed correctly taking into account the tax settings.
+* Fix - Evidence submission is no longer available for Klarna inquiries as this is not supported by Stripe / Klarna.
+* Fix - fix: express checkout to use its own css files.
+* Fix - fix: missing ece is_product_page checks
+* Fix - Fix ECE Tracks events not triggering when WooPay is disabled.
+* Fix - Fix WooPay component spacing.
+* Fix - Fix WooPay trial subscriptions purchases.
+* Fix - Make sure the status of manual capture enablement is fetched from the right place.
+* Fix - Prevent express checkout from being used if cart total becomes zero after coupon usage.
+* Fix - Resolved issue with terminal payments in the payment intent failed webhook processing.
+* Fix - Set the support phone field as mandatory in the settings page.
+* Fix - Update Link logo alignment issue when WooPay is enabled and a specific version of Gutenberg is enabled.
+* Fix - Use paragraph selector instead of label for pmme appearance
+* Fix - Validate required billing fields using data from objects instead of checking the labels.
+* Update - Avoid getting the appearance for pay for order page with the wrong appearance key.
+* Update - chore: rename wrapper from payment-request to express-checkout
+* Update - feat: add `wcpay_checkout_use_plain_method_label` filter to allow themes or merchants to force the "plain" WooPayments label on shortcode checkout.
+* Update - refactor: express checkout initialization page location checks
+* Update - refactor: express checkout utility for button UI interactions
+* Dev - Allow redirect to the settings page from WCPay connect
+* Dev - chore: removed old PRB implementation for ApplePay/GooglePay in favor of the ECE implementation; cleaned up ECE feature flag;
+* Dev - Disable visual regression testing from Playwright until a more reliable approach is defined.
+* Dev - Ensure proper return types in the webhook processing service.
+* Dev - fix: E_DEPRECATED on BNPL empty PMME
+* Dev - Fix return types
+* Dev - Update snapshots for E2E Playwright screenshots
+
 = 8.5.1 - 2024-11-25 =
 * Fix - fix: remove "test mode" badge from shortcode checkout.
 

diff --git a/changelog/8897-add-card-brands-order-received b/changelog/8897-add-card-brands-order-received
diff --git a/changelog/8969-fallback-to-card-payment-type b/changelog/8969-fallback-to-card-payment-type
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: Small change to payment method types fallback scenario.
+
+
diff --git a/changelog/add-2253-clickwrap-terms-and-conditions b/changelog/add-2253-clickwrap-terms-and-conditions
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Clickwrap terms and conditions support on WooPay
diff --git a/changelog/add-5316-payout-trace-id b/changelog/add-5316-payout-trace-id
diff --git a/changelog/add-6924-migrate-test-drive-capabilities b/changelog/add-6924-migrate-test-drive-capabilities
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Migrate active capabilities from test-drive account when switching to live account.
diff --git a/changelog/add-9556-set-support-phone-mandatory b/changelog/add-9556-set-support-phone-mandatory
diff --git a/changelog/add-9690-recommended-pm b/changelog/add-9690-recommended-pm
@@ -0,0 +1,4 @@
+Significance: minor
+Type: add
+
+Implement gateway method to retrieve recommended payment method.
diff --git a/changelog/add-ipp-missing-failure-webhooks b/changelog/add-ipp-missing-failure-webhooks
diff --git a/changelog/add-jetpack-config-callback b/changelog/add-jetpack-config-callback
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Added conditional use of Jetpack Config callback to avoid i18n notices.
diff --git a/changelog/add-limit-woopay-themeing-to-shortcode-checkout b/changelog/add-limit-woopay-themeing-to-shortcode-checkout
@@ -0,0 +1,5 @@
+Significance: patch
+Type: add
+Comment: Updates the availability criteria of WooPay Global theme-ing feature. This feature is unreleased and behind a feature flag.
+
+
diff --git a/changelog/add-pass-footer-header-styles-to-woopay b/changelog/add-pass-footer-header-styles-to-woopay
@@ -0,0 +1,5 @@
+Significance: patch
+Type: add
+Comment: Impovements to WooPay themeing, which is not yet released to the public.
+
+
diff --git a/changelog/as-fix-ece-tax-based-billing-address b/changelog/as-fix-ece-tax-based-billing-address
diff --git a/changelog/as-fix-ece-variable-subs b/changelog/as-fix-ece-variable-subs
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Refine verification for disabling ECE on subscriptions that require shipping.
diff --git a/changelog/as-fix-ece-variable-subs-free-trial b/changelog/as-fix-ece-variable-subs-free-trial
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Enable ECE for Virtual Variable Subscriptions with Free Trials.
diff --git a/changelog/as-hk-address b/changelog/as-hk-address
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Normalize HK addresses for ECE
diff --git a/changelog/chore-copy-of-express-checkout-ece-for-tokenized-feature-flag b/changelog/chore-copy-of-express-checkout-ece-for-tokenized-feature-flag
diff --git a/changelog/chore-ece-php-tests-location b/changelog/chore-ece-php-tests-location
diff --git a/changelog/chore-ece-states-class-constants b/changelog/chore-ece-states-class-constants
diff --git a/changelog/chore-payment-request-to-express-checkout-wrapper-name b/changelog/chore-payment-request-to-express-checkout-wrapper-name
diff --git a/changelog/chore-port-ece-changes-into-tokenized-ece b/changelog/chore-port-ece-changes-into-tokenized-ece
diff --git a/changelog/chore-prb-references-in-ece-docs-and-logs b/changelog/chore-prb-references-in-ece-docs-and-logs
@@ -0,0 +1,4 @@
+Significance: patch
+Type: update
+
+chore: renamed PRB references in GooglePay/ApplePay implementation docs and logs files to ECE.
diff --git a/changelog/chore-remove-arguments-passed-to-ece-handlers b/changelog/chore-remove-arguments-passed-to-ece-handlers
diff --git a/changelog/chore-remove-ece-error-assignment-on-loaderror b/changelog/chore-remove-ece-error-assignment-on-loaderror
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: chore: remove ECE error assignment on loaderror
+
+
diff --git a/changelog/chore-remove-redundant-init-for-payfororder b/changelog/chore-remove-redundant-init-for-payfororder
diff --git a/changelog/chore-remove-tokenized-payment-request-references b/changelog/chore-remove-tokenized-payment-request-references
@@ -0,0 +1,5 @@
+Significance: patch
+Type: dev
+Comment: chore: remove tokeinzed payment request code
+
+
diff --git a/changelog/chore-rename-tokenized-prb-flag-to-tokenized-ece b/changelog/chore-rename-tokenized-prb-flag-to-tokenized-ece
diff --git a/changelog/chore-withBlockOverride-arguments b/changelog/chore-withBlockOverride-arguments
diff --git a/changelog/compat-9727-avoid-early-translations b/changelog/compat-9727-avoid-early-translations
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Remove translations during initialization, preventing unnecessary warnings.
diff --git a/changelog/dev-4293-address-additional-union-types b/changelog/dev-4293-address-additional-union-types
diff --git a/...4293-enforce-proper-return-types-for-methodsfunctions-get_order_from_event_body_intent_id b/...4293-enforce-proper-return-types-for-methodsfunctions-get_order_from_event_body_intent_id
diff --git a/changelog/dev-allow-redirect-to-settings-page-from-wcpay-connect b/changelog/dev-allow-redirect-to-settings-page-from-wcpay-connect
diff --git a/changelog/dev-disable-flaky-visual-regression-tests b/changelog/dev-disable-flaky-visual-regression-tests
diff --git a/changelog/dev-qit-auth-fix-take-2 b/changelog/dev-qit-auth-fix-take-2
@@ -0,0 +1,4 @@
+Significance: minor
+Type: dev
+
+Fixing issue with parsing QIT authentication.Fixing issue with parsing QIT authentication.
diff --git a/changelog/dev-update-pw-screenshots b/changelog/dev-update-pw-screenshots
diff --git a/changelog/feat-add-gateway-label-filter-override b/changelog/feat-add-gateway-label-filter-override
diff --git a/changelog/feat-tokenized-ece-product-page-base-implementation b/changelog/feat-tokenized-ece-product-page-base-implementation
@@ -0,0 +1,5 @@
+Significance: patch
+Type: update
+Comment: feat: tokenized ECE product page base implementation
+
+
diff --git a/changelog/fix-5671-handle-error-on-refund-during-manual-capture b/changelog/fix-5671-handle-error-on-refund-during-manual-capture
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fixed an issue where order metadata was not updated when capturing an order in the processing state.
diff --git a/changelog/fix-7014-documents-list-view-table-download-label b/changelog/fix-7014-documents-list-view-table-download-label
diff --git a/changelog/fix-7230-payments-details-mobile-view b/changelog/fix-7230-payments-details-mobile-view
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Fix styling of transaction details page in mobile view.
diff --git a/changelog/fix-7399 b/changelog/fix-7399
diff --git a/changelog/fix-9304-fix-alignment-issue-with-link-logo-in-settings b/changelog/fix-9304-fix-alignment-issue-with-link-logo-in-settings
diff --git a/changelog/fix-9421-auto-enable-woopay-in-sandbox-mode b/changelog/fix-9421-auto-enable-woopay-in-sandbox-mode
@@ -0,0 +1,4 @@
+Significance: patch
+Type: fix
+
+Ensure WooPay 'enabled by default' value is correctly set in sandbox mode.
diff --git a/changelog/fix-9447-validate-required-fields-using-objects b/changelog/fix-9447-validate-required-fields-using-objects
diff --git a/changelog/fix-9612-inquiry-order-note b/changelog/fix-9612-inquiry-order-note
@@ -0,0 +1,4 @@
+Significance: minor
+Type: fix
+
+Order notes for inquiries have clearer content.
diff --git a/changelog/fix-9687-express-checkout-visible-for-zero-amount-after-coupon-discount b/changelog/fix-9687-express-checkout-visible-for-zero-amount-after-coupon-discount
diff --git a/changelog/fix-9700-payout-spotlight-illustration b/changelog/fix-9700-payout-spotlight-illustration
diff --git a/changelog/fix-9703-klarna-inquiries b/changelog/fix-9703-klarna-inquiries