From 3a63d2622c2143ab99a75d08c5b23e89385f2773 Mon Sep 17 00:00:00 2001 From: Thanaphon Frappet Date: Mon, 2 Dec 2024 16:29:36 +0700 Subject: [PATCH] refactor: handle pay installment no --- src/pages/08_request-list/ProductExpansion.vue | 18 +++++++++++++----- src/pages/08_request-list/RequestListView.vue | 5 +++-- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/src/pages/08_request-list/ProductExpansion.vue b/src/pages/08_request-list/ProductExpansion.vue index 09093828..4e791ba5 100644 --- a/src/pages/08_request-list/ProductExpansion.vue +++ b/src/pages/08_request-list/ProductExpansion.vue @@ -3,7 +3,7 @@ import { baseUrl } from 'src/stores/utils'; import BadgeComponent from 'src/components/BadgeComponent.vue'; -import { ProductRelation } from 'src/stores/quotations/types'; +import { ProductRelation, PayCondition } from 'src/stores/quotations/types'; import { Step, RequestWorkStatus } from 'src/stores/request-list/types'; const workStatus = [ @@ -32,7 +32,9 @@ defineProps<{ total: number; paid?: number; }; + installmentNo?: number; paySuccess: boolean; + payCondition: PayCondition; }>(); // NOTE: Function @@ -91,9 +93,11 @@ defineProps<{ :label=" $q.screen.lt.sm ? undefined - : $t( - `requestList.status.work.${status?.workStatus ?? RequestWorkStatus.Pending}`, - ) + : !paySuccess + ? $t('general.unavailable') + : $t( + `requestList.status.work.${status?.workStatus ?? RequestWorkStatus.Pending}`, + ) " class="text-capitalize text-weight-regular product-status rounded" :class="{ @@ -169,7 +173,11 @@ defineProps<{ }" > {{ - $t(`requestList.status.work.${status?.workStatus ?? 'Pending'}`) + !paySuccess + ? `${$t(`quotation.payCondition.${payCondition}`)} ${payCondition.includes('Split') ? `${installmentNo}/${installmentInfo?.total} ` : ''}` + : $t( + `requestList.status.work.${status?.workStatus ?? 'Pending'}`, + ) }} diff --git a/src/pages/08_request-list/RequestListView.vue b/src/pages/08_request-list/RequestListView.vue index 4d01e1a0..ac188289 100644 --- a/src/pages/08_request-list/RequestListView.vue +++ b/src/pages/08_request-list/RequestListView.vue @@ -606,6 +606,7 @@ function isInstallmentPaySuccess(installmentNo: number) { +