From eb373f10b39671fc1dcb6a28e6355e6ffa786921 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 23 Apr 2025 18:29:53 +0200
Subject: [PATCH] fix: refs #8388 update VnTable integration in InvoiceInDueDay
 component and enhance input handling

---
 src/components/VnTable/VnTable.vue           |   1 +
 src/pages/InvoiceIn/Card/InvoiceInDueDay.vue | 288 +++++++------------
 2 files changed, 111 insertions(+), 178 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 7e9ab85cb..f1f26d706 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -432,6 +432,7 @@ async function renderInput(rowId, field, clickedElement) {
     const row = CrudModelRef.value.formData[rowId];
     const oldValue = CrudModelRef.value.formData[rowId][column?.name];
 
+    if (column.disable) return;
     if (!clickedElement)
         clickedElement = document.querySelector(
             `[data-row-index="${rowId}"][data-col-field="${field}"]`,
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index 62fa4be09..2346ee301 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -6,81 +6,107 @@ import axios from 'axios';
 import { toDate } from 'src/filters';
 import { useArrayData } from 'src/composables/useArrayData';
 import { getTotal } from 'src/composables/getTotal';
-import CrudModel from 'src/components/CrudModel.vue';
+// import CrudModel from 'src/components/CrudModel.vue'; // Removed CrudModel import
 import VnSelect from 'src/components/common/VnSelect.vue';
 import useNotify from 'src/composables/useNotify.js';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import { toCurrency } from 'filters/index';
+import VnTable from 'src/components/VnTable/VnTable.vue'; // Added VnTable import
 
 const route = useRoute();
-const { notify } = useNotify();
+const { notify } = useNotify(); // Keep notify if used elsewhere, otherwise remove
 const { t } = useI18n();
 const arrayData = useArrayData();
 const invoiceIn = computed(() => arrayData.store.data);
 const currency = computed(() => invoiceIn.value?.currency?.code);
 
 const rowsSelected = ref([]);
-const invoiceInFormRef = ref();
+const invoiceInDueDayTableRef = ref(); // Renamed ref for VnTable
 const invoiceId = +route.params.id;
 const filter = { where: { invoiceInFk: invoiceId } };
 const areRows = ref(false);
 const totalTaxableBase = ref();
 const totalVat = ref();
+
+// Access formData from VnTable's internal CrudModelRef
+const tableRows = computed(
+    () => invoiceInDueDayTableRef.value?.CrudModelRef?.formData || [],
+);
+const totalAmount = computed(() => getTotal(tableRows.value, 'amount'));
+
 const noMatch = computed(
     () =>
         totalAmount.value != totalTaxableBase.value &&
         totalAmount.value != totalVat.value,
 );
+
 const columns = computed(() => [
     {
-        name: 'duedate',
+        name: 'dueDated',
         label: t('Date'),
-        field: (row) => toDate(row.dueDated),
         sortable: true,
         tabIndex: 1,
         align: 'left',
+        component: 'date',
+        isEditable: true,
+        create: true,
     },
     {
-        name: 'bank',
+        name: 'bankFk',
         label: t('Bank'),
-        field: (row) => row.bankFk,
-        model: 'bankFk',
-        optionLabel: 'bank',
-        url: 'Accountings',
         sortable: true,
         tabIndex: 2,
         align: 'left',
+        component: 'select',
+        attrs: {
+            url: 'Accountings',
+            optionLabel: 'bank',
+            optionValue: 'id',
+            fields: ['id', 'bank'],
+            'emit-value': true,
+        },
+        format: ({ bank }) => bank?.bank,
+        isEditable: true,
+        create: true,
     },
     {
         name: 'amount',
         label: t('Amount'),
-        field: (row) => row.amount,
         sortable: true,
         tabIndex: 3,
         align: 'left',
+        component: 'number',
+        attrs: {
+            clearable: true,
+            'clear-icon': 'close',
+        },
+        isEditable: true,
+        create: true,
     },
     {
-        name: 'foreignvalue',
+        name: 'foreignValue',
         label: t('Foreign value'),
-        field: (row) => row.foreignValue,
         sortable: true,
         tabIndex: 4,
         align: 'left',
+        component: 'number',
+        isEditable: true,
+        create: true,
+        disable: true,
     },
 ]);
 
-const totalAmount = computed(() => getTotal(invoiceInFormRef.value.formData, 'amount'));
-
 const isNotEuro = (code) => code != 'EUR';
 
 async function insert() {
     await axios.post('/InvoiceInDueDays/new', { id: +invoiceId });
-    await invoiceInFormRef.value.reload();
+    await invoiceInDueDayTableRef.value.reload();
     notify(t('globals.dataSaved'), 'positive');
 }
-
 async function setTaxableBase() {
+    const ref = invoiceInDueDayTableRef.value;
+    if (ref) ref.create = null;
     const { data } = await axios.get(`InvoiceIns/${invoiceId}/getTotals`);
     totalTaxableBase.value = data.totalTaxableBase;
     totalVat.value = data.totalVat;
@@ -89,189 +115,93 @@ async function setTaxableBase() {
 onBeforeMount(async () => await setTaxableBase());
 </script>
 <template>
-    <CrudModel
+    <VnTable
         v-if="invoiceIn"
-        ref="invoiceInFormRef"
+        ref="invoiceInDueDayTableRef"
         data-key="InvoiceInDueDays"
         url="InvoiceInDueDays"
+        save-url="InvoiceInDueDays/crud"
         :filter="filter"
+        :user-filter="{
+            include: { relation: 'bank', scope: { fields: ['id', 'bank'] } },
+        }"
         auto-load
         :data-required="{ invoiceInFk: invoiceId }"
         v-model:selected="rowsSelected"
         @on-fetch="(data) => (areRows = !!data.length)"
         @save-changes="setTaxableBase"
+        :columns="columns"
+        :is-editable="true"
+        :table="{ selection: 'multiple', 'row-key': '$index' }"
+        footer
+        :right-search="false"
+        :column-search="false"
+        :disable-option="{ card: true }"
+        class="q-pa-none"
     >
-        <template #body="{ rows }">
-            <QTable
-                v-model:selected="rowsSelected"
-                selection="multiple"
-                :columns
-                :rows
-                row-key="$index"
-                :grid="$q.screen.lt.sm"
+        <!-- <template #column-foreignValue="{ row }">
+            <VnInputNumber
+                :class="{
+                    'no-pointer-events': !isNotEuro(currency),
+                }"
+                :disable="!isNotEuro(currency)"
+                v-model="row.foreignValue"
+                dense
+                borderless
+                hide-bottom-space
+            />
+        </template> -->
+        <template #column-footer-amount>
+            <QChip
+                dense
+                :color="noMatch ? 'negative' : 'transparent'"
+                class="q-pa-xs"
+                :title="noMatch ? t('invoiceIn.noMatch', { totalTaxableBase }) : ''"
             >
-                <template #body-cell-duedate="{ row }">
-                    <QTd>
-                        <VnInputDate v-model="row.dueDated" />
-                    </QTd>
-                </template>
-                <template #body-cell-bank="{ row, col }">
-                    <QTd>
-                        <VnSelect
-                            v-model="row[col.model]"
-                            :url="col.url"
-                            :option-label="col.optionLabel"
-                            :option-value="col.optionValue"
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{
-                                            `${scope.opt.id}: ${scope.opt.bank}`
-                                        }}</QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelect>
-                    </QTd>
-                </template>
-                <template #body-cell-amount="{ row }">
-                    <QTd>
-                        <VnInputNumber
-                            v-model="row.amount"
-                            :is-outlined="false"
-                            clearable
-                            clear-icon="close"
-                        />
-                    </QTd>
-                </template>
-                <template #body-cell-foreignvalue="{ row }">
-                    <QTd>
-                        <VnInputNumber
-                            :class="{
-                                'no-pointer-events': !isNotEuro(currency),
-                            }"
-                            :disable="!isNotEuro(currency)"
-                            v-model="row.foreignValue"
-                        />
-                    </QTd>
-                </template>
-                <template #bottom-row>
-                    <QTr class="bg">
-                        <QTd />
-                        <QTd />
-                        <QTd />
-                        <QTd>
-                            <QChip
-                                dense
-                                :color="noMatch ? 'negative' : 'transparent'"
-                                class="q-pa-xs"
-                                :title="
-                                    noMatch
-                                        ? t('invoiceIn.noMatch', { totalTaxableBase })
-                                        : ''
-                                "
-                            >
-                                {{ toCurrency(totalAmount) }}
-                            </QChip>
-                        </QTd>
-                        <QTd>
-                            <template v-if="isNotEuro(invoiceIn.currency.code)">
-                                {{
-                                    getTotal(rows, 'foreignValue', {
-                                        currency: invoiceIn.currency.code,
-                                    })
-                                }}
-                            </template>
-                        </QTd>
-                    </QTr>
-                </template>
-                <template #item="props">
-                    <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
-                        <QCard>
-                            <QCardSection>
-                                <QCheckbox v-model="props.selected" dense />
-                            </QCardSection>
-                            <QSeparator />
-                            <QList>
-                                <QItem>
-                                    <VnInputDate
-                                        class="full-width"
-                                        :label="t('Date')"
-                                        v-model="props.row.dueDated"
-                                    />
-                                </QItem>
-                                <QItem>
-                                    <VnSelect
-                                        :label="t('Bank')"
-                                        class="full-width"
-                                        v-model="props.row['bankFk']"
-                                        url="Accountings"
-                                        option-label="bank"
-                                    >
-                                        <template #option="scope">
-                                            <QItem v-bind="scope.itemProps">
-                                                <QItemSection>
-                                                    <QItemLabel>{{
-                                                        `${scope.opt.id}: ${scope.opt.bank}`
-                                                    }}</QItemLabel>
-                                                </QItemSection>
-                                            </QItem>
-                                        </template>
-                                    </VnSelect>
-                                </QItem>
-                                <QItem>
-                                    <VnInputNumber
-                                        :label="t('Amount')"
-                                        class="full-width"
-                                        v-model="props.row.amount"
-                                    />
-                                </QItem>
-                                <QItem>
-                                    <VnInputNumber
-                                        :label="t('Foreign value')"
-                                        class="full-width"
-                                        :class="{
-                                            'no-pointer-events': !isNotEuro(currency),
-                                        }"
-                                        :disable="!isNotEuro(currency)"
-                                        v-model="props.row.foreignValue"
-                                        clearable
-                                        clear-icon="close"
-                                    />
-                                </QItem>
-                            </QList>
-                        </QCard>
-                    </div>
-                </template>
-            </QTable>
+                {{ toCurrency(totalAmount) }}
+            </QChip>
         </template>
-    </CrudModel>
-    <QPageSticky position="bottom-right" :offset="[25, 25]">
+        <template #column-footer-foreignValue>
+            <template v-if="isNotEuro(currency)">
+                {{
+                    getTotal(tableRows, 'foreignValue', {
+                        currency: currency,
+                    })
+                }}
+            </template>
+        </template>
+    </VnTable>
+    <QPageSticky :offset="[20, 20]" style="z-index: 2">
         <QBtn
-            color="primary"
-            icon="add"
-            v-shortcut="'+'"
-            size="lg"
-            round
             @click="
                 () => {
-                    if (!areRows) insert();
-                    else
-                        invoiceInFormRef.insert({
-                            amount: (totalTaxableBase - totalAmount).toFixed(2),
+                    if (!areRows) return insert();
+
+                    invoiceInDueDayTableRef.create = {
+                        urlCreate: 'InvoiceInDueDays',
+                        onDataSaved: () => invoiceInDueDayTableRef.reload(),
+                        title: t('Create due day'),
+                        formInitialData: {
                             invoiceInFk: invoiceId,
-                        });
+                            dueDated: Date.vnNew(),
+                            amount: (totalTaxableBase - totalAmount).toFixed(2),
+                        },
+                    };
+                    invoiceInDueDayTableRef.showForm = true;
                 }
             "
+            color="primary"
+            fab
+            icon="add"
+            v-shortcut="'+'"
+            data-cy="invoiceInDueDayAdd"
         />
+        <QTooltip class="text-no-wrap">
+            {{ t('Create due day') }}
+        </QTooltip>
     </QPageSticky>
 </template>
 <style lang="scss" scoped>
-.bg {
-    background-color: var(--vn-light-gray);
-}
-
 .q-chip {
     color: var(--vn-text-color);
 }
@@ -282,4 +212,6 @@ onBeforeMount(async () => await setTaxableBase());
         Bank: Caja
         Amount: Importe
         Foreign value: Divisa
+        invoiceIn.noMatch: El total {totalTaxableBase} no coincide con el importe
+        Create due day: Crear Vencimiento
 </i18n>