From 095f190f992ccb105773253237c5505dc3a53e8b Mon Sep 17 00:00:00 2001
From: puriphatt <puriphat@frappet.com>
Date: Tue, 21 Jan 2025 16:29:19 +0700
Subject: [PATCH] feat: 03 => update expiration date handling to accept string
 format and improve validation

---
 .../03_customer-management/ExpirationDate.vue        |  4 ++--
 src/pages/03_customer-management/MainPage.vue        | 12 ++++++------
 src/stores/utils/index.ts                            |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/components/03_customer-management/ExpirationDate.vue b/src/components/03_customer-management/ExpirationDate.vue
index 1a279d02..e0071d01 100644
--- a/src/components/03_customer-management/ExpirationDate.vue
+++ b/src/components/03_customer-management/ExpirationDate.vue
@@ -2,7 +2,7 @@
 import { calculateDaysUntilExpire } from 'stores/utils';
 
 defineProps<{
-  expirationDate: Date;
+  expirationDate?: Date | string;
   showAllDay?: boolean;
 }>();
 </script>
@@ -10,7 +10,7 @@ defineProps<{
 <template>
   <template
     v-if="
-      calculateDaysUntilExpire(expirationDate) <= 90 ||
+      (expirationDate && calculateDaysUntilExpire(expirationDate) <= 90) ||
       (expirationDate !== undefined && !!showAllDay)
     "
   >
diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue
index e8d88d02..bcbfea89 100644
--- a/src/pages/03_customer-management/MainPage.vue
+++ b/src/pages/03_customer-management/MainPage.vue
@@ -2419,26 +2419,26 @@ const emptyCreateDialog = ref(false);
           [
             {
               name: 'personalInfo',
-              label: 'customerEmployee.form.group.personalInfo',
+              label: $t('customerEmployee.form.group.personalInfo'),
             },
             {
               name: 'passport',
-              label: 'customerEmployee.fileType.passport',
+              label: $t('customerEmployee.fileType.passport'),
             },
             {
               name: 'visa',
-              label: 'customerEmployee.form.group.visa',
+              label: $t('customerEmployee.form.group.visa'),
             },
 
             {
               name: 'healthCheck',
-              label: 'customerEmployee.form.group.healthCheck',
+              label: $t('customerEmployee.form.group.healthCheck'),
             },
             {
               name: 'workHistory',
-              label: 'customerEmployee.form.group.workHistory',
+              label: $t('customerEmployee.form.group.workHistory'),
             },
-            { name: 'other', label: 'customerEmployee.form.group.other' },
+            { name: 'other', label: $t('customerEmployee.form.group.other') },
           ].filter((v) => {
             if (!employeeFormState.statusSavePersonal) {
               return v.name === 'personalInfo';
diff --git a/src/stores/utils/index.ts b/src/stores/utils/index.ts
index 65dadfe3..870be75b 100644
--- a/src/stores/utils/index.ts
+++ b/src/stores/utils/index.ts
@@ -511,7 +511,7 @@ export async function getAttachmentHead(api: AxiosInstance, url: string) {
   if (res) return res.headers;
 }
 
-export function calculateDaysUntilExpire(expireDate: Date): number {
+export function calculateDaysUntilExpire(expireDate: Date | string): number {
   const today = new Date();
   const expire = new Date(expireDate);
   const diffInTime = expire.getTime() - today.getTime();