From 94a1e413cbccbe03eed5ec12d67a18396946e2e6 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Mon, 10 Mar 2025 16:06:18 +0700
Subject: [PATCH 1/4] fix: dark mode text color

---
 src/pages/15_dash-board/chart/ChartReceipt.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/15_dash-board/chart/ChartReceipt.vue b/src/pages/15_dash-board/chart/ChartReceipt.vue
index 4e367ed6..e7423fbc 100644
--- a/src/pages/15_dash-board/chart/ChartReceipt.vue
+++ b/src/pages/15_dash-board/chart/ChartReceipt.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import { Icon } from '@iconify/vue/dist/iconify.js';
-import VueApexCharts from 'vue3-apexcharts';
+import VueApexCharts, { VueApexChartsComponent } from 'vue3-apexcharts';
 import DataDisplay from 'src/components/08_request-list/DataDisplay.vue';
 import { computed } from 'vue';
 import { formatNumberDecimal } from 'src/stores/utils';
@@ -22,12 +22,13 @@ const prop = withDefaults(
   },
 );
 
-const chartOptions = computed(() => {
+const chartOptions = computed<VueApexChartsComponent['options']>(() => {
   return {
     colors: ['#035aa1', '#ae3ec9', '#ffa94d', '#e64980'],
     chart: {
       fontFamily: 'Noto Sans Thai',
       type: 'line',
+      foreColor: 'var(--foreground)',
       zoom: {
         enabled: false,
       },

From aaff8c16f225e1f637e6b2ab30610f71ab11c06a Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Mon, 10 Mar 2025 16:08:14 +0700
Subject: [PATCH 2/4] fix: dark mode text color

---
 src/components/button/MainButton.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/button/MainButton.vue b/src/components/button/MainButton.vue
index 8ba02f55..836abe32 100644
--- a/src/components/button/MainButton.vue
+++ b/src/components/button/MainButton.vue
@@ -24,7 +24,7 @@ defineProps<{
       'main-btn__solid': solid && !outlined,
       'main-btn__outline': !solid && outlined,
       'main-btn__pill': pill,
-      'main-btn__dark': dark,
+      'main-btn__dark': dark || $q.dark.isActive,
       'main-btn__icon-only': iconOnly,
     }"
     :style="{ '--button-main-color': color }"

From 6f7de85e642b7203a6e0f306621aee470276f639 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Mon, 10 Mar 2025 17:06:41 +0700
Subject: [PATCH 3/4] fix: option not show

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

diff --git a/src/pages/05_quotation/QuotationForm.vue b/src/pages/05_quotation/QuotationForm.vue
index f85d4f38..65981411 100644
--- a/src/pages/05_quotation/QuotationForm.vue
+++ b/src/pages/05_quotation/QuotationForm.vue
@@ -2186,7 +2186,6 @@ function covertToNode() {
               <div class="surface-1 q-pa-md row" style="gap: var(--size-2)">
                 <SelectInput
                   class="q-mr-xl col-md-3 col-12"
-                  incremental
                   v-model="templateForm"
                   id="quotation-branch"
                   :option="templateFormOption"

From 25768af5118d1c3cb011557a94c79609bc6ae0ac Mon Sep 17 00:00:00 2001
From: Thanaphon Frappet <thanaphon@frappet.com>
Date: Tue, 11 Mar 2025 11:40:43 +0700
Subject: [PATCH 4/4] refactor: handle template form

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

diff --git a/src/pages/05_quotation/QuotationForm.vue b/src/pages/05_quotation/QuotationForm.vue
index 65981411..b2d0e5e5 100644
--- a/src/pages/05_quotation/QuotationForm.vue
+++ b/src/pages/05_quotation/QuotationForm.vue
@@ -2155,7 +2155,7 @@ function covertToNode() {
 
           <template
             v-if="
-              (view === View.Quotation || view === View.Payment) &&
+              (view === View.Quotation || view === View.Accepted) &&
               quotationFormData.id
             "
           >