From 26b6c07368ebfdb7650a35f37dd073dc4f6adf10 Mon Sep 17 00:00:00 2001 From: puriphatt Date: Wed, 18 Sep 2024 11:42:15 +0700 Subject: [PATCH] fix: address form zip code in full address --- src/components/form/AddressForm.vue | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/components/form/AddressForm.vue b/src/components/form/AddressForm.vue index 85887f6b..b3a60e37 100644 --- a/src/components/form/AddressForm.vue +++ b/src/components/form/AddressForm.vue @@ -83,13 +83,14 @@ const fullAddress = computed(() => { if (districtId.value && district) addressParts.push(typeof district.name === 'string' ? district.name : ''); - if (provinceId.value && province) + if (provinceId.value && province) { addressParts.push( typeof province.name === 'string' ? `${province.name}` : '', ); - - if (zipCode.value) { - addressParts.push(zipCode.value); + sDistrict && + addressParts.push( + typeof sDistrict.zipCode === 'string' ? `${sDistrict.zipCode}` : '', + ); } return addressParts.join(' '); @@ -118,13 +119,14 @@ const fullAddressEN = computed(() => { typeof district.nameEN === 'string' ? district.nameEN : '', ); - if (provinceId.value && province) + if (provinceId.value && province) { addressParts.push( typeof province.nameEN === 'string' ? `${province.nameEN}` : '', ); - - if (zipCode.value) { - addressParts.push(zipCode.value); + sDistrict && + addressParts.push( + typeof sDistrict.zipCode === 'string' ? `${sDistrict.zipCode}` : '', + ); } return addressParts.join(' ');