Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Local Pickup: Change location modal to have store country as default country

This commit is contained in:
Nadir Seghir 2022-12-23 13:26:06 +01:00
parent 994491c2b8
commit 549358c65c
4 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/woocommerce-blocks/assets/js/extensions/shipping-methods/pickup-location/location-settings.tsx
View File

@ -48,6 +48,7 @@ const LocationSettings = () => {
setPickupLocations, setPickupLocations,
toggleLocation, toggleLocation,
updateLocation, updateLocation,
readOnlySettings,
} = useSettingsContext(); } = useSettingsContext();
const [ editingLocation, setEditingLocation ] = const [ editingLocation, setEditingLocation ] =
useState< UniqueIdentifier >( '' ); useState< UniqueIdentifier >( '' );
@ -138,7 +139,7 @@ const LocationSettings = () => {
city: '', city: '',
state: '', state: '',
postcode: '', postcode: '',
country: '', country: readOnlySettings.storeCountry,
}, },
} }
: pickupLocations.find( ( { id } ) => { : pickupLocations.find( ( { id } ) => {

1
plugins/woocommerce-blocks/assets/js/extensions/shipping-methods/pickup-location/types.ts
View File

@ -31,6 +31,7 @@ export type ShippingMethodSettings = {
}; };
export type ReadOnlySettings = { export type ReadOnlySettings = {
storeCountry: string;
hasLegacyPickup: boolean; hasLegacyPickup: boolean;
}; };

1
plugins/woocommerce-blocks/assets/js/extensions/shipping-methods/pickup-location/utils.ts
View File

@ -32,6 +32,7 @@ export const defaultSettings = {
export const defaultReadyOnlySettings = { export const defaultReadyOnlySettings = {
hasLegacyPickup: false, hasLegacyPickup: false,
storeCountry: '',
}; };
declare global { declare global {
const hydratedScreenSettings: { const hydratedScreenSettings: {

1
plugins/woocommerce-blocks/src/Shipping/ShippingController.php
View File

@ -195,6 +195,7 @@ class ShippingController {
'pickupLocations' => $formatted_pickup_locations, 'pickupLocations' => $formatted_pickup_locations,
'readonlySettings' => array( 'readonlySettings' => array(
'hasLegacyPickup' => $has_legacy_pickup, 'hasLegacyPickup' => $has_legacy_pickup,
'storeCountry' => WC()->countries->get_base_country(),
), ),
); );