From d8844e759939e92cbca4026fa681a4936f53ca1f Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Thu, 19 Dec 2024 10:26:46 +0700 Subject: [PATCH] fix: make it fallback language instead of matched key --- .../shared/select/SelectCustomerItem.vue | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/components/shared/select/SelectCustomerItem.vue b/src/components/shared/select/SelectCustomerItem.vue index 917fdd3c..edc9b808 100644 --- a/src/components/shared/select/SelectCustomerItem.vue +++ b/src/components/shared/select/SelectCustomerItem.vue @@ -19,15 +19,16 @@ const optionStore = useOptionStore();
{{ { - [CustomerType.Corporate]: { - [Lang.English]: data.registerNameEN, - [Lang.Thai]: data.registerName, - }[$i18n.locale], + [CustomerType.Corporate]: + { + [1]: data.registerNameEN?.trim(), + [0]: data.registerName?.trim(), + }[+($i18n.locale === Lang.English)] || '-', [CustomerType.Person]: { - [Lang.English]: `${optionStore.mapOption(data.namePrefix)} ${data.firstNameEN} ${data.lastNameEN}`, - [Lang.Thai]: `${optionStore.mapOption(data.namePrefix)} ${data.firstName} ${data.lastName}`, - }[$i18n.locale] || '-', + [1]: `${optionStore.mapOption(data.namePrefix)} ${data.firstNameEN} ${data.lastNameEN}`.trim(), + [0]: `${optionStore.mapOption(data.namePrefix)} ${data.firstName} ${data.lastName}`.trim(), + }[+($i18n.locale === Lang.English)] || '-', }[data.customer.customerType] }} @@ -63,14 +64,14 @@ const optionStore = useOptionStore(); {{ { [CustomerType.Corporate]: { - [Lang.English]: data.registerNameEN, - [Lang.Thai]: data.registerName, - }[$i18n.locale], + [1]: data.registerNameEN, + [0]: data.registerName, + }[+($i18n.locale === Lang.English)], [CustomerType.Person]: { - [Lang.English]: `${optionStore.mapOption(data.namePrefix)} ${data.firstNameEN} ${data.lastNameEN}`, - [Lang.Thai]: `${optionStore.mapOption(data.namePrefix)} ${data.firstName} ${data.lastName}`, - }[$i18n.locale] || '-', + [1]: `${optionStore.mapOption(data.namePrefix)} ${data.firstNameEN} ${data.lastNameEN}`, + [0]: `${optionStore.mapOption(data.namePrefix)} ${data.firstName} ${data.lastName}`, + }[+($i18n.locale === Lang.English)] || '-', }[data.customer.customerType] }} ({{ data.code }})