From d60f8585826b991f6d205c8734a81a55db0e2f5d Mon Sep 17 00:00:00 2001
From: puriphatt <puriphat@frappet.com>
Date: Thu, 17 Jul 2025 11:12:27 +0700
Subject: [PATCH 1/3] fix: quotation disable selectInstallment invoice btn when
 not selected

---
 src/pages/05_quotation/QuotationForm.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/05_quotation/QuotationForm.vue b/src/pages/05_quotation/QuotationForm.vue
index 50e0afcc..41420441 100644
--- a/src/pages/05_quotation/QuotationForm.vue
+++ b/src/pages/05_quotation/QuotationForm.vue
@@ -2313,6 +2313,7 @@ function covertToNode() {
         >
           <MainButton
             solid
+            :disabled="selectedInstallment.length === 0"
             icon="mdi-account-multiple-check-outline"
             class="q-ml-sm"
             color="207 96% 32%"

From 8ca3f784f107a42313b517c7da18039a231f6193 Mon Sep 17 00:00:00 2001
From: puriphatt <puriphat@frappet.com>
Date: Mon, 21 Jul 2025 09:53:31 +0700
Subject: [PATCH 2/3] fix: handle customer business type in table

---
 src/pages/03_customer-management/MainPage.vue | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/pages/03_customer-management/MainPage.vue b/src/pages/03_customer-management/MainPage.vue
index f24c6b3b..3ec63b43 100644
--- a/src/pages/03_customer-management/MainPage.vue
+++ b/src/pages/03_customer-management/MainPage.vue
@@ -1266,15 +1266,19 @@ const emptyCreateDialog = ref(false);
                             class="ellipsis"
                           >
                             {{
-                              props.row.branch[0].businessType[
-                                $i18n.locale === 'eng' ? 'nameEN' : 'name'
-                              ]
+                              props.row.branch[0].businessType
+                                ? props.row.branch[0].businessType[
+                                    $i18n.locale === 'eng' ? 'nameEN' : 'name'
+                                  ]
+                                : '-'
                             }}
                             <q-tooltip>
                               {{
-                                props.row.branch[0].businessType[
-                                  $i18n.locale === 'eng' ? 'nameEN' : 'name'
-                                ]
+                                props.row.branch[0].businessType
+                                  ? props.row.branch[0].businessType[
+                                      $i18n.locale === 'eng' ? 'nameEN' : 'name'
+                                    ]
+                                  : '-'
                               }}
                             </q-tooltip>
                           </q-td>

From 968aa04aa99feb8637bb293a55a38fa06368a88e Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Fri, 25 Jul 2025 16:19:36 +0700
Subject: [PATCH 3/3] fix: remark handling

---
 src/pages/11_credit-note/FormPage.vue         | 13 +---
 src/pages/12_debit-note/FormPage.vue          |  7 ++-
 .../12_debit-note/document-view/MainPage.vue  |  3 +-
 .../expansion/RemarkExpansion.vue             | 61 ++++++++++++++++++-
 4 files changed, 66 insertions(+), 18 deletions(-)

diff --git a/src/pages/11_credit-note/FormPage.vue b/src/pages/11_credit-note/FormPage.vue
index 8e013234..fae332e6 100644
--- a/src/pages/11_credit-note/FormPage.vue
+++ b/src/pages/11_credit-note/FormPage.vue
@@ -96,7 +96,7 @@ const pageState = reactive({
   mode: 'view' as 'view' | 'edit' | 'info',
 });
 
-const defaultRemark = '#[quotation-labor]<br/><br/>#[quotation-payment]';
+const defaultRemark = '';
 
 const formData = ref<CreditNotePayload>({
   quotationId: '',
@@ -798,16 +798,7 @@ onMounted(async () => {
             :default-remark="defaultRemark"
             :items="[]"
             :readonly="pageState.mode === 'info'"
-          >
-            <template #hint>
-              {{ $t('general.hintRemark') }}
-              <code>#[quotation-labor]</code>
-              {{ $t('general.quotationLabor') }}
-              {{ $t('general.or') }}
-              <code>#[quotation-payment]</code>
-              {{ $t('general.quotationPayment') }}
-            </template>
-          </RemarkExpansion>
+          ></RemarkExpansion>
 
           <QuotationFormReceipt
             v-if="creditNoteData && view === CreditNoteStatus.Success"
diff --git a/src/pages/12_debit-note/FormPage.vue b/src/pages/12_debit-note/FormPage.vue
index 30ee9bb1..0b6b1870 100644
--- a/src/pages/12_debit-note/FormPage.vue
+++ b/src/pages/12_debit-note/FormPage.vue
@@ -386,7 +386,7 @@ async function assignFormData(id: string) {
   selectedProductGroup.value =
     data.productServiceList[0]?.product.productGroup?.id || '';
 
-  (previousValue = {
+  ((previousValue = {
     id: data.id || undefined,
     debitNoteQuotationId: data.debitNoteQuotationId || undefined,
     productServiceList: structuredClone(
@@ -412,7 +412,7 @@ async function assignFormData(id: string) {
     quotationId: data.debitNoteQuotationId,
     remark: data.remark || undefined,
   }),
-    (currentFormData.value = structuredClone(previousValue));
+    (currentFormData.value = structuredClone(previousValue)));
 
   assignProductServiceList();
   assignSelectedWorker();
@@ -1192,7 +1192,6 @@ async function submitAccepted() {
             "
           />
 
-          <!-- TODO: bind remark -->
           <RemarkExpansion
             v-if="
               view === QuotationStatus.Issued ||
@@ -1200,6 +1199,8 @@ async function submitAccepted() {
               view === QuotationStatus.PaymentPending
             "
             :readonly="readonly"
+            :final-price="summaryPrice.finalPrice"
+            :selected-worker
             v-model:remark="currentFormData.remark"
           />
 
diff --git a/src/pages/12_debit-note/document-view/MainPage.vue b/src/pages/12_debit-note/document-view/MainPage.vue
index 563b4d02..33faa935 100644
--- a/src/pages/12_debit-note/document-view/MainPage.vue
+++ b/src/pages/12_debit-note/document-view/MainPage.vue
@@ -492,9 +492,8 @@ function print() {
           v-html="
             convertTemplate(data?.remark || '', {
               'quotation-payment': {
-                paymentType: data?.payCondition || 'Full',
+                paymentType: 'Full',
                 amount: summaryPrice.finalPrice,
-                installments: data?.paySplit,
               },
               'quotation-labor': {
                 name:
diff --git a/src/pages/12_debit-note/expansion/RemarkExpansion.vue b/src/pages/12_debit-note/expansion/RemarkExpansion.vue
index d33fcf73..0ed7d568 100644
--- a/src/pages/12_debit-note/expansion/RemarkExpansion.vue
+++ b/src/pages/12_debit-note/expansion/RemarkExpansion.vue
@@ -1,9 +1,21 @@
 <script lang="ts" setup>
+import { ref } from 'vue';
+import { convertTemplate } from 'src/utils/string-template';
+import { RequestWork } from 'src/stores/request-list';
+import { Employee } from 'src/stores/employee/types';
+
 defineProps<{
   readonly?: boolean;
+  items?: {
+    product: RequestWork['productService']['product'];
+    list: RequestWork[];
+  }[];
+  finalPrice?: number;
+  selectedWorker?: Employee[];
 }>();
 
 const remark = defineModel<string>('remark', { default: '' });
+const remarkWrite = ref<boolean>(false);
 </script>
 <template>
   <q-expansion-item
@@ -24,7 +36,23 @@ const remark = defineModel<string>('remark', { default: '' });
       <q-editor
         dense
         :readonly="readonly"
-        :model-value="remark"
+        :model-value="
+          !remarkWrite || readonly
+            ? convertTemplate(remark || '', {
+                'quotation-payment': {
+                  paymentType: 'Full',
+                  amount: finalPrice,
+                },
+                'quotation-labor': {
+                  name: selectedWorker.map(
+                    (v, i) =>
+                      `${i + 1}. ` +
+                      `${v.employeePassport.length !== 0 ? v.employeePassport[0].number + '_' : ''}  ${v.namePrefix}.${v.firstNameEN ? `${v.firstNameEN} ${v.lastNameEN}` : `${v.firstName} ${v.lastName}`}  `.toUpperCase(),
+                  ),
+                },
+              })
+            : remark || ''
+        "
         min-height="5rem"
         class="full-width"
         toolbar-bg="input-border"
@@ -48,7 +76,36 @@ const remark = defineModel<string>('remark', { default: '' });
             remark = v;
           }
         "
-      />
+      >
+        <template v-if="!readonly" v-slot:toggle>
+          <div class="text-caption row no-wrap q-px-sm">
+            <MainButton
+              :solid="!remarkWrite"
+              icon="mdi-eye-outline"
+              color="0 0% 40%"
+              @click="remarkWrite = false"
+              style="padding: 0 var(--size-2); cursor: pointer"
+              :style="{
+                color: remarkWrite ? 'hsl(0 0% 40%)' : undefined,
+              }"
+            >
+              {{ $t('general.view', { msg: $t('general.example') }) }}
+            </MainButton>
+            <MainButton
+              :solid="remarkWrite"
+              icon="mdi-pencil-outline"
+              color="0 0% 40%"
+              @click="remarkWrite = true"
+              style="padding: 0 var(--size-2); cursor: pointer"
+              :style="{
+                color: !remarkWrite ? 'hsl(0 0% 40%)' : undefined,
+              }"
+            >
+              {{ $t('general.edit') }}
+            </MainButton>
+          </div>
+        </template>
+      </q-editor>
     </main>
   </q-expansion-item>
 </template>