Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert option renaming in settings controller #7565

Merged
merged 3 commits into from
Oct 27, 2023

Conversation

mdmoore
Copy link
Member

@mdmoore mdmoore commented Oct 26, 2023

Fixes #7554

Changes proposed in this Pull Request

This reverts the WooPay button location option renaming in the settings controller that was done in 1070cfa as part of #7431. This is done to prevent errors on plugin update due to changes in the REST controller.

The change will have no effect on the WooPay button locations settings. The list of locations will be pulled from payment request locations as they've always been in the settings controller. This can be updated again when there is a solution to plugin updates.

See p1698249967036989-slack-CGGCLBN58

Testing instructions

  • Check that WooPay button locations settings are still honored.

  • Run npm run changelog to add a changelog file, choose patch to leave it empty if the change is not significant. You can add multiple changelog files in one PR by running this command a few times.
  • Covered with tests (or have a good reason not to test in description ☝️)
  • Tested on mobile (or does not apply)

Post merge

@mdmoore mdmoore requested review from a team and timur27 and removed request for a team October 26, 2023 16:25
@botwoo
Copy link
Collaborator

botwoo commented Oct 26, 2023

Test the build

Option 1. Jetpack Beta

  • Install and activate Jetpack Beta.
  • Use this build by searching for PR number 7565 or branch name 7554/revert-woopay-settings-rename in your-test.site/wp-admin/admin.php?page=jetpack-beta&plugin=woocommerce-payments

Option 2. Jurassic Ninja - available for logged-in A12s

🚀 Launch a JN site with this branch 🚀

ℹ️ Install this Tampermonkey script to get more options.


Build info:

  • Latest commit: 5b5595a
  • Build time: 2023-10-27 15:37:56 UTC

Note: the build is updated when a new commit is pushed to this PR.

@github-actions
Copy link
Contributor

github-actions bot commented Oct 26, 2023

Size Change: +4.49 kB (0%)

Total Size: 1.44 MB

Filename Size Change
release/woocommerce-payments/assets/css/admin.css 1.06 kB +20 B (+2%)
release/woocommerce-payments/dist/blocks-checkout-rtl.css 1.8 kB +1 B (0%)
release/woocommerce-payments/dist/blocks-checkout.css 1.8 kB +1 B (0%)
release/woocommerce-payments/dist/checkout-rtl.css 441 B +1 B (0%)
release/woocommerce-payments/dist/checkout.css 442 B +1 B (0%)
release/woocommerce-payments/dist/index-rtl.css 36.4 kB +18 B (0%)
release/woocommerce-payments/dist/index.css 36.4 kB +20 B (0%)
release/woocommerce-payments/dist/index.js 284 kB +203 B (0%)
release/woocommerce-payments/dist/multi-currency-rtl.css 3.39 kB +509 B (+18%) ⚠️
release/woocommerce-payments/dist/multi-currency.css 3.39 kB +513 B (+18%) ⚠️
release/woocommerce-payments/dist/multi-currency.js 55.4 kB +513 B (+1%)
release/woocommerce-payments/dist/payment-gateways-rtl.css 1.3 kB +609 B (+88%) 🆘
release/woocommerce-payments/dist/payment-gateways.css 1.3 kB +607 B (+88%) 🆘
release/woocommerce-payments/dist/payment-gateways.js 39.1 kB +515 B (+1%)
release/woocommerce-payments/dist/settings-rtl.css 9.52 kB +470 B (+5%) 🔍
release/woocommerce-payments/dist/settings.css 9.53 kB +471 B (+5%) 🔍
release/woocommerce-payments/dist/settings.js 234 kB +368 B (0%)
release/woocommerce-payments/dist/upe_checkout-rtl.css 441 B +1 B (0%)
release/woocommerce-payments/dist/upe_checkout.css 442 B +1 B (0%)
release/woocommerce-payments/dist/upe_split_checkout-rtl.css 441 B +1 B (0%)
release/woocommerce-payments/dist/upe_split_checkout.css 442 B +1 B (0%)
release/woocommerce-payments/dist/upe-blocks-checkout-rtl.css 1.8 kB +1 B (0%)
release/woocommerce-payments/dist/upe-blocks-checkout.css 1.8 kB +1 B (0%)
release/woocommerce-payments/dist/upe-split-blocks-checkout-rtl.css 1.8 kB +1 B (0%)
release/woocommerce-payments/dist/upe-split-blocks-checkout.css 1.8 kB +1 B (0%)
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/about.css 1.03 kB -170 B (-14%) 👏
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/admin.css 3.6 kB +42 B (+1%)
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/admin.js 9.4 kB -231 B (-2%)
ℹ️ View Unchanged
Filename Size
release/woocommerce-payments/assets/css/success.css 158 B
release/woocommerce-payments/dist/blocks-checkout.js 75.1 kB
release/woocommerce-payments/dist/checkout.js 28.9 kB
release/woocommerce-payments/dist/multi-currency-analytics.js 1.05 kB
release/woocommerce-payments/dist/multi-currency-switcher-block.js 60.2 kB
release/woocommerce-payments/dist/order-rtl.css 676 B
release/woocommerce-payments/dist/order.css 679 B
release/woocommerce-payments/dist/order.js 41.1 kB
release/woocommerce-payments/dist/payment-request-rtl.css 153 B
release/woocommerce-payments/dist/payment-request.css 153 B
release/woocommerce-payments/dist/payment-request.js 13.1 kB
release/woocommerce-payments/dist/product-details.js 898 B
release/woocommerce-payments/dist/subscription-edit-page.js 669 B
release/woocommerce-payments/dist/subscription-product-onboarding-modal-rtl.css 519 B
release/woocommerce-payments/dist/subscription-product-onboarding-modal.css 519 B
release/woocommerce-payments/dist/subscription-product-onboarding-modal.js 20.4 kB
release/woocommerce-payments/dist/subscription-product-onboarding-toast.js 693 B
release/woocommerce-payments/dist/subscriptions-empty-state-rtl.css 117 B
release/woocommerce-payments/dist/subscriptions-empty-state.css 117 B
release/woocommerce-payments/dist/subscriptions-empty-state.js 19.5 kB
release/woocommerce-payments/dist/tos-rtl.css 230 B
release/woocommerce-payments/dist/tos.css 231 B
release/woocommerce-payments/dist/tos.js 22 kB
release/woocommerce-payments/dist/upe_checkout.js 34.1 kB
release/woocommerce-payments/dist/upe_split_checkout.js 34.7 kB
release/woocommerce-payments/dist/upe_with_deferred_intent_creation_checkout.js 37.1 kB
release/woocommerce-payments/dist/upe-blocks-checkout.js 40.9 kB
release/woocommerce-payments/dist/upe-split-blocks-checkout.js 42.5 kB
release/woocommerce-payments/dist/woopay-express-button-rtl.css 153 B
release/woocommerce-payments/dist/woopay-express-button.css 153 B
release/woocommerce-payments/dist/woopay-express-button.js 52 kB
release/woocommerce-payments/dist/woopay-rtl.css 3.91 kB
release/woocommerce-payments/dist/woopay.css 3.91 kB
release/woocommerce-payments/dist/woopay.js 71.7 kB
release/woocommerce-payments/includes/subscriptions/assets/css/plugin-page.css 622 B
release/woocommerce-payments/includes/subscriptions/assets/js/plugin-page.js 814 B
release/woocommerce-payments/vendor/automattic/jetpack-assets/build/i18n-loader.js 2.43 kB
release/woocommerce-payments/vendor/automattic/jetpack-assets/src/js/i18n-loader.js 1.01 kB
release/woocommerce-payments/vendor/automattic/jetpack-connection/dist/tracks-ajax.js 522 B
release/woocommerce-payments/vendor/automattic/jetpack-connection/dist/tracks-callables.js 581 B
release/woocommerce-payments/vendor/automattic/jetpack-identity-crisis/babel.config.js 160 B
release/woocommerce-payments/vendor/automattic/jetpack-identity-crisis/build/index.css 2.32 kB
release/woocommerce-payments/vendor/automattic/jetpack-identity-crisis/build/index.js 13.8 kB
release/woocommerce-payments/vendor/automattic/jetpack-identity-crisis/build/index.rtl.css 2.32 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/admin-empty-state.css 291 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/admin-order-statuses.css 403 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/checkout.css 299 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/modal.css 742 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/view-subscription.css 572 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/css/wcs-upgrade.css 411 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/admin-pointers.js 544 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/jstz.js 6.8 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/jstz.min.js 3.83 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/meta-boxes-coupon.js 544 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/meta-boxes-subscription.js 2.38 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/moment.js 22.1 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/moment.min.js 11.6 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/payment-method-restrictions.js 1.29 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/admin/wcs-meta-boxes-order.js 502 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/frontend/payment-methods.js 355 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/frontend/single-product.js 429 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/frontend/view-subscription.js 1.38 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/frontend/wcs-cart.js 781 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/modal.js 1.1 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/assets/js/wcs-upgrade.js 1.27 kB
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/build/index.css 392 B
release/woocommerce-payments/vendor/woocommerce/subscriptions-core/build/index.js 3.05 kB

compressed-size-action

@@ -505,7 +505,7 @@ public function get_settings(): WP_REST_Response {
'show_woopay_incompatibility_notice' => get_option( 'woopay_invalid_extension_found', false ),
'woopay_custom_message' => $this->wcpay_gateway->get_option( 'platform_checkout_custom_message' ),
'woopay_store_logo' => $this->wcpay_gateway->get_option( 'platform_checkout_store_logo' ),
'woopay_enabled_locations' => $this->wcpay_gateway->get_option( 'platform_checkout_button_locations', array_keys( $wcpay_form_fields['platform_checkout_button_locations']['options'] ) ),
'woopay_enabled_locations' => $this->wcpay_gateway->get_option( 'payment_request_button_locations', array_keys( $wcpay_form_fields['payment_request_button_locations']['options'] ) ),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the first argument had the value of platform_checkout_button_locations prior to the changes. Could you give some context if we should change it to payment_request_button_locations here? Thanks!

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Correct! Thank you for catching this. 5b5595a

@timur27
Copy link
Contributor

timur27 commented Oct 27, 2023

@mdmoore The revert looks good, I tested it successfully with the JN fresh site.

1️⃣ I created a new JN store with WooPayments 6.6.2 and updated the plugin with the version based on this PR. I haven't encountered the error during the plugin update.

image

2️⃣ On this new JN site, without saving any WooPay-related settings, I navigated to the shortcode checkout and the WooPay Express Checkout button was rendered as expected

image

@mdmoore mdmoore added this pull request to the merge queue Oct 27, 2023
Merged via the queue into develop with commit 0ca183e Oct 27, 2023
30 of 32 checks passed
@mdmoore mdmoore deleted the 7554/revert-woopay-settings-rename branch October 27, 2023 16:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants