From 36344d112b0019372c7026eb10e19465dfddf493 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Fri, 22 Dec 2023 00:34:18 -0400
Subject: [PATCH 01/18] Create order volume

---
 src/i18n/en/index.js            |   1 +
 src/i18n/es/index.js            |   1 +
 src/pages/Order/OrderVolume.vue | 149 ++++++++++++++++++++++++++++++++
 src/router/modules/order.js     |  11 ++-
 4 files changed, 161 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Order/OrderVolume.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 4a1eea8f4..45df3f1ff 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -557,6 +557,7 @@ export default {
             summary: 'Summary',
             basicData: 'Basic Data',
             catalog: 'Catalog',
+            volume: 'Volume'
         },
         field: {
             salesPersonFk: 'Sales Person',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 3f4ac1c27..90fdb18b6 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -466,6 +466,7 @@ export default {
             summary: 'Resumen',
             basicData: 'Datos básicos',
             catalog: 'Catálogo',
+            volume: 'Volumen',
         },
         field: {
             salesPersonFk: 'Comercial',
diff --git a/src/pages/Order/OrderVolume.vue b/src/pages/Order/OrderVolume.vue
new file mode 100644
index 000000000..f2b451628
--- /dev/null
+++ b/src/pages/Order/OrderVolume.vue
@@ -0,0 +1,149 @@
+<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 { dashIfEmpty } from 'src/filters';
+import CardList from 'components/ui/CardList.vue';
+import axios from 'axios';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+const volumeSummary = ref(null);
+
+const loadVolumes = async (rows) => {
+    const { data } = await axios.get(`Orders/${route.params.id}/getVolumes`);
+    (rows || []).forEach((order) => {
+        (data.volumes || []).forEach((volume) => {
+            if (order.itemFk === volume.itemFk) {
+                order.volume = volume.volume;
+            }
+        });
+    });
+};
+</script>
+
+<template>
+    <FetchData
+        :url="`Orders/${route.params.id}/getTotalVolume`"
+        @on-fetch="(data) => (volumeSummary = data)"
+        auto-load
+    />
+    <QPage class="column items-center q-pa-md">
+        <div class="card-list">
+            <QCard 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('boxes')"
+                    :value="`${dashIfEmpty(volumeSummary?.totalBoxes)} U`"
+                />
+            </QCard>
+            <VnPaginate
+                data-key="OrderCatalogVolume"
+                url="OrderRows"
+                :limit="20"
+                auto-load
+                :filter="{
+                    include: {
+                        relation: 'item',
+                    },
+                    where: { orderFk: route.params.id },
+                }"
+                order="itemFk"
+                @on-fetch="(data) => loadVolumes(data)"
+            >
+                <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 #list-items>
+                                <div class="q-mb-sm">
+                                    <fetched-tags :item="row.item" :max-length="5" />
+                                </div>
+                                <VnLv :label="t('item')" :value="row.item.id" />
+                                <VnLv :label="t('subName')">
+                                    <template #value>
+                                        <span class="text-uppercase">
+                                            {{ row.item.subName }}
+                                        </span>
+                                    </template>
+                                </VnLv>
+                                <VnLv :label="t('quantity')" :value="row.quantity" />
+                                <VnLv :label="t('volume')" :value="row.volume" />
+                            </template>
+                        </CardList>
+                    </div>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+</template>
+
+<style lang="scss">
+.card-list {
+    width: 100%;
+    max-width: 60em;
+}
+
+.order-volume-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>
+.header {
+    color: $primary;
+    font-weight: bold;
+    margin-bottom: 25px;
+    font-size: 20px;
+    display: inline-block;
+}
+</style>
+<i18n>
+en:
+    summary: Summary
+    total: Total
+    boxes: Boxes
+    item: Item
+    subName: Subname
+    quantity: Quantity
+    volume: m³ per quantity
+es:
+    summary: Resumen
+    total: Total
+    boxes: Cajas
+    item: Artículo
+    subName: Subname
+    quantity: Cantidad
+    volume: m³ por cantidad
+</i18n>
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
index e91e95493..8a55a39d2 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'],
+        card: ['OrderBasicData', 'OrderCatalog', 'OrderVolume'],
     },
     children: [
         {
@@ -72,6 +72,15 @@ export default {
                     },
                     component: () => import('src/pages/Order/OrderCatalog.vue'),
                 },
+                {
+                    name: 'OrderVolume',
+                    path: 'volume',
+                    meta: {
+                        title: 'volume',
+                        icon: 'vn:volume',
+                    },
+                    component: () => import('src/pages/Order/OrderVolume.vue'),
+                },
             ],
         },
     ],

From 06637cd89c004262826180ebb030f11dcbac6065 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Fri, 22 Dec 2023 00:50:07 -0400
Subject: [PATCH 02/18] Fix card list class

---
 src/pages/Order/OrderVolume.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/pages/Order/OrderVolume.vue b/src/pages/Order/OrderVolume.vue
index f2b451628..2c962600e 100644
--- a/src/pages/Order/OrderVolume.vue
+++ b/src/pages/Order/OrderVolume.vue
@@ -94,11 +94,6 @@ const loadVolumes = async (rows) => {
 </template>
 
 <style lang="scss">
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-
 .order-volume-summary {
     .vn-label-value {
         display: flex;
@@ -121,6 +116,11 @@ const loadVolumes = async (rows) => {
 }
 </style>
 <style lang="scss" scoped>
+.card-list {
+    width: 100%;
+    max-width: 60em;
+}
+
 .header {
     color: $primary;
     font-weight: bold;

From fdbad9c2cb5407b6690f2c3015126a322ecba3e4 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Fri, 22 Dec 2023 00:50:31 -0400
Subject: [PATCH 03/18] Fix order description warning

---
 src/pages/Order/Card/OrderDescriptor.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index 3b6d91cb4..09c87f138 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -98,7 +98,7 @@ const setData = (entity) => {
             <VnLv :label="t('order.summary.landed')" :value="toDate(entity?.landed)" />
             <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" />
+            <VnLv :label="t('order.summary.items')" :value="(entity?.rows?.length || 0).toString()" />
             <VnLv :label="t('order.summary.total')" :value="toCurrency(entity?.total)" />
         </template>
         <template #actions="{ entity }">

From 3ea1fc775d36ff0faa84c7b8c0b26173bb2b2f14 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Fri, 22 Dec 2023 01:01:51 -0400
Subject: [PATCH 04/18] Fix order summary address

---
 src/pages/Order/Card/OrderSummary.vue | 29 +++++++++++++++------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index 464ab3dfc..0efffa3fa 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -110,15 +110,11 @@ const detailsColumns = ref([
                     :label="t('order.summary.createdFrom')"
                     :value="entity?.sourceApp"
                 />
-                <VnLv :label="t('order.summary.address')">
-                    <template #value>
-                        <span class="address">
-                            {{
-                                `${entity?.address?.street} - ${entity?.address?.city} (${entity?.address?.province?.name})`
-                            }}
-                        </span>
-                    </template>
-                </VnLv>
+                <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">
@@ -203,11 +199,18 @@ const detailsColumns = ref([
         </template>
     </CardSummary>
 </template>
-<style lang="scss" scoped>
-.address {
-    white-space: normal;
-}
+<style lang="scss">
+.cardSummary .summaryBody .vn-label-value.order-summary-address {
+    .label {
+        flex-shrink: 0;
+    }
 
+    .value {
+        white-space: normal;
+    }
+}
+</style>
+<style lang="scss" scoped>
 .item {
     text-align: center;
 }

From 37d1239af11da6d9fa8e4cbd665fa528e03c6d6a Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 22 Dec 2023 08:28:08 -0300
Subject: [PATCH 05/18] Workers WIP

---
 src/components/CreateBankEntityForm.vue |   6 +-
 src/components/ui/VnTree.vue            | 112 ++++++++++++++++++++++++
 src/i18n/en/index.js                    |   9 +-
 src/i18n/es/index.js                    |   9 +-
 src/pages/Worker/WorkerDepartment.vue   |  15 ++++
 src/router/modules/worker.js            |  11 ++-
 6 files changed, 148 insertions(+), 14 deletions(-)
 create mode 100644 src/components/ui/VnTree.vue
 create mode 100644 src/pages/Worker/WorkerDepartment.vue

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index be213239f..6f3d33048 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -26,10 +26,6 @@ const closeButton = ref(null);
 const countriesOptions = ref([]);
 const loading = ref(false);
 
-const setCountriesOptions = (data) => {
-    countriesOptions.value = data;
-};
-
 const onDataSaved = (data) => {
     emit('onDataSaved', data);
     closeForm();
@@ -43,7 +39,7 @@ const closeForm = () => {
 <template>
     <FetchData
         url="Countries"
-        @on-fetch="(data) => setCountriesOptions(data)"
+        @on-fetch="(data) => (countriesOptions = data)"
         :filter="countriesFilter"
         auto-load
     />
diff --git a/src/components/ui/VnTree.vue b/src/components/ui/VnTree.vue
new file mode 100644
index 000000000..08541b6df
--- /dev/null
+++ b/src/components/ui/VnTree.vue
@@ -0,0 +1,112 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import axios from 'axios';
+
+const { t } = useI18n();
+
+const treeRef = ref(null);
+const expanded = ref([]);
+
+const nodes = ref([{ id: null, name: t('Departments'), sons: true, children: [{}] }]);
+
+const fetchedChildrensSet = ref(new Set());
+
+const onNodeExpanded = (nodeKeysArray) => {
+    // Verificar si el nodo ya fue expandido
+    if (!fetchedChildrensSet.value.has(nodeKeysArray.at(-1))) {
+        fetchedChildrensSet.value.add(nodeKeysArray.at(-1));
+        fetchNodeLeaves(nodeKeysArray.at(-1)); // Llamar a la función para obtener los nodos hijos
+    }
+};
+
+const fetchNodeLeaves = async (nodeKey) => {
+    try {
+        const node = treeRef.value.getNodeByKey(nodeKey);
+        if (!node || node.sons === 0) return;
+
+        const params = { parentId: node.id };
+        const response = await axios.get('/departments/getLeaves', { params });
+
+        // Si hay datos en la respuesta y tiene hijos, agregarlos al nodo actual
+        if (response.data) {
+            node.children = response.data;
+            node.children.forEach((node) => {
+                if (node.sons) node.children = [{}];
+            });
+        }
+    } catch (err) {
+        console.error('Error fetching department leaves');
+        throw new Error();
+    }
+};
+
+const removeNode = () => {};
+
+const createNode = async () => {
+    // const param = null;
+    // const response = axios.post('departments/createChild', param);
+};
+
+// const redirectToDepartmentSummary = () => {
+//     console.log('redirect to department summary:: ');
+// };
+</script>
+
+<template>
+    <QCard class="full-width" style="max-width: 800px">
+        <QTree
+            ref="treeRef"
+            :nodes="nodes"
+            node-key="id"
+            label-key="name"
+            v-model:expanded="expanded"
+            @update:expanded="onNodeExpanded($event)"
+        >
+            <template #default-header="prop">
+                <div class="row justify-between full-width bg-red q-pr-md">
+                    <!-- <pre>{{ prop }}</pre> -->
+                    <span class="text-uppercase">
+                        {{ prop.node.name }}
+                    </span>
+                    <div
+                        class="row bg-green justify-between"
+                        style="max-width: max-content"
+                    >
+                        <QIcon
+                            v-if="prop.node.id"
+                            name="delete"
+                            color="primary"
+                            size="sm"
+                            class="q-pr-xs"
+                            @click.stop="removeNode()"
+                        >
+                            <QTooltip>
+                                {{ t('Remove') }}
+                            </QTooltip>
+                        </QIcon>
+                        <QIcon
+                            name="add"
+                            color="primary"
+                            size="sm"
+                            @click.stop="createNode()"
+                        >
+                            <QTooltip>
+                                {{ t('Create') }}
+                            </QTooltip></QIcon
+                        >
+                    </div>
+                </div>
+            </template>
+        </QTree>
+        <pre>{{ nodes }}</pre>
+    </QCard>
+</template>
+
+<i18n>
+    es:
+        Departments: Departamentos
+        Remove: Quitar
+        Create: Crear
+    </i18n>
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 4a1eea8f4..66e725f4f 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -566,7 +566,7 @@ export default {
             landed: 'Landed',
             hour: 'Hour',
             agency: 'Agency',
-            total: 'Total'
+            total: 'Total',
         },
         form: {
             clientFk: 'Client',
@@ -575,7 +575,7 @@ export default {
             agencyModeFk: 'Agency',
         },
         list: {
-            newOrder: 'New Order'
+            newOrder: 'New Order',
         },
         summary: {
             basket: 'Basket',
@@ -601,8 +601,8 @@ export default {
             description: 'Description',
             quantity: 'Quantity',
             price: 'Price',
-            amount: 'Amount'
-        }
+            amount: 'Amount',
+        },
     },
     worker: {
         pageTitles: {
@@ -612,6 +612,7 @@ export default {
             summary: 'Summary',
             notifications: 'Notifications',
             workerCreate: 'New worker',
+            department: 'Department',
         },
         list: {
             name: 'Name',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 3f4ac1c27..66f14a2c1 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -475,7 +475,7 @@ export default {
             landed: 'F. entrega',
             hour: 'Hora',
             agency: 'Agencia',
-            total: 'Total'
+            total: 'Total',
         },
         form: {
             clientFk: 'Cliente',
@@ -484,7 +484,7 @@ export default {
             agencyModeFk: 'Agencia',
         },
         list: {
-            newOrder: 'Nuevo Pedido'
+            newOrder: 'Nuevo Pedido',
         },
         summary: {
             basket: 'Cesta',
@@ -510,8 +510,8 @@ export default {
             description: 'Descripción',
             quantity: 'Cantidad',
             price: 'Precio',
-            amount: 'Monto'
-        }
+            amount: 'Monto',
+        },
     },
     shelving: {
         pageTitles: {
@@ -612,6 +612,7 @@ export default {
             summary: 'Resumen',
             notifications: 'Notificaciones',
             workerCreate: 'Nuevo trabajador',
+            department: 'Departamentos',
         },
         list: {
             name: 'Nombre',
diff --git a/src/pages/Worker/WorkerDepartment.vue b/src/pages/Worker/WorkerDepartment.vue
new file mode 100644
index 000000000..3c0e5fdd0
--- /dev/null
+++ b/src/pages/Worker/WorkerDepartment.vue
@@ -0,0 +1,15 @@
+<script setup>
+import VnTree from 'components/ui/VnTree.vue';
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <VnTree />
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Search worker: Buscar trabajador
+    You can search by worker id or name: Puedes buscar por id o nombre del trabajador
+</i18n>
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index dfc994e96..f2332618f 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -10,7 +10,7 @@ export default {
     component: RouterView,
     redirect: { name: 'WorkerMain' },
     menus: {
-        main: ['WorkerList'],
+        main: ['WorkerList', 'WorkerDepartment'],
         card: ['WorkerNotificationsManager'],
     },
     children: [
@@ -29,6 +29,15 @@ export default {
                     },
                     component: () => import('src/pages/Worker/WorkerList.vue'),
                 },
+                {
+                    path: 'department',
+                    name: 'WorkerDepartment',
+                    meta: {
+                        title: 'department',
+                        icon: 'vn:greuge',
+                    },
+                    component: () => import('src/pages/Worker/WorkerDepartment.vue'),
+                },
                 {
                     path: 'create',
                     name: 'WorkerCreate',

From 465b595a92237dda69df2ae7084af12aad772b97 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 22 Dec 2023 08:32:49 -0300
Subject: [PATCH 06/18] correct qicon sizes

---
 src/components/CreateBankEntityForm.vue  | 2 +-
 src/components/CreateNewCityForm.vue     | 2 +-
 src/components/CreateNewPostcodeForm.vue | 2 +-
 src/components/CreateNewProvinceForm.vue | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index be213239f..3de4bed63 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -57,7 +57,7 @@ const closeForm = () => {
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
-                <QIcon name="close" size="22px" />
+                <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ t('title') }}</h1>
             <p class="q-mb-md">{{ t('subtitle') }}</p>
diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
index b028509e8..f3d6e4509 100644
--- a/src/components/CreateNewCityForm.vue
+++ b/src/components/CreateNewCityForm.vue
@@ -47,7 +47,7 @@ const closeForm = () => {
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
-                <QIcon name="close" size="22px" />
+                <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ t('New city') }}</h1>
             <p>{{ t('Please, ensure you put the correct data!') }}</p>
diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
index 0905f6bc3..18582cd49 100644
--- a/src/components/CreateNewPostcodeForm.vue
+++ b/src/components/CreateNewPostcodeForm.vue
@@ -76,7 +76,7 @@ const closeForm = () => {
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
-                <QIcon name="close" size="22px" />
+                <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ t('New postcode') }}</h1>
             <p>{{ t('Please, ensure you put the correct data!') }}</p>
diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
index 1896aec3f..3aea81596 100644
--- a/src/components/CreateNewProvinceForm.vue
+++ b/src/components/CreateNewProvinceForm.vue
@@ -47,7 +47,7 @@ const closeForm = () => {
     >
         <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
-                <QIcon name="close" size="22px" />
+                <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ t('New province') }}</h1>
             <p>{{ t('Please, ensure you put the correct data!') }}</p>

From 899b9536b6923db42e792a98118751dc4c1e88b6 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Fri, 22 Dec 2023 07:41:54 -0500
Subject: [PATCH 07/18] Se crea tabla de notificaciones, tarjeta por
 identificador y filtros

---
 src/i18n/en/index.js                          |   1 +
 src/i18n/es/index.js                          |   1 +
 .../Customer/CustomerExtendedListFilter.vue   |   2 +-
 src/pages/Customer/CustomerNotifications.vue  | 163 ++++++++++++++++++
 .../Customer/CustomerNotificationsFilter.vue  | 144 ++++++++++++++++
 src/router/modules/customer.js                |  17 +-
 6 files changed, 326 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/Customer/CustomerNotifications.vue
 create mode 100644 src/pages/Customer/CustomerNotificationsFilter.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 4a1eea8f4..132d8b0d4 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -112,6 +112,7 @@ export default {
             list: 'List',
             webPayments: 'Web Payments',
             extendedList: 'Extended list',
+            notifications: 'Notifications',
             createCustomer: 'Create customer',
             summary: 'Summary',
             basicData: 'Basic Data',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 3f4ac1c27..47963c070 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -112,6 +112,7 @@ export default {
             list: 'Listado',
             webPayments: 'Pagos Web',
             extendedList: 'Listado extendido',
+            notifications: 'Notificaciones',
             createCustomer: 'Crear cliente',
             basicData: 'Datos básicos',
             summary: 'Resumen',
diff --git a/src/pages/Customer/CustomerExtendedListFilter.vue b/src/pages/Customer/CustomerExtendedListFilter.vue
index eff0d20aa..ba1c966dc 100644
--- a/src/pages/Customer/CustomerExtendedListFilter.vue
+++ b/src/pages/Customer/CustomerExtendedListFilter.vue
@@ -80,7 +80,7 @@ const workers = ref();
                     <QItemSection v-if="workers">
                         <VnSelectFilter
                             :label="t('Salesperson')"
-                            v-model="params.salesPerson"
+                            v-model="params.salesPersonFk"
                             @update:model-value="searchFn()"
                             :options="workers"
                             option-value="id"
diff --git a/src/pages/Customer/CustomerNotifications.vue b/src/pages/Customer/CustomerNotifications.vue
new file mode 100644
index 000000000..91d137763
--- /dev/null
+++ b/src/pages/Customer/CustomerNotifications.vue
@@ -0,0 +1,163 @@
+<script setup>
+import { ref, computed, onBeforeMount } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import { QBtn } from 'quasar';
+
+import { useArrayData } from 'composables/useArrayData';
+import { useStateStore } from 'stores/useStateStore';
+
+import CustomerNotificationsFilter from './CustomerNotificationsFilter.vue';
+import CustomerDescriptorProxy from './Card/CustomerDescriptorProxy.vue';
+
+const { t } = useI18n();
+const stateStore = useStateStore();
+
+const arrayData = ref(null);
+
+onBeforeMount(async () => {
+    arrayData.value = useArrayData('CustomerNotifications', {
+        url: 'Clients',
+        limit: 0,
+    });
+    await arrayData.value.fetch({ append: false });
+    stateStore.rightDrawer = true;
+});
+
+const rows = computed(() => arrayData.value.store.data);
+
+const selected = ref([]);
+const selectedCustomerId = ref(0);
+
+const tableColumnComponents = {
+    id: {
+        component: QBtn,
+        props: () => ({ flat: true, color: 'blue' }),
+        event: (prop) => selectCustomerId(prop.row.id),
+    },
+    socialName: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    city: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    phone: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    email: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+};
+
+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 selectCustomerId = (id) => {
+    selectedCustomerId.value = id;
+};
+</script>
+
+<template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <CustomerNotificationsFilter data-key="CustomerNotifications" />
+        </QScrollArea>
+    </QDrawer>
+
+    <QToolbar class="bg-vn-dark">
+        <div id="st-data"></div>
+        <QSpace />
+        <div id="st-actions"></div>
+    </QToolbar>
+
+    <QPage class="column items-center q-pa-md">
+        <QTable
+            :columns="columns"
+            :pagination="{ rowsPerPage: 0 }"
+            :rows="rows"
+            class="full-width q-mt-md"
+            hide-bottom
+            row-key="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">
+                        <component
+                            :is="tableColumnComponents[props.col.name].component"
+                            class="col-content"
+                            v-bind="tableColumnComponents[props.col.name].props(props)"
+                            @click="tableColumnComponents[props.col.name].event(props)"
+                        >
+                            {{ props.value }}
+                            <CustomerDescriptorProxy :id="selectedCustomerId" />
+                        </component>
+                    </QTr>
+                </QTd>
+            </template>
+        </QTable>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.col-content {
+    border-radius: 4px;
+    padding: 6px 6px 6px 6px;
+}
+</style>
+
+<i18n>
+es:
+    Identifier: Identificador
+    Social name: Razón social
+    Salesperson: Comercial
+    Phone: Teléfono
+    City: Población
+    Email: Email
+</i18n>
diff --git a/src/pages/Customer/CustomerNotificationsFilter.vue b/src/pages/Customer/CustomerNotificationsFilter.vue
new file mode 100644
index 000000000..1c4c8f3e2
--- /dev/null
+++ b/src/pages/Customer/CustomerNotificationsFilter.vue
@@ -0,0 +1,144 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const clients = ref();
+const cities = ref();
+</script>
+
+<template>
+    <FetchData
+        url="Clients"
+        :filter="{ where: { role: 'socialName' } }"
+        @on-fetch="(data) => (clients = data)"
+        auto-load
+    />
+    <FetchData url="Towns" @on-fetch="(data) => (cities = data)" auto-load />
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+
+        <template #body="{ params, searchFn }">
+            <QList dense class="list">
+                <QItem class="q-mb-sm q-mt-sm">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('Identifier')"
+                            v-model="params.identifier"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection v-if="!clients">
+                        <QSkeleton type="QInput" class="full-width" />
+                    </QItemSection>
+                    <QItemSection v-if="clients">
+                        <VnSelectFilter
+                            :label="t('Social name')"
+                            v-model="params.socialName"
+                            @update:model-value="searchFn()"
+                            :options="clients"
+                            option-value="socialName"
+                            option-label="socialName"
+                            emit-value
+                            map-options
+                            use-input
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                            :input-debounce="0"
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection v-if="!cities">
+                        <QSkeleton type="QInput" class="full-width" />
+                    </QItemSection>
+                    <QItemSection v-if="cities">
+                        <VnSelectFilter
+                            :label="t('City')"
+                            v-model="params.city"
+                            @update:model-value="searchFn()"
+                            :options="cities"
+                            option-value="name"
+                            option-label="name"
+                            emit-value
+                            map-options
+                            use-input
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                            :input-debounce="0"
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection>
+                        <VnInput :label="t('Phone')" v-model="params.phone" is-outlined />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection>
+                        <VnInput :label="t('Email')" v-model="params.email" is-outlined />
+                    </QItemSection>
+                </QItem>
+                <QSeparator />
+            </QList>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<style scoped>
+.list {
+    width: 256px;
+}
+.list * {
+    max-width: 100%;
+}
+</style>
+
+<i18n>
+en:
+    params:
+        identifier: Identifier
+        socialName: Social name
+        city: City
+        phone: Phone
+        email: Email
+es:
+    params:
+        identifier: Identificador
+        socialName: Razón social
+        city: Población
+        phone: Teléfono
+        email: Email
+    Identifier: Identificador
+    Social name: Razón social
+    City: Población
+    Phone: Teléfono
+    Email: Email
+</i18n>
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index ec81a9c77..04cbf42b3 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -10,7 +10,12 @@ export default {
     component: RouterView,
     redirect: { name: 'CustomerMain' },
     menus: {
-        main: ['CustomerList', 'CustomerPayments', 'CustomerExtendedList'],
+        main: [
+            'CustomerList',
+            'CustomerPayments',
+            'CustomerExtendedList',
+            'CustomerNotifications',
+        ],
         card: ['CustomerBasicData'],
     },
     children: [
@@ -56,6 +61,16 @@ export default {
                     component: () =>
                         import('src/pages/Customer/CustomerExtendedList.vue'),
                 },
+                {
+                    path: 'notifications',
+                    name: 'CustomerNotifications',
+                    meta: {
+                        title: 'notifications',
+                        icon: 'notifications',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/CustomerNotifications.vue'),
+                },
             ],
         },
         {

From 2e09fbd9688b907dafe4b1fac3caadc955f5c5c7 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 25 Dec 2023 20:38:13 -0300
Subject: [PATCH 08/18] Department tree and summary view

---
 src/components/CreateDepartmentChild.vue      | 100 ++++++++++++++
 src/components/ui/VnTree.vue                  |  88 +++++++++---
 src/i18n/en/index.js                          |  20 +++
 src/i18n/es/index.js                          |  20 +++
 .../Department/Card/DepartmentBasicData.vue   |   3 +
 src/pages/Department/Card/DepartmentCard.vue  |  34 +++++
 .../Department/Card/DepartmentDescriptor.vue  | 129 ++++++++++++++++++
 .../Department/Card/DepartmentSummary.vue     | 107 +++++++++++++++
 src/router/modules/department.js              |  46 +++++++
 src/router/modules/index.js                   |   2 +
 src/router/modules/worker.js                  |   1 +
 src/router/routes.js                          |   4 +-
 12 files changed, 532 insertions(+), 22 deletions(-)
 create mode 100644 src/components/CreateDepartmentChild.vue
 create mode 100644 src/pages/Department/Card/DepartmentBasicData.vue
 create mode 100644 src/pages/Department/Card/DepartmentCard.vue
 create mode 100644 src/pages/Department/Card/DepartmentDescriptor.vue
 create mode 100644 src/pages/Department/Card/DepartmentSummary.vue
 create mode 100644 src/router/modules/department.js

diff --git a/src/components/CreateDepartmentChild.vue b/src/components/CreateDepartmentChild.vue
new file mode 100644
index 000000000..8f5b4b874
--- /dev/null
+++ b/src/components/CreateDepartmentChild.vue
@@ -0,0 +1,100 @@
+<script setup>
+import { onMounted, reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModel from 'components/FormModel.vue';
+
+const emit = defineEmits(['onDataSaved']);
+
+const $props = defineProps({
+    parentId: {
+        type: Number,
+        default: null,
+    },
+});
+
+const { t } = useI18n();
+
+const departmentChildData = reactive({
+    name: null,
+});
+
+const closeButton = ref(null);
+const isLoading = ref(false);
+
+const onDataSaved = () => {
+    emit('onDataSaved');
+    closeForm();
+};
+
+const closeForm = () => {
+    if (closeButton.value) closeButton.value.click();
+};
+
+onMounted(() => {
+    if ($props.parentId) departmentChildData.parentId = $props.parentId;
+});
+</script>
+
+<template>
+    <FormModel
+        :form-initial-data="departmentChildData"
+        :observe-form-changes="false"
+        :default-actions="false"
+        url-create="departments/createChild"
+        @on-data-saved="onDataSaved()"
+    >
+        <template #form="{ data }">
+            <span ref="closeButton" class="close-icon" v-close-popup>
+                <QIcon name="close" size="sm" />
+            </span>
+            <h1 class="title">{{ t('New department') }}</h1>
+            <VnRow class="row q-gutter-md q-mb-md" style="min-width: 250px">
+                <div class="col">
+                    <VnInput :label="t('Name')" v-model="data.name" />
+                </div>
+            </VnRow>
+            <div class="q-mt-lg row justify-end">
+                <QBtn
+                    :label="t('globals.cancel')"
+                    type="reset"
+                    color="primary"
+                    flat
+                    class="q-ml-sm"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                    v-close-popup
+                />
+                <QBtn
+                    :label="t('globals.save')"
+                    type="submit"
+                    color="primary"
+                    :disabled="isLoading"
+                    :loading="isLoading"
+                />
+            </div>
+        </template>
+    </FormModel>
+</template>
+
+<style lang="scss" scoped>
+.close-icon {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+    cursor: pointer;
+}
+.title {
+    font-size: 17px;
+    font-weight: bold;
+    line-height: 20px;
+}
+</style>
+
+<i18n>
+es:
+    Name: Nombre
+    New department: Nuevo departamento
+</i18n>
diff --git a/src/components/ui/VnTree.vue b/src/components/ui/VnTree.vue
index 08541b6df..23faf770f 100644
--- a/src/components/ui/VnTree.vue
+++ b/src/components/ui/VnTree.vue
@@ -1,12 +1,22 @@
 <script setup>
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+import { useQuasar } from 'quasar';
+
+import CreateDepartmentChild from '../CreateDepartmentChild.vue';
 
 import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
 
+const quasar = useQuasar();
 const { t } = useI18n();
+const router = useRouter();
+const { notify } = useNotify();
 
 const treeRef = ref(null);
+const showCreateNodeFormVal = ref(false);
+const creationNodeSelectedId = ref(null);
 const expanded = ref([]);
 
 const nodes = ref([{ id: null, name: t('Departments'), sons: true, children: [{}] }]);
@@ -42,16 +52,41 @@ const fetchNodeLeaves = async (nodeKey) => {
     }
 };
 
-const removeNode = () => {};
-
-const createNode = async () => {
-    // const param = null;
-    // const response = axios.post('departments/createChild', param);
+const removeNode = (node) => {
+    quasar
+        .dialog({
+            title: 'Are you sure you want to delete it?',
+            message: 'Delete department',
+            ok: {
+                push: true,
+                color: 'primary',
+            },
+            cancel: true,
+        })
+        .onOk(async () => {
+            try {
+                await axios.post(`/Departments/${node.id}/removeChild`, node.id);
+                notify('department.departmentRemoved', 'positive');
+                await fetchNodeLeaves(node.parentFk);
+            } catch (err) {
+                console.log('Error removing department');
+            }
+        });
 };
 
-// const redirectToDepartmentSummary = () => {
-//     console.log('redirect to department summary:: ');
-// };
+const showCreateNodeForm = (nodeId) => {
+    showCreateNodeFormVal.value = true;
+    creationNodeSelectedId.value = nodeId;
+};
+
+const onNodeCreated = async () => {
+    await fetchNodeLeaves(creationNodeSelectedId.value);
+};
+
+const redirectToDepartmentSummary = (id) => {
+    if (!id) return;
+    router.push({ name: 'DepartmentSummary', params: { id: id } });
+};
 </script>
 
 <template>
@@ -65,22 +100,21 @@ const createNode = async () => {
             @update:expanded="onNodeExpanded($event)"
         >
             <template #default-header="prop">
-                <div class="row justify-between full-width bg-red q-pr-md">
-                    <!-- <pre>{{ prop }}</pre> -->
+                <div
+                    class="row justify-between full-width q-pr-md cursor-pointer"
+                    @click.stop="redirectToDepartmentSummary(prop.node.id)"
+                >
                     <span class="text-uppercase">
                         {{ prop.node.name }}
                     </span>
-                    <div
-                        class="row bg-green justify-between"
-                        style="max-width: max-content"
-                    >
+                    <div class="row justify-between" style="max-width: max-content">
                         <QIcon
                             v-if="prop.node.id"
                             name="delete"
                             color="primary"
                             size="sm"
-                            class="q-pr-xs"
-                            @click.stop="removeNode()"
+                            class="q-pr-xs cursor-pointer"
+                            @click.stop="removeNode(prop.node)"
                         >
                             <QTooltip>
                                 {{ t('Remove') }}
@@ -90,17 +124,27 @@ const createNode = async () => {
                             name="add"
                             color="primary"
                             size="sm"
-                            @click.stop="createNode()"
+                            class="cursor-pointer"
+                            @click.stop="showCreateNodeForm(prop.node.id)"
                         >
                             <QTooltip>
                                 {{ t('Create') }}
-                            </QTooltip></QIcon
-                        >
+                            </QTooltip>
+                        </QIcon>
                     </div>
                 </div>
             </template>
         </QTree>
-        <pre>{{ nodes }}</pre>
+        <QDialog
+            v-model="showCreateNodeFormVal"
+            transition-show="scale"
+            transition-hide="scale"
+        >
+            <CreateDepartmentChild
+                :parent-id="creationNodeSelectedId"
+                @on-data-saved="onNodeCreated()"
+            />
+        </QDialog>
     </QCard>
 </template>
 
@@ -109,4 +153,6 @@ const createNode = async () => {
         Departments: Departamentos
         Remove: Quitar
         Create: Crear
-    </i18n>
+        Are you sure you want to delete it?: ¿Seguro que quieres eliminarlo?
+        Delete department: Eliminar departamento
+</i18n>
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 66e725f4f..023016f4c 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -604,6 +604,26 @@ export default {
             amount: 'Amount',
         },
     },
+    department: {
+        pageTitles: {
+            basicData: 'Basic data',
+            department: 'Department',
+            summary: 'Summary',
+        },
+        basicData: 'Basic data',
+        name: 'Name',
+        code: 'Code',
+        chat: 'Chat',
+        bossDepartment: 'Boss Department',
+        email: 'Email',
+        selfConsumptionCustomer: 'Self-consumption customer',
+        telework: 'Telework',
+        notifyOnErrors: 'Notify on errors',
+        worksInProduction: 'Works in production',
+        hasToRefill: 'Fill in days without physical check-ins',
+        hasToSendMail: 'Send check-ins by email',
+        departmentRemoved: 'Department removed',
+    },
     worker: {
         pageTitles: {
             workers: 'Workers',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 66f14a2c1..8eb15af43 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -604,6 +604,26 @@ export default {
             country: 'País',
         },
     },
+    department: {
+        pageTitles: {
+            basicData: 'Basic data',
+            department: 'Departamentos',
+            summary: 'Resumen',
+        },
+        basicData: 'Datos básicos',
+        name: 'Nombre',
+        code: 'Código',
+        chat: 'Chat',
+        bossDepartment: 'Jefe de departamento',
+        email: 'Email',
+        selfConsumptionCustomer: 'Cliente autoconsumo',
+        telework: 'Teletrabaja',
+        notifyOnErrors: 'Notificar errores',
+        worksInProduction: 'Pertenece a producción',
+        hasToRefill: 'Completar días sin registros físicos',
+        hasToSendMail: 'Enviar fichadas por mail',
+        departmentRemoved: 'Departamento eliminado',
+    },
     worker: {
         pageTitles: {
             workers: 'Trabajadores',
diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
new file mode 100644
index 000000000..c4068c60d
--- /dev/null
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@@ -0,0 +1,3 @@
+<script setup></script>
+
+<template>Department basic data</template>
diff --git a/src/pages/Department/Card/DepartmentCard.vue b/src/pages/Department/Card/DepartmentCard.vue
new file mode 100644
index 000000000..a175d6bb4
--- /dev/null
+++ b/src/pages/Department/Card/DepartmentCard.vue
@@ -0,0 +1,34 @@
+<script setup>
+import { useStateStore } from 'stores/useStateStore';
+import DepartmentDescriptor from 'pages/Department/Card/DepartmentDescriptor.vue';
+import LeftMenu from 'components/LeftMenu.vue';
+
+const stateStore = useStateStore();
+</script>
+<template>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit">
+            <DepartmentDescriptor />
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <QPage>
+            <QToolbar class="bg-vn-dark justify-end">
+                <div id="st-data"></div>
+                <QSpace />
+                <div id="st-actions"></div>
+            </QToolbar>
+            <div class="q-pa-md column items-center">
+                <RouterView></RouterView>
+            </div>
+        </QPage>
+    </QPageContainer>
+</template>
+
+<i18n>
+es:
+    Search worker: Buscar trabajador
+    You can search by worker id or name: Puedes buscar por id o nombre del trabajador
+</i18n>
diff --git a/src/pages/Department/Card/DepartmentDescriptor.vue b/src/pages/Department/Card/DepartmentDescriptor.vue
new file mode 100644
index 000000000..1f7e6dcbb
--- /dev/null
+++ b/src/pages/Department/Card/DepartmentDescriptor.vue
@@ -0,0 +1,129 @@
+<script setup>
+import { computed, ref } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
+
+import VnLv from 'src/components/ui/VnLv.vue';
+import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
+import useCardDescription from 'src/composables/useCardDescription';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+    summary: {
+        type: Object,
+        default: null,
+    },
+});
+
+const quasar = useQuasar();
+const route = useRoute();
+const router = useRouter();
+
+const { t } = useI18n();
+const { notify } = useNotify();
+
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+
+const department = ref();
+
+const data = ref(useCardDescription());
+
+const setData = (entity) => {
+    if (!entity) return;
+    data.value = useCardDescription(entity.name, entity.id);
+};
+
+const removeDepartment = () => {
+    console.log('entityId: ', entityId.value);
+    quasar
+        .dialog({
+            title: 'Are you sure you want to delete it?',
+            message: 'Delete department',
+            ok: {
+                push: true,
+                color: 'primary',
+            },
+            cancel: true,
+        })
+        .onOk(async () => {
+            try {
+                await axios.post(
+                    `/Departments/${entityId.value}/removeChild`,
+                    entityId.value
+                );
+                router.push({ name: 'WorkerDepartment' });
+                notify('department.departmentRemoved', 'positive');
+            } catch (err) {
+                console.log('Error removing department');
+            }
+        });
+};
+</script>
+<template>
+    <CardDescriptor
+        module="Department"
+        data-key="departmentData"
+        :url="`Departments/${entityId}`"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        :summary="$props.summary"
+        @on-fetch="
+            (data) => {
+                department = data;
+                setData(data);
+            }
+        "
+    >
+        <template #menu="{}">
+            <QItem v-ripple clickable @click="removeDepartment()">
+                <QItemSection>{{ t('Delete') }}</QItemSection>
+            </QItem>
+        </template>
+        <template #body="{ entity }">
+            <VnLv :label="t('department.chat')" :value="entity.chatName" dash />
+            <VnLv :label="t('department.email')" :value="entity.notificationEmail" dash />
+            <VnLv
+                :label="t('department.selfConsumptionCustomer')"
+                :value="entity.client?.name"
+                dash
+            />
+            <VnLv
+                :label="t('department.bossDepartment')"
+                :value="entity.worker?.user?.name"
+                dash
+            />
+        </template>
+        <template #actions>
+            <QCardActions>
+                <QBtn
+                    size="md"
+                    icon="vn:worker"
+                    color="primary"
+                    :to="{
+                        name: 'WorkerList',
+                        query: {
+                            params: JSON.stringify({ departmentFk: entityId }),
+                        },
+                    }"
+                >
+                    <QTooltip>{{ t('Department workers') }}</QTooltip>
+                </QBtn>
+            </QCardActions>
+        </template>
+    </CardDescriptor>
+</template>
+
+<i18n>
+    es:
+        Department workers: Trabajadores del departamento
+</i18n>
diff --git a/src/pages/Department/Card/DepartmentSummary.vue b/src/pages/Department/Card/DepartmentSummary.vue
new file mode 100644
index 000000000..40bb4c83d
--- /dev/null
+++ b/src/pages/Department/Card/DepartmentSummary.vue
@@ -0,0 +1,107 @@
+<script setup>
+import { ref, onMounted, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import CardSummary from 'components/ui/CardSummary.vue';
+import { getUrl } from 'src/composables/getUrl';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+
+const entityId = computed(() => $props.id || route.params.id);
+const departmentUrl = ref();
+
+onMounted(async () => {
+    departmentUrl.value = (await getUrl('')) + `departments/${entityId.value}/`;
+});
+</script>
+
+<template>
+    <CardSummary
+        ref="summary"
+        :url="`Departments/${entityId}`"
+        class="full-width"
+        style="max-width: 900px"
+    >
+        <template #header="{ entity }">
+            <div>{{ entity.name }}</div>
+        </template>
+        <template #body="{ entity: department }">
+            <QCard class="column">
+                <a class="header" :href="department + `basic-data`">
+                    {{ t('Basic data') }}
+                    <QIcon name="open_in_new" color="primary" />
+                </a>
+                <div class="full-width row wrap justify-between content-between">
+                    <div class="column" style="min-width: 50%">
+                        <VnLv
+                            :label="t('department.name')"
+                            :value="department.name"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.code')"
+                            :value="department.code"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.chat')"
+                            :value="department.chatName"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.bossDepartment')"
+                            :value="department.worker?.user?.name"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.email')"
+                            :value="department.notificationEmail"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.selfConsumptionCustomer')"
+                            :value="department.client?.name"
+                            dash
+                        />
+                    </div>
+                    <div class="column" style="min-width: 50%">
+                        <VnLv
+                            :label="t('department.telework')"
+                            :value="department.isTeleworking"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.notifyOnErrors')"
+                            :value="Boolean(department.hasToMistake)"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.worksInProduction')"
+                            :value="department.isProduction"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.hasToRefill')"
+                            :value="department.hasToRefill"
+                            dash
+                        />
+                        <VnLv
+                            :label="t('department.hasToSendMail')"
+                            :value="department.hasToSendMail"
+                            dash
+                        />
+                    </div>
+                </div>
+            </QCard>
+        </template>
+    </CardSummary>
+</template>
diff --git a/src/router/modules/department.js b/src/router/modules/department.js
new file mode 100644
index 000000000..aaffc3460
--- /dev/null
+++ b/src/router/modules/department.js
@@ -0,0 +1,46 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: '/department',
+    name: 'Department',
+    meta: {
+        title: 'department',
+        icon: 'vn:greuge',
+    },
+    component: RouterView,
+    redirect: { name: 'DepartmentCard' },
+    menus: {
+        main: [],
+        card: ['DepartmentBasicData'],
+    },
+    children: [
+        {
+            name: 'DepartmentCard',
+            path: 'department/:id',
+            component: () => import('src/pages/Department/Card/DepartmentCard.vue'),
+            redirect: { name: 'DepartmentSummary' },
+            children: [
+                {
+                    name: 'DepartmentSummary',
+                    path: 'summary',
+                    meta: {
+                        title: 'summary',
+                        icon: 'launch',
+                    },
+                    component: () =>
+                        import('src/pages/Department/Card/DepartmentSummary.vue'),
+                },
+                {
+                    name: 'DepartmentBasicData',
+                    path: 'basic-data',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Department/Card/DepartmentBasicData.vue'),
+                },
+            ],
+        },
+    ],
+};
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index 1eff2c180..68d1d8146 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -10,6 +10,7 @@ import Route from './route';
 import Supplier from './Supplier';
 import Travel from './travel';
 import Order from './order';
+import Department from './department';
 
 export default [
     Customer,
@@ -24,4 +25,5 @@ export default [
     Travel,
     Order,
     invoiceIn,
+    Department,
 ];
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index f2332618f..27a6f19a9 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -12,6 +12,7 @@ export default {
     menus: {
         main: ['WorkerList', 'WorkerDepartment'],
         card: ['WorkerNotificationsManager'],
+        departmentCard: ['BasicData'],
     },
     children: [
         {
diff --git a/src/router/routes.js b/src/router/routes.js
index ee8b30d64..32f5aaef6 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -8,8 +8,9 @@ import wagon from './modules/wagon';
 import supplier from './modules/Supplier';
 import route from './modules/route';
 import travel from './modules/travel';
+import department from './modules/department';
 import shelving from 'src/router/modules/shelving';
-import order from "src/router/modules/order";
+import order from 'src/router/modules/order';
 
 const routes = [
     {
@@ -61,6 +62,7 @@ const routes = [
             route,
             supplier,
             travel,
+            department,
             {
                 path: '/:catchAll(.*)*',
                 name: 'NotFound',

From 893b1bb4c8471645c8976110d6381f90059acaae Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 26 Dec 2023 16:15:46 -0300
Subject: [PATCH 09/18] Add department basic data

---
 src/components/FormModel.vue                  |  11 +-
 src/i18n/en/index.js                          |   1 -
 src/i18n/es/index.js                          |   1 -
 .../Department/Card/DepartmentBasicData.vue   | 136 +++++++++++++++++-
 src/pages/Department/Card/DepartmentCard.vue  |   6 -
 5 files changed, 141 insertions(+), 14 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 62993ef24..e683ce735 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -58,7 +58,7 @@ const $props = defineProps({
     mapper: {
         type: Function,
         default: null,
-    }
+    },
 });
 
 const emit = defineEmits(['onFetch', 'onDataSaved']);
@@ -129,7 +129,7 @@ async function save() {
     isLoading.value = true;
 
     try {
-        const body = $props.mapper ? $props.mapper(formData.value) : formData.value
+        const body = $props.mapper ? $props.mapper(formData.value) : formData.value;
         if ($props.urlCreate) {
             await axios.post($props.urlCreate, body);
             notify('globals.dataCreated', 'positive');
@@ -179,11 +179,14 @@ watch(formUrl, async () => {
 });
 </script>
 <template>
-    <QBanner v-if="$props.observeFormChanges && hasChanges" class="text-white bg-warning">
+    <QBanner
+        v-if="$props.observeFormChanges && hasChanges"
+        class="text-white bg-warning full-width"
+    >
         <QIcon name="warning" size="md" class="q-mr-md" />
         <span>{{ t('globals.changesToSave') }}</span>
     </QBanner>
-    <div class="column items-center">
+    <div class="column items-center full-width">
         <QForm
             v-if="formData"
             @submit="save"
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 023016f4c..e0b37b17e 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -610,7 +610,6 @@ export default {
             department: 'Department',
             summary: 'Summary',
         },
-        basicData: 'Basic data',
         name: 'Name',
         code: 'Code',
         chat: 'Chat',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 8eb15af43..6e7364cc7 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -610,7 +610,6 @@ export default {
             department: 'Departamentos',
             summary: 'Resumen',
         },
-        basicData: 'Datos básicos',
         name: 'Nombre',
         code: 'Código',
         chat: 'Chat',
diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
index c4068c60d..3b30a97e6 100644
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@@ -1,3 +1,135 @@
-<script setup></script>
+<script setup>
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
 
-<template>Department basic data</template>
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const workersOptions = ref([]);
+const clientsOptions = ref([]);
+</script>
+<template>
+    <fetch-data
+        url="Workers/search"
+        @on-fetch="(data) => (workersOptions = data)"
+        auto-load
+    />
+    <fetch-data url="Clients" @on-fetch="(data) => (clientsOptions = data)" auto-load />
+    <FormModel
+        :url="`Departments/${route.params.id}`"
+        model="department"
+        auto-load
+        class="full-width"
+    >
+        <template #form="{ data, validate }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        :label="t('department.name')"
+                        v-model="data.name"
+                        :rules="validate('department.name')"
+                        clearable
+                        autofocus
+                    />
+                </div>
+                <div class="col">
+                    <VnInput
+                        v-model="data.code"
+                        :label="t('department.code')"
+                        :rules="validate('department.code')"
+                        clearable
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        :label="t('department.chat')"
+                        v-model="data.chatName"
+                        :rules="validate('department.chat')"
+                        clearable
+                    />
+                </div>
+                <div class="col">
+                    <VnInput
+                        v-model="data.notificationEmail"
+                        :label="t('department.email')"
+                        :rules="validate('department.email')"
+                        clearable
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('department.bossDepartment')"
+                        v-model="data.workerFk"
+                        :options="workersOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        map-options
+                        :rules="validate('department.workerFk')"
+                    />
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('department.selfConsumptionCustomer')"
+                        v-model="data.clientFk"
+                        :options="clientsOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        map-options
+                        :rules="validate('department.clientFk')"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox
+                        :label="t('department.telework')"
+                        v-model="data.isTeleworking"
+                    />
+                </div>
+                <div class="col">
+                    <QCheckbox
+                        :label="t('department.notifyOnErrors')"
+                        v-model="data.hasToMistake"
+                        :false-value="0"
+                        :true-value="1"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox
+                        :label="t('department.worksInProduction')"
+                        v-model="data.isProduction"
+                    />
+                </div>
+                <div class="col">
+                    <QCheckbox
+                        :label="t('department.hasToRefill')"
+                        v-model="data.hasToRefill"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox
+                        :label="t('department.hasToSendMail')"
+                        v-model="data.hasToSendMail"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
diff --git a/src/pages/Department/Card/DepartmentCard.vue b/src/pages/Department/Card/DepartmentCard.vue
index a175d6bb4..885b5e5f1 100644
--- a/src/pages/Department/Card/DepartmentCard.vue
+++ b/src/pages/Department/Card/DepartmentCard.vue
@@ -26,9 +26,3 @@ const stateStore = useStateStore();
         </QPage>
     </QPageContainer>
 </template>
-
-<i18n>
-es:
-    Search worker: Buscar trabajador
-    You can search by worker id or name: Puedes buscar por id o nombre del trabajador
-</i18n>

From 5729204a3b39c5f2e56f33cdd6742ffdd990b897 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Thu, 28 Dec 2023 10:25:23 -0500
Subject: [PATCH 10/18] Se crea tabla y filtros de morosos en clientes

---
 src/i18n/en/index.js                          |   9 +-
 src/i18n/es/index.js                          |   9 +-
 .../Customer/Defaulter/CustomerDefaulter.vue  | 253 ++++++++++++++++++
 .../Defaulter/CustomerDefaulterFilter.vue     | 238 ++++++++++++++++
 .../CustomerExtendedList.vue                  |   0
 .../CustomerExtendedListActions.vue           |   2 +-
 .../CustomerExtendedListFilter.vue            |  17 +-
 .../CustomerNotifications.vue                 |   2 +-
 .../CustomerNotificationsFilter.vue           |  50 ++--
 .../{ => Payments}/CustomerPayments.vue       |   2 +-
 .../{ => Payments}/CustomerPaymentsFilter.vue |   0
 src/router/modules/customer.js                |  22 +-
 .../pages/Customer/CustomerPayments.spec.js   |   8 +-
 13 files changed, 552 insertions(+), 60 deletions(-)
 create mode 100644 src/pages/Customer/Defaulter/CustomerDefaulter.vue
 create mode 100644 src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
 rename src/pages/Customer/{ => ExtendedList}/CustomerExtendedList.vue (100%)
 rename src/pages/Customer/{ => ExtendedList}/CustomerExtendedListActions.vue (94%)
 rename src/pages/Customer/{ => ExtendedList}/CustomerExtendedListFilter.vue (91%)
 rename src/pages/Customer/{ => Notifications}/CustomerNotifications.vue (98%)
 rename src/pages/Customer/{ => Notifications}/CustomerNotificationsFilter.vue (94%)
 rename src/pages/Customer/{ => Payments}/CustomerPayments.vue (99%)
 rename src/pages/Customer/{ => Payments}/CustomerPaymentsFilter.vue (100%)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index f7234ba57..18a2e4ecf 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -113,6 +113,7 @@ export default {
             webPayments: 'Web Payments',
             extendedList: 'Extended list',
             notifications: 'Notifications',
+            defaulter: 'Defaulter',
             createCustomer: 'Create customer',
             summary: 'Summary',
             basicData: 'Basic Data',
@@ -568,7 +569,7 @@ export default {
             landed: 'Landed',
             hour: 'Hour',
             agency: 'Agency',
-            total: 'Total'
+            total: 'Total',
         },
         form: {
             clientFk: 'Client',
@@ -577,7 +578,7 @@ export default {
             agencyModeFk: 'Agency',
         },
         list: {
-            newOrder: 'New Order'
+            newOrder: 'New Order',
         },
         summary: {
             basket: 'Basket',
@@ -603,8 +604,8 @@ export default {
             description: 'Description',
             quantity: 'Quantity',
             price: 'Price',
-            amount: 'Amount'
-        }
+            amount: 'Amount',
+        },
     },
     worker: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index f96add139..af8191052 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -113,6 +113,7 @@ export default {
             webPayments: 'Pagos Web',
             extendedList: 'Listado extendido',
             notifications: 'Notificaciones',
+            defaulter: 'Morosos',
             createCustomer: 'Crear cliente',
             basicData: 'Datos básicos',
             summary: 'Resumen',
@@ -477,7 +478,7 @@ export default {
             landed: 'F. entrega',
             hour: 'Hora',
             agency: 'Agencia',
-            total: 'Total'
+            total: 'Total',
         },
         form: {
             clientFk: 'Cliente',
@@ -486,7 +487,7 @@ export default {
             agencyModeFk: 'Agencia',
         },
         list: {
-            newOrder: 'Nuevo Pedido'
+            newOrder: 'Nuevo Pedido',
         },
         summary: {
             basket: 'Cesta',
@@ -512,8 +513,8 @@ export default {
             description: 'Descripción',
             quantity: 'Cantidad',
             price: 'Precio',
-            amount: 'Monto'
-        }
+            amount: 'Monto',
+        },
     },
     shelving: {
         pageTitles: {
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
new file mode 100644
index 000000000..b35980416
--- /dev/null
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -0,0 +1,253 @@
+<script setup>
+import { ref, computed, onBeforeMount } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import { QBtn, QCheckbox } from 'quasar';
+
+import { useArrayData } from 'composables/useArrayData';
+import { useStateStore } from 'stores/useStateStore';
+
+import { toCurrency, toDate } from 'filters/index';
+import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+
+const { t } = useI18n();
+const stateStore = useStateStore();
+
+const arrayData = ref(null);
+
+onBeforeMount(async () => {
+    arrayData.value = useArrayData('CustomerDefaulter', {
+        url: 'Defaulters/filter',
+        limit: 0,
+    });
+    await arrayData.value.fetch({ append: false });
+    stateStore.rightDrawer = true;
+});
+
+const rows = computed(() => arrayData.value.store.data);
+
+const selected = ref([]);
+const worderId = ref(0);
+const customerId = ref(0);
+
+const tableColumnComponents = {
+    client: {
+        component: QBtn,
+        props: () => ({ flat: true, color: 'blue' }),
+        event: (prop) => selectClientId(prop.row.clientFk),
+    },
+    isWorker: {
+        component: QCheckbox,
+        props: (prop) => ({
+            disable: true,
+            'model-value': Boolean(prop.value),
+        }),
+        event: () => {},
+    },
+    salesperson: {
+        component: QBtn,
+        props: () => ({ flat: true, color: 'blue' }),
+        event: (prop) => selectSalespersonId(prop.row.salesPersonFk),
+    },
+    country: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    paymentMethod: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    balance: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    author: {
+        component: QBtn,
+        props: () => ({ flat: true, color: 'blue' }),
+        event: (prop) => selectAuthorId(prop.row.workerFk),
+    },
+    lastObservation: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    date: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    credit: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    from: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+};
+
+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: (row) => toCurrency(row.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: (row) => toDate(row.created),
+            label: t('L. O. Date'),
+            name: 'date',
+        },
+        {
+            align: 'left',
+            field: (row) => toCurrency(row.creditInsurance),
+            label: t('Credit I.'),
+            name: 'credit',
+        },
+        {
+            align: 'left',
+            field: (row) => toDate(row.defaulterSinced),
+            label: t('From'),
+            name: 'from',
+        },
+    ];
+});
+
+const selectClientId = (id) => {
+    worderId.value = 0;
+    customerId.value = id;
+};
+
+const selectSalespersonId = (id) => {
+    customerId.value = 0;
+    worderId.value = id;
+};
+
+const selectAuthorId = (id) => {
+    customerId.value = 0;
+    worderId.value = id;
+};
+</script>
+
+<template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <CustomerNotificationsFilter data-key="CustomerDefaulter" />
+        </QScrollArea>
+    </QDrawer>
+
+    <QToolbar class="bg-vn-dark">
+        <div id="st-data"></div>
+        <QSpace />
+        <div id="st-actions"></div>
+    </QToolbar>
+
+    <QPage class="column items-center q-pa-md">
+        <QTable
+            :columns="columns"
+            :pagination="{ rowsPerPage: 0 }"
+            :rows="rows"
+            class="full-width q-mt-md"
+            hide-bottom
+            row-key="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">
+                        <component
+                            :is="tableColumnComponents[props.col.name].component"
+                            class="col-content"
+                            v-bind="tableColumnComponents[props.col.name].props(props)"
+                            @click="tableColumnComponents[props.col.name].event(props)"
+                        >
+                            {{ props.value }}
+
+                            <WorkerDescriptorProxy v-if="worderId" :id="worderId" />
+                            <CustomerDescriptorProxy v-else :id="customerId" />
+                        </component>
+                    </QTr>
+                </QTd>
+            </template>
+        </QTable>
+    </QPage>
+</template>
+
+<style lang="scss" scoped>
+.col-content {
+    border-radius: 4px;
+    padding: 6px 6px 6px 6px;
+}
+</style>
+
+<i18n>
+es:
+    Client: Cliente
+    Is worker: Es trabajador
+    Salesperson: Comercial
+    Country: País
+    P. Method: F. Pago
+    Balance D.: Saldo V.
+    Author: Autor
+    Last observation: Última observación
+    L. O. Date: Fecha Ú. O.
+    Credit I.: Crédito A.
+    From: Desde
+</i18n>
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
new file mode 100644
index 000000000..43ceb1bac
--- /dev/null
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
@@ -0,0 +1,238 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const clients = ref();
+const salespersons = ref();
+const countries = ref();
+const authors = ref();
+</script>
+
+<template>
+    <FetchData @on-fetch="(data) => (clients = data)" auto-load url="Clients" />
+    <FetchData
+        :filter="{ where: { role: 'salesPerson' } }"
+        @on-fetch="(data) => (salespersons = data)"
+        auto-load
+        url="Workers/activeWithInheritedRole"
+    />
+    <FetchData @on-fetch="(data) => (countries = data)" auto-load url="Countries" />
+    <FetchData
+        @on-fetch="(data) => (authors = data)"
+        auto-load
+        url="Workers/activeWithInheritedRole"
+    />
+
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+
+        <template #body="{ params }">
+            <QList dense class="list">
+                <QItem class="q-mb-sm q-mt-sm">
+                    <QItemSection v-if="clients">
+                        <VnSelectFilter
+                            :input-debounce="0"
+                            :label="t('Client')"
+                            :options="clients"
+                            dense
+                            emit-value
+                            hide-selected
+                            map-options
+                            option-label="name"
+                            option-value="clientTypeFk"
+                            outlined
+                            rounded
+                            use-input
+                            v-model="params.clientFk"
+                        />
+                    </QItemSection>
+                    <QItemSection v-else>
+                        <QSkeleton class="full-width" type="QInput" />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection v-if="salespersons">
+                        <VnSelectFilter
+                            :input-debounce="0"
+                            :label="t('Salesperson')"
+                            :options="salespersons"
+                            dense
+                            emit-value
+                            hide-selected
+                            map-options
+                            option-label="name"
+                            option-value="id"
+                            outlined
+                            rounded
+                            use-input
+                            v-model="params.salesPersonFk"
+                        />
+                    </QItemSection>
+                    <QItemSection v-else>
+                        <QSkeleton class="full-width" type="QInput" />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection v-if="countries">
+                        <VnSelectFilter
+                            :input-debounce="0"
+                            :label="t('Country')"
+                            :options="countries"
+                            dense
+                            emit-value
+                            hide-selected
+                            map-options
+                            option-label="country"
+                            option-value="id"
+                            outlined
+                            rounded
+                            use-input
+                            v-model="params.countryFk"
+                        />
+                    </QItemSection>
+                    <QItemSection v-else>
+                        <QSkeleton class="full-width" type="QInput" />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('P. Method')"
+                            is-outlined
+                            v-model="params.paymentMethod"
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('Balance D.')"
+                            is-outlined
+                            v-model="params.balance"
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection v-if="authors">
+                        <VnSelectFilter
+                            :input-debounce="0"
+                            :label="t('Author')"
+                            :options="authors"
+                            dense
+                            emit-value
+                            hide-selected
+                            map-options
+                            option-label="name"
+                            option-value="id"
+                            outlined
+                            rounded
+                            use-input
+                            v-model="params.workerFk"
+                        />
+                    </QItemSection>
+                    <QItemSection v-else>
+                        <QSkeleton class="full-width" type="QInput" />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('L. O. Date')"
+                            is-outlined
+                            v-model="params.date"
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('Credit I.')"
+                            is-outlined
+                            v-model="params.credit"
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem class="q-mb-sm">
+                    <QItemSection>
+                        <VnInputDate
+                            :label="t('From')"
+                            is-outlined
+                            v-model="params.defaulterSinced"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QSeparator />
+            </QList>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<style scoped>
+.list {
+    width: 256px;
+}
+.list * {
+    max-width: 100%;
+}
+</style>
+
+<i18n>
+en:
+    params:
+        clientFk: Client
+        salesPersonFk: Salesperson
+        countryFk: Country
+        paymentMethod: P. Method
+        balance: Balance D.
+        workerFk: Author
+        date: L. O. Date
+        credit: Credit I.
+        defaulterSinced: From
+es:
+    params:
+        clientFk: Cliente
+        salesPersonFk: Comercial
+        countryFk: País
+        paymentMethod: F. Pago
+        balance: Saldo V.
+        workerFk: Autor
+        date: Fecha Ú. O.
+        credit: Crédito A.
+        defaulterSinced: Desde
+    Client: Cliente
+    Salesperson: Comercial
+    Country: País
+    P. Method: F. Pago
+    Balance D.: Saldo V.
+    Author: Autor
+    L. O. Date: Fecha Ú. O.
+    Credit I.: Crédito A.
+    From: Desde
+</i18n>
diff --git a/src/pages/Customer/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
similarity index 100%
rename from src/pages/Customer/CustomerExtendedList.vue
rename to src/pages/Customer/ExtendedList/CustomerExtendedList.vue
diff --git a/src/pages/Customer/CustomerExtendedListActions.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListActions.vue
similarity index 94%
rename from src/pages/Customer/CustomerExtendedListActions.vue
rename to src/pages/Customer/ExtendedList/CustomerExtendedListActions.vue
index 1fec71ffe..7e3639522 100644
--- a/src/pages/Customer/CustomerExtendedListActions.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedListActions.vue
@@ -4,7 +4,7 @@ import { useRouter } from 'vue-router';
 
 import { useQuasar } from 'quasar';
 
-import CustomerSummaryDialog from './Card/CustomerSummaryDialog.vue';
+import CustomerSummaryDialog from '../Card/CustomerSummaryDialog.vue';
 
 const { t } = useI18n();
 const quasar = useQuasar();
diff --git a/src/pages/Customer/CustomerExtendedListFilter.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
similarity index 91%
rename from src/pages/Customer/CustomerExtendedListFilter.vue
rename to src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
index ba1c966dc..dbed3141d 100644
--- a/src/pages/Customer/CustomerExtendedListFilter.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
@@ -80,7 +80,7 @@ const workers = ref();
                     <QItemSection v-if="workers">
                         <VnSelectFilter
                             :label="t('Salesperson')"
-                            v-model="params.salesPersonFk"
+                            v-model="params.salesPerson"
                             @update:model-value="searchFn()"
                             :options="workers"
                             option-value="id"
@@ -128,22 +128,7 @@ const workers = ref();
 </style>
 
 <i18n>
-en:
-    params:
-        identifier: Identifier
-        socialName: Social name
-        salesPerson: Salesperson
-        phone: Phone
-        city: City
-        email: Email
 es:
-    params:
-        identifier: Identificador
-        socialName: Razón social
-        salesPerson: Comercial
-        phone: Teléfono
-        city: Población
-        email: Email
     Identifier: Identificador
     Social name: Razón social
     Salesperson: Comercial
diff --git a/src/pages/Customer/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
similarity index 98%
rename from src/pages/Customer/CustomerNotifications.vue
rename to src/pages/Customer/Notifications/CustomerNotifications.vue
index 91d137763..f9ff66a7b 100644
--- a/src/pages/Customer/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -8,7 +8,7 @@ import { useArrayData } from 'composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 
 import CustomerNotificationsFilter from './CustomerNotificationsFilter.vue';
-import CustomerDescriptorProxy from './Card/CustomerDescriptorProxy.vue';
+import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
diff --git a/src/pages/Customer/CustomerNotificationsFilter.vue b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
similarity index 94%
rename from src/pages/Customer/CustomerNotificationsFilter.vue
rename to src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
index 1c4c8f3e2..650158278 100644
--- a/src/pages/Customer/CustomerNotificationsFilter.vue
+++ b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
@@ -4,8 +4,8 @@ import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -15,18 +15,18 @@ const props = defineProps({
     },
 });
 
-const clients = ref();
 const cities = ref();
+const clients = ref();
 </script>
 
 <template>
     <FetchData
-        url="Clients"
         :filter="{ where: { role: 'socialName' } }"
         @on-fetch="(data) => (clients = data)"
         auto-load
+        url="Clients"
     />
-    <FetchData url="Towns" @on-fetch="(data) => (cities = data)" auto-load />
+    <FetchData @on-fetch="(data) => (cities = data)" auto-load url="Towns" />
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
@@ -41,8 +41,8 @@ const cities = ref();
                     <QItemSection>
                         <VnInput
                             :label="t('Identifier')"
-                            v-model="params.identifier"
                             is-outlined
+                            v-model="params.identifier"
                         />
                     </QItemSection>
                 </QItem>
@@ -53,20 +53,20 @@ const cities = ref();
                     </QItemSection>
                     <QItemSection v-if="clients">
                         <VnSelectFilter
+                            :input-debounce="0"
                             :label="t('Social name')"
-                            v-model="params.socialName"
-                            @update:model-value="searchFn()"
                             :options="clients"
-                            option-value="socialName"
-                            option-label="socialName"
-                            emit-value
-                            map-options
-                            use-input
-                            hide-selected
+                            @update:model-value="searchFn()"
                             dense
+                            emit-value
+                            hide-selected
+                            map-options
+                            option-label="socialName"
+                            option-value="socialName"
                             outlined
                             rounded
-                            :input-debounce="0"
+                            use-input
+                            v-model="params.socialName"
                         />
                     </QItemSection>
                 </QItem>
@@ -77,33 +77,33 @@ const cities = ref();
                     </QItemSection>
                     <QItemSection v-if="cities">
                         <VnSelectFilter
+                            :input-debounce="0"
                             :label="t('City')"
-                            v-model="params.city"
-                            @update:model-value="searchFn()"
                             :options="cities"
-                            option-value="name"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            use-input
-                            hide-selected
+                            @update:model-value="searchFn()"
                             dense
+                            emit-value
+                            hide-selected
+                            map-options
+                            option-label="name"
+                            option-value="name"
                             outlined
                             rounded
-                            :input-debounce="0"
+                            use-input
+                            v-model="params.city"
                         />
                     </QItemSection>
                 </QItem>
 
                 <QItem class="q-mb-sm">
                     <QItemSection>
-                        <VnInput :label="t('Phone')" v-model="params.phone" is-outlined />
+                        <VnInput :label="t('Phone')" is-outlined v-model="params.phone" />
                     </QItemSection>
                 </QItem>
 
                 <QItem class="q-mb-sm">
                     <QItemSection>
-                        <VnInput :label="t('Email')" v-model="params.email" is-outlined />
+                        <VnInput :label="t('Email')" is-outlined v-model="params.email" />
                     </QItemSection>
                 </QItem>
                 <QSeparator />
diff --git a/src/pages/Customer/CustomerPayments.vue b/src/pages/Customer/Payments/CustomerPayments.vue
similarity index 99%
rename from src/pages/Customer/CustomerPayments.vue
rename to src/pages/Customer/Payments/CustomerPayments.vue
index 24e5efa39..b4a907665 100644
--- a/src/pages/Customer/CustomerPayments.vue
+++ b/src/pages/Customer/Payments/CustomerPayments.vue
@@ -7,7 +7,7 @@ import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'composables/useArrayData';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
-import CustomerDescriptorProxy from './Card/CustomerDescriptorProxy.vue';
+import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 import { toDate, toCurrency } from 'filters/index';
 import CustomerPaymentsFilter from './CustomerPaymentsFilter.vue';
 
diff --git a/src/pages/Customer/CustomerPaymentsFilter.vue b/src/pages/Customer/Payments/CustomerPaymentsFilter.vue
similarity index 100%
rename from src/pages/Customer/CustomerPaymentsFilter.vue
rename to src/pages/Customer/Payments/CustomerPaymentsFilter.vue
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 04cbf42b3..51511bcbf 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -15,6 +15,7 @@ export default {
             'CustomerPayments',
             'CustomerExtendedList',
             'CustomerNotifications',
+            'CustomerDefaulter',
         ],
         card: ['CustomerBasicData'],
     },
@@ -49,7 +50,8 @@ export default {
                         title: 'webPayments',
                         icon: 'vn:onlinepayment',
                     },
-                    component: () => import('src/pages/Customer/CustomerPayments.vue'),
+                    component: () =>
+                        import('src/pages/Customer/Payments/CustomerPayments.vue'),
                 },
                 {
                     path: 'extendedList',
@@ -59,7 +61,9 @@ export default {
                         icon: 'vn:client',
                     },
                     component: () =>
-                        import('src/pages/Customer/CustomerExtendedList.vue'),
+                        import(
+                            'src/pages/Customer/ExtendedList/CustomerExtendedList.vue'
+                        ),
                 },
                 {
                     path: 'notifications',
@@ -69,7 +73,19 @@ export default {
                         icon: 'notifications',
                     },
                     component: () =>
-                        import('src/pages/Customer/CustomerNotifications.vue'),
+                        import(
+                            'src/pages/Customer/Notifications/CustomerNotifications.vue'
+                        ),
+                },
+                {
+                    path: 'defaulter',
+                    name: 'CustomerDefaulter',
+                    meta: {
+                        title: 'defaulter',
+                        icon: 'vn:risk',
+                    },
+                    component: () =>
+                        import('src/pages/Customer/Defaulter/CustomerDefaulter.vue'),
                 },
             ],
         },
diff --git a/test/vitest/__tests__/pages/Customer/CustomerPayments.spec.js b/test/vitest/__tests__/pages/Customer/CustomerPayments.spec.js
index 5d096f113..13293f596 100644
--- a/test/vitest/__tests__/pages/Customer/CustomerPayments.spec.js
+++ b/test/vitest/__tests__/pages/Customer/CustomerPayments.spec.js
@@ -1,11 +1,10 @@
 import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
 import { createWrapper, axios } from 'app/test/vitest/helper';
-import CustomerPayments from 'pages/Customer/CustomerPayments.vue';
+import CustomerPayments from 'src/pages/Customer/Payments/CustomerPayments.vue';
 
 describe('CustomerPayments', () => {
     let vm;
 
-
     beforeAll(() => {
         vm = createWrapper(CustomerPayments, {
             global: {
@@ -13,7 +12,7 @@ describe('CustomerPayments', () => {
                 mocks: {
                     fetch: vi.fn(),
                 },
-            }
+            },
         }).vm;
     });
 
@@ -28,11 +27,10 @@ describe('CustomerPayments', () => {
 
             await vm.confirmTransaction({ id: 1 });
 
-
             expect(vm.quasar.notify).toHaveBeenCalledWith(
                 expect.objectContaining({
                     message: 'Payment confirmed',
-                    type: 'positive'
+                    type: 'positive',
                 })
             );
         });

From 9ede2912f36718c0c1884cfeb2a63a15a9ba80f0 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Thu, 28 Dec 2023 10:36:47 -0500
Subject: [PATCH 11/18] Correccion, elimine sin darme cuenta

---
 src/i18n/en/index.js | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 90e5effe4..8d8e4c670 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -607,6 +607,25 @@ export default {
             amount: 'Amount',
         },
     },
+    department: {
+        pageTitles: {
+            basicData: 'Basic data',
+            department: 'Department',
+            summary: 'Summary',
+        },
+        name: 'Name',
+        code: 'Code',
+        chat: 'Chat',
+        bossDepartment: 'Boss Department',
+        email: 'Email',
+        selfConsumptionCustomer: 'Self-consumption customer',
+        telework: 'Telework',
+        notifyOnErrors: 'Notify on errors',
+        worksInProduction: 'Works in production',
+        hasToRefill: 'Fill in days without physical check-ins',
+        hasToSendMail: 'Send check-ins by email',
+        departmentRemoved: 'Department removed',
+    },
     worker: {
         pageTitles: {
             workers: 'Workers',

From 1ab31a1e514e8f0eb82aeef73b12cc1c4f303c36 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 29 Dec 2023 11:08:11 -0300
Subject: [PATCH 12/18] Extended List big modifications and column add column
 filter component

---
 src/components/common/TableVisibleColumns.vue | 140 +++++
 src/i18n/en/index.js                          |  34 ++
 src/i18n/es/index.js                          |  34 ++
 src/pages/Customer/CustomerExtendedList.vue   | 439 ++++++++++++++--
 .../Customer/CustomerExtendedListActions.vue  |  39 +-
 .../Customer/CustomerExtendedListFilter.vue   | 490 ++++++++++++++++--
 6 files changed, 1089 insertions(+), 87 deletions(-)
 create mode 100644 src/components/common/TableVisibleColumns.vue

diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
new file mode 100644
index 000000000..94e3bfbc7
--- /dev/null
+++ b/src/components/common/TableVisibleColumns.vue
@@ -0,0 +1,140 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { ref, computed } from 'vue';
+
+import FetchData from 'components/FetchData.vue';
+
+import { useState } from 'src/composables/useState';
+import axios from 'axios';
+
+const $props = defineProps({
+    allColumns: {
+        type: Array,
+        default: () => [],
+    },
+    tableCode: {
+        type: String,
+        default: '',
+    },
+    labelsTraductionsPath: {
+        type: String,
+        default: '',
+    },
+});
+
+const emit = defineEmits(['onConfigSaved']);
+
+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([]);
+
+const areAllChecksMarked = computed(() => {
+    return formattedCols.value.every((col) => col.active);
+});
+
+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();
+};
+
+const toggleMarkAll = (val) => {
+    formattedCols.value.forEach((col) => (col.active = val));
+};
+
+const saveConfig = async () => {
+    try {
+        const data = {
+            id: initialUserConfigViewData.value[0].id,
+            userFk: 9,
+            tableCode: $props.tableCode,
+            configuration: {},
+        };
+
+        formattedCols.value.forEach((col) => {
+            data.configuration[col.name] = col.active;
+        });
+
+        await axios.patch('UserConfigViews', data);
+        emitSavedConfig();
+        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);
+};
+</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">
+                <QIcon name="info" size="sm" class="info-icon">
+                    <QTooltip>{{ t('Check the columns you want to see') }}</QTooltip>
+                </QIcon>
+                <span class="text-body1 q-mb-sm">{{ t('Visible columns') }}</span>
+                <QCheckbox
+                    :label="t('Tick all')"
+                    :model-value="areAllChecksMarked"
+                    @update:model-value="toggleMarkAll($event)"
+                    class="q-mb-sm"
+                />
+                <div
+                    v-if="allColumns.length !== 0 && formattedCols.length !== 0"
+                    class="checks-layout"
+                >
+                    <QCheckbox
+                        v-for="(col, index) in allColumns"
+                        :key="index"
+                        :label="t(`${$props.labelsTraductionsPath + '.' + col}`)"
+                        v-model="formattedCols[index].active"
+                    />
+                </div>
+                <QBtn class="full-width q-mt-md" color="primary" @click="saveConfig()">{{
+                    t('globals.save')
+                }}</QBtn>
+            </QCard>
+        </QPopupProxy>
+    </QBtn>
+</template>
+
+<style lang="scss" scoped>
+.info-icon {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+}
+
+.checks-layout {
+    display: grid;
+    grid-template-columns: repeat(3, 200px);
+}
+</style>
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 12505b30e..608a9303e 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -206,6 +206,40 @@ export default {
             salesPerson: 'Sales person',
             contactChannel: 'Contact channel',
         },
+        extendedList: {
+            tableVisibleColumns: {
+                id: 'Identifier',
+                name: 'Name',
+                fi: 'Tax number',
+                salesPersonFk: 'Salesperson',
+                credit: 'Credit',
+                creditInsurance: 'Credit insurance',
+                phone: 'Phone',
+                mobile: 'Mobile',
+                street: 'Street',
+                countryFk: 'Country',
+                provinceFk: 'Province',
+                city: 'City',
+                postcode: 'Postcode',
+                email: 'Email',
+                created: 'Created',
+                businessTypeFk: 'Business type',
+                payMethodFk: 'Billing data',
+                sageTaxTypeFk: 'Sage tax type',
+                sageTransactionTypeFk: 'Sage tr. type',
+                isActive: 'Active',
+                isVies: 'Vies',
+                isTaxDataChecked: 'Verified data',
+                isEqualizated: 'Is equalizated',
+                isFreezed: 'Freezed',
+                hasToInvoice: 'Invoice',
+                hasToInvoiceByAddress: 'Invoice by address',
+                isToBeMailed: 'Mailing',
+                hasLcr: 'Received LCR',
+                hasCoreVnl: 'VNL core received',
+                hasSepaVnl: 'VNL B2B received',
+            },
+        },
     },
     ticket: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index fe16df8fc..3a5d4c26b 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -205,6 +205,40 @@ export default {
             salesPerson: 'Comercial',
             contactChannel: 'Canal de contacto',
         },
+        extendedList: {
+            tableVisibleColumns: {
+                id: 'Identificador',
+                name: 'Nombre',
+                fi: 'NIF / CIF',
+                salesPersonFk: 'Comercial',
+                credit: 'Crédito',
+                creditInsurance: 'Crédito asegurado',
+                phone: 'Teléfono',
+                mobile: 'Móvil',
+                street: 'Dirección fiscal',
+                countryFk: 'País',
+                provinceFk: 'Provincia',
+                city: 'Población',
+                postcode: 'Código postal',
+                email: 'Email',
+                created: 'Fecha creación',
+                businessTypeFk: 'Tipo de negocio',
+                payMethodFk: 'Forma de pago',
+                sageTaxTypeFk: 'Tipo de impuesto Sage',
+                sageTransactionTypeFk: 'Tipo tr. sage',
+                isActive: 'Activo',
+                isVies: 'Vies',
+                isTaxDataChecked: 'Datos comprobados',
+                isEqualizated: 'Recargo de equivalencias',
+                isFreezed: 'Congelado',
+                hasToInvoice: 'Factura',
+                hasToInvoiceByAddress: 'Factura por consigna',
+                isToBeMailed: 'Env. emails',
+                hasLcr: 'Recibido LCR',
+                hasCoreVnl: 'Recibido core VNL',
+                hasSepaVnl: 'Recibido B2B VNL',
+            },
+        },
     },
     ticket: {
         pageTitles: {
diff --git a/src/pages/Customer/CustomerExtendedList.vue b/src/pages/Customer/CustomerExtendedList.vue
index be3463867..a60b79caf 100644
--- a/src/pages/Customer/CustomerExtendedList.vue
+++ b/src/pages/Customer/CustomerExtendedList.vue
@@ -1,16 +1,18 @@
 <script setup>
-import { ref, computed, onBeforeMount } from 'vue';
+import { ref, computed, onBeforeMount, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
-import { QBtn } from 'quasar';
-
-import { useArrayData } from 'composables/useArrayData';
-import { useStateStore } from 'stores/useStateStore';
-
+import { QBtn, QIcon } from 'quasar';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import CustomerExtendedListActions from './CustomerExtendedListActions.vue';
 import CustomerExtendedListFilter from './CustomerExtendedListFilter.vue';
+import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
+
+import { useArrayData } from 'composables/useArrayData';
+import { useStateStore } from 'stores/useStateStore';
+import { dashIfEmpty, toDate } from 'src/filters';
 
 const { t } = useI18n();
 const router = useRouter();
@@ -27,22 +29,62 @@ onBeforeMount(async () => {
     stateStore.rightDrawer = true;
 });
 
+onMounted(() => {
+    const filteredColumns = columns.value.filter(
+        (col) => col.name !== 'actions' && col.name !== 'customerStatus'
+    );
+    allColumnNames.value = filteredColumns.map((col) => col.name);
+});
+
 const rows = computed(() => arrayData.value.store.data);
 
 const selectedCustomerId = ref(0);
+const selectedSalesPersonId = ref(0);
+const allColumnNames = ref([]);
+const visibleColumns = ref([]);
 
 const tableColumnComponents = {
+    customerStatus: {
+        component: QIcon,
+        props: (prop) => ({
+            name: !prop.row.isActive
+                ? 'vn:disabled'
+                : prop.row.isActive && prop.row.isFreezed
+                ? 'vn:frozen'
+                : '',
+            color: 'primary',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
     id: {
         component: QBtn,
         props: () => ({ flat: true, color: 'blue' }),
-        event: (prop) => selectCustomerId(prop.row.id),
+        event: (prop) => {
+            selectCustomerId(prop.row.id);
+        },
     },
-    socialName: {
+    name: {
         component: 'span',
         props: () => {},
         event: () => {},
     },
-    salesPerson: {
+    fi: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    salesPersonFk: {
+        component: QBtn,
+        props: () => ({ flat: true, color: 'blue' }),
+        event: (prop) => selectSalesPersonId(prop.row.salesPersonFk),
+    },
+    credit: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    creditInsurance: {
         component: 'span',
         props: () => {},
         event: () => {},
@@ -52,16 +94,165 @@ const tableColumnComponents = {
         props: () => {},
         event: () => {},
     },
+    mobile: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    street: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    countryFk: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    provinceFk: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
     city: {
         component: 'span',
         props: () => {},
         event: () => {},
     },
+    postcode: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
     email: {
         component: 'span',
         props: () => {},
         event: () => {},
     },
+    created: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    businessTypeFk: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    payMethodFk: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    sageTaxTypeFk: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    sageTransactionTypeFk: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    isActive: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.isActive ? 'check' : 'close',
+            color: prop.row.isActive ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    isVies: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.isVies ? 'check' : 'close',
+            color: prop.row.isVies ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    isTaxDataChecked: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.isTaxDataChecked ? 'check' : 'close',
+            color: prop.row.isTaxDataChecked ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    isEqualizated: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.isEqualizated ? 'check' : 'close',
+            color: prop.row.isEqualizated ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    isFreezed: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.isFreezed ? 'check' : 'close',
+            color: prop.row.isFreezed ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    hasToInvoice: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.hasToInvoice ? 'check' : 'close',
+            color: prop.row.hasToInvoice ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    hasToInvoiceByAddress: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.hasToInvoiceByAddress ? 'check' : 'close',
+            color: prop.row.hasToInvoiceByAddress ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    isToBeMailed: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.isToBeMailed ? 'check' : 'close',
+            color: prop.row.isToBeMailed ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    hasLcr: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.hasLcr ? 'check' : 'close',
+            color: prop.row.hasLcr ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    hasCoreVnl: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.hasCoreVnl ? 'check' : 'close',
+            color: prop.row.hasCoreVnl ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
+    hasSepaVnl: {
+        component: QIcon,
+        props: (prop) => ({
+            name: prop.row.hasSepaVnl ? 'check' : 'close',
+            color: prop.row.hasSepaVnl ? 'positive' : 'negative',
+            size: 'sm',
+        }),
+        event: () => {},
+    },
     actions: {
         component: CustomerExtendedListActions,
         props: (prop) => ({
@@ -73,42 +264,205 @@ const tableColumnComponents = {
 
 const columns = computed(() => {
     return [
+        {
+            align: 'left',
+            field: '',
+            label: '',
+            name: 'customerStatus',
+            format: () => ' ',
+        },
         {
             align: 'left',
             field: 'id',
-            label: t('Identifier'),
+            label: t('customer.extendedList.tableVisibleColumns.id'),
             name: 'id',
         },
         {
             align: 'left',
-            field: 'socialName',
-            label: t('Social name'),
-            name: 'socialName',
+            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('Salesperson'),
-            name: '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('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('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('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',
@@ -119,7 +473,7 @@ const columns = computed(() => {
 });
 
 const stopEventPropagation = (event, col) => {
-    if (!['ref', 'id', 'supplier'].includes(col.name)) return;
+    if (!['id', 'salesPersonFk'].includes(col.name)) return;
     event.preventDefault();
     event.stopPropagation();
 };
@@ -131,17 +485,35 @@ const navigateToTravelId = (id) => {
 const selectCustomerId = (id) => {
     selectedCustomerId.value = id;
 };
+
+const selectSalesPersonId = (id) => {
+    console.log('selectedSalesPersonId:: ', selectedSalesPersonId.value);
+    selectedSalesPersonId.value = id;
+};
 </script>
 
 <template>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
-            <CustomerExtendedListFilter data-key="CustomerExtendedList" />
+            <CustomerExtendedListFilter
+                v-if="visibleColumns.length !== 0"
+                data-key="CustomerExtendedList"
+                :visible-columns="visibleColumns"
+            />
         </QScrollArea>
     </QDrawer>
 
     <QToolbar class="bg-vn-dark">
-        <div id="st-data"></div>
+        <div id="st-data">
+            <TableVisibleColumns
+                :all-columns="allColumnNames"
+                table-code="clientsDetail"
+                labels-traductions-path="customer.extendedList.tableVisibleColumns"
+                @on-config-saved="
+                    visibleColumns = ['customerStatus', ...$event, 'actions']
+                "
+            />
+        </div>
         <QSpace />
         <div id="st-actions"></div>
     </QToolbar>
@@ -149,11 +521,11 @@ const selectCustomerId = (id) => {
     <QPage class="column items-center q-pa-md">
         <QTable
             :columns="columns"
-            :pagination="{ rowsPerPage: 0 }"
+            :pagination="{ rowsPerPage: 12 }"
             :rows="rows"
             class="full-width q-mt-md"
-            hide-bottom
             row-key="id"
+            :visible-columns="visibleColumns"
         >
             <template #body="props">
                 <QTr
@@ -173,8 +545,15 @@ const selectCustomerId = (id) => {
                             v-bind="tableColumnComponents[col.name].props(props)"
                             @click="tableColumnComponents[col.name].event(props)"
                         >
-                            {{ col.value }}
-                            <CustomerDescriptorProxy :id="selectedCustomerId" />
+                            {{ dashIfEmpty(col.value) }}
+                            <WorkerDescriptorProxy
+                                v-if="props.row.salesPersonFk"
+                                :id="selectedSalesPersonId"
+                            />
+                            <CustomerDescriptorProxy
+                                v-if="props.row.id"
+                                :id="selectedCustomerId"
+                            />
                         </component>
                     </QTd>
                 </QTr>
@@ -189,13 +568,3 @@ const selectCustomerId = (id) => {
     padding: 6px 6px 6px 6px;
 }
 </style>
-
-<i18n>
-es:
-    Identifier: Identificador
-    Social name: Razón social
-    Salesperson: Comercial
-    Phone: Teléfono
-    City: Población
-    Email: Email
-</i18n>
diff --git a/src/pages/Customer/CustomerExtendedListActions.vue b/src/pages/Customer/CustomerExtendedListActions.vue
index 1fec71ffe..882a71936 100644
--- a/src/pages/Customer/CustomerExtendedListActions.vue
+++ b/src/pages/Customer/CustomerExtendedListActions.vue
@@ -39,22 +39,29 @@ const viewSummary = () => {
 </script>
 
 <template>
-    <QIcon @click.stop="redirectToCreateView" color="primary" name="vn:ticket" size="sm">
-        <QTooltip>
-            {{ t('Client ticket list') }}
-        </QTooltip>
-    </QIcon>
-    <QIcon
-        @click.stop="viewSummary"
-        class="q-ml-md"
-        color="primary"
-        name="preview"
-        size="sm"
-    >
-        <QTooltip>
-            {{ t('Preview') }}
-        </QTooltip>
-    </QIcon>
+    <div>
+        <QIcon
+            @click.stop="redirectToCreateView"
+            color="primary"
+            name="vn:ticket"
+            size="sm"
+        >
+            <QTooltip>
+                {{ t('Client ticket list') }}
+            </QTooltip>
+        </QIcon>
+        <QIcon
+            @click.stop="viewSummary"
+            class="q-ml-md"
+            color="primary"
+            name="preview"
+            size="sm"
+        >
+            <QTooltip>
+                {{ t('Preview') }}
+            </QTooltip>
+        </QIcon>
+    </div>
 </template>
 
 <i18n>
diff --git a/src/pages/Customer/CustomerExtendedListFilter.vue b/src/pages/Customer/CustomerExtendedListFilter.vue
index ba1c966dc..0cf614fca 100644
--- a/src/pages/Customer/CustomerExtendedListFilter.vue
+++ b/src/pages/Customer/CustomerExtendedListFilter.vue
@@ -1,22 +1,40 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import FetchData from 'components/FetchData.vue';
 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';
 
-const { t } = useI18n();
 const props = defineProps({
     dataKey: {
         type: String,
         required: true,
     },
+    visibleColumns: {
+        type: Array,
+        required: true,
+    },
 });
 
+const { t } = useI18n();
+
 const clients = ref();
 const workers = ref();
+const countriesOptions = ref([]);
+const provincesOptions = ref([]);
+const paymethodsOptions = ref([]);
+const businessTypesOptions = ref([]);
+const sageTaxTypesOptions = ref([]);
+const sageTransactionTypesOptions = ref([]);
+
+const visibleColumnsSet = computed(() => new Set(props.visibleColumns));
+
+const shouldRenderColumn = (colName) => {
+    return visibleColumnsSet.value.has(colName);
+};
 </script>
 
 <template>
@@ -32,25 +50,75 @@ const workers = ref();
         @on-fetch="(data) => (workers = data)"
         auto-load
     />
+    <FetchData
+        url="Workers/activeWithInheritedRole"
+        :filter="{ where: { role: 'salesPerson' } }"
+        @on-fetch="(data) => (workers = data)"
+        auto-load
+    />
+    <FetchData
+        url="Countries"
+        :filter="{ fields: ['id', 'country'], order: 'country ASC' }"
+        @on-fetch="(data) => (countriesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        ref="provincesFetchDataRef"
+        @on-fetch="(data) => (provincesOptions = data)"
+        auto-load
+        url="Provinces"
+    />
+    <FetchData
+        url="Paymethods"
+        @on-fetch="(data) => (paymethodsOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="BusinessTypes"
+        @on-fetch="(data) => (businessTypesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="SageTaxTypes"
+        auto-load
+        @on-fetch="(data) => (sageTaxTypesOptions = data)"
+    />
+    <FetchData
+        url="sageTransactionTypes"
+        auto-load
+        @on-fetch="(data) => (sageTransactionTypesOptions = data)"
+    />
     <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <strong
+                    >{{ t(`customer.extendedList.tableVisibleColumns.${tag.label}`) }}:
+                </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense class="list">
-                <QItem class="q-mb-sm q-mt-sm">
+            <QList dense class="list q-gutter-y-sm q-mt-sm">
+                <QItem v-if="shouldRenderColumn('id')">
                     <QItemSection>
                         <VnInput
-                            :label="t('Identifier')"
-                            v-model="params.identifier"
+                            :label="t('customer.extendedList.tableVisibleColumns.id')"
+                            v-model="params.id"
+                            is-outlined
+                            clearable
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('name')">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.name')"
+                            v-model="params.name"
                             is-outlined
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <!-- <QItem class="q-mb-sm">
                     <QItemSection v-if="!clients">
                         <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
@@ -72,14 +140,27 @@ const workers = ref();
                             :input-debounce="0"
                         />
                     </QItemSection>
+                </QItem> -->
+                <QItem v-if="shouldRenderColumn('fi')">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.fi')"
+                            v-model="params.fi"
+                            is-outlined
+                        />
+                    </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem v-if="shouldRenderColumn('salesPersonFk')">
                     <QItemSection v-if="!workers">
                         <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
                     <QItemSection v-if="workers">
                         <VnSelectFilter
-                            :label="t('Salesperson')"
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.salesPersonFk'
+                                )
+                            "
                             v-model="params.salesPersonFk"
                             @update:model-value="searchFn()"
                             :options="workers"
@@ -96,19 +177,375 @@ const workers = ref();
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem v-if="shouldRenderColumn('credit')">
                     <QItemSection>
-                        <VnInput :label="t('Phone')" v-model="params.phone" is-outlined />
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.credit')"
+                            v-model="params.credit"
+                            is-outlined
+                        />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem v-if="shouldRenderColumn('creditInsurance')">
                     <QItemSection>
-                        <VnInput :label="t('City')" v-model="params.city" is-outlined />
+                        <VnInput
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.creditInsurance'
+                                )
+                            "
+                            v-model="params.creditInsurance"
+                            is-outlined
+                        />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem v-if="shouldRenderColumn('phone')">
                     <QItemSection>
-                        <VnInput :label="t('Email')" v-model="params.email" is-outlined />
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.phone')"
+                            v-model="params.phone"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('mobile')">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.mobile')"
+                            v-model="params.mobile"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('street')">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.street')"
+                            v-model="params.street"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('countryFk')">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.countryFk')
+                            "
+                            v-model="params.countryFk"
+                            @update:model-value="searchFn()"
+                            :options="countriesOptions"
+                            option-value="id"
+                            option-label="country"
+                            map-options
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('provinceFk')">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.provinceFk')
+                            "
+                            v-model="params.provinceFk"
+                            @update:model-value="searchFn()"
+                            :options="provincesOptions"
+                            option-value="id"
+                            option-label="name"
+                            map-options
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('city')">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.city')"
+                            v-model="params.city"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('postcode')">
+                    <QItemSection>
+                        <VnInput
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.postcode')
+                            "
+                            v-model="params.postcode"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('email')">
+                    <QItemSection>
+                        <VnInput
+                            :label="t('customer.extendedList.tableVisibleColumns.email')"
+                            v-model="params.email"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+
+                <QItem v-if="shouldRenderColumn('created')">
+                    <QItemSection>
+                        <VnInputDate
+                            v-model="params.created"
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.created')
+                            "
+                            @update:model-value="searchFn()"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('businessTypeFk')">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.businessTypeFk'
+                                )
+                            "
+                            v-model="params.businessTypeFk"
+                            :options="businessTypesOptions"
+                            @update:model-value="searchFn()"
+                            option-value="code"
+                            option-label="description"
+                            map-options
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('payMethodFk')">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.payMethodFk')
+                            "
+                            v-model="params.payMethodFk"
+                            :options="paymethodsOptions"
+                            @update:model-value="searchFn()"
+                            option-value="id"
+                            option-label="name"
+                            map-options
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('sageTaxTypeFk')">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.sageTaxTypeFk'
+                                )
+                            "
+                            v-model="params.sageTaxTypeFk"
+                            @update:model-value="searchFn()"
+                            :options="sageTaxTypesOptions"
+                            option-value="id"
+                            option-label="vat"
+                            map-options
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('sageTransactionTypeFk')">
+                    <QItemSection>
+                        <VnSelectFilter
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'
+                                )
+                            "
+                            v-model="params.sageTransactionTypeFk"
+                            @update:model-value="searchFn()"
+                            :options="sageTransactionTypesOptions"
+                            option-value="id"
+                            option-label="transaction"
+                            map-options
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem
+                    v-if="shouldRenderColumn('isActive') || shouldRenderColumn('isVies')"
+                >
+                    <QItemSection v-if="shouldRenderColumn('isActive')">
+                        <QCheckbox
+                            v-model="params.isActive"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.isActive')
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                    <QItemSection v-if="shouldRenderColumn('isVies')">
+                        <QCheckbox
+                            v-model="params.isVies"
+                            @update:model-value="searchFn()"
+                            :label="t('customer.extendedList.tableVisibleColumns.isVies')"
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem
+                    v-if="
+                        shouldRenderColumn('isEqualizated') ||
+                        shouldRenderColumn('isTaxDataChecked')
+                    "
+                >
+                    <QItemSection v-if="shouldRenderColumn('isTaxDataChecked')">
+                        <QCheckbox
+                            v-model="params.isTaxDataChecked"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.isTaxDataChecked'
+                                )
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                    <QItemSection v-if="shouldRenderColumn('isEqualizated')">
+                        <QCheckbox
+                            v-model="params.isEqualizated"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.isEqualizated'
+                                )
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem
+                    v-if="
+                        shouldRenderColumn('hasToInvoice') ||
+                        shouldRenderColumn('isFreezed')
+                    "
+                >
+                    <QItemSection v-if="shouldRenderColumn('isFreezed')">
+                        <QCheckbox
+                            v-model="params.isFreezed"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.isFreezed')
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                    <QItemSection v-if="shouldRenderColumn('hasToInvoice')">
+                        <QCheckbox
+                            v-model="params.hasToInvoice"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.hasToInvoice'
+                                )
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem
+                    v-if="
+                        shouldRenderColumn('isToBeMailed') ||
+                        shouldRenderColumn('hasToInvoiceByAddress')
+                    "
+                >
+                    <QItemSection v-if="shouldRenderColumn('hasToInvoiceByAddress')">
+                        <QCheckbox
+                            v-model="params.hasToInvoiceByAddress"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'
+                                )
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                    <QItemSection v-if="shouldRenderColumn('isToBeMailed')">
+                        <QCheckbox
+                            v-model="params.isToBeMailed"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t(
+                                    'customer.extendedList.tableVisibleColumns.isToBeMailed'
+                                )
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem
+                    v-if="
+                        shouldRenderColumn('hasLcr') || shouldRenderColumn('hasCoreVnl')
+                    "
+                >
+                    <QItemSection v-if="shouldRenderColumn('hasLcr')">
+                        <QCheckbox
+                            v-model="params.hasLcr"
+                            @update:model-value="searchFn()"
+                            :label="t('customer.extendedList.tableVisibleColumns.hasLcr')"
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                    <QItemSection v-if="shouldRenderColumn('hasCoreVnl')">
+                        <QCheckbox
+                            v-model="params.hasCoreVnl"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.hasCoreVnl')
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem v-if="shouldRenderColumn('hasSepaVnl')">
+                    <QItemSection>
+                        <QCheckbox
+                            v-model="params.hasSepaVnl"
+                            @update:model-value="searchFn()"
+                            :label="
+                                t('customer.extendedList.tableVisibleColumns.hasSepaVnl')
+                            "
+                            toggle-indeterminate
+                            :false-value="undefined"
+                        />
                     </QItemSection>
                 </QItem>
 
@@ -128,26 +565,7 @@ const workers = ref();
 </style>
 
 <i18n>
-en:
-    params:
-        identifier: Identifier
-        socialName: Social name
-        salesPerson: Salesperson
-        phone: Phone
-        city: City
-        email: Email
+
 es:
-    params:
-        identifier: Identificador
-        socialName: Razón social
-        salesPerson: Comercial
-        phone: Teléfono
-        city: Población
-        email: Email
-    Identifier: Identificador
     Social name: Razón social
-    Salesperson: Comercial
-    Phone: Teléfono
-    City: Población
-    Email: Email
 </i18n>

From c4c344f07ab91f53f1b3f286d26d8b3b3929174b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 29 Dec 2023 14:00:32 -0300
Subject: [PATCH 13/18] Add descriptor and submodules to supplier card left
 menu

---
 src/i18n/en/index.js                          |  11 +-
 src/i18n/es/index.js                          |   9 ++
 src/pages/Supplier/Card/SupplierAccounts.vue  |   1 +
 src/pages/Supplier/Card/SupplierAddresses.vue |   1 +
 .../Supplier/Card/SupplierAgencyTerm.vue      |   1 +
 src/pages/Supplier/Card/SupplierBasicData.vue |   1 +
 .../Supplier/Card/SupplierBillingData.vue     |   1 +
 src/pages/Supplier/Card/SupplierCard.vue      |   6 +-
 .../Supplier/Card/SupplierConsumption.vue     |   1 +
 src/pages/Supplier/Card/SupplierContacts.vue  |   1 +
 .../Supplier/Card/SupplierFiscalData.vue      |   1 +
 src/pages/Supplier/Card/SupplierLog.vue       |   1 +
 src/router/modules/Supplier.js                | 101 +++++++++++++++++-
 13 files changed, 133 insertions(+), 3 deletions(-)
 create mode 100644 src/pages/Supplier/Card/SupplierAccounts.vue
 create mode 100644 src/pages/Supplier/Card/SupplierAddresses.vue
 create mode 100644 src/pages/Supplier/Card/SupplierAgencyTerm.vue
 create mode 100644 src/pages/Supplier/Card/SupplierBasicData.vue
 create mode 100644 src/pages/Supplier/Card/SupplierBillingData.vue
 create mode 100644 src/pages/Supplier/Card/SupplierConsumption.vue
 create mode 100644 src/pages/Supplier/Card/SupplierContacts.vue
 create mode 100644 src/pages/Supplier/Card/SupplierFiscalData.vue
 create mode 100644 src/pages/Supplier/Card/SupplierLog.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 12505b30e..ea2431821 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -558,7 +558,7 @@ export default {
             summary: 'Summary',
             basicData: 'Basic Data',
             catalog: 'Catalog',
-            volume: 'Volume'
+            volume: 'Volume',
         },
         field: {
             salesPersonFk: 'Sales Person',
@@ -769,6 +769,15 @@ export default {
             list: 'List',
             create: 'Create',
             summary: 'Summary',
+            basicData: 'Basic Data',
+            fiscalData: 'Fiscal Data',
+            billingData: 'Billing Data',
+            log: 'Log',
+            accounts: 'Accounts',
+            contacts: 'Contacts',
+            addresses: 'Addresses',
+            consumption: 'Consumption',
+            agencyTerm: 'Agency Agreement',
         },
         list: {
             payMethod: 'Pay method',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index fe16df8fc..60b813f3a 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -769,6 +769,15 @@ export default {
             list: 'Listado',
             create: 'Crear',
             summary: 'Resumen',
+            basicData: 'Datos básicos',
+            fiscalData: 'Datos fiscales',
+            billingData: 'Forma de pago',
+            log: 'Historial',
+            accounts: 'Cuentas',
+            contacts: 'Contactos',
+            addresses: 'Direcciones',
+            consumption: 'Consumo',
+            agencyTerm: 'Acuerdo agencia',
         },
         list: {
             payMethod: 'Método de pago',
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
new file mode 100644
index 000000000..2b7059ea3
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -0,0 +1 @@
+<template>Supplier accounts</template>
diff --git a/src/pages/Supplier/Card/SupplierAddresses.vue b/src/pages/Supplier/Card/SupplierAddresses.vue
new file mode 100644
index 000000000..dd82abe78
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierAddresses.vue
@@ -0,0 +1 @@
+<template>Supplier addresses</template>
diff --git a/src/pages/Supplier/Card/SupplierAgencyTerm.vue b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
new file mode 100644
index 000000000..2a0c341cf
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierAgencyTerm.vue
@@ -0,0 +1 @@
+<template>Supplier agency term</template>
diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
new file mode 100644
index 000000000..582da48f3
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -0,0 +1 @@
+<template>Supplier basic data</template>
diff --git a/src/pages/Supplier/Card/SupplierBillingData.vue b/src/pages/Supplier/Card/SupplierBillingData.vue
new file mode 100644
index 000000000..849737fa7
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierBillingData.vue
@@ -0,0 +1 @@
+<template>Supplier billing data</template>
diff --git a/src/pages/Supplier/Card/SupplierCard.vue b/src/pages/Supplier/Card/SupplierCard.vue
index cf94c9e8d..04115cc3d 100644
--- a/src/pages/Supplier/Card/SupplierCard.vue
+++ b/src/pages/Supplier/Card/SupplierCard.vue
@@ -2,6 +2,8 @@
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import LeftMenu from 'components/LeftMenu.vue';
+import SupplierDescriptor from './SupplierDescriptor.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -18,7 +20,9 @@ const { t } = useI18n();
     </template>
     <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
         <QScrollArea class="fit">
-            <!-- Aca iría left menu y descriptor -->
+            <SupplierDescriptor />
+            <QSeparator />
+            <LeftMenu source="card" />
         </QScrollArea>
     </QDrawer>
     <QPageContainer>
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
new file mode 100644
index 000000000..df1dead17
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -0,0 +1 @@
+<template>Supplier consumption</template>
diff --git a/src/pages/Supplier/Card/SupplierContacts.vue b/src/pages/Supplier/Card/SupplierContacts.vue
new file mode 100644
index 000000000..ca58d4ab7
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierContacts.vue
@@ -0,0 +1 @@
+<template>Supplier contacts</template>
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
new file mode 100644
index 000000000..dd018ac60
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -0,0 +1 @@
+<template>Supplier fiscal data</template>
diff --git a/src/pages/Supplier/Card/SupplierLog.vue b/src/pages/Supplier/Card/SupplierLog.vue
new file mode 100644
index 000000000..2733e958d
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierLog.vue
@@ -0,0 +1 @@
+<template>Supplier log</template>
diff --git a/src/router/modules/Supplier.js b/src/router/modules/Supplier.js
index 198a9581e..6ce1a7688 100644
--- a/src/router/modules/Supplier.js
+++ b/src/router/modules/Supplier.js
@@ -11,7 +11,17 @@ export default {
     redirect: { name: 'SupplierMain' },
     menus: {
         main: ['SupplierList'],
-        card: [],
+        card: [
+            'SupplierBasicData',
+            'SupplierFiscalData',
+            'SupplierBillingData',
+            'SupplierLog',
+            'SupplierAccounts',
+            'SupplierContacts',
+            'SupplierAddresses',
+            'SupplierConsumption',
+            'SupplierAgencyTerm',
+        ],
     },
     children: [
         {
@@ -55,6 +65,95 @@ export default {
                     component: () =>
                         import('src/pages/Supplier/Card/SupplierSummary.vue'),
                 },
+                {
+                    path: 'basic-data',
+                    name: 'SupplierBasicData',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierBasicData.vue'),
+                },
+                {
+                    path: 'fiscal-data',
+                    name: 'SupplierFiscalData',
+                    meta: {
+                        title: 'fiscalData',
+                        icon: 'vn:dfiscales',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierFiscalData.vue'),
+                },
+                {
+                    path: 'billing-data',
+                    name: 'SupplierBillingData',
+                    meta: {
+                        title: 'billingData',
+                        icon: 'vn:payment',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierBillingData.vue'),
+                },
+                {
+                    path: 'log',
+                    name: 'SupplierLog',
+                    meta: {
+                        title: 'log',
+                        icon: 'vn:History',
+                    },
+                    component: () => import('src/pages/Supplier/Card/SupplierLog.vue'),
+                },
+                {
+                    path: 'account',
+                    name: 'SupplierAccounts',
+                    meta: {
+                        title: 'accounts',
+                        icon: 'vn:account',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierAccounts.vue'),
+                },
+                {
+                    path: 'contact',
+                    name: 'SupplierContacts',
+                    meta: {
+                        title: 'contacts',
+                        icon: 'contact_phone',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierContacts.vue'),
+                },
+                {
+                    path: 'address',
+                    name: 'SupplierAddresses',
+                    meta: {
+                        title: 'addresses',
+                        icon: 'vn:delivery',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierAddresses.vue'),
+                },
+                {
+                    path: 'consumption',
+                    name: 'SupplierConsumption',
+                    meta: {
+                        title: 'consumption',
+                        icon: 'show_chart',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierConsumption.vue'),
+                },
+                {
+                    path: 'agency-term',
+                    name: 'SupplierAgencyTerm',
+                    meta: {
+                        title: 'agencyTerm',
+                        icon: 'vn:agency-term',
+                    },
+                    component: () =>
+                        import('src/pages/Supplier/Card/SupplierAgencyTerm.vue'),
+                },
             ],
         },
     ],

From 2edaf71e403190c39cdd7c73170f5a5f3e653b12 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 29 Dec 2023 14:19:44 -0300
Subject: [PATCH 14/18] change suppliers submodules titles casing

---
 src/i18n/en/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index ea2431821..9fc3333a3 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -769,9 +769,9 @@ export default {
             list: 'List',
             create: 'Create',
             summary: 'Summary',
-            basicData: 'Basic Data',
-            fiscalData: 'Fiscal Data',
-            billingData: 'Billing Data',
+            basicData: 'Basic data',
+            fiscalData: 'Fiscal data',
+            billingData: 'Billing data',
             log: 'Log',
             accounts: 'Accounts',
             contacts: 'Contacts',

From 8b24ac9fe4081db937276dbba55b00f17a109c56 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 29 Dec 2023 14:43:20 -0300
Subject: [PATCH 15/18] change suppliers submodules titles casing

---
 src/i18n/en/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 9fc3333a3..7f3237050 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -777,7 +777,7 @@ export default {
             contacts: 'Contacts',
             addresses: 'Addresses',
             consumption: 'Consumption',
-            agencyTerm: 'Agency Agreement',
+            agencyTerm: 'Agency agreement',
         },
         list: {
             payMethod: 'Pay method',

From 113df44705815331027fab318eb722ab09ae7308 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 29 Dec 2023 16:54:35 -0300
Subject: [PATCH 16/18] create entries basic structure and add create entry and
 clone travel with entries feature to travel list and travel summary

---
 src/i18n/en/index.js                    |  12 +++
 src/i18n/es/index.js                    |  11 ++
 src/pages/Entry/Card/EntryCard.vue      |  26 +++++
 src/pages/Entry/EntryCreate.vue         | 135 ++++++++++++++++++++++++
 src/pages/Entry/EntryList.vue           |  22 ++++
 src/pages/Entry/EntryMain.vue           |  17 +++
 src/pages/Supplier/SupplierCreate.vue   |  10 --
 src/pages/Travel/Card/TravelSummary.vue |  22 ++--
 src/pages/Travel/TravelList.vue         |   6 +-
 src/router/modules/entry.js             |  61 +++++++++++
 src/router/modules/index.js             |   2 +
 src/router/routes.js                    |   2 +
 src/stores/useNavigationStore.js        |   1 +
 13 files changed, 310 insertions(+), 17 deletions(-)
 create mode 100644 src/pages/Entry/Card/EntryCard.vue
 create mode 100644 src/pages/Entry/EntryCreate.vue
 create mode 100644 src/pages/Entry/EntryList.vue
 create mode 100644 src/pages/Entry/EntryMain.vue
 create mode 100644 src/router/modules/entry.js

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 7f3237050..878dc03b8 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -207,6 +207,18 @@ export default {
             contactChannel: 'Contact channel',
         },
     },
+    entry: {
+        pageTitles: {
+            entries: 'Entries',
+            list: 'List',
+            createEntry: 'New entry',
+            summary: 'Summary',
+            create: 'Create',
+        },
+        list: {
+            newEntry: 'New entry',
+        },
+    },
     ticket: {
         pageTitles: {
             tickets: 'Tickets',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 60b813f3a..4d29947a7 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -206,6 +206,17 @@ export default {
             contactChannel: 'Canal de contacto',
         },
     },
+    entry: {
+        pageTitles: {
+            entries: 'Entradas',
+            list: 'Listado',
+            summary: 'Resumen',
+            create: 'Crear',
+        },
+        list: {
+            newEntry: 'Nueva entrada',
+        },
+    },
     ticket: {
         pageTitles: {
             tickets: 'Tickets',
diff --git a/src/pages/Entry/Card/EntryCard.vue b/src/pages/Entry/Card/EntryCard.vue
new file mode 100644
index 000000000..5aa50fc94
--- /dev/null
+++ b/src/pages/Entry/Card/EntryCard.vue
@@ -0,0 +1,26 @@
+<script setup>
+import { useStateStore } from 'stores/useStateStore';
+import LeftMenu from 'components/LeftMenu.vue';
+
+const stateStore = useStateStore();
+</script>
+<template>
+    <!-- Entry searchbar -->
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit">
+            <!-- EntryDescriptor -->
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <QPage>
+            <QToolbar class="bg-vn-dark justify-end">
+                <div id="st-data"></div>
+                <QSpace />
+                <div id="st-actions"></div>
+            </QToolbar>
+            <div class="q-pa-md"><RouterView></RouterView></div>
+        </QPage>
+    </QPageContainer>
+</template>
diff --git a/src/pages/Entry/EntryCreate.vue b/src/pages/Entry/EntryCreate.vue
new file mode 100644
index 000000000..30b54cb38
--- /dev/null
+++ b/src/pages/Entry/EntryCreate.vue
@@ -0,0 +1,135 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import FetchData from 'components/FetchData.vue';
+
+import { toDate } from 'src/filters';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const newEntryForm = reactive({
+    supplierFk: null,
+    travelFk: route.query?.travelFk || null,
+    companyFk: null,
+});
+
+const suppliersOptions = ref([]);
+const travelsOptionsOptions = ref([]);
+const companiesOptions = ref([]);
+</script>
+
+<template>
+    <FetchData
+        url="Suppliers"
+        :filter="{ fields: ['id', 'nickname'] }"
+        order="nickname"
+        @on-fetch="(data) => (suppliersOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="Travels/filter"
+        :filter="{ fields: ['id', 'warehouseInName'] }"
+        order="id"
+        @on-fetch="(data) => (travelsOptionsOptions = data)"
+        auto-load
+    />
+    <FetchData
+        ref="companiesRef"
+        url="Companies"
+        :filter="{ fields: ['id', 'code'] }"
+        order="code"
+        @on-fetch="(data) => (companiesOptions = data)"
+        auto-load
+    />
+
+    <!-- Agregar searchbar de entries -->
+
+    <QPage>
+        <QToolbar class="bg-vn-dark justify-end">
+            <div id="st-data"></div>
+            <QSpace />
+            <div id="st-actions"></div>
+        </QToolbar>
+        <FormModel url-create="Entries" model="entry" :form-initial-data="newEntryForm">
+            <template #form="{ data, validate }">
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelectFilter
+                        :label="t('Supplier *')"
+                        class="full-width"
+                        v-model="data.supplierFk"
+                        :options="suppliersOptions"
+                        option-value="id"
+                        option-label="nickname"
+                        hide-selected
+                        :rules="validate('entry.supplierFk')"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.nickname }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        #{{ scope.opt?.id }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelectFilter
+                        :label="t('Travel *')"
+                        class="full-width"
+                        v-model="data.travelFk"
+                        :options="travelsOptionsOptions"
+                        option-value="id"
+                        option-label="warehouseInName"
+                        map-options
+                        hide-selected
+                        :rules="validate('entry.travelFk')"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel
+                                        >{{ scope.opt?.agencyModeName }} -
+                                        {{ scope.opt?.warehouseInName }} ({{
+                                            toDate(scope.opt?.shipped)
+                                        }}) &#x2192; {{ scope.opt?.warehouseOutName }} ({{
+                                            toDate(scope.opt?.landed)
+                                        }})</QItemLabel
+                                    >
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelectFilter
+                        :label="t('Company *')"
+                        class="full-width"
+                        v-model="data.companyFk"
+                        :options="companiesOptions"
+                        option-value="id"
+                        option-label="code"
+                        map-options
+                        hide-selected
+                        :rules="validate('entry.companyFk')"
+                    />
+                </VnRow>
+            </template>
+        </FormModel>
+    </QPage>
+</template>
+
+<i18n>
+    es:
+        Supplier *: Proveedor *
+        Travel *: Envío *
+        Company *: Empresa *
+    </i18n>
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
new file mode 100644
index 000000000..1baa9e019
--- /dev/null
+++ b/src/pages/Entry/EntryList.vue
@@ -0,0 +1,22 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+const router = useRouter();
+const { t } = useI18n();
+
+const redirectToCreateView = () => {
+    router.push({ name: 'EntryCreate' });
+};
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <QPageSticky :offset="[20, 20]">
+            <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
+            <QTooltip>
+                {{ t('entry.list.newEntry') }}
+            </QTooltip>
+        </QPageSticky>
+    </QPage>
+</template>
diff --git a/src/pages/Entry/EntryMain.vue b/src/pages/Entry/EntryMain.vue
new file mode 100644
index 000000000..66ce78f23
--- /dev/null
+++ b/src/pages/Entry/EntryMain.vue
@@ -0,0 +1,17 @@
+<script setup>
+import { useStateStore } from 'stores/useStateStore';
+import LeftMenu from 'src/components/LeftMenu.vue';
+
+const stateStore = useStateStore();
+</script>
+
+<template>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit text-grey-8">
+            <LeftMenu />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <RouterView></RouterView>
+    </QPageContainer>
+</template>
diff --git a/src/pages/Supplier/SupplierCreate.vue b/src/pages/Supplier/SupplierCreate.vue
index 3317225d5..d6cfaeb42 100644
--- a/src/pages/Supplier/SupplierCreate.vue
+++ b/src/pages/Supplier/SupplierCreate.vue
@@ -51,13 +51,3 @@ const newSupplierForm = reactive({
         </FormModel>
     </QPage>
 </template>
-
-<style lang="scss" scoped>
-.card {
-    display: flex;
-    justify-content: center;
-    width: 100%;
-    background-color: var(--vn-dark);
-    padding: 40px;
-}
-</style>
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index ad4659b11..c8a62ec00 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -2,15 +2,17 @@
 import { onMounted, ref, computed, onUpdated } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+
+import { QCheckbox, QIcon } from 'quasar';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import { getUrl } from 'src/composables/getUrl';
-import { toDate } from 'src/filters';
-import travelService from 'src/services/travel.service';
-import { QCheckbox, QIcon } from 'quasar';
-import { toCurrency } from 'filters/index';
 import VnRow from 'components/ui/VnRow.vue';
 
+import travelService from 'src/services/travel.service';
+import { toDate, toCurrency } from 'src/filters';
+import { getUrl } from 'src/composables/getUrl';
+import axios from 'axios';
+
 onUpdated(() => summaryRef.value.fetch());
 
 const route = useRoute();
@@ -40,9 +42,17 @@ const cloneTravel = () => {
     redirectToCreateView(stringifiedTravelData);
 };
 
+const cloneTravelWithEntries = () => {
+    try {
+        axios.post(`Travels/${$props.id}/cloneWithEntries`);
+    } catch (err) {
+        console.err('Error cloning travel with entries');
+    }
+};
+
 const headerMenuOptions = [
     { name: t('travel.summary.cloneShipping'), action: cloneTravel },
-    { name: t('travel.summary.CloneTravelAndEntries'), action: null },
+    { name: t('travel.summary.CloneTravelAndEntries'), action: cloneTravelWithEntries },
     { name: t('travel.summary.AddEntry'), action: null },
 ];
 
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 56d529a7b..889f096aa 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -31,6 +31,10 @@ const redirectToCreateView = (queryParams) => {
     router.push({ name: 'TravelCreate', query: { travelData: queryParams } });
 };
 
+const redirectCreateEntryView = (travelData) => {
+    router.push({ name: 'EntryCreate', query: { travelFk: travelData.id } });
+};
+
 const viewSummary = (id) => {
     quasar.dialog({
         component: TravelSummaryDialog,
@@ -103,7 +107,7 @@ onMounted(async () => {
                             />
                             <QBtn
                                 :label="t('addEntry')"
-                                @click.stop="viewSummary(row.id)"
+                                @click.stop="redirectCreateEntryView(row)"
                                 class="bg-vn-dark"
                                 outline
                                 style="margin-top: 15px"
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
new file mode 100644
index 000000000..6a1cd6173
--- /dev/null
+++ b/src/router/modules/entry.js
@@ -0,0 +1,61 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: '/entry',
+    name: 'Entry',
+    meta: {
+        title: 'entries',
+        icon: 'vn:entry',
+    },
+    component: RouterView,
+    redirect: { name: 'EntryMain' },
+    menus: {
+        main: ['EntryList'],
+        card: [],
+    },
+    children: [
+        {
+            path: '',
+            name: 'EntryMain',
+            component: () => import('src/pages/Entry/EntryMain.vue'),
+            redirect: { name: 'EntryList' },
+            children: [
+                {
+                    path: 'list',
+                    name: 'EntryList',
+                    meta: {
+                        title: 'list',
+                        icon: 'view_list',
+                    },
+                    component: () => import('src/pages/Entry/EntryList.vue'),
+                },
+                {
+                    path: 'create',
+                    name: 'EntryCreate',
+                    meta: {
+                        title: 'create',
+                    },
+                    component: () => import('src/pages/Entry/EntryCreate.vue'),
+                },
+            ],
+        },
+        // {
+        //     name: 'EntryCard',
+        //     path: ':id',
+        //     component: () => import('src/pages/Entry/Card/EntryCard.vue'),
+        //     redirect: { name: 'EntrySummary' },
+        //     children: [
+        //         {
+        //             name: 'EntrySummary',
+        //             path: 'summary',
+        //             meta: {
+        //                 title: 'summary',
+        //                 icon: 'launch',
+        //             },
+        //             component: () =>
+        //                 import('src/pages/Entry/Card/EntrySummary.vue'),
+        //         },
+        //     ],
+        // },
+    ],
+};
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index 68d1d8146..cc5034959 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -11,6 +11,7 @@ import Supplier from './Supplier';
 import Travel from './travel';
 import Order from './order';
 import Department from './department';
+import Entry from './entry';
 
 export default [
     Customer,
@@ -26,4 +27,5 @@ export default [
     Order,
     invoiceIn,
     Department,
+    Entry,
 ];
diff --git a/src/router/routes.js b/src/router/routes.js
index 32f5aaef6..6a2fa6a97 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -11,6 +11,7 @@ import travel from './modules/travel';
 import department from './modules/department';
 import shelving from 'src/router/modules/shelving';
 import order from 'src/router/modules/order';
+import entry from 'src/router/modules/entry';
 
 const routes = [
     {
@@ -63,6 +64,7 @@ const routes = [
             supplier,
             travel,
             department,
+            entry,
             {
                 path: '/:catchAll(.*)*',
                 name: 'NotFound',
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index 63dce6162..6964c9401 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -19,6 +19,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
         'supplier',
         'travel',
         'invoiceIn',
+        'entry',
     ];
     const pinnedModules = ref([]);
     const role = useRole();

From bf259b5fadda679d6aafcbe38389b47018f6e4a0 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Tue, 2 Jan 2024 08:12:44 -0500
Subject: [PATCH 17/18] Correcciones a branch pr 2

---
 src/pages/Customer/Defaulter/CustomerDefaulter.vue    |  2 +-
 .../Customer/ExtendedList/CustomerExtendedList.vue    |  2 +-
 .../Customer/Notifications/CustomerNotifications.vue  |  2 +-
 src/pages/InvoiceOut/InvoiceOutGlobal.vue             |  2 +-
 src/pages/InvoiceOut/InvoiceOutNegativeBases.vue      |  2 +-
 src/pages/Order/Card/OrderSearchbar.vue               | 11 ++++-------
 src/pages/Travel/ExtraCommunity.vue                   |  2 +-
 7 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index b35980416..476c612d6 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -233,7 +233,7 @@ const selectAuthorId = (id) => {
 <style lang="scss" scoped>
 .col-content {
     border-radius: 4px;
-    padding: 6px 6px 6px 6px;
+    padding: 6px;
 }
 </style>
 
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
index a60b79caf..a1aa47791 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
@@ -565,6 +565,6 @@ const selectSalesPersonId = (id) => {
 <style lang="scss" scoped>
 .col-content {
     border-radius: 4px;
-    padding: 6px 6px 6px 6px;
+    padding: 6px;
 }
 </style>
diff --git a/src/pages/Customer/Notifications/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
index f9ff66a7b..e8d779cb5 100644
--- a/src/pages/Customer/Notifications/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -148,7 +148,7 @@ const selectCustomerId = (id) => {
 <style lang="scss" scoped>
 .col-content {
     border-radius: 4px;
-    padding: 6px 6px 6px 6px;
+    padding: 6px;
 }
 </style>
 
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobal.vue b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
index 7284ca04e..ea1978702 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobal.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
@@ -175,7 +175,7 @@ onUnmounted(() => {
 
 .col-content {
     border-radius: 4px;
-    padding: 6px 6px 6px 6px;
+    padding: 6px;
 }
 </style>
 
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 3595a650d..15010c66d 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -255,7 +255,7 @@ const selectWorkerId = (id) => {
 <style lang="scss" scoped>
 .col-content {
     border-radius: 4px;
-    padding: 6px 6px 6px 6px;
+    padding: 6px;
 }
 </style>
 
diff --git a/src/pages/Order/Card/OrderSearchbar.vue b/src/pages/Order/Card/OrderSearchbar.vue
index 4d354603b..a768768a5 100644
--- a/src/pages/Order/Card/OrderSearchbar.vue
+++ b/src/pages/Order/Card/OrderSearchbar.vue
@@ -9,17 +9,14 @@ const { t } = useI18n();
     <VnSearchbar
         data-key="OrderList"
         url="Orders/filter"
-        :label="t('search-order')"
-        :info="t('search-order-info')"
+        :label="t('Search order')"
+        :info="t('You can search orders by reference')"
     />
 </template>
 
 <style scoped lang="scss"></style>
 <i18n>
-en:
-    search-order: Search order
-    search-order-info: You can search orders by reference
 es:
-    Search shelving: Buscar orden
-    You can search by shelving reference: Puedes buscar por referencia de la orden
+    Search order: Buscar orden
+    You can search orders by reference: Puedes buscar por referencia de la orden
 </i18n>
diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index 245cbc9de..f3cf557c6 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -395,7 +395,7 @@ onMounted(async () => {
 <style lang="scss" scoped>
 .col-content {
     border-radius: 4px;
-    padding: 6px 6px 6px 6px;
+    padding: 6px;
 }
 
 .secondary-row {

From b0b8205b5266603ac14affd15edbd234e79bd001 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Tue, 2 Jan 2024 10:28:52 -0500
Subject: [PATCH 18/18] Solucion comentario

---
 src/pages/Order/Card/OrderCatalogFilter.vue | 25 +++++++++------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 46de63abd..814aa49c6 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -67,24 +67,19 @@ function exprBuilder(param, value) {
             return { [param]: value };
     }
 }
+
+const setCategoryList = (data) => {
+    categoryList.value = (data || [])
+        .filter((category) => category.display)
+        .map((category) => ({
+            ...category,
+            icon: `vn:${(category.icon || '').split('-')[1]}`,
+        }));
+};
 </script>
 
 <template>
-    <FetchData
-        url="ItemCategories"
-        limit="30"
-        auto-load
-        @on-fetch="
-            (data) => {
-                categoryList = (data || [])
-                    .filter((category) => category.display)
-                    .map((category) => ({
-                        ...category,
-                        icon: `vn:${(category.icon || '').split('-')[1]}`,
-                    }));
-            }
-        "
-    />
+    <FetchData url="ItemCategories" limit="30" auto-load @on-fetch="setCategoryList" />
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"