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

Refactor force billing: remove forcedBillingAddress from conditions for showBillingFields (https://github.com/woocommerce/woocommerce-blocks/pull/7393) 

Co-authored-by: Niels Lange <info@nielslange.de>
This commit is contained in:
Tarun Vijwani 2022-10-14 14:29:06 +04:00 committed by GitHub
parent aa8622d985
commit 9167a04e20
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,8 +90,7 @@ export const useCheckoutAddress = (): CheckoutAddress => {
useShippingAsBilling, useShippingAsBilling,
setUseShippingAsBilling: __internalSetUseShippingAsBilling, setUseShippingAsBilling: __internalSetUseShippingAsBilling,
showShippingFields: ! forcedBillingAddress && needsShipping, showShippingFields: ! forcedBillingAddress && needsShipping,
showBillingFields: showBillingFields: ! needsShipping || ! useShippingAsBilling,
forcedBillingAddress || ! needsShipping || ! useShippingAsBilling,
forcedBillingAddress, forcedBillingAddress,
}; };
}; };

4
plugins/woocommerce-blocks/assets/js/blocks/checkout/inner-blocks/checkout-billing-address-block/frontend.tsx
View File

@ -38,9 +38,9 @@ const FrontendBlock = ( {
showCompanyField, showCompanyField,
showPhoneField, showPhoneField,
} = useCheckoutBlockContext(); } = useCheckoutBlockContext();
const { showBillingFields } = useCheckoutAddress(); const { showBillingFields, forcedBillingAddress } = useCheckoutAddress();
if ( ! showBillingFields ) { if ( ! showBillingFields && ! forcedBillingAddress ) {
return null; return null;
} }