From 1166a7966985973a52e204eb842d95ee5b465fc1 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Tue, 26 Dec 2023 15:59:52 -0400
Subject: [PATCH 01/26] Fix order descriptor total

---
 src/pages/Order/Card/OrderDescriptor.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index 09c87f138..d9fa46471 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -10,6 +10,7 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import OrderDescriptorMenu from "pages/Order/Card/OrderDescriptorMenu.vue";
+import FetchData from "components/FetchData.vue";
 
 const $props = defineProps({
     id: {
@@ -60,9 +61,15 @@ const setData = (entity) => {
     data.value = useCardDescription(entity.client.name, entity.id);
     state.set('ClaimDescriptor', entity);
 };
+const total = ref(null);
 </script>
 
 <template>
+    <FetchData
+        :url="`Orders/${entityId}/getTotal`"
+        @on-fetch="(response) => (total = response)"
+        auto-load
+    />
     <CardDescriptor
         ref="descriptor"
         :url="`Orders/${entityId}`"
@@ -99,7 +106,7 @@ const setData = (entity) => {
             <VnLv :label="t('order.field.agency')" :value="entity?.agencyMode?.name" />
             <VnLv :label="t('order.summary.alias')" :value="entity?.address?.nickname" />
             <VnLv :label="t('order.summary.items')" :value="(entity?.rows?.length || 0).toString()" />
-            <VnLv :label="t('order.summary.total')" :value="toCurrency(entity?.total)" />
+            <VnLv :label="t('order.summary.total')" :value="toCurrency(total)" />
         </template>
         <template #actions="{ entity }">
             <QCardActions>

From b22fcddcd363a57e9b06b92b55e83cb9e49ecdf5 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Tue, 26 Dec 2023 17:45:54 -0400
Subject: [PATCH 02/26] Create order lines

---
 src/i18n/en/index.js           |   3 +-
 src/i18n/es/index.js           |   1 +
 src/pages/Order/OrderLines.vue | 253 +++++++++++++++++++++++++++++++++
 src/router/modules/order.js    |  11 +-
 4 files changed, 266 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/Order/OrderLines.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 45df3f1ff..2293cd76f 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -557,7 +557,8 @@ export default {
             summary: 'Summary',
             basicData: 'Basic Data',
             catalog: 'Catalog',
-            volume: 'Volume'
+            volume: 'Volume',
+            lines: 'Lines',
         },
         field: {
             salesPersonFk: 'Sales Person',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 90fdb18b6..5744dc682 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -467,6 +467,7 @@ export default {
             basicData: 'Datos básicos',
             catalog: 'Catálogo',
             volume: 'Volumen',
+            lines: 'Líneas',
         },
         field: {
             salesPersonFk: 'Comercial',
diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue
new file mode 100644
index 000000000..e014ed44a
--- /dev/null
+++ b/src/pages/Order/OrderLines.vue
@@ -0,0 +1,253 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import FetchData from 'components/FetchData.vue';
+import VnLv from 'components/ui/VnLv.vue';
+import { ref } from 'vue';
+import { toCurrency, toDate } from 'src/filters';
+import CardList from 'components/ui/CardList.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import { useSession } from 'composables/useSession';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+import axios from 'axios';
+import { useQuasar } from 'quasar';
+
+const route = useRoute();
+const { t } = useI18n();
+const session = useSession();
+const quasar = useQuasar();
+const token = session.getToken();
+const orderSummary = ref({
+    total: null,
+    vat: null,
+});
+const componentKey = ref(0);
+
+const refresh = () => {
+    componentKey.value += 1;
+};
+
+function confirmRemove(item) {
+    quasar.dialog({
+        component: VnConfirm,
+        componentProps: {
+            title: t('confirmDeletion'),
+            message: t('confirmDeletionMessage'),
+            promise: async () => remove(item),
+        },
+    });
+}
+
+async function remove(item) {
+    await axios.post('OrderRows/removes', {
+        actualOrderId: route.params.id,
+        rows: [item.id],
+    });
+    quasar.notify({
+        message: t('globals.dataDeleted'),
+        type: 'positive',
+    });
+    refresh();
+}
+</script>
+
+<template>
+    <FetchData
+        :key="componentKey"
+        :url="`Orders/${route.params.id}/getTotal`"
+        @on-fetch="(data) => (orderSummary.total = data)"
+        auto-load
+    />
+    <FetchData
+        :key="componentKey"
+        :url="`Orders/${route.params.id}/getVAT`"
+        @on-fetch="(data) => (orderSummary.vat = data)"
+        auto-load
+    />
+    <QPage :key="componentKey" class="column items-center q-pa-md">
+        <div class="card-list">
+            <QCard class="order-lines-summary q-pa-lg">
+                <p class="header text-right block">
+                    {{ t('summary') }}
+                </p>
+                <VnLv
+                    v-if="orderSummary.vat && orderSummary.total"
+                    :label="t('subtotal')"
+                    :value="toCurrency(orderSummary.total - orderSummary.vat)"
+                />
+                <VnLv
+                    v-if="orderSummary.vat"
+                    :label="t('VAT')"
+                    :value="toCurrency(orderSummary?.vat)"
+                />
+                <VnLv
+                    v-if="orderSummary.total"
+                    :label="t('total')"
+                    :value="toCurrency(orderSummary?.total)"
+                />
+            </QCard>
+            <VnPaginate
+                data-key="OrderLines"
+                url="OrderRows"
+                :limit="20"
+                auto-load
+                :filter="{
+                    include: [
+                        {
+                            relation: 'item',
+                        },
+                        {
+                            relation: 'warehouse',
+                        },
+                    ],
+                    where: { orderFk: route.params.id },
+                }"
+            >
+                <template #body="{ rows }">
+                    <div class="catalog-list q-mt-xl">
+                        <CardList
+                            v-for="row in rows"
+                            :key="row.id"
+                            :id="row.id"
+                            :title="row?.item?.name"
+                            class="cursor-inherit"
+                        >
+                            <template #title>
+                                <div class="flex items-center">
+                                    <div class="image-wrapper q-mr-md">
+                                        <QImg
+                                            :src="`/api/Images/catalog/50x50/${row?.item?.id}/download?access_token=${token}`"
+                                            spinner-color="primary"
+                                            :ratio="1"
+                                            height="50"
+                                            width="50"
+                                            class="image"
+                                        />
+                                    </div>
+                                    <div
+                                        class="title text-primary text-weight-bold text-h5"
+                                    >
+                                        {{ row?.item?.name }}
+                                    </div>
+                                    <QChip class="q-chip-color" outline size="sm">
+                                        {{ t('ID') }}: {{ row.id }}
+                                    </QChip>
+                                </div>
+                            </template>
+                            <template #list-items>
+                                <div class="q-mb-sm">
+                                    <span class="text-uppercase">
+                                        {{ row.item.subName }}
+                                    </span>
+                                    <fetched-tags :item="row.item" :max-length="5" />
+                                </div>
+                                <VnLv :label="t('item')" :value="row.item.id" />
+                                <VnLv
+                                    :label="t('warehouse')"
+                                    :value="row.warehouse.name"
+                                />
+                                <VnLv
+                                    :label="t('shipped')"
+                                    :value="toDate(row.shipped)"
+                                />
+                                <VnLv :label="t('quantity')" :value="row.quantity" />
+                                <VnLv
+                                    :label="t('price')"
+                                    :value="toCurrency(row.price)"
+                                />
+                                <VnLv
+                                    :label="t('amount')"
+                                    :value="toCurrency(row.price * row.quantity)"
+                                />
+                            </template>
+                            <template #actions>
+                                <QBtn
+                                    :label="t('remove')"
+                                    @click.stop="confirmRemove(row)"
+                                    color="primary"
+                                    style="margin-top: 15px"
+                                />
+                            </template>
+                        </CardList>
+                    </div>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+</template>
+<style lang="scss">
+.order-lines-summary {
+    .vn-label-value {
+        display: flex;
+        justify-content: flex-end;
+        gap: 2%;
+
+        .label {
+            color: var(--vn-label);
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+
+        .value {
+            overflow: hidden;
+            text-overflow: ellipsis;
+            white-space: nowrap;
+        }
+    }
+}
+</style>
+<style lang="scss" scoped>
+.card-list {
+    width: 100%;
+    max-width: 60em;
+}
+
+.header {
+    color: $primary;
+    font-weight: bold;
+    margin-bottom: 25px;
+    font-size: 20px;
+    display: inline-block;
+}
+
+.image-wrapper {
+    height: 50px;
+    width: 50px;
+
+    .image {
+        border-radius: 50%;
+    }
+}
+</style>
+<i18n>
+en:
+    summary: Summary
+    subtotal: Subtotal
+    VAT: VAT
+    total: Total
+    item: Item
+    warehouse: Warehouse
+    shipped: Shipped
+    quantity: Quantity
+    price: Price
+    amount: Amount
+    remove: Remove
+    confirmDeletion: Confirm deletion,
+    confirmDeletionMessage: Are you sure you want to delete this item?
+es:
+    summary: Resumen
+    subtotal: Subtotal
+    VAT: IVA
+    total: Total
+    item: Artículo
+    warehouse: Almacén
+    shipped: F. envío
+    quantity: Cantidad
+    price: Precio
+    amount: Importe
+    remove: Eliminar
+    confirmDeletion: Confirmar eliminación,
+    confirmDeletionMessage: Seguro que quieres eliminar este artículo?
+</i18n>
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
index 8a55a39d2..4599394cd 100644
--- a/src/router/modules/order.js
+++ b/src/router/modules/order.js
@@ -11,7 +11,7 @@ export default {
     redirect: { name: 'OrderMain' },
     menus: {
         main: ['OrderList'],
-        card: ['OrderBasicData', 'OrderCatalog', 'OrderVolume'],
+        card: ['OrderBasicData', 'OrderCatalog', 'OrderVolume', 'OrderLines'],
     },
     children: [
         {
@@ -81,6 +81,15 @@ export default {
                     },
                     component: () => import('src/pages/Order/OrderVolume.vue'),
                 },
+                {
+                    name: 'OrderLines',
+                    path: 'line',
+                    meta: {
+                        title: 'lines',
+                        icon: 'vn:lines',
+                    },
+                    component: () => import('src/pages/Order/OrderLines.vue'),
+                },
             ],
         },
     ],

From e3fd9bf54b720e2967266a60649d959fcbf2a84c Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Wed, 27 Dec 2023 07:52:47 -0400
Subject: [PATCH 03/26] Add order confirmation

---
 src/pages/Order/OrderLines.vue | 26 +++++++++++++++++++++++---
 1 file changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue
index e014ed44a..38ed8f9b0 100644
--- a/src/pages/Order/OrderLines.vue
+++ b/src/pages/Order/OrderLines.vue
@@ -50,6 +50,14 @@ async function remove(item) {
     });
     refresh();
 }
+
+async function confirmOrder() {
+    await axios.post(`Orders/${route.params.id}/confirm`);
+    quasar.notify({
+        message: t('globals.confirm'),
+        type: 'positive',
+    });
+}
 </script>
 
 <template>
@@ -137,12 +145,12 @@ async function remove(item) {
                             </template>
                             <template #list-items>
                                 <div class="q-mb-sm">
-                                    <span class="text-uppercase">
+                                    <span class="text-uppercase subname">
                                         {{ row.item.subName }}
                                     </span>
                                     <fetched-tags :item="row.item" :max-length="5" />
                                 </div>
-                                <VnLv :label="t('item')" :value="row.item.id" />
+                                <VnLv :label="t('item')" :value="String(row.item.id)" />
                                 <VnLv
                                     :label="t('warehouse')"
                                     :value="row.warehouse.name"
@@ -151,7 +159,7 @@ async function remove(item) {
                                     :label="t('shipped')"
                                     :value="toDate(row.shipped)"
                                 />
-                                <VnLv :label="t('quantity')" :value="row.quantity" />
+                                <VnLv :label="t('quantity')" :value="String(row.quantity)" />
                                 <VnLv
                                     :label="t('price')"
                                     :value="toCurrency(row.price)"
@@ -174,6 +182,12 @@ async function remove(item) {
                 </template>
             </VnPaginate>
         </div>
+        <QPageSticky :offset="[20, 20]">
+            <QBtn fab icon="check" color="primary" @click="confirmOrder()" />
+            <QTooltip>
+                {{ t('confirm') }}
+            </QTooltip>
+        </QPageSticky>
     </QPage>
 </template>
 <style lang="scss">
@@ -220,6 +234,10 @@ async function remove(item) {
         border-radius: 50%;
     }
 }
+
+.subname {
+    color: var(--vn-label);
+}
 </style>
 <i18n>
 en:
@@ -236,6 +254,7 @@ en:
     remove: Remove
     confirmDeletion: Confirm deletion,
     confirmDeletionMessage: Are you sure you want to delete this item?
+    confirm: Confirm
 es:
     summary: Resumen
     subtotal: Subtotal
@@ -250,4 +269,5 @@ es:
     remove: Eliminar
     confirmDeletion: Confirmar eliminación,
     confirmDeletionMessage: Seguro que quieres eliminar este artículo?
+    confirm: Confirmar
 </i18n>

From 4de1b52c30c51b6ed79e56d5c849b747ad042fef Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Wed, 27 Dec 2023 08:08:19 -0400
Subject: [PATCH 04/26] Implement orders no results

---
 src/i18n/en/index.js             |  1 +
 src/i18n/es/index.js             |  1 +
 src/pages/Order/OrderCatalog.vue | 12 +++++++++++-
 src/pages/Order/OrderLines.vue   | 17 +++++++++++++++--
 src/pages/Order/OrderVolume.vue  | 20 +++++++++++++++-----
 5 files changed, 43 insertions(+), 8 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 2293cd76f..b18c00325 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -63,6 +63,7 @@ export default {
         selectRows: 'Select all { numberRows } row(s)',
         allRows: 'All { numberRows } row(s)',
         markAll: 'Mark all',
+        noResults: 'No results'
     },
     errors: {
         statusUnauthorized: 'Access denied',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 5744dc682..0c3a747c6 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -63,6 +63,7 @@ export default {
         selectRows: 'Seleccionar las { numberRows } filas(s)',
         allRows: 'Todo { numberRows } filas(s)',
         markAll: 'Marcar todo',
+        noResults: 'Sin resultados'
     },
     errors: {
         statusUnauthorized: 'Acceso denegado',
diff --git a/src/pages/Order/OrderCatalog.vue b/src/pages/Order/OrderCatalog.vue
index ec81c50f1..08075260c 100644
--- a/src/pages/Order/OrderCatalog.vue
+++ b/src/pages/Order/OrderCatalog.vue
@@ -70,6 +70,9 @@ function exprBuilder(param, value) {
             >
                 <template #body="{ rows }">
                     <div class="catalog-list">
+                        <div v-if="rows && !rows?.length" class="no-result">
+                            {{ t('globals.noResults') }}
+                        </div>
                         <OrderCatalogItem v-for="row in rows" :key="row.id" :item="row" />
                     </div>
                 </template>
@@ -78,7 +81,7 @@ function exprBuilder(param, value) {
     </QPage>
 </template>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .card-list {
     width: 100%;
 }
@@ -90,4 +93,11 @@ function exprBuilder(param, value) {
     justify-content: center;
     gap: 16px;
 }
+
+.no-result {
+    font-size: 24px;
+    font-weight: bold;
+    color: var(--vn-label);
+    text-align: center;
+}
 </style>
diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue
index 38ed8f9b0..316c9ae3f 100644
--- a/src/pages/Order/OrderLines.vue
+++ b/src/pages/Order/OrderLines.vue
@@ -75,7 +75,10 @@ async function confirmOrder() {
     />
     <QPage :key="componentKey" class="column items-center q-pa-md">
         <div class="card-list">
-            <QCard class="order-lines-summary q-pa-lg">
+            <div v-if="!orderSummary.total" class="no-result">
+                {{ t('globals.noResults') }}
+            </div>
+            <QCard v-else class="order-lines-summary q-pa-lg">
                 <p class="header text-right block">
                     {{ t('summary') }}
                 </p>
@@ -159,7 +162,10 @@ async function confirmOrder() {
                                     :label="t('shipped')"
                                     :value="toDate(row.shipped)"
                                 />
-                                <VnLv :label="t('quantity')" :value="String(row.quantity)" />
+                                <VnLv
+                                    :label="t('quantity')"
+                                    :value="String(row.quantity)"
+                                />
                                 <VnLv
                                     :label="t('price')"
                                     :value="toCurrency(row.price)"
@@ -238,6 +244,13 @@ async function confirmOrder() {
 .subname {
     color: var(--vn-label);
 }
+
+.no-result {
+    font-size: 24px;
+    font-weight: bold;
+    color: var(--vn-label);
+    text-align: center;
+}
 </style>
 <i18n>
 en:
diff --git a/src/pages/Order/OrderVolume.vue b/src/pages/Order/OrderVolume.vue
index 2c962600e..48d91574b 100644
--- a/src/pages/Order/OrderVolume.vue
+++ b/src/pages/Order/OrderVolume.vue
@@ -34,14 +34,17 @@ const loadVolumes = async (rows) => {
     />
     <QPage class="column items-center q-pa-md">
         <div class="card-list">
-            <QCard class="order-volume-summary q-pa-lg">
+            <div
+                v-if="!volumeSummary?.totalVolume && !volumeSummary?.totalBoxes"
+                class="no-result"
+            >
+                {{ t('globals.noResults') }}
+            </div>
+            <QCard v-else class="order-volume-summary q-pa-lg">
                 <p class="header text-right block">
                     {{ t('summary') }}
                 </p>
-                <VnLv
-                    :label="t('total')"
-                    :value="`${volumeSummary?.totalVolume} m³`"
-                />
+                <VnLv :label="t('total')" :value="`${volumeSummary?.totalVolume} m³`" />
                 <VnLv
                     :label="t('boxes')"
                     :value="`${dashIfEmpty(volumeSummary?.totalBoxes)} U`"
@@ -128,6 +131,13 @@ const loadVolumes = async (rows) => {
     font-size: 20px;
     display: inline-block;
 }
+
+.no-result {
+    font-size: 24px;
+    font-weight: bold;
+    color: var(--vn-label);
+    text-align: center;
+}
 </style>
 <i18n>
 en:

From 677660f5ccae7d5b1192681a686e1aa78cc630bf Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Tue, 2 Jan 2024 06:54:15 -0500
Subject: [PATCH 05/26] Se hacen maquetado general de menu izquierdo en summary
 de clientes

---
 src/i18n/en/index.js                          |  15 +-
 src/i18n/es/index.js                          |  15 +-
 src/pages/Customer/Card/CustomerBalance.vue   |   3 +
 .../Customer/Card/CustomerBillingData.vue     |   3 +
 .../Customer/Card/CustomerConsignees.vue      |   3 +
 .../Card/CustomerCreditManagement.vue         |   3 +
 src/pages/Customer/Card/CustomerCredits.vue   |   3 +
 .../Customer/Card/CustomerFiscalData.vue      |   3 +
 src/pages/Customer/Card/CustomerGreuges.vue   |   3 +
 src/pages/Customer/Card/CustomerLog.vue       |   3 +
 src/pages/Customer/Card/CustomerNotes.vue     |   3 +
 src/pages/Customer/Card/CustomerOthers.vue    |   3 +
 .../Customer/Card/CustomerRecoveries.vue      |   3 +
 src/pages/Customer/Card/CustomerSms.vue       |   3 +
 src/pages/Customer/Card/CustomerWebAccess.vue |   3 +
 .../CustomerExtendedListFilter.vue            |   5 -
 src/router/modules/customer.js                | 143 +++++++++++++++++-
 17 files changed, 209 insertions(+), 8 deletions(-)
 create mode 100644 src/pages/Customer/Card/CustomerBalance.vue
 create mode 100644 src/pages/Customer/Card/CustomerBillingData.vue
 create mode 100644 src/pages/Customer/Card/CustomerConsignees.vue
 create mode 100644 src/pages/Customer/Card/CustomerCreditManagement.vue
 create mode 100644 src/pages/Customer/Card/CustomerCredits.vue
 create mode 100644 src/pages/Customer/Card/CustomerFiscalData.vue
 create mode 100644 src/pages/Customer/Card/CustomerGreuges.vue
 create mode 100644 src/pages/Customer/Card/CustomerLog.vue
 create mode 100644 src/pages/Customer/Card/CustomerNotes.vue
 create mode 100644 src/pages/Customer/Card/CustomerOthers.vue
 create mode 100644 src/pages/Customer/Card/CustomerRecoveries.vue
 create mode 100644 src/pages/Customer/Card/CustomerSms.vue
 create mode 100644 src/pages/Customer/Card/CustomerWebAccess.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 65e8c4cf2..6904353da 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -116,7 +116,20 @@ export default {
             defaulter: 'Defaulter',
             createCustomer: 'Create customer',
             summary: 'Summary',
-            basicData: 'Basic Data',
+            basicData: 'Basic data',
+            fiscalData: 'Fiscal data',
+            billingData: 'Billing data',
+            consignees: 'Consignees',
+            notes: 'Notes',
+            credits: 'Credits',
+            greuges: 'Greuges',
+            balance: 'Balance',
+            recoveries: 'Recoveries',
+            webAccess: 'Web access',
+            log: 'Log',
+            sms: 'Sms',
+            creditManagement: 'Credit management',
+            others: 'Other',
         },
         list: {
             phone: 'Phone',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index ed658c87c..59bf0027b 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -115,8 +115,21 @@ export default {
             notifications: 'Notificaciones',
             defaulter: 'Morosos',
             createCustomer: 'Crear cliente',
-            basicData: 'Datos básicos',
             summary: 'Resumen',
+            basicData: 'Datos básicos',
+            fiscalData: 'Datos fiscales',
+            billingData: 'Forma de pago',
+            consignees: 'Consignatarios',
+            notes: 'Notas',
+            credits: 'Créditos',
+            greuges: 'Greuges',
+            balance: 'Balance',
+            recoveries: 'Recobros',
+            webAccess: 'Acceso web',
+            log: 'Historial',
+            sms: 'Sms',
+            creditManagement: 'Gestión de crédito',
+            others: 'Otros',
         },
         list: {
             phone: 'Teléfono',
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
new file mode 100644
index 000000000..9e44f67f5
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Balance</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
new file mode 100644
index 000000000..c14f3b499
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Billing data</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerConsignees.vue b/src/pages/Customer/Card/CustomerConsignees.vue
new file mode 100644
index 000000000..bab2bd1ff
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerConsignees.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Consignees</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerCreditManagement.vue b/src/pages/Customer/Card/CustomerCreditManagement.vue
new file mode 100644
index 000000000..fe24ddfd0
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerCreditManagement.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Credit management</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerCredits.vue b/src/pages/Customer/Card/CustomerCredits.vue
new file mode 100644
index 000000000..e8a4c3b48
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerCredits.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Credits</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
new file mode 100644
index 000000000..ced6012b8
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Fiscal data</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
new file mode 100644
index 000000000..d322e04a5
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Greuges</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerLog.vue b/src/pages/Customer/Card/CustomerLog.vue
new file mode 100644
index 000000000..fe59bf2dc
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerLog.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Log</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerNotes.vue b/src/pages/Customer/Card/CustomerNotes.vue
new file mode 100644
index 000000000..65ade2903
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerNotes.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Notes</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerOthers.vue b/src/pages/Customer/Card/CustomerOthers.vue
new file mode 100644
index 000000000..bd4729cab
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerOthers.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Others</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerRecoveries.vue b/src/pages/Customer/Card/CustomerRecoveries.vue
new file mode 100644
index 000000000..54274717c
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerRecoveries.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Recoveries</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerSms.vue b/src/pages/Customer/Card/CustomerSms.vue
new file mode 100644
index 000000000..fa4a34e30
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerSms.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Sms</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
new file mode 100644
index 000000000..95ec77c3d
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Web access</div>
+</template>
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
index a4d26a78a..3a9cebc96 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
@@ -565,12 +565,7 @@ const shouldRenderColumn = (colName) => {
 </style>
 
 <i18n>
-<<<<<<< HEAD:src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
 es:
     Identifier: Identificador
-=======
-
-es:
->>>>>>> dev:src/pages/Customer/CustomerExtendedListFilter.vue
     Social name: Razón social
 </i18n>
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 51511bcbf..a79ab8a6b 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -17,7 +17,22 @@ export default {
             'CustomerNotifications',
             'CustomerDefaulter',
         ],
-        card: ['CustomerBasicData'],
+        card: [
+            'CustomerBasicData',
+            'CustomerFiscalData',
+            'CustomerBillingData',
+            'CustomerConsignees',
+            'CustomerNotes',
+            'CustomerCredits',
+            'CustomerGreuges',
+            'CustomerBalance',
+            'CustomerRecoveries',
+            'CustomerWebAccess',
+            'CustomerLog',
+            'CustomerSms',
+            'CustomerCreditManagement',
+            'CustomerOthers',
+        ],
     },
     children: [
         {
@@ -115,6 +130,132 @@ export default {
                     component: () =>
                         import('src/pages/Customer/Card/CustomerBasicData.vue'),
                 },
+                {
+                    path: 'fiscal-data',
+                    name: 'CustomerFiscalData',
+                    meta: {
+                        title: 'fiscalData',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerFiscalData.vue'),
+                },
+                {
+                    path: 'billing-data',
+                    name: 'CustomerBillingData',
+                    meta: {
+                        title: 'billingData',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerBillingData.vue'),
+                },
+                {
+                    path: 'consignees',
+                    name: 'CustomerConsignees',
+                    meta: {
+                        title: 'consignees',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerConsignees.vue'),
+                },
+                {
+                    path: 'notes',
+                    name: 'CustomerNotes',
+                    meta: {
+                        title: 'notes',
+                        icon: 'vn:settings',
+                    },
+                    component: () => import('src/pages/Customer/Card/CustomerNotes.vue'),
+                },
+                {
+                    path: 'credits',
+                    name: 'CustomerCredits',
+                    meta: {
+                        title: 'credits',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerCredits.vue'),
+                },
+                {
+                    path: 'greuges',
+                    name: 'CustomerGreuges',
+                    meta: {
+                        title: 'greuges',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerGreuges.vue'),
+                },
+                {
+                    path: 'balance',
+                    name: 'CustomerBalance',
+                    meta: {
+                        title: 'balance',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerBalance.vue'),
+                },
+                {
+                    path: 'recoveries',
+                    name: 'CustomerRecoveries',
+                    meta: {
+                        title: 'recoveries',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerRecoveries.vue'),
+                },
+                {
+                    path: 'web-access',
+                    name: 'CustomerWebAccess',
+                    meta: {
+                        title: 'webAccess',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerWebAccess.vue'),
+                },
+                {
+                    path: 'log',
+                    name: 'CustomerLog',
+                    meta: {
+                        title: 'log',
+                        icon: 'vn:settings',
+                    },
+                    component: () => import('src/pages/Customer/Card/CustomerLog.vue'),
+                },
+                {
+                    path: 'sms',
+                    name: 'CustomerSms',
+                    meta: {
+                        title: 'sms',
+                        icon: 'vn:settings',
+                    },
+                    component: () => import('src/pages/Customer/Card/CustomerSms.vue'),
+                },
+                {
+                    path: 'credit-management',
+                    name: 'CustomerCreditManagement',
+                    meta: {
+                        title: 'creditManagement',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Card/CustomerCreditManagement.vue'),
+                },
+                {
+                    path: 'others',
+                    name: 'CustomerOthers',
+                    meta: {
+                        title: 'others',
+                        icon: 'vn:settings',
+                    },
+                    component: () => import('src/pages/Customer/Card/CustomerOthers.vue'),
+                },
             ],
         },
     ],

From 606f4f08920289aebb569bfda030f2bd57b706ab Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Tue, 2 Jan 2024 11:40:07 -0400
Subject: [PATCH 06/26] Implement orders catalog tag filter

---
 src/components/ui/VnFilterPanel.vue         |   3 +-
 src/pages/Order/Card/OrderCatalogFilter.vue | 171 ++++++++++++++++++--
 src/pages/Order/OrderCatalog.vue            |  22 ++-
 3 files changed, 183 insertions(+), 13 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 6f6183224..a138e0b64 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -41,7 +41,7 @@ const props = defineProps({
     },
 });
 
-const emit = defineEmits(['refresh', 'clear', 'search', 'init']);
+const emit = defineEmits(['refresh', 'clear', 'search', 'init', 'remove']);
 
 const arrayData = useArrayData(props.dataKey, {
     exprBuilder: props.exprBuilder,
@@ -116,6 +116,7 @@ const tags = computed(() => {
 async function remove(key) {
     userParams.value[key] = null;
     await search();
+    emit('remove', key)
 }
 
 function formatValue(value) {
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 46de63abd..00606d57c 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -6,6 +6,7 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import axios from 'axios';
 import { useRoute } from 'vue-router';
+import VnInput from 'components/common/VnInput.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -14,6 +15,10 @@ const props = defineProps({
         type: String,
         required: true,
     },
+    tags: {
+        type: Array,
+        required: true,
+    },
 });
 
 const categoryList = ref(null);
@@ -21,16 +26,27 @@ const selectedCategoryFk = ref(null);
 const typeList = ref(null);
 const selectedTypeFk = ref(null);
 
-const selectCategory = (params, category) => {
+const resetCategory = () => {
+    selectedCategoryFk.value = null;
+    typeList.value = null;
+};
+
+const clearFilter = (key) => {
+    if (key === 'categoryFk') {
+        resetCategory();
+    }
+};
+
+const selectCategory = (params, category, search) => {
     if (params.categoryFk === category?.id) {
-        selectedCategoryFk.value = null;
+        resetCategory();
         params.categoryFk = null;
-        typeList.value = null;
     } else {
         selectedCategoryFk.value = category?.id;
         params.categoryFk = category?.id;
         loadTypes(category?.id);
     }
+    search();
 };
 
 const loadTypes = async (categoryFk) => {
@@ -67,6 +83,27 @@ function exprBuilder(param, value) {
             return { [param]: value };
     }
 }
+
+const selectedTag = ref(null);
+const tagValues = ref([{}]);
+const tagOptions = ref(null);
+
+const applyTagFilter = (params, search) => {
+    if (!tagValues.value?.length) {
+        params.tagGroups = null;
+        search();
+        return;
+    }
+    params.tagGroups = JSON.stringify({
+        values: tagValues.value,
+        tagSelection: {
+            ...selectedTag.value,
+            orgShowField: selectedTag.value.name,
+        },
+        tagFk: selectedTag.value.tagFk,
+    });
+    search();
+};
 </script>
 
 <template>
@@ -87,13 +124,19 @@ function exprBuilder(param, value) {
     />
     <VnFilterPanel
         :data-key="props.dataKey"
-        :search-button="true"
         :hidden-tags="['orderFk', 'orderBy']"
         :expr-builder="exprBuilder"
         @init="onFilterInit"
+        @remove="clearFilter"
     >
         <template #tags="{ tag, formatFn }">
-            <strong v-if="tag.label === 'categoryFk'">
+            <div v-if="tag.label === 'tagGroups'">
+                <strong>
+                    {{ JSON.parse(tag?.value).tagSelection?.name  }}:
+                </strong>
+                <span>{{ (JSON.parse(tag?.value).values || []).map(item => item.value).join(' | ') }}</span>
+            </div>
+            <strong v-else-if="tag.label === 'categoryFk'">
                 {{ t(selectedCategory?.name || '') }}
             </strong>
             <strong v-else-if="tag.label === 'typeFk'">
@@ -104,8 +147,8 @@ function exprBuilder(param, value) {
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params }">
-            <QList dense>
+        <template #body="{ params, searchFn }">
+            <QList dense style="max-width: 256px">
                 <QItem class="category-filter q-mt-md">
                     <div
                         v-for="category in categoryList"
@@ -118,7 +161,7 @@ function exprBuilder(param, value) {
                         <QIcon
                             :name="category.icon"
                             class="category-icon"
-                            @click="selectCategory(params, category)"
+                            @click="selectCategory(params, category, searchFn)"
                         >
                             <QTooltip>
                                 {{ t(category.name) }}
@@ -126,7 +169,7 @@ function exprBuilder(param, value) {
                         </QIcon>
                     </div>
                 </QItem>
-                <QItem class="q-mt-md">
+                <QItem class="q-my-md">
                     <QItemSection>
                         <VnSelectFilter
                             :label="t('params.type')"
@@ -140,7 +183,12 @@ function exprBuilder(param, value) {
                             emit-value
                             use-input
                             :disable="!selectedCategoryFk"
-                            @update:model-value="(value) => (selectedTypeFk = value)"
+                            @update:model-value="
+                                (value) => {
+                                    selectedTypeFk = value;
+                                    searchFn();
+                                }
+                            "
                         >
                             <template #option="{ itemProps, opt }">
                                 <QItem v-bind="itemProps">
@@ -155,6 +203,88 @@ function exprBuilder(param, value) {
                         </VnSelectFilter>
                     </QItemSection>
                 </QItem>
+                <QSeparator />
+                <QItem class="q-mt-md">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="t('params.tag')"
+                            v-model="selectedTag"
+                            :options="props.tags || []"
+                            option-value="id"
+                            option-label="name"
+                            dense
+                            outlined
+                            rounded
+                            :emit-value="false"
+                            use-input
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem
+                    v-for="(value, index) in tagValues"
+                    :key="value"
+                    class="q-mt-md filter-value"
+                >
+                    <VnInput
+                        v-if="selectedTag?.isFree"
+                        v-model="value.value"
+                        :label="t('params.value')"
+                        is-outlined
+                        class="filter-input"
+                    />
+                    <VnSelectFilter
+                        v-else
+                        :label="t('params.value')"
+                        v-model="value.value"
+                        :options="tagOptions || []"
+                        option-value="value"
+                        option-label="value"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        use-input
+                        :disable="!selectedTag"
+                        class="filter-input"
+                    />
+
+                    <FetchData
+                        v-if="selectedTag && !selectedTag.isFree"
+                        :url="`Tags/${selectedTag?.id}/filterValue`"
+                        limit="30"
+                        auto-load
+                        @on-fetch="(data) => (tagOptions = data)"
+                    />
+
+                    <QIcon
+                        name="delete"
+                        class="filter-icon"
+                        @click="(tagValues || []).splice(index, 1)"
+                    />
+                </QItem>
+                <QItem class="q-mt-lg">
+                    <QIcon
+                        name="add_circle"
+                        class="filter-icon"
+                        @click="tagValues.push({})"
+                    />
+                </QItem>
+                <QItem>
+                    <QItemSection class="q-py-sm">
+                        <QBtn
+                            :label="t('Search')"
+                            class="full-width"
+                            color="primary"
+                            dense
+                            icon="search"
+                            rounded
+                            type="button"
+                            unelevated
+                            @click.stop="applyTagFilter(params, searchFn)"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QSeparator />
             </QList>
         </template>
     </VnFilterPanel>
@@ -188,6 +318,23 @@ function exprBuilder(param, value) {
         cursor: pointer;
     }
 }
+
+.filter-icon {
+    font-size: 24px;
+    color: $primary;
+    padding: 0 4px;
+    cursor: pointer;
+}
+
+.filter-input {
+    flex-shrink: 1;
+    min-width: 0;
+}
+
+.filter-value {
+    display: flex;
+    align-items: center;
+}
 </style>
 
 <i18n>
@@ -195,10 +342,14 @@ en:
     params:
         type: Type
         orderBy: Order By
+        tag: Tag
+        value: Value
 es:
     params:
         type: Tipo
         orderBy: Ordenar por
+        tag: Etiqueta
+        value: Valor
     Plant: Planta
     Flower: Flor
     Handmade: Confección
diff --git a/src/pages/Order/OrderCatalog.vue b/src/pages/Order/OrderCatalog.vue
index 08075260c..4741f64e6 100644
--- a/src/pages/Order/OrderCatalog.vue
+++ b/src/pages/Order/OrderCatalog.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import { useRoute } from 'vue-router';
-import { onMounted, onUnmounted } from 'vue';
+import {onMounted, onUnmounted, ref} from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
@@ -20,12 +20,29 @@ const catalogParams = {
     orderBy: JSON.stringify({ field: 'relevancy DESC, name', way: 'ASC', isTag: false }),
 };
 
+const tags = ref([])
+
 function exprBuilder(param, value) {
     switch (param) {
         case 'search':
             return { 'i.name': { like: `%${value}%` } };
     }
 }
+
+function extractTags(items) {
+    const resultTags = [];
+    (items || []).forEach((item) => {
+        (item.tags || []).forEach((tag) => {
+            const index = resultTags.findIndex((item) => item.tagFk === tag.tagFk);
+            if (index === -1) {
+                resultTags.push({ ...tag, priority: 1 });
+            } else {
+                resultTags[index].priority += 1;
+            }
+        });
+    });
+    tags.value = resultTags
+}
 </script>
 
 <template>
@@ -56,7 +73,7 @@ function exprBuilder(param, value) {
     </Teleport>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
-            <OrderCatalogFilter data-key="OrderCatalogList" />
+            <OrderCatalogFilter data-key="OrderCatalogList" :tags="tags" />
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
@@ -67,6 +84,7 @@ function exprBuilder(param, value) {
                 :limit="50"
                 :user-params="catalogParams"
                 auto-load
+                @on-fetch="extractTags"
             >
                 <template #body="{ rows }">
                     <div class="catalog-list">

From 24fdc1ff979e2d19a4eda38a2d155867a9fb7dd0 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 3 Jan 2024 10:56:13 -0300
Subject: [PATCH 07/26] wip

---
 src/components/common/TableVisibleColumns.vue | 47 +++++++++++++-----
 src/filters/dateRange.js                      |  8 +++
 src/filters/index.js                          |  2 +
 .../CustomerExtendedListFilter.vue            | 49 ++++++++++++++++++-
 src/pages/Travel/ExtraCommunityFilter.vue     |  2 +-
 5 files changed, 94 insertions(+), 14 deletions(-)
 create mode 100644 src/filters/dateRange.js

diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
index 94e3bfbc7..663a7bb93 100644
--- a/src/components/common/TableVisibleColumns.vue
+++ b/src/components/common/TableVisibleColumns.vue
@@ -43,17 +43,17 @@ const areAllChecksMarked = computed(() => {
 });
 
 const setUserConfigViewData = (data) => {
-    initialUserConfigViewData.value = data;
-    if (data.length === 0) return;
-    formattedCols.value = $props.allColumns.map((col) => {
-        // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
-        const obj = {
-            name: col,
-            active: data[0].configuration[col],
-        };
-        return obj;
-    });
-    emitSavedConfig();
+    // initialUserConfigViewData.value = data;
+    // if (data.length === 0) return;
+    // formattedCols.value = $props.allColumns.map((col) => {
+    //     // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
+    //     const obj = {
+    //         name: col,
+    //         active: data[0].configuration[col],
+    //     };
+    //     return obj;
+    // });
+    // emitSavedConfig();
 };
 
 const toggleMarkAll = (val) => {
@@ -80,6 +80,22 @@ const saveConfig = async () => {
         console.error('Error saving user view config');
     }
 };
+
+const setDefaultViewConfig = (data) => {
+    initialUserConfigViewData.value = data;
+    if (data.length === 0) return;
+    formattedCols.value = $props.allColumns.map((col) => {
+        // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
+        const obj = {
+            name: col,
+            active: data[0].columns[col],
+        };
+        return obj;
+    });
+    console.log('formattedCols:: ', formattedCols);
+    emitSavedConfig();
+};
+
 const emitSavedConfig = () => {
     const filteredCols = formattedCols.value.filter((col) => col.active);
     const mappedCols = filteredCols.map((col) => col.name);
@@ -87,12 +103,19 @@ const emitSavedConfig = () => {
 };
 </script>
 <template>
-    <fetch-data
+    <!-- <fetch-data
         v-if="user"
         url="UserConfigViews"
         :filter="userConfigFilter"
         @on-fetch="(data) => setUserConfigViewData(data)"
         auto-load
+    /> -->
+    <fetch-data
+        v-if="user"
+        url="DefaultViewConfigs"
+        :filter="{ where: { tableCode: tableCode } }"
+        @on-fetch="(data) => setDefaultViewConfig(data)"
+        auto-load
     />
     <QBtn color="primary" icon="view_column">
         <QPopupProxy ref="popupProxyRef">
diff --git a/src/filters/dateRange.js b/src/filters/dateRange.js
new file mode 100644
index 000000000..4c0cfe654
--- /dev/null
+++ b/src/filters/dateRange.js
@@ -0,0 +1,8 @@
+export default function dateRange(value) {
+    const minHour = new Date(value);
+    minHour.setHours(0, 0, 0, 0);
+    const maxHour = new Date(value);
+    maxHour.setHours(23, 59, 59, 59);
+
+    return [minHour, maxHour];
+}
diff --git a/src/filters/index.js b/src/filters/index.js
index b0c441641..f0120e663 100644
--- a/src/filters/index.js
+++ b/src/filters/index.js
@@ -7,6 +7,7 @@ import toCurrency from './toCurrency';
 import toPercentage from './toPercentage';
 import toLowerCamel from './toLowerCamel';
 import dashIfEmpty from './dashIfEmpty';
+import dateRange from './dateRange';
 
 export {
     toLowerCase,
@@ -18,4 +19,5 @@ export {
     toCurrency,
     toPercentage,
     dashIfEmpty,
+    dateRange,
 };
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
index 3a9cebc96..7d54aaf0a 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
@@ -7,6 +7,7 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import { dateRange } from 'src/filters';
 
 const props = defineProps({
     dataKey: {
@@ -32,6 +33,48 @@ const sageTransactionTypesOptions = ref([]);
 
 const visibleColumnsSet = computed(() => new Set(props.visibleColumns));
 
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'created':
+            return {
+                'c.created': {
+                    between: dateRange(value),
+                },
+            };
+        case 'id':
+        case 'name':
+        case 'socialName':
+        case 'fi':
+        case 'credit':
+        case 'creditInsurance':
+        case 'phone':
+        case 'mobile':
+        case 'street':
+        case 'city':
+        case 'postcode':
+        case 'email':
+        case 'isActive':
+        case 'isVies':
+        case 'isTaxDataChecked':
+        case 'isEqualizated':
+        case 'isFreezed':
+        case 'hasToInvoice':
+        case 'hasToInvoiceByAddress':
+        case 'isToBeMailed':
+        case 'hasSepaVnl':
+        case 'hasLcr':
+        case 'hasCoreVnl':
+        case 'countryFk':
+        case 'provinceFk':
+        case 'salesPersonFk':
+        case 'businessTypeFk':
+        case 'payMethodFk':
+        case 'sageTaxTypeFk':
+        case 'sageTransactionTypeFk':
+            return { [`c.${param}`]: value };
+    }
+};
+
 const shouldRenderColumn = (colName) => {
     return visibleColumnsSet.value.has(colName);
 };
@@ -88,7 +131,11 @@ const shouldRenderColumn = (colName) => {
         auto-load
         @on-fetch="(data) => (sageTransactionTypesOptions = data)"
     />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :expr-builder="exprBuilder"
+    >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong
diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index 73aa13ccf..260b0fb42 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { reactive, ref } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';

From a66b88ba8e8c27a7068916747215b5bef50bdb7f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 3 Jan 2024 10:59:11 -0300
Subject: [PATCH 08/26] add delete department popup translation

---
 src/components/ui/VnTree.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ui/VnTree.vue b/src/components/ui/VnTree.vue
index 23faf770f..637b18256 100644
--- a/src/components/ui/VnTree.vue
+++ b/src/components/ui/VnTree.vue
@@ -55,8 +55,8 @@ const fetchNodeLeaves = async (nodeKey) => {
 const removeNode = (node) => {
     quasar
         .dialog({
-            title: 'Are you sure you want to delete it?',
-            message: 'Delete department',
+            title: t('Are you sure you want to delete it?'),
+            message: t('Delete department'),
             ok: {
                 push: true,
                 color: 'primary',

From 54d77c98519feab2ba025d76bb43bf3a3eae063c Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Wed, 3 Jan 2024 10:02:14 -0400
Subject: [PATCH 09/26] Fix Icon sizing

---
 src/components/common/VnSelectCreate.vue    | 2 +-
 src/components/common/VnSelectFilter.vue    | 2 +-
 src/pages/Route/Cmr/CmrList.vue             | 2 +-
 src/pages/Supplier/Card/SupplierSummary.vue | 2 +-
 src/pages/Travel/Card/TravelSummary.vue     | 2 +-
 src/pages/Wagon/Type/WagonTypeCreate.vue    | 4 ++--
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/components/common/VnSelectCreate.vue b/src/components/common/VnSelectCreate.vue
index 0b5694ec5..bdc3f5cc8 100644
--- a/src/components/common/VnSelectCreate.vue
+++ b/src/components/common/VnSelectCreate.vue
@@ -49,7 +49,7 @@ const toggleForm = () => {
             <QIcon
                 @click.stop.prevent="toggleForm()"
                 name="add"
-                size="19px"
+                size="xs"
                 class="add-icon"
             />
             <QDialog v-model="showForm" transition-show="scale" transition-hide="scale">
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index a0605bbae..6da733c98 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -93,7 +93,7 @@ const value = computed({
                 name="close"
                 @click.stop="value = null"
                 class="cursor-pointer"
-                size="18px"
+                size="xs"
             />
         </template>
         <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index e9355eed0..dc5602c1c 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -150,7 +150,7 @@ function downloadPdfs() {
                                     <QIcon
                                         name="visibility"
                                         color="primary"
-                                        size="2em"
+                                        size="md"
                                         class="q-mr-sm q-ml-sm"
                                     />
                                     <QTooltip>
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index e9fbffe96..8f09b5510 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -53,7 +53,7 @@ const isAdministrative = computed(() => {
     >
         <template #header-left>
             <a v-if="isAdministrative" class="header link" :href="supplierUrl">
-                <QIcon name="open_in_new" color="white" size="25px" />
+                <QIcon name="open_in_new" color="white" size="sm" />
             </a>
         </template>
         <template #header>
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index c8a62ec00..3bc5f0584 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -195,7 +195,7 @@ const openEntryDescriptor = () => {};
     >
         <template #header-left>
             <a class="header link" :href="travelUrl">
-                <QIcon name="open_in_new" color="white" size="25px" />
+                <QIcon name="open_in_new" color="white" size="sm" />
             </a>
         </template>
         <template #header>
diff --git a/src/pages/Wagon/Type/WagonTypeCreate.vue b/src/pages/Wagon/Type/WagonTypeCreate.vue
index aa14e2cbf..bc9c1a40c 100644
--- a/src/pages/Wagon/Type/WagonTypeCreate.vue
+++ b/src/pages/Wagon/Type/WagonTypeCreate.vue
@@ -309,8 +309,8 @@ function exceedMaxHeight(pos) {
                     </div>
                 </div>
                 <div class="q-mb-sm wheels">
-                    <QIcon color="grey-6" name="trip_origin" size="3rem" />
-                    <QIcon color="grey-6" name="trip_origin" size="3rem" />
+                    <QIcon color="grey-6" name="trip_origin" size="xl" />
+                    <QIcon color="grey-6" name="trip_origin" size="xl" />
                 </div>
                 <QDialog
                     v-model="colorPickerActive"

From 2af176a502bff57c95f8e0ef2e0eed37c1458f69 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Wed, 3 Jan 2024 10:50:26 -0400
Subject: [PATCH 10/26] Fix catalog filter

---
 src/components/ui/VnFilterPanel.vue         |  3 +-
 src/pages/Order/Card/OrderCatalogFilter.vue | 32 ++++++++++++++++-----
 src/pages/Order/OrderCatalog.vue            |  8 +-----
 3 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 6f6183224..a138e0b64 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -41,7 +41,7 @@ const props = defineProps({
     },
 });
 
-const emit = defineEmits(['refresh', 'clear', 'search', 'init']);
+const emit = defineEmits(['refresh', 'clear', 'search', 'init', 'remove']);
 
 const arrayData = useArrayData(props.dataKey, {
     exprBuilder: props.exprBuilder,
@@ -116,6 +116,7 @@ const tags = computed(() => {
 async function remove(key) {
     userParams.value[key] = null;
     await search();
+    emit('remove', key)
 }
 
 function formatValue(value) {
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 23accb680..0859e14a6 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -21,16 +21,27 @@ const selectedCategoryFk = ref(null);
 const typeList = ref(null);
 const selectedTypeFk = ref(null);
 
-const selectCategory = (params, category) => {
+const resetCategory = () => {
+    selectedCategoryFk.value = null;
+    typeList.value = null;
+};
+
+const clearFilter = (key) => {
+    if (key === 'categoryFk') {
+        resetCategory();
+    }
+};
+
+const selectCategory = (params, category, search) => {
     if (params.categoryFk === category?.id) {
-        selectedCategoryFk.value = null;
+        resetCategory();
         params.categoryFk = null;
-        typeList.value = null;
     } else {
         selectedCategoryFk.value = category?.id;
         params.categoryFk = category?.id;
         loadTypes(category?.id);
     }
+    search();
 };
 
 const loadTypes = async (categoryFk) => {
@@ -65,6 +76,8 @@ function exprBuilder(param, value) {
         case 'categoryFk':
         case 'typeFk':
             return { [param]: value };
+        case 'search':
+            return { 'i.name': { like: `%${value}%` } };
     }
 }
 
@@ -88,10 +101,10 @@ const getCategoryClass = (category, params) => {
     <FetchData url="ItemCategories" limit="30" auto-load @on-fetch="setCategoryList" />
     <VnFilterPanel
         :data-key="props.dataKey"
-        :search-button="true"
         :hidden-tags="['orderFk', 'orderBy']"
         :expr-builder="exprBuilder"
         @init="onFilterInit"
+        @remove="clearFilter"
     >
         <template #tags="{ tag, formatFn }">
             <strong v-if="tag.label === 'categoryFk'">
@@ -105,7 +118,7 @@ const getCategoryClass = (category, params) => {
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params }">
+        <template #body="{ params, searchFn }">
             <QList dense>
                 <QItem class="category-filter q-mt-md">
                     <div
@@ -116,7 +129,7 @@ const getCategoryClass = (category, params) => {
                         <QIcon
                             :name="category.icon"
                             class="category-icon"
-                            @click="selectCategory(params, category)"
+                            @click="selectCategory(params, category, searchFn)"
                         >
                             <QTooltip>
                                 {{ t(category.name) }}
@@ -138,7 +151,12 @@ const getCategoryClass = (category, params) => {
                             emit-value
                             use-input
                             :disable="!selectedCategoryFk"
-                            @update:model-value="(value) => (selectedTypeFk = value)"
+                            @update:model-value="
+                                (value) => {
+                                    selectedTypeFk = value;
+                                    searchFn();
+                                }
+                            "
                         >
                             <template #option="{ itemProps, opt }">
                                 <QItem v-bind="itemProps">
diff --git a/src/pages/Order/OrderCatalog.vue b/src/pages/Order/OrderCatalog.vue
index ec81c50f1..a257f7627 100644
--- a/src/pages/Order/OrderCatalog.vue
+++ b/src/pages/Order/OrderCatalog.vue
@@ -20,12 +20,6 @@ const catalogParams = {
     orderBy: JSON.stringify({ field: 'relevancy DESC, name', way: 'ASC', isTag: false }),
 };
 
-function exprBuilder(param, value) {
-    switch (param) {
-        case 'search':
-            return { 'i.name': { like: `%${value}%` } };
-    }
-}
 </script>
 
 <template>
@@ -35,8 +29,8 @@ function exprBuilder(param, value) {
             url="Orders/CatalogFilter"
             :limit="50"
             :user-params="catalogParams"
-            :expr-builder="exprBuilder"
             :static-params="['orderFk', 'orderBy']"
+            :redirect="false"
         />
     </Teleport>
     <Teleport v-if="stateStore.isHeaderMounted()" to="#actions-append">

From 142bac7a432de87dc8f809e17ae3f9efa56b7aa2 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 3 Jan 2024 13:49:08 -0300
Subject: [PATCH 11/26] agregar data por default en tabla extended list

---
 src/components/common/TableVisibleColumns.vue | 142 +++++++++++-------
 1 file changed, 84 insertions(+), 58 deletions(-)

diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
index 663a7bb93..5e077433a 100644
--- a/src/components/common/TableVisibleColumns.vue
+++ b/src/components/common/TableVisibleColumns.vue
@@ -1,8 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { ref, computed } from 'vue';
-
-import FetchData from 'components/FetchData.vue';
+import { ref, computed, onMounted } from 'vue';
 
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
@@ -29,12 +27,6 @@ const { t } = useI18n();
 const popupProxyRef = ref(null);
 const user = state.getUser();
 const initialUserConfigViewData = ref(null);
-const userConfigFilter = {
-    where: {
-        tableCode: $props.tableCode,
-        userFk: user.id,
-    },
-};
 
 const formattedCols = ref([]);
 
@@ -43,37 +35,96 @@ const areAllChecksMarked = computed(() => {
 });
 
 const setUserConfigViewData = (data) => {
-    // initialUserConfigViewData.value = data;
-    // if (data.length === 0) return;
-    // formattedCols.value = $props.allColumns.map((col) => {
-    //     // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
-    //     const obj = {
-    //         name: col,
-    //         active: data[0].configuration[col],
-    //     };
-    //     return obj;
-    // });
-    // emitSavedConfig();
+    if (!data) return;
+    formattedCols.value = $props.allColumns.map((col) => {
+        // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
+        const obj = {
+            name: col,
+            active: data[col],
+        };
+        return obj;
+    });
+    emitSavedConfig();
 };
 
 const toggleMarkAll = (val) => {
     formattedCols.value.forEach((col) => (col.active = val));
 };
 
-const saveConfig = async () => {
+const fetchViewConfigData = async () => {
     try {
-        const data = {
-            id: initialUserConfigViewData.value[0].id,
-            userFk: 9,
-            tableCode: $props.tableCode,
-            configuration: {},
+        const userConfigFilter = {
+            where: {
+                tableCode: $props.tableCode,
+                userFk: user.id,
+            },
         };
 
-        formattedCols.value.forEach((col) => {
-            data.configuration[col.name] = col.active;
+        const userViewConfigResponse = await axios.get('UserConfigViews', {
+            params: { filter: userConfigFilter },
         });
 
-        await axios.patch('UserConfigViews', data);
+        if (userViewConfigResponse.data && userViewConfigResponse.data.length > 0) {
+            initialUserConfigViewData.value = userViewConfigResponse.data[0];
+            setUserConfigViewData(userViewConfigResponse.data[0].configuration);
+            return;
+        }
+
+        const defaultConfigFilter = {
+            where: {
+                tableCode: $props.tableCode,
+            },
+        };
+
+        const defaultViewConfigResponse = await axios.get('DefaultViewConfigs', {
+            params: { filter: defaultConfigFilter },
+        });
+
+        if (defaultViewConfigResponse.data && defaultViewConfigResponse.data.length > 0) {
+            setUserConfigViewData(defaultViewConfigResponse.data[0].columns);
+            return;
+        }
+    } catch (err) {
+        console.err('Error fetching config view data');
+    }
+};
+
+const saveConfig = async () => {
+    try {
+        const params = {};
+        const configuration = {};
+
+        formattedCols.value.forEach((col) => {
+            configuration[col.name] = col.active;
+        });
+
+        // Si existe una view config del usuario hacemos un update si no la creamos
+        if (initialUserConfigViewData.value) {
+            params.updates = [
+                {
+                    data: {
+                        configuration: configuration,
+                    },
+                    where: {
+                        id: initialUserConfigViewData.value.id,
+                    },
+                },
+            ];
+        } else {
+            params.creates = [
+                {
+                    userFk: user.value.id,
+                    tableCode: $props.tableCode,
+                    tableConfig: $props.tableCode,
+                    configuration: configuration,
+                },
+            ];
+        }
+
+        const response = await axios.post('UserConfigViews/crud', params);
+        if (response.data && response.data[0]) {
+            initialUserConfigViewData.value = response.data[0];
+        }
         emitSavedConfig();
         popupProxyRef.value.hide();
     } catch (err) {
@@ -81,42 +132,17 @@ const saveConfig = async () => {
     }
 };
 
-const setDefaultViewConfig = (data) => {
-    initialUserConfigViewData.value = data;
-    if (data.length === 0) return;
-    formattedCols.value = $props.allColumns.map((col) => {
-        // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
-        const obj = {
-            name: col,
-            active: data[0].columns[col],
-        };
-        return obj;
-    });
-    console.log('formattedCols:: ', formattedCols);
-    emitSavedConfig();
-};
-
 const emitSavedConfig = () => {
     const filteredCols = formattedCols.value.filter((col) => col.active);
     const mappedCols = filteredCols.map((col) => col.name);
     emit('onConfigSaved', mappedCols);
 };
+
+onMounted(async () => {
+    await fetchViewConfigData();
+});
 </script>
 <template>
-    <!-- <fetch-data
-        v-if="user"
-        url="UserConfigViews"
-        :filter="userConfigFilter"
-        @on-fetch="(data) => setUserConfigViewData(data)"
-        auto-load
-    /> -->
-    <fetch-data
-        v-if="user"
-        url="DefaultViewConfigs"
-        :filter="{ where: { tableCode: tableCode } }"
-        @on-fetch="(data) => setDefaultViewConfig(data)"
-        auto-load
-    />
     <QBtn color="primary" icon="view_column">
         <QPopupProxy ref="popupProxyRef">
             <QCard class="column q-pa-md">

From ead8bb4992ed059be55c6b91696f142cdded94d7 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Wed, 3 Jan 2024 14:53:01 -0500
Subject: [PATCH 12/26] Se definen los iconos de las tarjetas en summary y se
 organiza cabeceras de tablas

---
 src/i18n/en/index.js                          |  2 +-
 .../Defaulter/CustomerBalanceDueTotal.vue     | 54 +++++++++++++++++++
 .../Customer/Defaulter/CustomerDefaulter.vue  | 20 ++++---
 .../Notifications/CustomerNotifications.vue   |  5 --
 src/router/modules/customer.js                | 26 ++++-----
 5 files changed, 81 insertions(+), 26 deletions(-)
 create mode 100644 src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 49a475b9e..a1811df4e 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -130,7 +130,7 @@ export default {
             log: 'Log',
             sms: 'Sms',
             creditManagement: 'Credit management',
-            others: 'Other',
+            others: 'Others',
         },
         list: {
             phone: 'Phone',
diff --git a/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue b/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue
new file mode 100644
index 000000000..dfbaf8ad4
--- /dev/null
+++ b/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue
@@ -0,0 +1,54 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+
+import { toCurrency } from 'filters/index';
+
+const $props = defineProps({
+    amount: {
+        type: Number,
+        required: true,
+    },
+});
+
+const { t } = useI18n();
+</script>
+
+<template>
+    <div class="card_balance">
+        <h6 class="title_balance">{{ t('Total') }}</h6>
+        <div style="display: flex">
+            <p class="key_balance">{{ t('Balance due') }}:&ensp;</p>
+            <b class="value_balance">
+                {{ toCurrency($props.amount) }}
+            </b>
+        </div>
+    </div>
+</template>
+
+<style lang="scss">
+.card_balance {
+    border: 1px solid black;
+    margin: 7px;
+    padding: 5px 7px;
+}
+.title_balance {
+    color: white;
+    margin-top: 0;
+    margin-bottom: 0;
+    text-align: center;
+}
+.key_balance {
+    color: grey;
+    margin-bottom: 0;
+}
+.value_balance {
+    color: white;
+    margin-bottom: 0;
+}
+</style>
+
+<i18n>
+es:
+    Total: Total
+    Balance due: Saldo vencido
+</i18n>
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index b35980416..15bfd84eb 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -4,11 +4,12 @@ import { useI18n } from 'vue-i18n';
 
 import { QBtn, QCheckbox } from 'quasar';
 
+import { toCurrency, toDate } from 'filters/index';
 import { useArrayData } from 'composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 
-import { toCurrency, toDate } from 'filters/index';
 import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
+import CustomerBalanceDueTotal from './CustomerBalanceDueTotal.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
@@ -16,6 +17,7 @@ const { t } = useI18n();
 const stateStore = useStateStore();
 
 const arrayData = ref(null);
+const balanceDueTotal = ref(0);
 
 onBeforeMount(async () => {
     arrayData.value = useArrayData('CustomerDefaulter', {
@@ -23,6 +25,13 @@ onBeforeMount(async () => {
         limit: 0,
     });
     await arrayData.value.fetch({ append: false });
+    balanceDueTotal.value = arrayData.value.store.data.reduce(
+        (accumulator, currentValue) => {
+            return accumulator + (currentValue['amount'] || 0);
+        },
+        0
+    );
+    console.log(balanceDueTotal.value);
     stateStore.rightDrawer = true;
 });
 
@@ -188,7 +197,9 @@ const selectAuthorId = (id) => {
     </QDrawer>
 
     <QToolbar class="bg-vn-dark">
-        <div id="st-data"></div>
+        <div id="st-data">
+            <CustomerBalanceDueTotal :amount="balanceDueTotal" />
+        </div>
         <QSpace />
         <div id="st-actions"></div>
     </QToolbar>
@@ -204,11 +215,6 @@ const selectAuthorId = (id) => {
             selection="multiple"
             v-model:selected="selected"
         >
-            <template #top>
-                <div v-if="rows" class="full-width flex justify-end">
-                    {{ `${rows.length} ${t('route.cmr.list.results')}` }}
-                </div>
-            </template>
             <template #body-cell="props">
                 <QTd :props="props">
                     <QTr :props="props" class="cursor-pointer">
diff --git a/src/pages/Customer/Notifications/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
index f9ff66a7b..ce194eb06 100644
--- a/src/pages/Customer/Notifications/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -121,11 +121,6 @@ const selectCustomerId = (id) => {
             selection="multiple"
             v-model:selected="selected"
         >
-            <template #top>
-                <div v-if="rows" class="full-width flex justify-end">
-                    {{ `${rows.length} ${t('route.cmr.list.results')}` }}
-                </div>
-            </template>
             <template #body-cell="props">
                 <QTd :props="props">
                     <QTr :props="props" class="cursor-pointer">
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index a79ab8a6b..3c8445f42 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -135,7 +135,7 @@ export default {
                     name: 'CustomerFiscalData',
                     meta: {
                         title: 'fiscalData',
-                        icon: 'vn:settings',
+                        icon: 'vn:dfiscales',
                     },
                     component: () =>
                         import('src/pages/Customer/Card/CustomerFiscalData.vue'),
@@ -145,7 +145,7 @@ export default {
                     name: 'CustomerBillingData',
                     meta: {
                         title: 'billingData',
-                        icon: 'vn:settings',
+                        icon: 'vn:payment',
                     },
                     component: () =>
                         import('src/pages/Customer/Card/CustomerBillingData.vue'),
@@ -155,7 +155,7 @@ export default {
                     name: 'CustomerConsignees',
                     meta: {
                         title: 'consignees',
-                        icon: 'vn:settings',
+                        icon: 'vn:delivery',
                     },
                     component: () =>
                         import('src/pages/Customer/Card/CustomerConsignees.vue'),
@@ -165,7 +165,7 @@ export default {
                     name: 'CustomerNotes',
                     meta: {
                         title: 'notes',
-                        icon: 'vn:settings',
+                        icon: 'vn:notes',
                     },
                     component: () => import('src/pages/Customer/Card/CustomerNotes.vue'),
                 },
@@ -174,7 +174,7 @@ export default {
                     name: 'CustomerCredits',
                     meta: {
                         title: 'credits',
-                        icon: 'vn:settings',
+                        icon: 'vn:credit',
                     },
                     component: () =>
                         import('src/pages/Customer/Card/CustomerCredits.vue'),
@@ -184,7 +184,7 @@ export default {
                     name: 'CustomerGreuges',
                     meta: {
                         title: 'greuges',
-                        icon: 'vn:settings',
+                        icon: 'vn:greuge',
                     },
                     component: () =>
                         import('src/pages/Customer/Card/CustomerGreuges.vue'),
@@ -194,7 +194,7 @@ export default {
                     name: 'CustomerBalance',
                     meta: {
                         title: 'balance',
-                        icon: 'vn:settings',
+                        icon: 'vn:invoice',
                     },
                     component: () =>
                         import('src/pages/Customer/Card/CustomerBalance.vue'),
@@ -204,7 +204,7 @@ export default {
                     name: 'CustomerRecoveries',
                     meta: {
                         title: 'recoveries',
-                        icon: 'vn:settings',
+                        icon: 'vn:recovery',
                     },
                     component: () =>
                         import('src/pages/Customer/Card/CustomerRecoveries.vue'),
@@ -214,7 +214,7 @@ export default {
                     name: 'CustomerWebAccess',
                     meta: {
                         title: 'webAccess',
-                        icon: 'vn:settings',
+                        icon: 'vn:web',
                     },
                     component: () =>
                         import('src/pages/Customer/Card/CustomerWebAccess.vue'),
@@ -224,7 +224,7 @@ export default {
                     name: 'CustomerLog',
                     meta: {
                         title: 'log',
-                        icon: 'vn:settings',
+                        icon: 'vn:History',
                     },
                     component: () => import('src/pages/Customer/Card/CustomerLog.vue'),
                 },
@@ -233,7 +233,7 @@ export default {
                     name: 'CustomerSms',
                     meta: {
                         title: 'sms',
-                        icon: 'vn:settings',
+                        icon: 'sms',
                     },
                     component: () => import('src/pages/Customer/Card/CustomerSms.vue'),
                 },
@@ -242,7 +242,7 @@ export default {
                     name: 'CustomerCreditManagement',
                     meta: {
                         title: 'creditManagement',
-                        icon: 'vn:settings',
+                        icon: 'paid',
                     },
                     component: () =>
                         import('src/pages/Customer/Card/CustomerCreditManagement.vue'),
@@ -252,7 +252,7 @@ export default {
                     name: 'CustomerOthers',
                     meta: {
                         title: 'others',
-                        icon: 'vn:settings',
+                        icon: 'pending',
                     },
                     component: () => import('src/pages/Customer/Card/CustomerOthers.vue'),
                 },

From 8fc7a5ea12ae38da6fb1b0d973dbfad03b80f7f7 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 3 Jan 2024 16:55:48 -0300
Subject: [PATCH 13/26] Aplicar clases a close-icon en el css

---
 src/components/FormModelPopup.vue | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index 9021adc46..c314f6897 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -62,12 +62,7 @@ const closeForm = () => {
         @on-data-saved="onDataSaved()"
     >
         <template #form="{ data, validate }">
-            <span
-                ref="closeButton"
-                class="absolute cursor-pointer"
-                style="top: 20px; right: 20px"
-                v-close-popup
-            >
+            <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ title }}</h1>
@@ -102,4 +97,11 @@ const closeForm = () => {
     font-weight: bold;
     line-height: 20px;
 }
+
+.close-icon {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+    cursor: pointer;
+}
 </style>

From b622f9cca7dfc9bf7b4bb0b2948e4a7f9ca0156a Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Thu, 4 Jan 2024 02:27:43 -0400
Subject: [PATCH 14/26] Add order orderBy filter

---
 src/pages/Order/Card/OrderCatalogFilter.vue | 50 +++++++++++++++++++--
 1 file changed, 46 insertions(+), 4 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 00606d57c..09e243959 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -31,6 +31,12 @@ const resetCategory = () => {
     typeList.value = null;
 };
 
+const selectedOrder = ref(null);
+const orderList = [
+    { way: 'ASC', name: 'Ascendant' },
+    { way: 'DESC', name: 'Descendant' },
+];
+
 const clearFilter = (key) => {
     if (key === 'categoryFk') {
         resetCategory();
@@ -64,6 +70,10 @@ const onFilterInit = async ({ params }) => {
         await loadTypes(params.categoryFk);
         selectedCategoryFk.value = params.categoryFk;
     }
+    if (params.orderBy) {
+        selectedOrder.value = JSON.parse(params.orderBy).way;
+        orderByParam.value = JSON.parse(params.orderBy);
+    }
 };
 
 const selectedCategory = computed(() =>
@@ -104,6 +114,14 @@ const applyTagFilter = (params, search) => {
     });
     search();
 };
+
+const orderByParam = ref(null);
+
+const onOrderChange = (value, params, search) => {
+    const orderBy = Object.assign({}, orderByParam.value, { way: value.way });
+    params.orderBy = JSON.stringify(orderBy);
+    search();
+};
 </script>
 
 <template>
@@ -131,10 +149,12 @@ const applyTagFilter = (params, search) => {
     >
         <template #tags="{ tag, formatFn }">
             <div v-if="tag.label === 'tagGroups'">
-                <strong>
-                    {{ JSON.parse(tag?.value).tagSelection?.name  }}:
-                </strong>
-                <span>{{ (JSON.parse(tag?.value).values || []).map(item => item.value).join(' | ') }}</span>
+                <strong> {{ JSON.parse(tag?.value).tagSelection?.name }}: </strong>
+                <span>{{
+                    (JSON.parse(tag?.value).values || [])
+                        .map((item) => item.value)
+                        .join(' | ')
+                }}</span>
             </div>
             <strong v-else-if="tag.label === 'categoryFk'">
                 {{ t(selectedCategory?.name || '') }}
@@ -204,6 +224,26 @@ const applyTagFilter = (params, search) => {
                     </QItemSection>
                 </QItem>
                 <QSeparator />
+                <QItem class="q-my-md">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="t('params.order')"
+                            v-model="selectedOrder"
+                            :options="orderList || []"
+                            option-value="way"
+                            option-label="name"
+                            dense
+                            outlined
+                            rounded
+                            :emit-value="false"
+                            use-input
+                            @update:model-value="
+                                (value) => onOrderChange(value, params, searchFn)
+                            "
+                        />
+                    </QItemSection>
+                </QItem>
+                <QSeparator />
                 <QItem class="q-mt-md">
                     <QItemSection>
                         <VnSelectFilter
@@ -344,12 +384,14 @@ en:
         orderBy: Order By
         tag: Tag
         value: Value
+        order: Order
 es:
     params:
         type: Tipo
         orderBy: Ordenar por
         tag: Etiqueta
         value: Valor
+        order: Orden
     Plant: Planta
     Flower: Flor
     Handmade: Confección

From de8996d5960d4aaa6a67797098e26b5e7b04c995 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 4 Jan 2024 09:34:24 -0300
Subject: [PATCH 15/26] Fixes PR

---
 src/components/common/TableVisibleColumns.vue | 123 +++++++++++++-----
 src/components/common/VnInput.vue             |   9 ++
 src/components/common/VnSelectCreate.vue      |  16 ++-
 src/components/common/VnSelectFilter.vue      |   9 ++
 src/components/ui/VnTree.vue                  |   9 +-
 src/filters/dateRange.js                      |   8 ++
 src/filters/index.js                          |   2 +
 .../CustomerExtendedListFilter.vue            |  55 +++++++-
 src/pages/Entry/EntryCreate.vue               |  14 +-
 9 files changed, 191 insertions(+), 54 deletions(-)
 create mode 100644 src/filters/dateRange.js

diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
index 94e3bfbc7..e0b8ad86f 100644
--- a/src/components/common/TableVisibleColumns.vue
+++ b/src/components/common/TableVisibleColumns.vue
@@ -1,11 +1,10 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { ref, computed } from 'vue';
-
-import FetchData from 'components/FetchData.vue';
+import { ref, computed, onMounted } from 'vue';
 
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
 
 const $props = defineProps({
     allColumns: {
@@ -24,17 +23,12 @@ const $props = defineProps({
 
 const emit = defineEmits(['onConfigSaved']);
 
+const { notify } = useNotify();
 const state = useState();
 const { t } = useI18n();
 const popupProxyRef = ref(null);
 const user = state.getUser();
 const initialUserConfigViewData = ref(null);
-const userConfigFilter = {
-    where: {
-        tableCode: $props.tableCode,
-        userFk: user.id,
-    },
-};
 
 const formattedCols = ref([]);
 
@@ -43,16 +37,12 @@ const areAllChecksMarked = computed(() => {
 });
 
 const setUserConfigViewData = (data) => {
-    initialUserConfigViewData.value = data;
-    if (data.length === 0) return;
-    formattedCols.value = $props.allColumns.map((col) => {
-        // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
-        const obj = {
-            name: col,
-            active: data[0].configuration[col],
-        };
-        return obj;
-    });
+    if (!data) return;
+    // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
+    formattedCols.value = $props.allColumns.map((col) => ({
+        name: col,
+        active: data[col],
+    }));
     emitSavedConfig();
 };
 
@@ -60,40 +50,101 @@ const toggleMarkAll = (val) => {
     formattedCols.value.forEach((col) => (col.active = val));
 };
 
-const saveConfig = async () => {
+const fetchViewConfigData = async () => {
     try {
-        const data = {
-            id: initialUserConfigViewData.value[0].id,
-            userFk: 9,
-            tableCode: $props.tableCode,
-            configuration: {},
+        const userConfigFilter = {
+            where: {
+                tableCode: $props.tableCode,
+                userFk: user.id,
+            },
         };
 
-        formattedCols.value.forEach((col) => {
-            data.configuration[col.name] = col.active;
+        const userViewConfigResponse = await axios.get('UserConfigViews', {
+            params: { filter: userConfigFilter },
         });
 
-        await axios.patch('UserConfigViews', data);
+        if (userViewConfigResponse.data && userViewConfigResponse.data.length > 0) {
+            initialUserConfigViewData.value = userViewConfigResponse.data[0];
+            setUserConfigViewData(userViewConfigResponse.data[0].configuration);
+            return;
+        }
+
+        const defaultConfigFilter = {
+            where: {
+                tableCode: $props.tableCode,
+            },
+        };
+
+        const defaultViewConfigResponse = await axios.get('DefaultViewConfigs', {
+            params: { filter: defaultConfigFilter },
+        });
+
+        if (defaultViewConfigResponse.data && defaultViewConfigResponse.data.length > 0) {
+            setUserConfigViewData(defaultViewConfigResponse.data[0].columns);
+            return;
+        }
+    } catch (err) {
+        console.err('Error fetching config view data');
+    }
+};
+
+const saveConfig = async () => {
+    try {
+        const params = {};
+        const configuration = {};
+
+        formattedCols.value.forEach((col) => {
+            const { name, active } = col;
+            configuration[name] = active;
+        });
+
+        // Si existe una view config del usuario hacemos un update si no la creamos
+        if (initialUserConfigViewData.value) {
+            params.updates = [
+                {
+                    data: {
+                        configuration: configuration,
+                    },
+                    where: {
+                        id: initialUserConfigViewData.value.id,
+                    },
+                },
+            ];
+        } else {
+            params.creates = [
+                {
+                    userFk: user.value.id,
+                    tableCode: $props.tableCode,
+                    tableConfig: $props.tableCode,
+                    configuration: configuration,
+                },
+            ];
+        }
+
+        const response = await axios.post('UserConfigViews/crud', params);
+        if (response.data && response.data[0]) {
+            initialUserConfigViewData.value = response.data[0];
+        }
         emitSavedConfig();
+        notify('globals.dataSaved', 'positive');
+
         popupProxyRef.value.hide();
     } catch (err) {
         console.error('Error saving user view config');
     }
 };
+
 const emitSavedConfig = () => {
     const filteredCols = formattedCols.value.filter((col) => col.active);
     const mappedCols = filteredCols.map((col) => col.name);
     emit('onConfigSaved', mappedCols);
 };
+
+onMounted(async () => {
+    await fetchViewConfigData();
+});
 </script>
 <template>
-    <fetch-data
-        v-if="user"
-        url="UserConfigViews"
-        :filter="userConfigFilter"
-        @on-fetch="(data) => setUserConfigViewData(data)"
-        auto-load
-    />
     <QBtn color="primary" icon="view_column">
         <QPopupProxy ref="popupProxyRef">
             <QCard class="column q-pa-md">
@@ -108,7 +159,7 @@ const emitSavedConfig = () => {
                     class="q-mb-sm"
                 />
                 <div
-                    v-if="allColumns.length !== 0 && formattedCols.length !== 0"
+                    v-if="allColumns.length > 0 && formattedCols.length > 0"
                     class="checks-layout"
                 >
                     <QCheckbox
diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index e3040a698..bfd0dea40 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -12,6 +12,14 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    label: {
+        type: String,
+        default: '',
+    },
+    required: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const value = computed({
@@ -39,6 +47,7 @@ const styleAttrs = computed(() => {
         ref="vnInputRef"
         v-model="value"
         v-bind="{ ...$attrs, ...styleAttrs }"
+        :label="required ? label + ' *' : label"
         type="text"
     >
         <template v-if="$slots.prepend" #prepend>
diff --git a/src/components/common/VnSelectCreate.vue b/src/components/common/VnSelectCreate.vue
index 0b5694ec5..54d36ceaa 100644
--- a/src/components/common/VnSelectCreate.vue
+++ b/src/components/common/VnSelectCreate.vue
@@ -20,6 +20,14 @@ const $props = defineProps({
         type: Array,
         default: () => ['developer'],
     },
+    label: {
+        type: String,
+        default: '',
+    },
+    required: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const role = useRole();
@@ -44,7 +52,13 @@ const toggleForm = () => {
 </script>
 
 <template>
-    <VnSelectFilter v-model="value" :options="options" v-bind="$attrs">
+    <VnSelectFilter
+        v-model="value"
+        :options="options"
+        :label="label"
+        :required="required"
+        v-bind="$attrs"
+    >
         <template v-if="isAllowedToCreate" #append>
             <QIcon
                 @click.stop.prevent="toggleForm()"
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index a0605bbae..759706d11 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -23,6 +23,14 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    label: {
+        type: String,
+        default: '',
+    },
+    required: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const { optionLabel } = toRefs($props);
@@ -87,6 +95,7 @@ const value = computed({
         hide-selected
         fill-input
         ref="vnSelectRef"
+        :label="required ? label + ' *' : label"
     >
         <template v-if="isClearable" #append>
             <QIcon
diff --git a/src/components/ui/VnTree.vue b/src/components/ui/VnTree.vue
index 637b18256..948a0a8e2 100644
--- a/src/components/ui/VnTree.vue
+++ b/src/components/ui/VnTree.vue
@@ -53,6 +53,7 @@ const fetchNodeLeaves = async (nodeKey) => {
 };
 
 const removeNode = (node) => {
+    const { id, parentFk } = node;
     quasar
         .dialog({
             title: t('Are you sure you want to delete it?'),
@@ -65,9 +66,9 @@ const removeNode = (node) => {
         })
         .onOk(async () => {
             try {
-                await axios.post(`/Departments/${node.id}/removeChild`, node.id);
-                notify('department.departmentRemoved', 'positive');
-                await fetchNodeLeaves(node.parentFk);
+                await axios.post(`/Departments/${id}/removeChild`, id);
+                notify(t('department.departmentRemoved'), 'positive');
+                await fetchNodeLeaves(parentFk);
             } catch (err) {
                 console.log('Error removing department');
             }
@@ -85,7 +86,7 @@ const onNodeCreated = async () => {
 
 const redirectToDepartmentSummary = (id) => {
     if (!id) return;
-    router.push({ name: 'DepartmentSummary', params: { id: id } });
+    router.push({ name: 'DepartmentSummary', params: { id } });
 };
 </script>
 
diff --git a/src/filters/dateRange.js b/src/filters/dateRange.js
new file mode 100644
index 000000000..4c0cfe654
--- /dev/null
+++ b/src/filters/dateRange.js
@@ -0,0 +1,8 @@
+export default function dateRange(value) {
+    const minHour = new Date(value);
+    minHour.setHours(0, 0, 0, 0);
+    const maxHour = new Date(value);
+    maxHour.setHours(23, 59, 59, 59);
+
+    return [minHour, maxHour];
+}
diff --git a/src/filters/index.js b/src/filters/index.js
index b0c441641..f0120e663 100644
--- a/src/filters/index.js
+++ b/src/filters/index.js
@@ -7,6 +7,7 @@ import toCurrency from './toCurrency';
 import toPercentage from './toPercentage';
 import toLowerCamel from './toLowerCamel';
 import dashIfEmpty from './dashIfEmpty';
+import dateRange from './dateRange';
 
 export {
     toLowerCase,
@@ -18,4 +19,5 @@ export {
     toCurrency,
     toPercentage,
     dashIfEmpty,
+    dateRange,
 };
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
index a4d26a78a..46b4e1e7b 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
@@ -7,6 +7,7 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import { dateRange } from 'src/filters';
 
 const props = defineProps({
     dataKey: {
@@ -32,6 +33,48 @@ const sageTransactionTypesOptions = ref([]);
 
 const visibleColumnsSet = computed(() => new Set(props.visibleColumns));
 
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'created':
+            return {
+                'c.created': {
+                    between: dateRange(value),
+                },
+            };
+        case 'id':
+        case 'name':
+        case 'socialName':
+        case 'fi':
+        case 'credit':
+        case 'creditInsurance':
+        case 'phone':
+        case 'mobile':
+        case 'street':
+        case 'city':
+        case 'postcode':
+        case 'email':
+        case 'isActive':
+        case 'isVies':
+        case 'isTaxDataChecked':
+        case 'isEqualizated':
+        case 'isFreezed':
+        case 'hasToInvoice':
+        case 'hasToInvoiceByAddress':
+        case 'isToBeMailed':
+        case 'hasSepaVnl':
+        case 'hasLcr':
+        case 'hasCoreVnl':
+        case 'countryFk':
+        case 'provinceFk':
+        case 'salesPersonFk':
+        case 'businessTypeFk':
+        case 'payMethodFk':
+        case 'sageTaxTypeFk':
+        case 'sageTransactionTypeFk':
+            return { [`c.${param}`]: value };
+    }
+};
+
 const shouldRenderColumn = (colName) => {
     return visibleColumnsSet.value.has(colName);
 };
@@ -88,7 +131,11 @@ const shouldRenderColumn = (colName) => {
         auto-load
         @on-fetch="(data) => (sageTransactionTypesOptions = data)"
     />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :expr-builder="exprBuilder"
+    >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong
@@ -565,12 +612,6 @@ const shouldRenderColumn = (colName) => {
 </style>
 
 <i18n>
-<<<<<<< HEAD:src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
 es:
-    Identifier: Identificador
-=======
-
-es:
->>>>>>> dev:src/pages/Customer/CustomerExtendedListFilter.vue
     Social name: Razón social
 </i18n>
diff --git a/src/pages/Entry/EntryCreate.vue b/src/pages/Entry/EntryCreate.vue
index 30b54cb38..fc725447c 100644
--- a/src/pages/Entry/EntryCreate.vue
+++ b/src/pages/Entry/EntryCreate.vue
@@ -60,13 +60,14 @@ const companiesOptions = ref([]);
             <template #form="{ data, validate }">
                 <VnRow class="row q-gutter-md q-mb-md">
                     <VnSelectFilter
-                        :label="t('Supplier *')"
+                        :label="t('Supplier')"
                         class="full-width"
                         v-model="data.supplierFk"
                         :options="suppliersOptions"
                         option-value="id"
                         option-label="nickname"
                         hide-selected
+                        required
                         :rules="validate('entry.supplierFk')"
                     >
                         <template #option="scope">
@@ -83,7 +84,7 @@ const companiesOptions = ref([]);
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <VnSelectFilter
-                        :label="t('Travel *')"
+                        :label="t('Travel')"
                         class="full-width"
                         v-model="data.travelFk"
                         :options="travelsOptionsOptions"
@@ -91,6 +92,7 @@ const companiesOptions = ref([]);
                         option-label="warehouseInName"
                         map-options
                         hide-selected
+                        required
                         :rules="validate('entry.travelFk')"
                     >
                         <template #option="scope">
@@ -111,7 +113,7 @@ const companiesOptions = ref([]);
                 </VnRow>
                 <VnRow class="row q-gutter-md q-mb-md">
                     <VnSelectFilter
-                        :label="t('Company *')"
+                        :label="t('Company')"
                         class="full-width"
                         v-model="data.companyFk"
                         :options="companiesOptions"
@@ -129,7 +131,7 @@ const companiesOptions = ref([]);
 
 <i18n>
     es:
-        Supplier *: Proveedor *
-        Travel *: Envío *
-        Company *: Empresa *
+        Supplier: Proveedor
+        Travel: Envío
+        Company: Empresa
     </i18n>

From cfac9acbe8bef3edfbeb06570423c57ee2b1082e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 4 Jan 2024 09:58:37 -0300
Subject: [PATCH 16/26] Small corrections

---
 src/components/common/TableVisibleColumns.vue |  7 +++++++
 src/components/ui/VnTree.vue                  | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
index e0b8ad86f..7defdb0de 100644
--- a/src/components/common/TableVisibleColumns.vue
+++ b/src/components/common/TableVisibleColumns.vue
@@ -174,6 +174,7 @@ onMounted(async () => {
                 }}</QBtn>
             </QCard>
         </QPopupProxy>
+        <QTooltip>{{ t('Visible columns') }}</QTooltip>
     </QBtn>
 </template>
 
@@ -189,3 +190,9 @@ onMounted(async () => {
     grid-template-columns: repeat(3, 200px);
 }
 </style>
+
+<i18n>
+    es:
+        Check the columns you want to see: Marca las columnas que quieres ver
+        Visible columns: Columnas visibles
+</i18n>
diff --git a/src/components/ui/VnTree.vue b/src/components/ui/VnTree.vue
index 948a0a8e2..c382ef9f2 100644
--- a/src/components/ui/VnTree.vue
+++ b/src/components/ui/VnTree.vue
@@ -100,22 +100,22 @@ const redirectToDepartmentSummary = (id) => {
             v-model:expanded="expanded"
             @update:expanded="onNodeExpanded($event)"
         >
-            <template #default-header="prop">
+            <template #default-header="{ node }">
                 <div
                     class="row justify-between full-width q-pr-md cursor-pointer"
-                    @click.stop="redirectToDepartmentSummary(prop.node.id)"
+                    @click.stop="redirectToDepartmentSummary(node.id)"
                 >
                     <span class="text-uppercase">
-                        {{ prop.node.name }}
+                        {{ node.name }}
                     </span>
                     <div class="row justify-between" style="max-width: max-content">
                         <QIcon
-                            v-if="prop.node.id"
+                            v-if="node.id"
                             name="delete"
                             color="primary"
                             size="sm"
                             class="q-pr-xs cursor-pointer"
-                            @click.stop="removeNode(prop.node)"
+                            @click.stop="removeNode(node)"
                         >
                             <QTooltip>
                                 {{ t('Remove') }}
@@ -126,7 +126,7 @@ const redirectToDepartmentSummary = (id) => {
                             color="primary"
                             size="sm"
                             class="cursor-pointer"
-                            @click.stop="showCreateNodeForm(prop.node.id)"
+                            @click.stop="showCreateNodeForm(node.id)"
                         >
                             <QTooltip>
                                 {{ t('Create') }}

From 64777bb80467fcf7f117f6b718a4ca2153e6d1c7 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Thu, 4 Jan 2024 10:23:55 -0500
Subject: [PATCH 17/26] Se hacen correcciones en base a comentarios en el PR

---
 .../Customer/Defaulter/CustomerDefaulter.vue  | 23 ++++++++-----------
 1 file changed, 9 insertions(+), 14 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index 0331acfc0..b9c863e56 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -38,14 +38,14 @@ onBeforeMount(async () => {
 const rows = computed(() => arrayData.value.store.data);
 
 const selected = ref([]);
-const worderId = ref(0);
+const workerId = ref(0);
 const customerId = ref(0);
 
 const tableColumnComponents = {
     client: {
         component: QBtn,
         props: () => ({ flat: true, color: 'blue' }),
-        event: (prop) => selectClientId(prop.row.clientFk),
+        event: ({ row }) => selectCustomerId(row.clientFk),
     },
     isWorker: {
         component: QCheckbox,
@@ -58,7 +58,7 @@ const tableColumnComponents = {
     salesperson: {
         component: QBtn,
         props: () => ({ flat: true, color: 'blue' }),
-        event: (prop) => selectSalespersonId(prop.row.salesPersonFk),
+        event: ({ row }) => selectWorkerId(row.salesPersonFk),
     },
     country: {
         component: 'span',
@@ -78,7 +78,7 @@ const tableColumnComponents = {
     author: {
         component: QBtn,
         props: () => ({ flat: true, color: 'blue' }),
-        event: (prop) => selectAuthorId(prop.row.workerFk),
+        event: ({ row }) => selectWorkerId(row.workerFk),
     },
     lastObservation: {
         component: 'span',
@@ -173,19 +173,14 @@ const columns = computed(() => {
     ];
 });
 
-const selectClientId = (id) => {
-    worderId.value = 0;
+const selectCustomerId = (id) => {
+    workerId.value = 0;
     customerId.value = id;
 };
 
-const selectSalespersonId = (id) => {
+const selectWorkerId = (id) => {
     customerId.value = 0;
-    worderId.value = id;
-};
-
-const selectAuthorId = (id) => {
-    customerId.value = 0;
-    worderId.value = id;
+    workerId.value = id;
 };
 </script>
 
@@ -226,7 +221,7 @@ const selectAuthorId = (id) => {
                         >
                             {{ props.value }}
 
-                            <WorkerDescriptorProxy v-if="worderId" :id="worderId" />
+                            <WorkerDescriptorProxy v-if="workerId" :id="workerId" />
                             <CustomerDescriptorProxy v-else :id="customerId" />
                         </component>
                     </QTr>

From 6b3bed008537ac531f6fe3fb267f2c8f3c4b8d47 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Thu, 4 Jan 2024 11:37:46 -0500
Subject: [PATCH 18/26] Mejoras en las correcciones de codigo

---
 .../Customer/Defaulter/CustomerBalanceDueTotal.vue  | 13 +++++--------
 src/pages/Customer/Defaulter/CustomerDefaulter.vue  | 12 ++++++------
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue b/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue
index c2bfbc2f5..c4a50a10f 100644
--- a/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue
+++ b/src/pages/Customer/Defaulter/CustomerBalanceDueTotal.vue
@@ -14,8 +14,8 @@ const { t } = useI18n();
 </script>
 
 <template>
-    <div class="card_balance">
-        <h6 class="title_balance">{{ t('Total') }}</h6>
+    <div class="card_balance q-px-md q-py-sm q-my-sm">
+        <h6 class="title_balance text-center">{{ t('Total') }}</h6>
         <div class="row">
             <p class="key_balance">{{ t('Balance due') }}:&ensp;</p>
             <b class="value_balance">
@@ -28,21 +28,18 @@ const { t } = useI18n();
 <style lang="scss">
 .card_balance {
     border: 1px solid black;
-    margin: 7px;
-    padding: 5px 7px;
 }
 .title_balance {
-    color: white;
+    color: var(--vn-text);
     margin-top: 0;
     margin-bottom: 0;
-    text-align: center;
 }
 .key_balance {
-    color: grey;
+    color: var(--vn-label);
     margin-bottom: 0;
 }
 .value_balance {
-    color: white;
+    color: var(--vn-text);
     margin-bottom: 0;
 }
 </style>
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index b9c863e56..e2e14427e 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -49,9 +49,9 @@ const tableColumnComponents = {
     },
     isWorker: {
         component: QCheckbox,
-        props: (prop) => ({
+        props: ({ value }) => ({
             disable: true,
-            'model-value': Boolean(prop.value),
+            'model-value': Boolean(value),
         }),
         event: () => {},
     },
@@ -136,7 +136,7 @@ const columns = computed(() => {
         },
         {
             align: 'left',
-            field: (row) => toCurrency(row.amount),
+            field: ({ amount }) => toCurrency(amount),
             label: t('Balance D.'),
             name: 'balance',
         },
@@ -154,19 +154,19 @@ const columns = computed(() => {
         },
         {
             align: 'left',
-            field: (row) => toDate(row.created),
+            field: ({ created }) => toDate(created),
             label: t('L. O. Date'),
             name: 'date',
         },
         {
             align: 'left',
-            field: (row) => toCurrency(row.creditInsurance),
+            field: ({ creditInsurance }) => toCurrency(creditInsurance),
             label: t('Credit I.'),
             name: 'credit',
         },
         {
             align: 'left',
-            field: (row) => toDate(row.defaulterSinced),
+            field: ({ defaulterSinced }) => toDate(defaulterSinced),
             label: t('From'),
             name: 'from',
         },

From bd8acbe0842df7a478a28d267663c18d36b598ae Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Thu, 4 Jan 2024 13:12:58 -0500
Subject: [PATCH 19/26] Correcciones solicitadas

---
 .../Customer/Defaulter/CustomerDefaulter.vue  | 138 +++---
 .../ExtendedList/CustomerExtendedList.vue     | 416 +++++++++---------
 .../Notifications/CustomerNotifications.vue   |  66 ++-
 src/pages/InvoiceOut/InvoiceOutGlobal.vue     |  46 +-
 src/pages/Travel/ExtraCommunity.vue           | 208 +++++----
 5 files changed, 432 insertions(+), 442 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index e2e14427e..d54d5df35 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -102,76 +102,74 @@ const tableColumnComponents = {
     },
 };
 
-const columns = computed(() => {
-    return [
-        {
-            align: 'left',
-            field: 'clientName',
-            label: t('Client'),
-            name: 'client',
-        },
-        {
-            align: 'left',
-            field: 'isWorker',
-            label: t('Is worker'),
-            name: 'isWorker',
-        },
-        {
-            align: 'left',
-            field: 'salesPersonName',
-            label: t('Salesperson'),
-            name: 'salesperson',
-        },
-        {
-            align: 'left',
-            field: 'country',
-            label: t('Country'),
-            name: 'country',
-        },
-        {
-            align: 'left',
-            field: 'payMethod',
-            label: t('P. Method'),
-            name: 'paymentMethod',
-        },
-        {
-            align: 'left',
-            field: ({ amount }) => toCurrency(amount),
-            label: t('Balance D.'),
-            name: 'balance',
-        },
-        {
-            align: 'left',
-            field: 'workerName',
-            label: t('Author'),
-            name: 'author',
-        },
-        {
-            align: 'left',
-            field: 'observation',
-            label: t('Last observation'),
-            name: 'lastObservation',
-        },
-        {
-            align: 'left',
-            field: ({ created }) => toDate(created),
-            label: t('L. O. Date'),
-            name: 'date',
-        },
-        {
-            align: 'left',
-            field: ({ creditInsurance }) => toCurrency(creditInsurance),
-            label: t('Credit I.'),
-            name: 'credit',
-        },
-        {
-            align: 'left',
-            field: ({ defaulterSinced }) => toDate(defaulterSinced),
-            label: t('From'),
-            name: 'from',
-        },
-    ];
-});
+const columns = computed(() => [
+    {
+        align: 'left',
+        field: 'clientName',
+        label: t('Client'),
+        name: 'client',
+    },
+    {
+        align: 'left',
+        field: 'isWorker',
+        label: t('Is worker'),
+        name: 'isWorker',
+    },
+    {
+        align: 'left',
+        field: 'salesPersonName',
+        label: t('Salesperson'),
+        name: 'salesperson',
+    },
+    {
+        align: 'left',
+        field: 'country',
+        label: t('Country'),
+        name: 'country',
+    },
+    {
+        align: 'left',
+        field: 'payMethod',
+        label: t('P. Method'),
+        name: 'paymentMethod',
+    },
+    {
+        align: 'left',
+        field: ({ amount }) => toCurrency(amount),
+        label: t('Balance D.'),
+        name: 'balance',
+    },
+    {
+        align: 'left',
+        field: 'workerName',
+        label: t('Author'),
+        name: 'author',
+    },
+    {
+        align: 'left',
+        field: 'observation',
+        label: t('Last observation'),
+        name: 'lastObservation',
+    },
+    {
+        align: 'left',
+        field: ({ created }) => toDate(created),
+        label: t('L. O. Date'),
+        name: 'date',
+    },
+    {
+        align: 'left',
+        field: ({ creditInsurance }) => toCurrency(creditInsurance),
+        label: t('Credit I.'),
+        name: 'credit',
+    },
+    {
+        align: 'left',
+        field: ({ defaulterSinced }) => toDate(defaulterSinced),
+        label: t('From'),
+        name: 'from',
+    },
+]);
 
 const selectCustomerId = (id) => {
     workerId.value = 0;
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
index a1aa47791..caee06d60 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
@@ -262,215 +262,213 @@ const tableColumnComponents = {
     },
 };
 
-const columns = computed(() => {
-    return [
-        {
-            align: 'left',
-            field: '',
-            label: '',
-            name: 'customerStatus',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'id',
-            label: t('customer.extendedList.tableVisibleColumns.id'),
-            name: 'id',
-        },
-        {
-            align: 'left',
-            field: 'name',
-            label: t('customer.extendedList.tableVisibleColumns.name'),
-            name: 'name',
-        },
-        {
-            align: 'left',
-            field: 'fi',
-            label: t('customer.extendedList.tableVisibleColumns.fi'),
-            name: 'fi',
-        },
-        {
-            align: 'left',
-            field: 'salesPerson',
-            label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
-            name: 'salesPersonFk',
-        },
-        {
-            align: 'left',
-            field: 'credit',
-            label: t('customer.extendedList.tableVisibleColumns.credit'),
-            name: 'credit',
-        },
-        {
-            align: 'left',
-            field: 'creditInsurance',
-            label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
-            name: 'creditInsurance',
-        },
-        {
-            align: 'left',
-            field: 'phone',
-            label: t('customer.extendedList.tableVisibleColumns.phone'),
-            name: 'phone',
-        },
-        {
-            align: 'left',
-            field: 'mobile',
-            label: t('customer.extendedList.tableVisibleColumns.mobile'),
-            name: 'mobile',
-        },
-        {
-            align: 'left',
-            field: 'street',
-            label: t('customer.extendedList.tableVisibleColumns.street'),
-            name: 'street',
-        },
-        {
-            align: 'left',
-            field: 'country',
-            label: t('customer.extendedList.tableVisibleColumns.countryFk'),
-            name: 'countryFk',
-        },
-        {
-            align: 'left',
-            field: 'province',
-            label: t('customer.extendedList.tableVisibleColumns.provinceFk'),
-            name: 'provinceFk',
-        },
-        {
-            align: 'left',
-            field: 'city',
-            label: t('customer.extendedList.tableVisibleColumns.city'),
-            name: 'city',
-        },
-        {
-            align: 'left',
-            field: 'postcode',
-            label: t('customer.extendedList.tableVisibleColumns.postcode'),
-            name: 'postcode',
-        },
-        {
-            align: 'left',
-            field: 'email',
-            label: t('customer.extendedList.tableVisibleColumns.email'),
-            name: 'email',
-        },
-        {
-            align: 'left',
-            field: 'created',
-            label: t('customer.extendedList.tableVisibleColumns.created'),
-            name: 'created',
-            format: (value) => toDate(value),
-        },
-        {
-            align: 'left',
-            field: 'businessType',
-            label: t('customer.extendedList.tableVisibleColumns.businessTypeFk'),
-            name: 'businessTypeFk',
-        },
-        {
-            align: 'left',
-            field: 'payMethod',
-            label: t('customer.extendedList.tableVisibleColumns.payMethodFk'),
-            name: 'payMethodFk',
-        },
-        {
-            align: 'left',
-            field: 'sageTaxType',
-            label: t('customer.extendedList.tableVisibleColumns.sageTaxTypeFk'),
-            name: 'sageTaxTypeFk',
-        },
-        {
-            align: 'left',
-            field: 'sageTransactionType',
-            label: t('customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'),
-            name: 'sageTransactionTypeFk',
-        },
-        {
-            align: 'left',
-            field: 'isActive',
-            label: t('customer.extendedList.tableVisibleColumns.isActive'),
-            name: 'isActive',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'isVies',
-            label: t('customer.extendedList.tableVisibleColumns.isVies'),
-            name: 'isVies',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'isTaxDataChecked',
-            label: t('customer.extendedList.tableVisibleColumns.isTaxDataChecked'),
-            name: 'isTaxDataChecked',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'isEqualizated',
-            label: t('customer.extendedList.tableVisibleColumns.isEqualizated'),
-            name: 'isEqualizated',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'isFreezed',
-            label: t('customer.extendedList.tableVisibleColumns.isFreezed'),
-            name: 'isFreezed',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'hasToInvoice',
-            label: t('customer.extendedList.tableVisibleColumns.hasToInvoice'),
-            name: 'hasToInvoice',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'hasToInvoiceByAddress',
-            label: t('customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'),
-            name: 'hasToInvoiceByAddress',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'isToBeMailed',
-            label: t('customer.extendedList.tableVisibleColumns.isToBeMailed'),
-            name: 'isToBeMailed',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'hasLcr',
-            label: t('customer.extendedList.tableVisibleColumns.hasLcr'),
-            name: 'hasLcr',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'hasCoreVnl',
-            label: t('customer.extendedList.tableVisibleColumns.hasCoreVnl'),
-            name: 'hasCoreVnl',
-            format: () => ' ',
-        },
-        {
-            align: 'left',
-            field: 'hasSepaVnl',
-            label: t('customer.extendedList.tableVisibleColumns.hasSepaVnl'),
-            name: 'hasSepaVnl',
-            format: () => ' ',
-        },
-        {
-            align: 'right',
-            field: 'actions',
-            label: '',
-            name: 'actions',
-        },
-    ];
-});
+const columns = computed(() => [
+    {
+        align: 'left',
+        field: '',
+        label: '',
+        name: 'customerStatus',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'id',
+        label: t('customer.extendedList.tableVisibleColumns.id'),
+        name: 'id',
+    },
+    {
+        align: 'left',
+        field: 'name',
+        label: t('customer.extendedList.tableVisibleColumns.name'),
+        name: 'name',
+    },
+    {
+        align: 'left',
+        field: 'fi',
+        label: t('customer.extendedList.tableVisibleColumns.fi'),
+        name: 'fi',
+    },
+    {
+        align: 'left',
+        field: 'salesPerson',
+        label: t('customer.extendedList.tableVisibleColumns.salesPersonFk'),
+        name: 'salesPersonFk',
+    },
+    {
+        align: 'left',
+        field: 'credit',
+        label: t('customer.extendedList.tableVisibleColumns.credit'),
+        name: 'credit',
+    },
+    {
+        align: 'left',
+        field: 'creditInsurance',
+        label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
+        name: 'creditInsurance',
+    },
+    {
+        align: 'left',
+        field: 'phone',
+        label: t('customer.extendedList.tableVisibleColumns.phone'),
+        name: 'phone',
+    },
+    {
+        align: 'left',
+        field: 'mobile',
+        label: t('customer.extendedList.tableVisibleColumns.mobile'),
+        name: 'mobile',
+    },
+    {
+        align: 'left',
+        field: 'street',
+        label: t('customer.extendedList.tableVisibleColumns.street'),
+        name: 'street',
+    },
+    {
+        align: 'left',
+        field: 'country',
+        label: t('customer.extendedList.tableVisibleColumns.countryFk'),
+        name: 'countryFk',
+    },
+    {
+        align: 'left',
+        field: 'province',
+        label: t('customer.extendedList.tableVisibleColumns.provinceFk'),
+        name: 'provinceFk',
+    },
+    {
+        align: 'left',
+        field: 'city',
+        label: t('customer.extendedList.tableVisibleColumns.city'),
+        name: 'city',
+    },
+    {
+        align: 'left',
+        field: 'postcode',
+        label: t('customer.extendedList.tableVisibleColumns.postcode'),
+        name: 'postcode',
+    },
+    {
+        align: 'left',
+        field: 'email',
+        label: t('customer.extendedList.tableVisibleColumns.email'),
+        name: 'email',
+    },
+    {
+        align: 'left',
+        field: 'created',
+        label: t('customer.extendedList.tableVisibleColumns.created'),
+        name: 'created',
+        format: (value) => toDate(value),
+    },
+    {
+        align: 'left',
+        field: 'businessType',
+        label: t('customer.extendedList.tableVisibleColumns.businessTypeFk'),
+        name: 'businessTypeFk',
+    },
+    {
+        align: 'left',
+        field: 'payMethod',
+        label: t('customer.extendedList.tableVisibleColumns.payMethodFk'),
+        name: 'payMethodFk',
+    },
+    {
+        align: 'left',
+        field: 'sageTaxType',
+        label: t('customer.extendedList.tableVisibleColumns.sageTaxTypeFk'),
+        name: 'sageTaxTypeFk',
+    },
+    {
+        align: 'left',
+        field: 'sageTransactionType',
+        label: t('customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'),
+        name: 'sageTransactionTypeFk',
+    },
+    {
+        align: 'left',
+        field: 'isActive',
+        label: t('customer.extendedList.tableVisibleColumns.isActive'),
+        name: 'isActive',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isVies',
+        label: t('customer.extendedList.tableVisibleColumns.isVies'),
+        name: 'isVies',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isTaxDataChecked',
+        label: t('customer.extendedList.tableVisibleColumns.isTaxDataChecked'),
+        name: 'isTaxDataChecked',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isEqualizated',
+        label: t('customer.extendedList.tableVisibleColumns.isEqualizated'),
+        name: 'isEqualizated',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isFreezed',
+        label: t('customer.extendedList.tableVisibleColumns.isFreezed'),
+        name: 'isFreezed',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasToInvoice',
+        label: t('customer.extendedList.tableVisibleColumns.hasToInvoice'),
+        name: 'hasToInvoice',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasToInvoiceByAddress',
+        label: t('customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'),
+        name: 'hasToInvoiceByAddress',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'isToBeMailed',
+        label: t('customer.extendedList.tableVisibleColumns.isToBeMailed'),
+        name: 'isToBeMailed',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasLcr',
+        label: t('customer.extendedList.tableVisibleColumns.hasLcr'),
+        name: 'hasLcr',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasCoreVnl',
+        label: t('customer.extendedList.tableVisibleColumns.hasCoreVnl'),
+        name: 'hasCoreVnl',
+        format: () => ' ',
+    },
+    {
+        align: 'left',
+        field: 'hasSepaVnl',
+        label: t('customer.extendedList.tableVisibleColumns.hasSepaVnl'),
+        name: 'hasSepaVnl',
+        format: () => ' ',
+    },
+    {
+        align: 'right',
+        field: 'actions',
+        label: '',
+        name: 'actions',
+    },
+]);
 
 const stopEventPropagation = (event, col) => {
     if (!['id', 'salesPersonFk'].includes(col.name)) return;
diff --git a/src/pages/Customer/Notifications/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
index d93de1c2d..df128cce7 100644
--- a/src/pages/Customer/Notifications/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -57,40 +57,38 @@ const tableColumnComponents = {
     },
 };
 
-const columns = computed(() => {
-    return [
-        {
-            align: 'left',
-            field: 'id',
-            label: t('Identifier'),
-            name: 'id',
-        },
-        {
-            align: 'left',
-            field: 'socialName',
-            label: t('Social name'),
-            name: 'socialName',
-        },
-        {
-            align: 'left',
-            field: 'city',
-            label: t('City'),
-            name: 'city',
-        },
-        {
-            align: 'left',
-            field: 'phone',
-            label: t('Phone'),
-            name: 'phone',
-        },
-        {
-            align: 'left',
-            field: 'email',
-            label: t('Email'),
-            name: 'email',
-        },
-    ];
-});
+const columns = computed(() => [
+    {
+        align: 'left',
+        field: 'id',
+        label: t('Identifier'),
+        name: 'id',
+    },
+    {
+        align: 'left',
+        field: 'socialName',
+        label: t('Social name'),
+        name: 'socialName',
+    },
+    {
+        align: 'left',
+        field: 'city',
+        label: t('City'),
+        name: 'city',
+    },
+    {
+        align: 'left',
+        field: 'phone',
+        label: t('Phone'),
+        name: 'phone',
+    },
+    {
+        align: 'left',
+        field: 'email',
+        label: t('Email'),
+        name: 'email',
+    },
+]);
 
 const selectCustomerId = (id) => {
     selectedCustomerId.value = id;
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobal.vue b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
index ea1978702..7e2b43a76 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobal.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
@@ -49,30 +49,28 @@ const tableColumnComponents = {
     },
 };
 
-const columns = computed(() => {
-    return [
-        { label: 'Id', field: 'clientId', name: 'clientId', align: 'left' },
-        {
-            label: t('invoiceOut.globalInvoices.table.client'),
-            field: 'clientName',
-            name: 'clientName',
-            align: 'left',
-        },
-        {
-            label: t('invoiceOut.globalInvoices.table.addressId'),
-            field: 'id',
-            name: 'id',
-            align: 'left',
-        },
-        {
-            label: t('invoiceOut.globalInvoices.table.streetAddress'),
-            field: 'nickname',
-            name: 'nickname',
-            align: 'left',
-        },
-        { label: 'Error', field: 'message', name: 'message', align: 'left' },
-    ];
-});
+const columns = computed(() => [
+    { label: 'Id', field: 'clientId', name: 'clientId', align: 'left' },
+    {
+        label: t('invoiceOut.globalInvoices.table.client'),
+        field: 'clientName',
+        name: 'clientName',
+        align: 'left',
+    },
+    {
+        label: t('invoiceOut.globalInvoices.table.addressId'),
+        field: 'id',
+        name: 'id',
+        align: 'left',
+    },
+    {
+        label: t('invoiceOut.globalInvoices.table.streetAddress'),
+        field: 'nickname',
+        name: 'nickname',
+        align: 'left',
+    },
+    { label: 'Error', field: 'message', name: 'message', align: 'left' },
+]);
 
 const rows = computed(() => {
     if (!errors && !errors.length > 0) return [];
diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index f3cf557c6..62292f115 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -103,111 +103,109 @@ const tableColumnComponents = {
     },
 };
 
-const columns = computed(() => {
-    return [
-        {
-            label: 'id',
-            field: 'id',
-            name: 'id',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('supplier.pageTitles.supplier'),
-            field: 'cargoSupplierNickname',
-            name: 'cargoSupplierNickname',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('globals.agency'),
-            field: 'agencyModeName',
-            name: 'agencyModeName',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('globals.amount'),
-            name: 'invoiceAmount',
-            field: 'entries',
-            align: 'left',
-            showValue: true,
-            format: (value) =>
-                toCurrency(
-                    value
-                        ? value.reduce((sum, entry) => {
-                              return sum + (entry.invoiceAmount || 0);
-                          }, 0)
-                        : 0
-                ),
-        },
-        {
-            label: t('globals.reference'),
-            field: 'ref',
-            name: 'ref',
-            align: 'left',
-            showValue: false,
-        },
-        {
-            label: t('globals.packages'),
-            field: 'stickers',
-            name: 'stickers',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('kg'),
-            field: 'kg',
-            name: 'kg',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('physicKg'),
-            field: 'loadedKg',
-            name: 'loadedKg',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: 'KG Vol.',
-            field: 'volumeKg',
-            name: 'volumeKg',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('globals.wareHouseOut'),
-            field: 'warehouseOutName',
-            name: 'warehouseOutName',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('shipped'),
-            field: 'shipped',
-            name: 'shipped',
-            align: 'left',
-            format: (value) => toDate(value.substring(0, 10)),
-            showValue: true,
-        },
-        {
-            label: t('globals.wareHouseIn'),
-            field: 'warehouseInName',
-            name: 'warehouseInName',
-            align: 'left',
-            showValue: true,
-        },
-        {
-            label: t('landed'),
-            field: 'landed',
-            name: 'landed',
-            align: 'left',
-            format: (value) => toDate(value.substring(0, 10)),
-            showValue: true,
-        },
-    ];
-});
+const columns = computed(() => [
+    {
+        label: 'id',
+        field: 'id',
+        name: 'id',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('supplier.pageTitles.supplier'),
+        field: 'cargoSupplierNickname',
+        name: 'cargoSupplierNickname',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('globals.agency'),
+        field: 'agencyModeName',
+        name: 'agencyModeName',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('globals.amount'),
+        name: 'invoiceAmount',
+        field: 'entries',
+        align: 'left',
+        showValue: true,
+        format: (value) =>
+            toCurrency(
+                value
+                    ? value.reduce((sum, entry) => {
+                          return sum + (entry.invoiceAmount || 0);
+                      }, 0)
+                    : 0
+            ),
+    },
+    {
+        label: t('globals.reference'),
+        field: 'ref',
+        name: 'ref',
+        align: 'left',
+        showValue: false,
+    },
+    {
+        label: t('globals.packages'),
+        field: 'stickers',
+        name: 'stickers',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('kg'),
+        field: 'kg',
+        name: 'kg',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('physicKg'),
+        field: 'loadedKg',
+        name: 'loadedKg',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: 'KG Vol.',
+        field: 'volumeKg',
+        name: 'volumeKg',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('globals.wareHouseOut'),
+        field: 'warehouseOutName',
+        name: 'warehouseOutName',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('shipped'),
+        field: 'shipped',
+        name: 'shipped',
+        align: 'left',
+        format: (value) => toDate(value.substring(0, 10)),
+        showValue: true,
+    },
+    {
+        label: t('globals.wareHouseIn'),
+        field: 'warehouseInName',
+        name: 'warehouseInName',
+        align: 'left',
+        showValue: true,
+    },
+    {
+        label: t('landed'),
+        field: 'landed',
+        name: 'landed',
+        align: 'left',
+        format: (value) => toDate(value.substring(0, 10)),
+        showValue: true,
+    },
+]);
 
 async function getData() {
     await arrayData.fetch({ append: false });

From e8fa564bc2afe79ef318b5e03f3e20ceabeec5cb Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 4 Jan 2024 18:13:31 -0300
Subject: [PATCH 20/26] Agregar * a inputs de campos required via css

---
 src/components/common/VnInput.vue        | 17 ++++++++---------
 src/components/common/VnSelectCreate.vue | 16 +---------------
 src/components/common/VnSelectFilter.vue | 17 ++++++++---------
 src/pages/Entry/EntryCreate.vue          |  7 ++++---
 4 files changed, 21 insertions(+), 36 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index bfd0dea40..9684dcc32 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -12,14 +12,6 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
-    label: {
-        type: String,
-        default: '',
-    },
-    required: {
-        type: Boolean,
-        default: false,
-    },
 });
 
 const value = computed({
@@ -47,8 +39,8 @@ const styleAttrs = computed(() => {
         ref="vnInputRef"
         v-model="value"
         v-bind="{ ...$attrs, ...styleAttrs }"
-        :label="required ? label + ' *' : label"
         type="text"
+        :class="{ required: $attrs.required }"
     >
         <template v-if="$slots.prepend" #prepend>
             <slot name="prepend" />
@@ -58,3 +50,10 @@ const styleAttrs = computed(() => {
         </template>
     </QInput>
 </template>
+
+<style lang="scss">
+/* Estilo para el asterisco en campos requeridos */
+.q-field.required .q-field__label:after {
+    content: ' *';
+}
+</style>
diff --git a/src/components/common/VnSelectCreate.vue b/src/components/common/VnSelectCreate.vue
index cdfb0bfbd..bdc3f5cc8 100644
--- a/src/components/common/VnSelectCreate.vue
+++ b/src/components/common/VnSelectCreate.vue
@@ -20,14 +20,6 @@ const $props = defineProps({
         type: Array,
         default: () => ['developer'],
     },
-    label: {
-        type: String,
-        default: '',
-    },
-    required: {
-        type: Boolean,
-        default: false,
-    },
 });
 
 const role = useRole();
@@ -52,13 +44,7 @@ const toggleForm = () => {
 </script>
 
 <template>
-    <VnSelectFilter
-        v-model="value"
-        :options="options"
-        :label="label"
-        :required="required"
-        v-bind="$attrs"
-    >
+    <VnSelectFilter v-model="value" :options="options" v-bind="$attrs">
         <template v-if="isAllowedToCreate" #append>
             <QIcon
                 @click.stop.prevent="toggleForm()"
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index c223571f3..4256118f9 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -23,14 +23,6 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
-    label: {
-        type: String,
-        default: '',
-    },
-    required: {
-        type: Boolean,
-        default: false,
-    },
 });
 
 const { optionLabel } = toRefs($props);
@@ -95,7 +87,7 @@ const value = computed({
         hide-selected
         fill-input
         ref="vnSelectRef"
-        :label="required ? label + ' *' : label"
+        :class="{ required: $attrs.required }"
     >
         <template v-if="isClearable" #append>
             <QIcon
@@ -110,3 +102,10 @@ const value = computed({
         </template>
     </QSelect>
 </template>
+
+<style lang="scss">
+/* Estilo para el asterisco en campos requeridos */
+.q-field.required .q-field__label:after {
+    content: ' *';
+}
+</style>
diff --git a/src/pages/Entry/EntryCreate.vue b/src/pages/Entry/EntryCreate.vue
index fc725447c..37cfea1ad 100644
--- a/src/pages/Entry/EntryCreate.vue
+++ b/src/pages/Entry/EntryCreate.vue
@@ -67,7 +67,7 @@ const companiesOptions = ref([]);
                         option-value="id"
                         option-label="nickname"
                         hide-selected
-                        required
+                        :required="true"
                         :rules="validate('entry.supplierFk')"
                     >
                         <template #option="scope">
@@ -92,7 +92,7 @@ const companiesOptions = ref([]);
                         option-label="warehouseInName"
                         map-options
                         hide-selected
-                        required
+                        :required="true"
                         :rules="validate('entry.travelFk')"
                     >
                         <template #option="scope">
@@ -121,6 +121,7 @@ const companiesOptions = ref([]);
                         option-label="code"
                         map-options
                         hide-selected
+                        :required="true"
                         :rules="validate('entry.companyFk')"
                     />
                 </VnRow>
@@ -134,4 +135,4 @@ const companiesOptions = ref([]);
         Supplier: Proveedor
         Travel: Envío
         Company: Empresa
-    </i18n>
+</i18n>

From 8cb6ed136aba46d5617c9958c3ef68b5a22eff79 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 4 Jan 2024 19:37:46 -0300
Subject: [PATCH 21/26] =?UTF-8?q?mover=20clase=20de=20selector=20de=20css?=
 =?UTF-8?q?=20para=20a=C3=B1adir=20*=20a=20inputs=20requeridos=20a=20archi?=
 =?UTF-8?q?vo=20de=20css=20global?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/VnInput.vue        | 7 -------
 src/components/common/VnSelectFilter.vue | 7 -------
 src/css/app.scss                         | 5 +++++
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 9684dcc32..cdc6dd865 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -50,10 +50,3 @@ const styleAttrs = computed(() => {
         </template>
     </QInput>
 </template>
-
-<style lang="scss">
-/* Estilo para el asterisco en campos requeridos */
-.q-field.required .q-field__label:after {
-    content: ' *';
-}
-</style>
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 4256118f9..f2fd2a311 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -102,10 +102,3 @@ const value = computed({
         </template>
     </QSelect>
 </template>
-
-<style lang="scss">
-/* Estilo para el asterisco en campos requeridos */
-.q-field.required .q-field__label:after {
-    content: ' *';
-}
-</style>
diff --git a/src/css/app.scss b/src/css/app.scss
index 02d4f8946..f0c26d482 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -53,3 +53,8 @@ body.body--dark {
     color: var(--vn-text);
     border-radius: 8px;
 }
+
+/* Estilo para el asterisco en campos requeridos */
+.q-field.required .q-field__label:after {
+    content: ' *';
+}

From 27616b9bd456e457341498378968a2f9458177df Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 5 Jan 2024 10:57:43 -0300
Subject: [PATCH 22/26] improve TableVisibleColumns code

---
 src/components/common/TableVisibleColumns.vue | 50 ++++++++-----------
 1 file changed, 22 insertions(+), 28 deletions(-)

diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
index 7defdb0de..d9a1a2004 100644
--- a/src/components/common/TableVisibleColumns.vue
+++ b/src/components/common/TableVisibleColumns.vue
@@ -50,41 +50,35 @@ const toggleMarkAll = (val) => {
     formattedCols.value.forEach((col) => (col.active = val));
 };
 
+const getConfig = async (url, filter) => {
+    const response = await axios.get(url, {
+        params: { filter: filter },
+    });
+    return response.data && response.data.length > 0 ? response.data[0] : null;
+};
+
 const fetchViewConfigData = async () => {
     try {
         const userConfigFilter = {
-            where: {
-                tableCode: $props.tableCode,
-                userFk: user.id,
-            },
+            where: { tableCode: $props.tableCode, userFk: user.id },
         };
+        const userConfig = await getConfig('UserConfigViews', userConfigFilter);
 
-        const userViewConfigResponse = await axios.get('UserConfigViews', {
-            params: { filter: userConfigFilter },
-        });
-
-        if (userViewConfigResponse.data && userViewConfigResponse.data.length > 0) {
-            initialUserConfigViewData.value = userViewConfigResponse.data[0];
-            setUserConfigViewData(userViewConfigResponse.data[0].configuration);
+        if (userConfig) {
+            initialUserConfigViewData.value = userConfig;
+            setUserConfigViewData(userConfig.configuration);
             return;
         }
 
-        const defaultConfigFilter = {
-            where: {
-                tableCode: $props.tableCode,
-            },
-        };
+        const defaultConfigFilter = { where: { tableCode: $props.tableCode } };
+        const defaultConfig = await getConfig('DefaultViewConfigs', defaultConfigFilter);
 
-        const defaultViewConfigResponse = await axios.get('DefaultViewConfigs', {
-            params: { filter: defaultConfigFilter },
-        });
-
-        if (defaultViewConfigResponse.data && defaultViewConfigResponse.data.length > 0) {
-            setUserConfigViewData(defaultViewConfigResponse.data[0].columns);
+        if (defaultConfig) {
+            setUserConfigViewData(defaultConfig.columns);
             return;
         }
     } catch (err) {
-        console.err('Error fetching config view data');
+        console.err('Error fetching config view data', err);
     }
 };
 
@@ -127,17 +121,17 @@ const saveConfig = async () => {
         }
         emitSavedConfig();
         notify('globals.dataSaved', 'positive');
-
         popupProxyRef.value.hide();
     } catch (err) {
-        console.error('Error saving user view config');
+        console.error('Error saving user view config', err);
     }
 };
 
 const emitSavedConfig = () => {
-    const filteredCols = formattedCols.value.filter((col) => col.active);
-    const mappedCols = filteredCols.map((col) => col.name);
-    emit('onConfigSaved', mappedCols);
+    const activeColumns = formattedCols.value
+        .filter((col) => col.active)
+        .map((col) => col.name);
+    emit('onConfigSaved', activeColumns);
 };
 
 onMounted(async () => {

From c997d19a5eb0a8fb8004ecd5253610477dd00553 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Fri, 5 Jan 2024 13:04:06 -0400
Subject: [PATCH 23/26] Implement tag filter

---
 src/components/ui/VnFilterPanel.vue         | 47 +++++++++-----
 src/components/ui/VnFilterPanelChip.vue     |  7 ++
 src/pages/Order/Card/OrderCatalogFilter.vue | 72 +++++++++++++++------
 3 files changed, 91 insertions(+), 35 deletions(-)
 create mode 100644 src/components/ui/VnFilterPanelChip.vue

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index a138e0b64..0a306dc5f 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -4,6 +4,8 @@ import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import toDate from 'filters/toDate';
 
+import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
+
 const { t } = useI18n();
 const props = defineProps({
     dataKey: {
@@ -39,6 +41,10 @@ const props = defineProps({
         type: Array,
         default: () => [],
     },
+    customTags: {
+        type: Array,
+        default: () => [],
+    },
 });
 
 const emit = defineEmits(['refresh', 'clear', 'search', 'init', 'remove']);
@@ -104,19 +110,26 @@ async function clearFilters() {
     emit('clear');
 }
 
-const tags = computed(() => {
-    return Object.entries(userParams.value)
+const tagsList = computed(() =>
+    Object.entries(userParams.value)
         .filter(([key, value]) => value && !(props.hiddenTags || []).includes(key))
         .map(([key, value]) => ({
             label: key,
             value: value,
-        }));
-});
+        }))
+);
+
+const tags = computed(() =>
+    tagsList.value.filter((tag) => !(props.customTags || []).includes(tag.label))
+);
+const customTags = computed(() =>
+    tagsList.value.filter((tag) => (props.customTags || []).includes(tag.label))
+);
 
 async function remove(key) {
     userParams.value[key] = null;
     await search();
-    emit('remove', key)
+    emit('remove', key);
 }
 
 function formatValue(value) {
@@ -172,21 +185,17 @@ function formatValue(value) {
             </QItem>
             <QItem class="q-mb-sm">
                 <div
-                    v-if="tags.length === 0"
+                    v-if="tagsList.length === 0"
                     class="text-grey font-xs text-center full-width"
                 >
                     {{ t(`No filters applied`) }}
                 </div>
                 <div>
-                    <QChip
-                        :key="chip.label"
-                        @remove="remove(chip.label)"
-                        class="text-dark"
-                        color="primary"
-                        icon="label"
-                        :removable="!unremovableParams.includes(chip.label)"
-                        size="sm"
+                    <VnFilterPanelChip
                         v-for="chip of tags"
+                        :key="chip.label"
+                        :removable="!unremovableParams.includes(chip.label)"
+                        @remove="remove(chip.label)"
                     >
                         <slot name="tags" :tag="chip" :format-fn="formatValue">
                             <div class="q-gutter-x-xs">
@@ -194,7 +203,15 @@ function formatValue(value) {
                                 <span>"{{ chip.value }}"</span>
                             </div>
                         </slot>
-                    </QChip>
+                    </VnFilterPanelChip>
+                    <slot
+                        v-if="$slots.customTags"
+                        name="customTags"
+                        :params="userParams"
+                        :tags="customTags"
+                        :format-fn="formatValue"
+                        :search-fn="search"
+                    />
                 </div>
             </QItem>
             <QSeparator />
diff --git a/src/components/ui/VnFilterPanelChip.vue b/src/components/ui/VnFilterPanelChip.vue
new file mode 100644
index 000000000..89aad39e8
--- /dev/null
+++ b/src/components/ui/VnFilterPanelChip.vue
@@ -0,0 +1,7 @@
+<script setup></script>
+
+<template>
+    <QChip class="text-dark" color="primary" icon="label" size="sm" v-bind="$attrs">
+        <slot />
+    </QChip>
+</template>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 09e243959..c402dd5f4 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -1,12 +1,14 @@
 <script setup>
 import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import axios from 'axios';
+
+import VnInput from 'components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
-import axios from 'axios';
-import { useRoute } from 'vue-router';
-import VnInput from 'components/common/VnInput.vue';
+import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -97,6 +99,7 @@ function exprBuilder(param, value) {
 const selectedTag = ref(null);
 const tagValues = ref([{}]);
 const tagOptions = ref(null);
+const isButtonDisabled = computed(()=> !selectedTag.value || tagValues.value.some(item => !item.value))
 
 const applyTagFilter = (params, search) => {
     if (!tagValues.value?.length) {
@@ -104,14 +107,30 @@ const applyTagFilter = (params, search) => {
         search();
         return;
     }
-    params.tagGroups = JSON.stringify({
-        values: tagValues.value,
-        tagSelection: {
-            ...selectedTag.value,
-            orgShowField: selectedTag.value.name,
-        },
-        tagFk: selectedTag.value.tagFk,
-    });
+    if (!params.tagGroups) {
+        params.tagGroups = [];
+    }
+    params.tagGroups.push(
+        JSON.stringify({
+            values: tagValues.value,
+            tagSelection: {
+                ...selectedTag.value,
+                orgShowField: selectedTag.value.name,
+            },
+            tagFk: selectedTag.value.tagFk,
+        })
+    );
+    search();
+    selectedTag.value = null;
+    tagValues.value = [{}]
+};
+
+const removeTagChip = (selection, params, search) => {
+    if (params.tagGroups) {
+        params.tagGroups = (params.tagGroups || []).filter(
+            (value) => value !== selection
+        );
+    }
     search();
 };
 
@@ -144,19 +163,12 @@ const onOrderChange = (value, params, search) => {
         :data-key="props.dataKey"
         :hidden-tags="['orderFk', 'orderBy']"
         :expr-builder="exprBuilder"
+        :custom-tags="['tagGroups']"
         @init="onFilterInit"
         @remove="clearFilter"
     >
         <template #tags="{ tag, formatFn }">
-            <div v-if="tag.label === 'tagGroups'">
-                <strong> {{ JSON.parse(tag?.value).tagSelection?.name }}: </strong>
-                <span>{{
-                    (JSON.parse(tag?.value).values || [])
-                        .map((item) => item.value)
-                        .join(' | ')
-                }}</span>
-            </div>
-            <strong v-else-if="tag.label === 'categoryFk'">
+            <strong v-if="tag.label === 'categoryFk'">
                 {{ t(selectedCategory?.name || '') }}
             </strong>
             <strong v-else-if="tag.label === 'typeFk'">
@@ -167,6 +179,25 @@ const onOrderChange = (value, params, search) => {
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
+        <template #customTags="{ tags: customTags, params, searchFn }">
+            <template v-for="tag in customTags" :key="tag.label">
+                <template v-if="tag.label === 'tagGroups'">
+                    <VnFilterPanelChip
+                        v-for="chip in tag.value"
+                        :key="chip"
+                        removable
+                        @remove="removeTagChip(chip, params, searchFn)"
+                    >
+                        <strong> {{ JSON.parse(chip).tagSelection?.name }}: </strong>
+                        <span>{{
+                            (JSON.parse(chip).values || [])
+                                .map((item) => item.value)
+                                .join(' | ')
+                        }}</span>
+                    </VnFilterPanelChip>
+                </template>
+            </template>
+        </template>
         <template #body="{ params, searchFn }">
             <QList dense style="max-width: 256px">
                 <QItem class="category-filter q-mt-md">
@@ -320,6 +351,7 @@ const onOrderChange = (value, params, search) => {
                             rounded
                             type="button"
                             unelevated
+                            :disable="isButtonDisabled"
                             @click.stop="applyTagFilter(params, searchFn)"
                         />
                     </QItemSection>

From fbd5abb3300921fffa109f87fd63bd0d3388cd03 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Mon, 8 Jan 2024 10:00:04 -0400
Subject: [PATCH 24/26] Fix fallowing feedback

---
 src/components/FormModel.vue                 |   5 +-
 src/pages/Order/Card/OrderBasicData.vue      |  12 -
 src/pages/Order/Card/OrderCard.vue           |   4 +-
 src/pages/Order/Card/OrderCatalogFilter.vue  |   2 +-
 src/pages/Order/Card/OrderCatalogItem.vue    |   4 +-
 src/pages/Order/Card/OrderDescriptorMenu.vue |   8 +-
 src/pages/Order/Card/OrderForm.vue           | 189 ++++++------
 src/pages/Order/Card/OrderSummary.vue        | 297 ++++++++++---------
 src/pages/Order/OrderLines.vue               |  11 +-
 9 files changed, 270 insertions(+), 262 deletions(-)
 delete mode 100644 src/pages/Order/Card/OrderBasicData.vue

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 691cf63bd..a5560dfc0 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -135,12 +135,11 @@ async function save() {
             await axios.patch($props.urlUpdate || $props.url, body);
         }
         emit('onDataSaved', formData.value);
+        originalData.value = JSON.parse(JSON.stringify(formData.value));
+        hasChanges.value = false;
     } catch (err) {
         notify('errors.create', 'negative');
     }
-
-    originalData.value = JSON.parse(JSON.stringify(formData.value));
-    hasChanges.value = false;
     isLoading.value = false;
 }
 
diff --git a/src/pages/Order/Card/OrderBasicData.vue b/src/pages/Order/Card/OrderBasicData.vue
deleted file mode 100644
index 0611fa874..000000000
--- a/src/pages/Order/Card/OrderBasicData.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<script setup>
-import OrderForm from 'pages/Order/Card/OrderForm.vue';
-</script>
-<template>
-    <QToolbar>
-        <div id="st-data"></div>
-        <QSpace />
-        <div id="st-actions"></div>
-    </QToolbar>
-    <OrderForm />
-</template>
-<style lang="scss" scoped></style>
diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue
index 4163e22a4..e81c6a3eb 100644
--- a/src/pages/Order/Card/OrderCard.vue
+++ b/src/pages/Order/Card/OrderCard.vue
@@ -15,9 +15,7 @@ const stateStore = useStateStore();
     </QDrawer>
     <QPageContainer>
         <QPage>
-            <div class="q-pa-md">
-                <RouterView></RouterView>
-            </div>
+            <RouterView></RouterView>
         </QPage>
     </QPageContainer>
 </template>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 766643eba..ee6859c80 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -384,7 +384,7 @@ const getCategoryClass = (category, params) => {
 
     .category-icon {
         border-radius: 50%;
-        background-color: var(--vn-label);
+        background-color: var(--vn-light-gray);
         font-size: 2.6rem;
         padding: 8px;
         cursor: pointer;
diff --git a/src/pages/Order/Card/OrderCatalogItem.vue b/src/pages/Order/Card/OrderCatalogItem.vue
index e36ba7836..140a4c349 100644
--- a/src/pages/Order/Card/OrderCatalogItem.vue
+++ b/src/pages/Order/Card/OrderCatalogItem.vue
@@ -24,7 +24,7 @@ const dialog = ref(null);
 
 <template>
     <div class="container order-catalog-item overflow-hidden">
-        <div class="card shadow-6 bg-dark">
+        <QCard class="card shadow-6">
             <div class="img-wrapper">
                 <QImg
                     :src="`/api/Images/catalog/200x200/${item.id}/download?access_token=${token}`"
@@ -76,7 +76,7 @@ const dialog = ref(null);
                     </p>
                 </div>
             </div>
-        </div>
+        </QCard>
     </div>
 </template>
 
diff --git a/src/pages/Order/Card/OrderDescriptorMenu.vue b/src/pages/Order/Card/OrderDescriptorMenu.vue
index b432ba4d7..2e36aa3c5 100644
--- a/src/pages/Order/Card/OrderDescriptorMenu.vue
+++ b/src/pages/Order/Card/OrderDescriptorMenu.vue
@@ -51,13 +51,13 @@ async function remove() {
 
 <i18n>
 en:
-    deleteOrder: Delete order,
-    confirmDeletion: Confirm deletion,
+    deleteOrder: Delete order
+    confirmDeletion: Confirm deletion
     confirmDeletionMessage: Are you sure you want to delete this order?
 
 es:
-    deleteOrder: Eliminar pedido,
-    confirmDeletion: Confirmar eliminación,
+    deleteOrder: Eliminar pedido
+    confirmDeletion: Confirmar eliminación
     confirmDeletionMessage: Seguro que quieres eliminar este pedido?
 
 </i18n>
diff --git a/src/pages/Order/Card/OrderForm.vue b/src/pages/Order/Card/OrderForm.vue
index 4c7e2c326..67f77d0ca 100644
--- a/src/pages/Order/Card/OrderForm.vue
+++ b/src/pages/Order/Card/OrderForm.vue
@@ -65,8 +65,8 @@ const fetchAgencyList = async (landed, addressFk) => {
 };
 
 const fetchOrderDetails = (order) => {
-    fetchAddressList(order?.addressFk)
-    fetchAgencyList(order?.landed, order?.addressFk)
+    fetchAddressList(order?.addressFk);
+    fetchAgencyList(order?.landed, order?.addressFk);
 };
 
 const orderMapper = (order) => {
@@ -105,7 +105,7 @@ const orderFilter = {
 </script>
 
 <template>
-    <QToolbar>
+    <QToolbar class="bg-vn-dark justify-end">
         <div id="st-data"></div>
         <QSpace />
         <div id="st-actions"></div>
@@ -116,94 +116,97 @@ const orderFilter = {
         :filter="{ fields: ['id', 'name', 'defaultAddressFk'] }"
         auto-load
     />
-    <FormModel
-        :url="!isNew ? `Orders/${route.params.id}` : null"
-        :url-create="isNew ? 'Orders/new' : null"
-        :model="ORDER_MODEL"
-        :form-initial-data="isNew ? initialFormState : null"
-        :observe-form-changes="!isNew"
-        :mapper="isNew ? orderMapper : null"
-        :filter="orderFilter"
-        @on-fetch="fetchOrderDetails"
-    >
-        <template #form="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelectFilter
-                        :label="t('order.form.clientFk')"
-                        v-model="data.clientFk"
-                        :options="clientList"
-                        option-value="id"
-                        option-label="name"
-                        hide-selected
-                        @update:model-value="
-                            (client) => fetchAddressList(client.defaultAddressFk)
-                        "
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>
-                                        {{ `${scope.opt.id}: ${scope.opt.name}` }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelectFilter>
-                </div>
-                <div class="col">
-                    <VnSelectFilter
-                        :label="t('order.form.addressFk')"
-                        v-model="data.addressFk"
-                        :options="addressList"
-                        option-value="id"
-                        option-label="nickname"
-                        hide-selected
-                        :disable="!addressList?.length"
-                        @update:model-value="
-                            () => fetchAgencyList(data.landed, data.addressFk)
-                        "
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel>
-                                        {{
-                                            `${scope.opt.nickname}: ${scope.opt.street},${scope.opt.city}`
-                                        }}
-                                    </QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelectFilter>
-                </div>
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInputDate
-                        placeholder="dd-mm-aaa"
-                        :label="t('order.form.landed')"
-                        v-model="data.landed"
-                        @update:model-value="
-                            () => fetchAgencyList(data.landed, data.addressFk)
-                        "
-                    />
-                </div>
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnSelectFilter
-                        :label="t('order.form.agencyModeFk')"
-                        v-model="data.agencyModeFk"
-                        :options="agencyList"
-                        option-value="agencyModeFk"
-                        option-label="agencyMode"
-                        hide-selected
-                        :disable="!agencyList?.length"
-                    >
-                    </VnSelectFilter>
-                </div>
-            </VnRow>
-        </template>
-    </FormModel>
+
+    <div class="q-pa-md">
+        <FormModel
+            :url="!isNew ? `Orders/${route.params.id}` : null"
+            :url-create="isNew ? 'Orders/new' : null"
+            :model="ORDER_MODEL"
+            :form-initial-data="isNew ? initialFormState : null"
+            :observe-form-changes="!isNew"
+            :mapper="isNew ? orderMapper : null"
+            :filter="orderFilter"
+            @on-fetch="fetchOrderDetails"
+        >
+            <template #form="{ data }">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('order.form.clientFk')"
+                            v-model="data.clientFk"
+                            :options="clientList"
+                            option-value="id"
+                            option-label="name"
+                            hide-selected
+                            @update:model-value="
+                                (client) => fetchAddressList(client.defaultAddressFk)
+                            "
+                        >
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection>
+                                        <QItemLabel>
+                                            {{ `${scope.opt.id}: ${scope.opt.name}` }}
+                                        </QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelectFilter>
+                    </div>
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('order.form.addressFk')"
+                            v-model="data.addressFk"
+                            :options="addressList"
+                            option-value="id"
+                            option-label="nickname"
+                            hide-selected
+                            :disable="!addressList?.length"
+                            @update:model-value="
+                                () => fetchAgencyList(data.landed, data.addressFk)
+                            "
+                        >
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection>
+                                        <QItemLabel>
+                                            {{
+                                                `${scope.opt.nickname}: ${scope.opt.street},${scope.opt.city}`
+                                            }}
+                                        </QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelectFilter>
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnInputDate
+                            placeholder="dd-mm-aaa"
+                            :label="t('order.form.landed')"
+                            v-model="data.landed"
+                            @update:model-value="
+                                () => fetchAgencyList(data.landed, data.addressFk)
+                            "
+                        />
+                    </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('order.form.agencyModeFk')"
+                            v-model="data.agencyModeFk"
+                            :options="agencyList"
+                            option-value="agencyModeFk"
+                            option-label="agencyMode"
+                            hide-selected
+                            :disable="!agencyList?.length"
+                        >
+                        </VnSelectFilter>
+                    </div>
+                </VnRow>
+            </template>
+        </FormModel>
+    </div>
 </template>
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index 0ddae2d16..9b26891a1 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -56,148 +56,161 @@ const detailsColumns = ref([
     <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
         <OrderSearchbar />
     </Teleport>
-    <CardSummary ref="summary" :url="`Orders/${entityId}/summary`">
-        <template #header="{ entity }">
-            {{ t('order.summary.basket') }} #{{ entity?.id }} -
-            {{ entity?.client?.name }} ({{ entity?.clientFk }})
-        </template>
-        <template #body="{ entity }">
-            <QCard class="vn-one">
-                <VnLv label="ID" :value="entity.id" />
-                <VnLv :label="t('order.summary.nickname')" dash>
-                    <template #value>
-                        <span class="link">
-                            {{ dashIfEmpty(entity?.address?.nickname) }}
-                            <CustomerDescriptorProxy :id="entity?.clientFk" />
-                        </span>
-                    </template>
-                </VnLv>
-                <VnLv
-                    :label="t('order.summary.company')"
-                    :value="entity?.address?.companyFk"
-                />
-                <VnLv
-                    :label="t('order.summary.confirmed')"
-                    :value="Boolean(entity?.isConfirmed)"
-                />
-            </QCard>
-            <QCard class="vn-one">
-                <VnLv
-                    :label="t('order.summary.created')"
-                    :value="toDateHour(entity?.created)"
-                />
-                <VnLv
-                    :label="t('order.summary.confirmed')"
-                    :value="toDateHour(entity?.confirmed)"
-                />
-                <VnLv
-                    :label="t('order.summary.landed')"
-                    :value="toDateHour(entity?.landed)"
-                />
-                <VnLv :label="t('order.summary.phone')">
-                    <template #value>
-                        {{ dashIfEmpty(entity?.address?.phone) }}
-                        <a
-                            v-if="entity?.address?.phone"
-                            :href="`tel:${entity?.address?.phone}`"
-                            class="text-primary"
-                        >
-                            <QIcon name="phone" />
-                        </a>
-                    </template>
-                </VnLv>
-                <VnLv
-                    :label="t('order.summary.createdFrom')"
-                    :value="entity?.sourceApp"
-                />
-                <VnLv
-                    :label="t('order.summary.address')"
-                    :value="`${entity?.address?.street} - ${entity?.address?.city} (${entity?.address?.province?.name})`"
-                    class="order-summary-address"
-                />
-            </QCard>
-            <QCard class="vn-one">
-                <p class="header">
-                    {{ t('order.summary.notes') }}
-                </p>
-                <p v-if="entity?.note" class="no-margin">
-                    {{ entity?.note }}
-                </p>
-            </QCard>
-            <QCard class="vn-one">
-                <VnLv>
-                    <template #label>
-                        <span class="text-h6">{{ t('order.summary.subtotal') }}</span>
-                    </template>
-                    <template #value>
-                        <span class="text-h6">{{ toCurrency(entity?.subTotal) }}</span>
-                    </template>
-                </VnLv>
-                <VnLv>
-                    <template #label>
-                        <span class="text-h6">{{ t('order.summary.vat') }}</span>
-                    </template>
-                    <template #value>
-                        <span class="text-h6">{{ toCurrency(entity?.VAT) }}</span>
-                    </template>
-                </VnLv>
-                <VnLv>
-                    <template #label>
-                        <span class="text-h6">{{ t('order.summary.total') }}</span>
-                    </template>
-                    <template #value>
-                        <span class="text-h6">{{ toCurrency(entity?.total) }}</span>
-                    </template>
-                </VnLv>
-            </QCard>
-            <QCard>
-                <p class="header">
-                    {{ t('order.summary.details') }}
-                </p>
-                <QTable
-                    :columns="detailsColumns"
-                    :rows="entity?.rows"
-                    flat
-                    hide-pagination
-                >
-                    <template #header="props">
-                        <QTr :props="props">
-                            <QTh auto-width>{{ t('order.summary.item') }}</QTh>
-                            <QTh>{{ t('order.summary.description') }}</QTh>
-                            <QTh auto-width>{{ t('order.summary.quantity') }}</QTh>
-                            <QTh auto-width>{{ t('order.summary.price') }}</QTh>
-                            <QTh auto-width>{{ t('order.summary.amount') }}</QTh>
-                        </QTr>
-                    </template>
-                    <template #body="props">
-                        <QTr :props="props">
-                            <QTd key="item" :props="props" class="item">
-                                {{ props.row.item?.id }}
-                            </QTd>
-                            <QTd key="description" :props="props" class="description">
-                                <div class="name">
-                                    <span>{{ props.row.item.name }}</span>
-                                    <span v-if="props.row.item.subName" class="subName">
-                                        {{ props.row.item.subName }}
-                                    </span>
-                                </div>
-                                <fetched-tags :item="props.row.item" :max-length="5" />
-                            </QTd>
-                            <QTd key="quantity" :props="props">
-                                {{ props.row.quantity }}
-                            </QTd>
-                            <QTd key="price" :props="props">
-                                {{ props.row.price }}
-                            </QTd>
-                            <QTd key="amount" :props="props">
-                                {{ toCurrency(props.row?.quantity * props.row?.price) }}
-                            </QTd>
-                        </QTr>
-                    </template>
-                </QTable>
-            </QCard>
-        </template>
-    </CardSummary>
+
+    <div class="q-pa-md">
+        <CardSummary ref="summary" :url="`Orders/${entityId}/summary`">
+            <template #header="{ entity }">
+                {{ t('order.summary.basket') }} #{{ entity?.id }} -
+                {{ entity?.client?.name }} ({{ entity?.clientFk }})
+            </template>
+            <template #body="{ entity }">
+                <QCard class="vn-one">
+                    <VnLv label="ID" :value="entity.id" />
+                    <VnLv :label="t('order.summary.nickname')" dash>
+                        <template #value>
+                            <span class="link">
+                                {{ dashIfEmpty(entity?.address?.nickname) }}
+                                <CustomerDescriptorProxy :id="entity?.clientFk" />
+                            </span>
+                        </template>
+                    </VnLv>
+                    <VnLv
+                        :label="t('order.summary.company')"
+                        :value="entity?.address?.companyFk"
+                    />
+                    <VnLv
+                        :label="t('order.summary.confirmed')"
+                        :value="Boolean(entity?.isConfirmed)"
+                    />
+                </QCard>
+                <QCard class="vn-one">
+                    <VnLv
+                        :label="t('order.summary.created')"
+                        :value="toDateHour(entity?.created)"
+                    />
+                    <VnLv
+                        :label="t('order.summary.confirmed')"
+                        :value="toDateHour(entity?.confirmed)"
+                    />
+                    <VnLv
+                        :label="t('order.summary.landed')"
+                        :value="toDateHour(entity?.landed)"
+                    />
+                    <VnLv :label="t('order.summary.phone')">
+                        <template #value>
+                            {{ dashIfEmpty(entity?.address?.phone) }}
+                            <a
+                                v-if="entity?.address?.phone"
+                                :href="`tel:${entity?.address?.phone}`"
+                                class="text-primary"
+                            >
+                                <QIcon name="phone" />
+                            </a>
+                        </template>
+                    </VnLv>
+                    <VnLv
+                        :label="t('order.summary.createdFrom')"
+                        :value="entity?.sourceApp"
+                    />
+                    <VnLv
+                        :label="t('order.summary.address')"
+                        :value="`${entity?.address?.street} - ${entity?.address?.city} (${entity?.address?.province?.name})`"
+                        class="order-summary-address"
+                    />
+                </QCard>
+                <QCard class="vn-one">
+                    <p class="header">
+                        {{ t('order.summary.notes') }}
+                    </p>
+                    <p v-if="entity?.note" class="no-margin">
+                        {{ entity?.note }}
+                    </p>
+                </QCard>
+                <QCard class="vn-one">
+                    <VnLv>
+                        <template #label>
+                            <span class="text-h6">{{ t('order.summary.subtotal') }}</span>
+                        </template>
+                        <template #value>
+                            <span class="text-h6">{{
+                                toCurrency(entity?.subTotal)
+                            }}</span>
+                        </template>
+                    </VnLv>
+                    <VnLv>
+                        <template #label>
+                            <span class="text-h6">{{ t('order.summary.vat') }}</span>
+                        </template>
+                        <template #value>
+                            <span class="text-h6">{{ toCurrency(entity?.VAT) }}</span>
+                        </template>
+                    </VnLv>
+                    <VnLv>
+                        <template #label>
+                            <span class="text-h6">{{ t('order.summary.total') }}</span>
+                        </template>
+                        <template #value>
+                            <span class="text-h6">{{ toCurrency(entity?.total) }}</span>
+                        </template>
+                    </VnLv>
+                </QCard>
+                <QCard>
+                    <p class="header">
+                        {{ t('order.summary.details') }}
+                    </p>
+                    <QTable
+                        :columns="detailsColumns"
+                        :rows="entity?.rows"
+                        flat
+                        hide-pagination
+                    >
+                        <template #header="props">
+                            <QTr :props="props">
+                                <QTh auto-width>{{ t('order.summary.item') }}</QTh>
+                                <QTh>{{ t('order.summary.description') }}</QTh>
+                                <QTh auto-width>{{ t('order.summary.quantity') }}</QTh>
+                                <QTh auto-width>{{ t('order.summary.price') }}</QTh>
+                                <QTh auto-width>{{ t('order.summary.amount') }}</QTh>
+                            </QTr>
+                        </template>
+                        <template #body="props">
+                            <QTr :props="props">
+                                <QTd key="item" :props="props" class="item">
+                                    {{ props.row.item?.id }}
+                                </QTd>
+                                <QTd key="description" :props="props" class="description">
+                                    <div class="name">
+                                        <span>{{ props.row.item.name }}</span>
+                                        <span
+                                            v-if="props.row.item.subName"
+                                            class="subName"
+                                        >
+                                            {{ props.row.item.subName }}
+                                        </span>
+                                    </div>
+                                    <fetched-tags
+                                        :item="props.row.item"
+                                        :max-length="5"
+                                    />
+                                </QTd>
+                                <QTd key="quantity" :props="props">
+                                    {{ props.row.quantity }}
+                                </QTd>
+                                <QTd key="price" :props="props">
+                                    {{ props.row.price }}
+                                </QTd>
+                                <QTd key="amount" :props="props">
+                                    {{
+                                        toCurrency(props.row?.quantity * props.row?.price)
+                                    }}
+                                </QTd>
+                            </QTr>
+                        </template>
+                    </QTable>
+                </QCard>
+            </template>
+        </CardSummary>
+    </div>
 </template>
 <style lang="scss">
 .cardSummary .summaryBody .vn-label-value.order-summary-address {
diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue
index 48d0e548c..0dce70831 100644
--- a/src/pages/Order/OrderLines.vue
+++ b/src/pages/Order/OrderLines.vue
@@ -25,6 +25,7 @@ const orderSummary = ref({
     vat: null,
 });
 const componentKey = ref(0);
+const order = ref(0);
 
 const refresh = () => {
     componentKey.value += 1;
@@ -63,6 +64,12 @@ async function confirmOrder() {
 </script>
 
 <template>
+    <FetchData
+        :key="componentKey"
+        :url="`Orders/${route.params.id}`"
+        @on-fetch="(data) => (order = data)"
+        auto-load
+    />
     <FetchData
         :key="componentKey"
         :url="`Orders/${route.params.id}/getTotal`"
@@ -177,7 +184,7 @@ async function confirmOrder() {
                                     :value="toCurrency(row.price * row.quantity)"
                                 />
                             </template>
-                            <template #actions>
+                            <template #actions v-if="!order?.isConfirmed">
                                 <QBtn
                                     :label="t('remove')"
                                     @click.stop="confirmRemove(row)"
@@ -190,7 +197,7 @@ async function confirmOrder() {
                 </template>
             </VnPaginate>
         </div>
-        <QPageSticky :offset="[20, 20]">
+        <QPageSticky :offset="[20, 20]" v-if="!order?.isConfirmed">
             <QBtn fab icon="check" color="primary" @click="confirmOrder()" />
             <QTooltip>
                 {{ t('confirm') }}

From 5c2b99565949cb0d1b14f7e91c8da4500b2b9dd9 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Mon, 8 Jan 2024 10:28:55 -0400
Subject: [PATCH 25/26] Add order catalog sort filter

---
 src/pages/Order/Card/OrderCatalogFilter.vue | 44 +++++++++++++++++++--
 1 file changed, 41 insertions(+), 3 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index ee6859c80..c325a9b05 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -39,6 +39,14 @@ const orderList = [
     { way: 'DESC', name: 'Descendant' },
 ];
 
+const selectedOrderField = ref(null);
+const OrderFields = [
+    { field: 'relevancy DESC, name', name: 'Relevancy', priority: 999 },
+    { field: 'showOrder, price', name: 'Color and price', priority: 999 },
+    { field: 'name', name: 'Name', priority: 999 },
+    { field: 'price', name: 'Price', priority: 999 },
+];
+
 const clearFilter = (key) => {
     if (key === 'categoryFk') {
         resetCategory();
@@ -73,8 +81,9 @@ const onFilterInit = async ({ params }) => {
         selectedCategoryFk.value = params.categoryFk;
     }
     if (params.orderBy) {
-        selectedOrder.value = JSON.parse(params.orderBy).way;
         orderByParam.value = JSON.parse(params.orderBy);
+        selectedOrder.value = orderByParam.value?.way;
+        selectedOrderField.value = orderByParam.value?.field;
     }
 };
 
@@ -101,7 +110,9 @@ function exprBuilder(param, value) {
 const selectedTag = ref(null);
 const tagValues = ref([{}]);
 const tagOptions = ref(null);
-const isButtonDisabled = computed(()=> !selectedTag.value || tagValues.value.some(item => !item.value))
+const isButtonDisabled = computed(
+    () => !selectedTag.value || tagValues.value.some((item) => !item.value)
+);
 
 const applyTagFilter = (params, search) => {
     if (!tagValues.value?.length) {
@@ -124,7 +135,7 @@ const applyTagFilter = (params, search) => {
     );
     search();
     selectedTag.value = null;
-    tagValues.value = [{}]
+    tagValues.value = [{}];
 };
 
 const removeTagChip = (selection, params, search) => {
@@ -138,6 +149,12 @@ const removeTagChip = (selection, params, search) => {
 
 const orderByParam = ref(null);
 
+const onOrderFieldChange = (value, params, search) => {
+    const orderBy = Object.assign({}, orderByParam.value, { field: value.field });
+    params.orderBy = JSON.stringify(orderBy);
+    search();
+};
+
 const onOrderChange = (value, params, search) => {
     const orderBy = Object.assign({}, orderByParam.value, { way: value.way });
     params.orderBy = JSON.stringify(orderBy);
@@ -268,12 +285,33 @@ const getCategoryClass = (category, params) => {
                             rounded
                             :emit-value="false"
                             use-input
+                            :is-clearable="false"
                             @update:model-value="
                                 (value) => onOrderChange(value, params, searchFn)
                             "
                         />
                     </QItemSection>
                 </QItem>
+                <QItem class="q-mb-md">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="t('params.order')"
+                            v-model="selectedOrderField"
+                            :options="OrderFields || []"
+                            option-value="field"
+                            option-label="name"
+                            dense
+                            outlined
+                            rounded
+                            :emit-value="false"
+                            use-input
+                            :is-clearable="false"
+                            @update:model-value="
+                                (value) => onOrderFieldChange(value, params, searchFn)
+                            "
+                        />
+                    </QItemSection>
+                </QItem>
                 <QSeparator />
                 <QItem class="q-mt-md">
                     <QItemSection>

From 8a2a6fe1c92592db2d2b2f3ef0f8c2614c2ac8fd Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 8 Jan 2024 11:51:20 -0300
Subject: [PATCH 26/26] =?UTF-8?q?Cambiar=20traducci=C3=B3n=20de=20fiscalDa?=
 =?UTF-8?q?ta?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/es/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 6b1e22263..d5f4691a1 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -62,7 +62,7 @@ export default {
         selectRows: 'Seleccionar las { numberRows } filas(s)',
         allRows: 'Todo { numberRows } filas(s)',
         markAll: 'Marcar todo',
-        noResults: 'Sin resultados'
+        noResults: 'Sin resultados',
     },
     errors: {
         statusUnauthorized: 'Acceso denegado',
@@ -856,7 +856,7 @@ export default {
             payDeadline: 'Plazo de pago',
             payDay: 'Día de pago',
             account: 'Cuenta',
-            fiscalData: 'Data fiscal',
+            fiscalData: 'Datos fiscales',
             sageTaxType: 'Tipo de impuesto Sage',
             sageTransactionType: 'Tipo de transacción Sage',
             sageWithholding: 'Retención sage',