Merge branch 'develop' into feat/4-property-managment

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 }"

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
             "
           >
@@ -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"

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,
       },