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.

Sign up for GitHub

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

Jump to bottom

Add support for allowedShippingCountries in Express Checkout Element #9592

Merged
merged 8 commits into from
Oct 29, 2024
Merged

Add support for allowedShippingCountries in Express Checkout Element #9592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
526b712
Expose allowed shipping countries to the frontend
asumaran Oct 18, 2024
c9feecf
Define allowedShippingCountries on Stripe for Express Checkouts
asumaran Oct 18, 2024
022a7ba
Add changelog entry
asumaran Oct 18, 2024
d77f174
Add allowedShippingCountries para to ECE in product and shortcode pages
asumaran Oct 18, 2024
6b82bd5
Do not send list of countries if store ships to all countries
asumaran Oct 18, 2024
606ec49
Skip sending full country list when unnecessary
asumaran Oct 20, 2024
62c6c56
Remove the condition that enables optimization when sending all count…
asumaran Oct 28, 2024
dbbf82f
Merge branch 'develop' into 9104-add-support-for-allowedshippingcount…
asumaran Oct 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions changelog/9104-add-support-for-allowedshippingcountries-in-express-checkout-element
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: add

Add support for allowedShippingCountries in Express Checkout Element.
2 changes: 2 additions & 0 deletions client/express-checkout/blocks/hooks/use-express-checkout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ export const useExpressCheckout = ( {
};
}
),
allowedShippingCountries: getExpressCheckoutData( 'checkout' )
.allowed_shipping_countries,
};

// Click event from WC Blocks.
Expand Down
3 changes: 3 additions & 0 deletions client/express-checkout/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,9 @@ jQuery( ( $ ) => {
shippingAddressRequired: options.requestShipping,
phoneNumberRequired: options.requestPhone,
shippingRates,
allowedShippingCountries: getExpressCheckoutData(
'checkout'
).allowed_shipping_countries,
};

onClickHandler( event );
Expand Down
9 changes: 5 additions & 4 deletions includes/express-checkout/class-wc-payments-express-checkout-button-handler.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,11 +240,12 @@ public function scripts() {
'pay_for_order' => wp_create_nonce( 'pay_for_order' ),
],
'checkout' => [
'currency_code' => strtolower( get_woocommerce_currency() ),
'country_code' => substr( get_option( 'woocommerce_default_country' ), 0, 2 ),
'needs_shipping' => WC()->cart->needs_shipping(),
'currency_code' => strtolower( get_woocommerce_currency() ),
'country_code' => substr( get_option( 'woocommerce_default_country' ), 0, 2 ),
'needs_shipping' => WC()->cart->needs_shipping(),
// Defaults to 'required' to match how core initializes this option.
'needs_payer_phone' => 'required' === get_option( 'woocommerce_checkout_phone_field', 'required' ),
'needs_payer_phone' => 'required' === get_option( 'woocommerce_checkout_phone_field', 'required' ),
'allowed_shipping_countries' => array_keys( WC()->countries->get_shipping_countries() ?? [] ),
],
'button' => $this->get_button_settings(),
'login_confirmation' => $this->get_login_confirmation_settings(),
Expand Down
Loading