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

Hide store address fields in regions that specify hidden (https://github.com/woocommerce/woocommerce-admin/pull/8172) 

* Hide store address fields in regions that specify hidden

* Add changelog entry
This commit is contained in:
Joshua T Flowers 2022-01-19 09:07:43 -05:00 committed by GitHub
parent 9cfd69d778
commit ecd8c34c42
2 changed files with 47 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/woocommerce-admin/changelogs/add-store-address-hidden Normal file
View File

@ -0,0 +1,4 @@
Significance: minor
Type: Tweak
Hide store address fields in regions that specify hidden #8172

78
plugins/woocommerce-admin/client/dashboard/components/settings/general/store-address.tsx
View File

@ -281,25 +281,29 @@ export function StoreAddress( props ) {
return (
<div className="woocommerce-store-address-fields">
<TextControl
label={
locale?.address_1?.label ||
__( 'Address line 1', 'woocommerce-admin' )
}
required={ isAddressFieldRequired( 'address_1', locale ) }
autoComplete="address-line1"
{ ...getInputProps( 'addressLine1' ) }
/>
{ ! locale?.address_1?.hidden && (
<TextControl
label={
locale?.address_1?.label ||
__( 'Address line 1', 'woocommerce-admin' )
}
required={ isAddressFieldRequired( 'address_1', locale ) }
autoComplete="address-line1"
{ ...getInputProps( 'addressLine1' ) }
/>
) }
<TextControl
label={
locale?.address_2?.label ||
__( 'Address line 2 (optional)', 'woocommerce-admin' )
}
required={ isAddressFieldRequired( 'address_2', locale ) }
autoComplete="address-line2"
{ ...getInputProps( 'addressLine2' ) }
/>
{ ! locale?.address_2?.hidden && (
<TextControl
label={
locale?.address_2?.label ||
__( 'Address line 2 (optional)', 'woocommerce-admin' )
}
required={ isAddressFieldRequired( 'address_2', locale ) }
autoComplete="address-line2"
{ ...getInputProps( 'addressLine2' ) }
/>
) }
<SelectControl
label={ __( 'Country / Region', 'woocommerce-admin' ) }
@ -315,24 +319,28 @@ export function StoreAddress( props ) {
{ countryStateAutofill }
</SelectControl>
<TextControl
label={
locale?.city?.label || __( 'City', 'woocommerce-admin' )
}
required={ isAddressFieldRequired( 'city', locale ) }
{ ...getInputProps( 'city' ) }
autoComplete="address-level2"
/>
{ ! locale?.city?.hidden && (
<TextControl
label={
locale?.city?.label || __( 'City', 'woocommerce-admin' )
}
required={ isAddressFieldRequired( 'city', locale ) }
{ ...getInputProps( 'city' ) }
autoComplete="address-level2"
/>
) }
<TextControl
label={
locale?.postcode?.label ||
__( 'Post code', 'woocommerce-admin' )
}
required={ isAddressFieldRequired( 'postcode', locale ) }
autoComplete="postal-code"
{ ...getInputProps( 'postCode' ) }
/>
{ ! locale?.postcode?.hidden && (
<TextControl
label={
locale?.postcode?.label ||
__( 'Post code', 'woocommerce-admin' )
}
required={ isAddressFieldRequired( 'postcode', locale ) }
autoComplete="postal-code"
{ ...getInputProps( 'postCode' ) }
/>
) }
</div>
);
}