Skip to content

Commit

Permalink
Merge branch 'develop' into update/deprecating-sofort-from-checkout
Browse files Browse the repository at this point in the history
  • Loading branch information
FangedParakeet committed Dec 20, 2024
2 parents 7dad6bd + 915fcc8 commit bd0a45a
Show file tree
Hide file tree
Showing 194 changed files with 4,011 additions and 4,534 deletions.
4 changes: 0 additions & 4 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -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/
4 changes: 2 additions & 2 deletions bin/docker-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
43 changes: 31 additions & 12 deletions bin/jurassic-tube-setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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."
Expand Down
4 changes: 4 additions & 0 deletions changelog.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
*** WooPayments Changelog ***

= 8.6.1 - 2024-12-17 =
* Fix - Checkout: Fix error when wc_address_i18n_params does not have data for a given country
* Fix - Skip mysqlcheck SSL Requirement during E2E environment setup

= 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.
Expand Down
5 changes: 5 additions & 0 deletions changelog/8969-fallback-to-card-payment-type
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: update
Comment: Small change to payment method types fallback scenario.


4 changes: 4 additions & 0 deletions changelog/add-6924-migrate-test-drive-capabilities
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: add

Migrate active capabilities from test-drive account when switching to live account.
4 changes: 4 additions & 0 deletions changelog/add-9690-recommended-pm
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: add

Implement gateway method to retrieve recommended payment method.
4 changes: 4 additions & 0 deletions changelog/add-jetpack-config-callback
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: fix

Added conditional use of Jetpack Config callback to avoid i18n notices.
5 changes: 5 additions & 0 deletions changelog/add-pass-footer-header-styles-to-woopay
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: add
Comment: Impovements to WooPay themeing, which is not yet released to the public.


4 changes: 4 additions & 0 deletions changelog/add-woopay-klaviyo-newsletter-support
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: add

Add WooPay Klaviyo newsletter integration.
4 changes: 4 additions & 0 deletions changelog/as-fix-ece-variable-subs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: dev

Refine verification for disabling ECE on subscriptions that require shipping.
4 changes: 4 additions & 0 deletions changelog/as-fix-ece-variable-subs-free-trial
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: fix

Enable ECE for Virtual Variable Subscriptions with Free Trials.
4 changes: 4 additions & 0 deletions changelog/as-hk-address
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: fix

Normalize HK addresses for ECE
5 changes: 5 additions & 0 deletions changelog/chore-remove-ece-error-assignment-on-loaderror
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: update
Comment: chore: remove ECE error assignment on loaderror


5 changes: 5 additions & 0 deletions changelog/chore-remove-tokenized-payment-request-references
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: dev
Comment: chore: remove tokeinzed payment request code


4 changes: 4 additions & 0 deletions changelog/compat-9727-avoid-early-translations
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fix

Remove translations during initialization, preventing unnecessary warnings.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: dev

Remove hooks from customer and token services to dedicated methods
4 changes: 4 additions & 0 deletions changelog/feat-9810-add-seller-message
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: add

Add seller_message to failed order notes
5 changes: 5 additions & 0 deletions changelog/feat-tokenized-ece-product-page-base-implementation
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: update
Comment: feat: tokenized ECE product page base implementation


5 changes: 5 additions & 0 deletions changelog/fix-198-mccy-fedex-conversion
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fix
Comment: Fix FedEx insurance rates with different currencies.


Original file line number Diff line number Diff line change
@@ -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.
4 changes: 4 additions & 0 deletions changelog/fix-9114-level3-rounding
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: fix

Add a rounding entry to Level 3 data for rare cases where rounding errors break calculations.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fix

Hide transaction fee on admin view order screen when transaction is not captured.
4 changes: 4 additions & 0 deletions changelog/fix-9421-auto-enable-woopay-in-sandbox-mode
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fix

Ensure WooPay 'enabled by default' value is correctly set in sandbox mode.
4 changes: 4 additions & 0 deletions changelog/fix-9716-disputes-api-requests
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: fix

Performance improvements for Disputes Needing Response task shown in WooCommerce admin.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fix

Fix inconsistent alignment of the download button across transactions, payouts, and disputes reporting views for a more cohesive user interface.
4 changes: 4 additions & 0 deletions changelog/fix-9794-refresh-page-when-ece-dismissed
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: add

Refresh the cart and checkout pages when ECE is dismissed and the shipping options were modified in the payment sheet.
4 changes: 4 additions & 0 deletions changelog/fix-9806-ECE-subscription-checkout-signed-out
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fix

Ensure ECE login confirmation dialog is shown on Blocks.
4 changes: 4 additions & 0 deletions changelog/fix-9889-log-level
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: fix

Errors were incorrectly marked as info in logs.
4 changes: 4 additions & 0 deletions changelog/fix-9987-filter-csv-disputes
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fix

Fix filtering in async Disputes CSV export
4 changes: 4 additions & 0 deletions changelog/fix-9996-currency-conversion-fee-phrasing
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: fix

Use "currency conversion fee" instead "foreign exchange fee" in payment timeline and various other places.
5 changes: 5 additions & 0 deletions changelog/fix-add-payment-method-check
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: dev
Comment: Added a check for the gateway id before comparing it


4 changes: 4 additions & 0 deletions changelog/fix-allow-addresses-from-woo-supported-countries
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fix

Checkout: Fix error when wc_address_i18n_params does not have data for a given country
4 changes: 4 additions & 0 deletions changelog/fix-ece-button-for-price-including-tax
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: fix

Show express checkout for products w/o shipping but where tax is included into price.
4 changes: 4 additions & 0 deletions changelog/fix-method-title-availability
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: fix

Set payment method title once title is known.
4 changes: 4 additions & 0 deletions changelog/fix-rounding-error-with-deposit-products
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fix

Ceil product prices after applying currency conversion, but before charm pricing and price rounding from settings is applied.
4 changes: 4 additions & 0 deletions changelog/fix-skip-ssl-requirement-env-setup
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: fix

Skip mysqlcheck SSL Requirement during E2E environment setup
5 changes: 5 additions & 0 deletions changelog/fix-tokenized-cart-error-notice-json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fix
Comment: fix: tokenized cart error notice json


5 changes: 5 additions & 0 deletions changelog/fix-tokenized-cart-multiple-variations
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fix
Comment: fix: tokenized cart & multiple variations.


5 changes: 5 additions & 0 deletions changelog/fix-tokenized-cart-subscription-signup-fee
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fix
Comment: fix: tokenized cart subscription signup fee price


5 changes: 5 additions & 0 deletions changelog/fix-tokenized-ece-product-bundles-totals
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fix
Comment: fix: tokenized ECE item compatibility w/ product bundles


4 changes: 4 additions & 0 deletions changelog/fix-unhandled-promises
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: fix

Fix payment method filtering when billing country changes in Blocks checkout.
4 changes: 4 additions & 0 deletions changelog/fix-upe-country-selection
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fix

Fixed UPE country detection in Checkout for non-logged in users
5 changes: 5 additions & 0 deletions changelog/fix-use-effect-console-warning
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: dev
Comment: fix: console warning on plugins page


4 changes: 4 additions & 0 deletions changelog/frosso-patch-1
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fix

fix: undefined $cart_contains_subscription
4 changes: 4 additions & 0 deletions changelog/load-checkout-scripts-on-checkout-if-not-loaded
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fix

Load checkout scripts when they are not previously loaded on checkout page.
4 changes: 4 additions & 0 deletions changelog/replace-from-url-query
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: fix

Fix Jetpack onboarding URL query from "woocommerce-payments" to "woocommerce-core-profiler"
4 changes: 4 additions & 0 deletions changelog/update-1-5316-rename-bank-reference-id
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: update

Change 'Bank reference key' label to 'Bank reference ID' in Payouts list column for consistency.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: update

Update error messages for payment authorization actions to provide more specific and user-friendly feedback.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: update

Add failure reason to failed payments in the timeline.
5 changes: 5 additions & 0 deletions changelog/update-9910-transaction-id-label
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
Significance: patch
Type: fix
Comment: Change ID to uppercase in the 'Transaction ID' column label for consistency with similar unique IDs in the UI.


4 changes: 4 additions & 0 deletions changelog/update-9916-go-live-modal-and-notice
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: update

Adjust the go-live modal to match the latest design.
4 changes: 4 additions & 0 deletions changelog/update-9919-embedded-components-width
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: update

Update Embedded Components and MOX to support custom width and paddings.
4 changes: 4 additions & 0 deletions changelog/update-confirmation-modal-nox
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: update

Update confirmation modal after onbarding
4 changes: 4 additions & 0 deletions changelog/update-jetpack-onboarding-flow
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: update

Update Jetpack onboarding flow
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: dev

Add support for utilizing NOX capabilities as URL parameters during account creation.
5 changes: 0 additions & 5 deletions changelog/update-server-container-name

This file was deleted.

4 changes: 4 additions & 0 deletions changelog/update-to-standalone-jt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: dev

Update the tunelling setup.
Loading

0 comments on commit bd0a45a

Please sign in to comment.