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: hide regular shipping rates when Local pickup is selected.

This commit is contained in:
Mike Jolley 2023-01-12 11:55:54 +00:00 committed by Nadir Seghir
parent 7bfda113b0
commit 5076541597
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/woocommerce-blocks/assets/js/base/context/hooks/use-checkout-address.ts
View File

@ -34,6 +34,7 @@ interface CheckoutAddress {
forcedBillingAddress: boolean; forcedBillingAddress: boolean;
useBillingAsShipping: boolean; useBillingAsShipping: boolean;
needsShipping: boolean; needsShipping: boolean;
showShippingMethods: boolean;
} }
/** /**
@ -98,6 +99,7 @@ export const useCheckoutAddress = (): CheckoutAddress => {
needsShipping, needsShipping,
showShippingFields: showShippingFields:
! forcedBillingAddress && needsShipping && ! prefersCollection, ! forcedBillingAddress && needsShipping && ! prefersCollection,
showShippingMethods: needsShipping && ! prefersCollection,
showBillingFields: showBillingFields:
! needsShipping || ! useShippingAsBilling || prefersCollection, ! needsShipping || ! useShippingAsBilling || prefersCollection,
forcedBillingAddress, forcedBillingAddress,

4
plugins/woocommerce-blocks/assets/js/blocks/checkout/inner-blocks/checkout-shipping-methods-block/edit.tsx
View File

@ -46,9 +46,9 @@ export const Edit = ( {
'activeShippingZones' 'activeShippingZones'
) as shippingAdminLink[]; ) as shippingAdminLink[];
const { showShippingFields } = useCheckoutAddress(); const { showShippingMethods } = useCheckoutAddress();
if ( ! showShippingFields ) { if ( ! showShippingMethods ) {
return null; return null;
} }

14
plugins/woocommerce-blocks/assets/js/blocks/checkout/inner-blocks/checkout-shipping-methods-block/frontend.tsx
View File

@ -32,18 +32,12 @@ const FrontendBlock = ( {
children: JSX.Element; children: JSX.Element;
className?: string; className?: string;
} ) => { } ) => {
const { checkoutIsProcessing, prefersCollection } = useSelect( const checkoutIsProcessing = useSelect( ( select ) =>
( select ) => { select( CHECKOUT_STORE_KEY ).isProcessing()
const checkoutStore = select( CHECKOUT_STORE_KEY );
return {
checkoutIsProcessing: checkoutStore.isProcessing(),
prefersCollection: checkoutStore.prefersCollection(),
};
}
); );
const { needsShipping } = useCheckoutAddress(); const { showShippingMethods } = useCheckoutAddress();
if ( ! needsShipping || prefersCollection ) { if ( ! showShippingMethods ) {
return null; return null;
} }