From b06234441c0d0ead6cd7efc3b089cd826acde540 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Fri, 19 Jan 2024 10:08:26 -0500
Subject: [PATCH 01/19] Se crean las tarjetas de greuges, recobros y acceso web

---
 src/pages/Customer/Card/CustomerCredits.vue   |  20 +-
 src/pages/Customer/Card/CustomerGreuges.vue   | 201 +++++++++++++++++-
 .../Customer/Card/CustomerRecoveries.vue      | 156 +++++++++++++-
 src/pages/Customer/Card/CustomerWebAccess.vue |  68 +++++-
 .../components/CustomerGreugeCreate.vue       |  93 ++++++++
 .../components/CustomerNoteCreate.vue         |   2 +-
 .../components/CustomerRecoverieCreate.vue    |  72 +++++++
 src/router/modules/customer.js                |  64 ++++--
 8 files changed, 644 insertions(+), 32 deletions(-)
 create mode 100644 src/pages/Customer/components/CustomerGreugeCreate.vue
 create mode 100644 src/pages/Customer/components/CustomerRecoverieCreate.vue

diff --git a/src/pages/Customer/Card/CustomerCredits.vue b/src/pages/Customer/Card/CustomerCredits.vue
index 13bc684b3..7840453ef 100644
--- a/src/pages/Customer/Card/CustomerCredits.vue
+++ b/src/pages/Customer/Card/CustomerCredits.vue
@@ -1,22 +1,24 @@
 <script setup>
-import { ref, computed, onBeforeMount, onMounted } from 'vue';
+import { ref, computed, onBeforeMount } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 
 import { date, QBtn } from 'quasar';
 
-import { toCurrency, toDate } from 'src/filters';
+import { toCurrency } from 'src/filters';
 import { useArrayData } from 'composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 const { t } = useI18n();
+const route = useRoute();
 const router = useRouter();
 const stateStore = useStateStore();
 
 const arrayData = ref(null);
 const workerId = ref(0);
+const rows = computed(() => arrayData.value.store.data);
 
 onBeforeMount(async () => {
     const filter = {
@@ -29,7 +31,7 @@ onBeforeMount(async () => {
                 },
             },
         ],
-        where: { clientFk: '1' },
+        where: { clientFk: `${route.params.id}` },
         order: ['created DESC'],
         limit: 20,
     };
@@ -41,16 +43,6 @@ 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 allColumnNames = ref([]);
-
 const tableColumnComponents = {
     created: {
         component: 'span',
diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index d322e04a5..2d67737d4 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -1,3 +1,202 @@
+<script setup>
+import { ref, computed, onBeforeMount } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute, useRouter } from 'vue-router';
+
+import { date, QBtn } from 'quasar';
+
+import { useArrayData } from 'composables/useArrayData';
+import { useStateStore } from 'stores/useStateStore';
+import { toCurrency } from 'src/filters';
+
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const router = useRouter();
+const stateStore = useStateStore();
+
+const arrayData = ref(null);
+const totalAmount = ref(0);
+const workerId = ref(0);
+const rows = computed(() => arrayData.value.store.data);
+
+onBeforeMount(async () => {
+    const filter = {
+        include: [
+            {
+                relation: 'greugeType',
+                scope: {
+                    fields: ['id', 'name'],
+                },
+            },
+            {
+                relation: 'user',
+                scope: {
+                    fields: ['id', 'name'],
+                },
+            },
+        ],
+        order: 'shipped DESC, amount',
+        where: {
+            clientFk: `${route.params.id}`,
+        },
+        limit: 20,
+    };
+
+    arrayData.value = useArrayData('CustomerGreugesCard', {
+        url: 'greuges',
+        filter,
+    });
+    await arrayData.value.fetch({ append: false });
+    totalAmount.value = arrayData.value.store.data.reduce((acumulador, objetoActual) => {
+        return acumulador + objetoActual.amount;
+    }, 0);
+    stateStore.rightDrawer = true;
+});
+
+const tableColumnComponents = {
+    date: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    createdBy: {
+        component: QBtn,
+        props: () => ({ flat: true, color: 'blue' }),
+        event: (prop) => {
+            selectWorkerId(prop.row.clientFk);
+        },
+    },
+    comment: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    type: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    amount: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+};
+
+const columns = computed(() => [
+    {
+        align: 'left',
+        field: 'shipped',
+        label: t('Date'),
+        name: 'date',
+        format: (value) => date.formatDate(value, 'DD/MM/YYYY hh:mm:ss'),
+    },
+    {
+        align: 'left',
+        field: (value) => value.user.name,
+        label: t('Created by'),
+        name: 'createdBy',
+    },
+    {
+        align: 'left',
+        field: 'description',
+        label: t('Comment'),
+        name: 'comment',
+    },
+    {
+        align: 'left',
+        field: (value) => value.greugeType.name,
+        label: t('Type'),
+        name: 'type',
+    },
+    {
+        align: 'left',
+        field: 'amount',
+        label: t('Amount'),
+        name: 'amount',
+        format: (value) => toCurrency(value),
+    },
+]);
+
+const selectWorkerId = (id) => {
+    workerId.value = id;
+};
+
+const toCustomerGreugeCreate = () => {
+    router.push({ name: 'CustomerGreugeCreate' });
+};
+</script>
+
 <template>
-    <div class="flex justify-center">Greuges</div>
+    <QPage class="column items-center q-pa-md">
+        <QCard class="full-width" v-if="totalAmount">
+            <h6 class="flex justify-end q-my-lg q-pr-lg">
+                <span class="label-color q-mr-md">{{ t('Total') }}:</span>
+                {{ toCurrency(totalAmount) }}
+            </h6>
+        </QCard>
+
+        <QTable
+            :columns="columns"
+            :pagination="{ rowsPerPage: 12 }"
+            :rows="rows"
+            class="full-width q-mt-md"
+            row-key="id"
+            v-if="rows?.length"
+        >
+            <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 :id="workerId" />
+                        </component>
+                    </QTr>
+                </QTd>
+            </template>
+        </QTable>
+
+        <QCard class="full-width" v-else>
+            <h5 class="flex justify-center label-color">
+                {{ t('globals.noResults') }}
+            </h5>
+        </QCard>
+    </QPage>
+
+    <QPageSticky :offset="[18, 18]">
+        <QBtn @click.stop="toCustomerGreugeCreate()" color="primary" fab icon="add" />
+        <QTooltip>
+            {{ t('New greuge') }}
+        </QTooltip>
+    </QPageSticky>
 </template>
+
+<style lang="scss">
+.consignees-card {
+    border: 2px solid var(--vn-light-gray);
+    border-radius: 10px;
+    padding: 10px;
+}
+
+.label-color {
+    color: var(--vn-label);
+}
+</style>
+
+<i18n>
+es:
+    Total: Total
+    Date: Fecha
+    Created by: Creado por
+    Comment: Comentario
+    Type: Tipo
+    Amount: Importe
+    New greuge: Nuevo greuge
+</i18n>
diff --git a/src/pages/Customer/Card/CustomerRecoveries.vue b/src/pages/Customer/Card/CustomerRecoveries.vue
index 54274717c..7247145f2 100644
--- a/src/pages/Customer/Card/CustomerRecoveries.vue
+++ b/src/pages/Customer/Card/CustomerRecoveries.vue
@@ -1,3 +1,157 @@
+<script setup>
+import { ref, computed, onBeforeMount } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute, useRouter } from 'vue-router';
+
+import { date, QBtn } from 'quasar';
+
+import { useArrayData } from 'composables/useArrayData';
+import { useStateStore } from 'stores/useStateStore';
+import { toCurrency } from 'src/filters';
+
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const router = useRouter();
+const stateStore = useStateStore();
+
+const arrayData = ref(null);
+const workerId = ref(0);
+const rows = computed(() => arrayData.value.store.data);
+
+onBeforeMount(async () => {
+    const filter = {
+        where: { clientFk: `${route.params.id}` },
+        order: ['started DESC'],
+        limit: 20,
+    };
+
+    arrayData.value = useArrayData('CustomerRecoveriesCard', {
+        url: 'Recoveries',
+        filter,
+    });
+    await arrayData.value.fetch({ append: false });
+    stateStore.rightDrawer = true;
+});
+
+const tableColumnComponents = {
+    since: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    to: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    amount: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    period: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+};
+
+const columns = computed(() => [
+    {
+        align: 'left',
+        field: 'started',
+        label: t('Since'),
+        name: 'since',
+        format: (value) => date.formatDate(value, 'DD/MM/YYYY'),
+    },
+    {
+        align: 'left',
+        field: 'finished',
+        label: t('To'),
+        name: 'to',
+        format: (value) => date.formatDate(value, 'DD/MM/YYYY'),
+    },
+    {
+        align: 'left',
+        field: 'amount',
+        label: t('Amount'),
+        name: 'amount',
+        format: (value) => toCurrency(value),
+    },
+    {
+        align: 'left',
+        field: 'period',
+        label: t('Period'),
+        name: 'period',
+    },
+]);
+
+const toCustomerRecoverieCreate = () => {
+    router.push({ name: 'CustomerRecoverieCreate' });
+};
+</script>
+
 <template>
-    <div class="flex justify-center">Recoveries</div>
+    <QPage class="column items-center q-pa-md">
+        <QTable
+            :columns="columns"
+            :pagination="{ rowsPerPage: 12 }"
+            :rows="rows"
+            class="full-width q-mt-md"
+            row-key="id"
+            v-if="rows?.length"
+        >
+            <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 :id="workerId" />
+                        </component>
+                    </QTr>
+                </QTd>
+            </template>
+        </QTable>
+
+        <QCard class="full-width" v-else>
+            <h5 class="flex justify-center label-color">
+                {{ t('globals.noResults') }}
+            </h5>
+        </QCard>
+    </QPage>
+
+    <QPageSticky :offset="[18, 18]">
+        <QBtn @click.stop="toCustomerRecoverieCreate()" color="primary" fab icon="add" />
+        <QTooltip>
+            {{ t('New recoverie') }}
+        </QTooltip>
+    </QPageSticky>
 </template>
+
+<style lang="scss">
+.consignees-card {
+    border: 2px solid var(--vn-light-gray);
+    border-radius: 10px;
+    padding: 10px;
+}
+
+.label-color {
+    color: var(--vn-label);
+}
+</style>
+
+<i18n>
+es:
+    Since: Desde
+    To: Hasta
+    Amount: Importe
+    Period: Periodo
+    New recoverie: Nuevo recobro
+</i18n>
diff --git a/src/pages/Customer/Card/CustomerWebAccess.vue b/src/pages/Customer/Card/CustomerWebAccess.vue
index 95ec77c3d..d3be7bec8 100644
--- a/src/pages/Customer/Card/CustomerWebAccess.vue
+++ b/src/pages/Customer/Card/CustomerWebAccess.vue
@@ -1,3 +1,69 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const filter = { where: { id: `${route.params.id}` } };
+</script>
+
 <template>
-    <div class="flex justify-center">Web access</div>
+    <FormModel
+        :filter="filter"
+        :observe-form-changes="false"
+        :url-update="`Clients/${route.params.id}/updateUser`"
+        :url="'VnUsers/preview'"
+        model="client"
+    >
+        <template #form="{ data }">
+            <div
+                v-for="(item, index) in data"
+                :key="index"
+                :class="{
+                    'q-mb-md': index < data.length - 1,
+                }"
+            >
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <QCheckbox
+                            :label="t('Enable web access')"
+                            v-model="item.active"
+                        />
+                    </div>
+                </VnRow>
+
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnInput :label="t('User')" v-model="item.name" />
+                    </div>
+                    <div class="col">
+                        <VnInput :label="t('Recovery email')" v-model="item.email">
+                            <template #append>
+                                <QIcon name="info" class="cursor-pointer">
+                                    <QTooltip>{{
+                                        t(
+                                            'This email is used for user to regain access their account'
+                                        )
+                                    }}</QTooltip>
+                                </QIcon>
+                            </template>
+                        </VnInput>
+                    </div>
+                </VnRow>
+            </div>
+        </template>
+    </FormModel>
 </template>
+
+<i18n>
+es:
+    Enable web access: Habilitar acceso web
+    User: Usuario
+    Recovery email: Correo de recuperacion
+    This email is used for user to regain access their account: Este correo electrónico se usa para que el usuario recupere el acceso a su cuenta
+</i18n>
diff --git a/src/pages/Customer/components/CustomerGreugeCreate.vue b/src/pages/Customer/components/CustomerGreugeCreate.vue
new file mode 100644
index 000000000..1ff467d97
--- /dev/null
+++ b/src/pages/Customer/components/CustomerGreugeCreate.vue
@@ -0,0 +1,93 @@
+<script setup>
+import { onMounted, reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute, useRouter } from 'vue-router';
+
+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 VnInputDate from 'components/common/VnInputDate.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const router = useRouter();
+
+const initialData = reactive({
+    amount: null,
+    description: null,
+    greugeTypeFk: null,
+    shipped: '2001-01-01T11:00:00.000Z',
+});
+
+const greugeTypes = ref([]);
+
+onMounted(() => {
+    initialData.clientFk = `${route.params.id}`;
+});
+
+const toCustomerGreuges = () => {
+    router.push({
+        name: 'CustomerGreuges',
+        params: {
+            id: route.params.id,
+        },
+    });
+};
+</script>
+
+<template>
+    <fetch-data @on-fetch="(data) => (greugeTypes = data)" auto-load url="greugeTypes" />
+
+    <FormModel
+        :form-initial-data="initialData"
+        :observe-form-changes="false"
+        @on-data-saved="toCustomerGreuges()"
+        model="client"
+        url-create="Greuges"
+    >
+        <template #form="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput :label="t('Amount')" type="number" v-model="data.amount" />
+                </div>
+                <div class="col">
+                    <VnInputDate :label="t('Date')" v-model="data.shipped" />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput :label="t('Comment')" v-model="data.description" />
+                </div>
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Type')"
+                        :options="greugeTypes"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.greugeTypeFk"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
+
+<style lang="scss" scoped>
+.add-icon {
+    cursor: pointer;
+    background-color: $primary;
+    border-radius: 50px;
+}
+</style>
+
+<i18n>
+es:
+    Amount: Importe
+    Date: Fecha
+    Comment: Comentario
+    Type: Tipo
+</i18n>
diff --git a/src/pages/Customer/components/CustomerNoteCreate.vue b/src/pages/Customer/components/CustomerNoteCreate.vue
index cea90f975..640f6f3a0 100644
--- a/src/pages/Customer/components/CustomerNoteCreate.vue
+++ b/src/pages/Customer/components/CustomerNoteCreate.vue
@@ -32,8 +32,8 @@ const toCustomerNotes = () => {
     <FormModel
         :form-initial-data="initialData"
         :observe-form-changes="false"
-        url-create="ClientObservations"
         @on-data-saved="toCustomerNotes()"
+        url-create="ClientObservations"
     >
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
diff --git a/src/pages/Customer/components/CustomerRecoverieCreate.vue b/src/pages/Customer/components/CustomerRecoverieCreate.vue
new file mode 100644
index 000000000..ed7304be0
--- /dev/null
+++ b/src/pages/Customer/components/CustomerRecoverieCreate.vue
@@ -0,0 +1,72 @@
+<script setup>
+import { onMounted, reactive } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute, useRouter } from 'vue-router';
+
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const router = useRouter();
+
+const initialData = reactive({
+    started: '2001-01-01T11:00:00.000Z',
+    finished: null,
+    amount: null,
+    period: null,
+});
+
+onMounted(() => {
+    initialData.clientFk = `${route.params.id}`;
+});
+
+const toCustomerRecoveries = () => {
+    router.push({
+        name: 'CustomerRecoveries',
+        params: {
+            id: route.params.id,
+        },
+    });
+};
+</script>
+
+<template>
+    <FormModel
+        :form-initial-data="initialData"
+        :observe-form-changes="false"
+        @on-data-saved="toCustomerRecoveries()"
+        model="client"
+        url-create="Recoveries"
+    >
+        <template #form="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInputDate :label="t('Since')" v-model="data.started" />
+                </div>
+                <div class="col">
+                    <VnInputDate :label="t('To')" v-model="data.finished" />
+                </div>
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput :label="t('Amount')" type="number" v-model="data.amount" />
+                </div>
+                <div class="col">
+                    <VnInput :label="t('Period')" type="number" v-model="data.period" />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
+
+<i18n>
+es:
+    Since: Desde
+    To: Hasta
+    Amount: Importe
+    Period: Periodo
+</i18n>
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index fa57682af..a17ef4271 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -254,13 +254,31 @@ export default {
                 },
                 {
                     path: 'greuges',
-                    name: 'CustomerGreuges',
-                    meta: {
-                        title: 'greuges',
-                        icon: 'vn:greuge',
-                    },
-                    component: () =>
-                        import('src/pages/Customer/Card/CustomerGreuges.vue'),
+                    name: 'GreugesCard',
+                    redirect: { name: 'CustomerGreuges' },
+                    children: [
+                        {
+                            path: '',
+                            name: 'CustomerGreuges',
+                            meta: {
+                                title: 'greuges',
+                                icon: 'vn:greuge',
+                            },
+                            component: () =>
+                                import('src/pages/Customer/Card/CustomerGreuges.vue'),
+                        },
+                        {
+                            path: 'create',
+                            name: 'CustomerGreugeCreate',
+                            meta: {
+                                title: 'greuge-create',
+                            },
+                            component: () =>
+                                import(
+                                    'src/pages/Customer/components/CustomerGreugeCreate.vue'
+                                ),
+                        },
+                    ],
                 },
                 {
                     path: 'balance',
@@ -274,13 +292,31 @@ export default {
                 },
                 {
                     path: 'recoveries',
-                    name: 'CustomerRecoveries',
-                    meta: {
-                        title: 'recoveries',
-                        icon: 'vn:recovery',
-                    },
-                    component: () =>
-                        import('src/pages/Customer/Card/CustomerRecoveries.vue'),
+                    name: 'RecoveriesCard',
+                    redirect: { name: 'CustomerRecoveries' },
+                    children: [
+                        {
+                            path: '',
+                            name: 'CustomerRecoveries',
+                            meta: {
+                                title: 'recoveries',
+                                icon: 'vn:recovery',
+                            },
+                            component: () =>
+                                import('src/pages/Customer/Card/CustomerRecoveries.vue'),
+                        },
+                        {
+                            path: 'create',
+                            name: 'CustomerRecoverieCreate',
+                            meta: {
+                                title: 'recoverie-create',
+                            },
+                            component: () =>
+                                import(
+                                    'src/pages/Customer/components/CustomerRecoverieCreate.vue'
+                                ),
+                        },
+                    ],
                 },
                 {
                     path: 'web-access',

From 8b56a151316040586d7d1a7e7e0beb6eeda2e950 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 19 Jan 2024 17:03:46 -0300
Subject: [PATCH 02/19] Remove pre tag in worker create

---
 src/pages/Worker/WorkerCreate.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 91d4d454b..5cc3993ea 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -363,7 +363,6 @@ onMounted(async () => {
                         </template>
                     </VnSelectCreate>
                 </VnRow>
-                <pre>{{ data }}</pre>
             </template>
         </FormModel>
     </QPage>

From 660a53b44fca837b87336bcd0500a06101f00b73 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Mon, 22 Jan 2024 12:52:53 -0400
Subject: [PATCH 03/19] Add response data on form model save

---
 src/components/FormModel.vue       | 2 +-
 src/pages/Route/Card/RouteForm.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 4ad566bf8..755cef77c 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -135,7 +135,7 @@ async function save() {
         } else {
             response = await axios.patch($props.urlUpdate || $props.url, body);
         }
-        emit('onDataSaved', formData.value, response);
+        emit('onDataSaved', formData.value, response?.data);
         originalData.value = JSON.parse(JSON.stringify(formData.value));
         hasChanges.value = false;
     } catch (err) {
diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 49a067c00..5acbcff0e 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -71,8 +71,8 @@ const routeFilter = {
 };
 const onSave = (data, response) => {
     if (isNew) {
-        axios.post(`Routes/${response.data?.id}/updateWorkCenter`);
-        router.push({ name: 'RouteSummary', params: { id: response.data?.id } });
+        axios.post(`Routes/${response?.id}/updateWorkCenter`);
+        router.push({ name: 'RouteSummary', params: { id: response?.id } });
     }
 };
 </script>

From d0d57f71e0a02738dfa6144b34e566ec2d85d9ee Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Wed, 24 Jan 2024 06:51:52 -0400
Subject: [PATCH 04/19] Implement routes report

---
 src/pages/Route/RouteList.vue | 31 +++++++++++++++++++++++++++++--
 1 file changed, 29 insertions(+), 2 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 591f723e9..392d7f8cb 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -15,11 +15,13 @@ import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
 import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
 import { useQuasar } from 'quasar';
 import RouteSummaryDialog from 'pages/Route/Card/RouteSummaryDialog.vue';
+import {useSession} from "composables/useSession";
 
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { validate } = useValidator();
 const quasar = useQuasar();
+const session = useSession();
 
 const to = Date.vnNew();
 to.setDate(to.getDate() + 1);
@@ -149,6 +151,23 @@ const cloneRoutes = () => {
     startingDate.value = null;
 };
 
+const showRouteReport = () => {
+    const ids = selectedRows.value.map(row => row?.id)
+    const idString = ids.join(',')
+    let url;
+
+    if (selectedRows.value.length <= 1) {
+        url = `api/Routes/${idString}/driver-route-pdf?access_token=${session.getToken()}`;
+    } else {
+        const params = new URLSearchParams({
+            access_token: session.getToken(),
+            id: idString
+        })
+        url = `api/Routes/downloadZip?${params.toString()}`;
+    }
+    window.open(url, '_blank');
+}
+
 const markAsServed = () => {
     selectedRows.value.forEach((row) => {
         if (row?.id) {
@@ -206,7 +225,6 @@ function previewRoute(id) {
                     autofocus
                 />
             </QCardSection>
-            <!-- TODO: Add report -->
             <QCardActions align="right">
                 <QBtn flat :label="t('Cancel')" v-close-popup class="text-primary" />
                 <QBtn color="primary" v-close-popup @click="cloneRoutes">
@@ -239,7 +257,15 @@ function previewRoute(id) {
                 >
                     <QTooltip>{{ t('Clone Selected Routes') }}</QTooltip>
                 </QBtn>
-
+                <QBtn
+                    icon="cloud_download"
+                    color="primary"
+                    class="q-mr-sm"
+                    :disable="!selectedRows?.length"
+                    @click="showRouteReport"
+                >
+                    <QTooltip>{{ t('Download selected routes as PDF') }}</QTooltip>
+                </QBtn>
                 <QBtn
                     icon="check"
                     color="primary"
@@ -527,4 +553,5 @@ es:
     Cancel: Cancelar
     Clone: Clonar
     Mark as served: Marcar como servidas
+    Download selected routes as PDF: Descargar rutas seleccionadas como PDF
 </i18n>

From 1d6625a9be1e0962086b415c8ae8e026c59107fb Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Thu, 25 Jan 2024 05:50:00 -0500
Subject: [PATCH 05/19] Se crea la tarjeta de balances

---
 src/pages/Customer/Card/CustomerBalance.vue   | 281 ++++++++++++++++-
 .../Customer/Card/CustomerConsignees.vue      |  18 +-
 src/pages/Customer/Card/CustomerGreuges.vue   |   4 +-
 src/pages/Customer/Card/CustomerNotes.vue     |   2 +-
 .../components/CustomerConsigneeCreate.vue    |   4 +-
 .../components/CustomerNewPayment.vue         | 286 ++++++++++++++++++
 6 files changed, 577 insertions(+), 18 deletions(-)
 create mode 100644 src/pages/Customer/components/CustomerNewPayment.vue

diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 9e44f67f5..5d296881f 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -1,3 +1,282 @@
+<script setup>
+import { computed, onBeforeMount, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import axios from 'axios';
+import { date, QCheckbox, QBtn, useQuasar } from 'quasar';
+
+import { toCurrency } from 'src/filters';
+import { useStateStore } from 'stores/useStateStore';
+
+import FetchData from 'components/FetchData.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const quasar = useQuasar();
+const stateStore = useStateStore();
+
+const clientRisks = ref(null);
+const companiesOptions = ref([]);
+const companyId = ref(442);
+const rows = ref(null);
+const workerId = ref(0);
+
+const filterCompanies = { order: ['code'] };
+
+const tableColumnComponents = {
+    payed: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    created: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    userName: {
+        component: QBtn,
+        props: () => ({ flat: true, color: 'blue' }),
+        event: (prop) => {
+            workerId.value = prop.row.clientFk;
+        },
+    },
+    description: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    bankFk: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    debit: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    credit: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    balance: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
+    isConciliate: {
+        component: QCheckbox,
+        props: (prop) => ({
+            disable: true,
+            'model-value': Boolean(prop.value),
+        }),
+        event: () => {},
+    },
+};
+
+const columns = computed(() => [
+    {
+        align: 'left',
+        field: 'payed',
+        format: (value) => date.formatDate(value, 'DD/MM/YYYY'),
+        label: t('Date'),
+        name: 'payed',
+    },
+    {
+        align: 'left',
+        field: 'created',
+        format: (value) => date.formatDate(value, 'DD/MM/YYYY hh:mm:ss'),
+        label: t('Creation date'),
+        name: 'created',
+    },
+    {
+        align: 'left',
+        field: 'userName',
+        label: t('Employee'),
+        name: 'userName',
+    },
+    {
+        align: 'left',
+        field: 'description',
+        label: t('Reference'),
+        name: 'description',
+    },
+    {
+        align: 'left',
+        field: 'bankFk',
+        label: t('Bank'),
+        name: 'bankFk',
+    },
+    {
+        align: 'left',
+        field: 'debit',
+        label: t('Debit'),
+        name: 'debit',
+    },
+    {
+        align: 'left',
+        field: 'credit',
+        format: (value) => toCurrency(value),
+        label: t('Havings'),
+        name: 'credit',
+    },
+    {
+        align: 'left',
+        field: (value) => value.debit - value.credit,
+        format: (value) => toCurrency(value),
+        label: t('Balance'),
+        name: 'balance',
+    },
+    {
+        align: 'left',
+        field: 'isConciliate',
+        label: t('Conciliated'),
+        name: 'isConciliate',
+    },
+]);
+
+onBeforeMount(() => {
+    getData();
+});
+
+const getData = () => {
+    getReceipts();
+    getClientRisks();
+};
+
+const getReceipts = async () => {
+    const params = {
+        clientId: `${route.params.id}`,
+        companyId: companyId.value,
+        filter: { limit: 20 },
+    };
+    const { data } = await axios.get('Receipts/filter', { params });
+    rows.value = data;
+    stateStore.rightDrawer = true;
+};
+
+const getClientRisks = async () => {
+    const filter = {
+        include: { relation: 'company', scope: { fields: ['code'] } },
+        where: { clientFk: `${route.params.id}`, companyFk: companyId.value },
+    };
+    const { data } = await axios.get('ClientRisks', {
+        params: { filter: JSON.stringify(filter) },
+    });
+    clientRisks.value = data;
+    console.log(clientRisks.value[0].amount);
+};
+
+const showNewPaymentDialog = () => {
+    quasar.dialog({
+        component: CustomerNewPayment,
+        componentProps: {
+            companyId: companyId.value,
+            totalCredit: clientRisks.value[0]?.amount,
+            promise: getData,
+        },
+    });
+};
+
+const updateCompanyId = (id) => {
+    if (id) companyId.value = id;
+    getData();
+};
+</script>
+
 <template>
-    <div class="flex justify-center">Balance</div>
+    <FetchData
+        :filter="filterCompanies"
+        @on-fetch="(data) => (companiesOptions = data)"
+        auto-load
+        url="Companies"
+    />
+
+    <QTable
+        :columns="columns"
+        :pagination="{ rowsPerPage: 12 }"
+        :rows="rows"
+        class="full-width q-mt-md"
+        row-key="id"
+        v-if="rows?.length"
+    >
+        <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 :id="workerId" />
+                    </component>
+                </QTr>
+            </QTd>
+        </template>
+    </QTable>
+
+    <h5 class="flex justify-center label-color" v-else>
+        {{ t('globals.noResults') }}
+    </h5>
+
+    <QDrawer :width="256" show-if-above side="right" v-model="stateStore.rightDrawer">
+        <div class="q-mt-xl q-px-md">
+            <VnSelectFilter
+                :label="t('Company')"
+                :options="companiesOptions"
+                @update:model-value="updateCompanyId($event)"
+                hide-selected
+                option-label="code"
+                option-value="id"
+                v-model="companyId"
+            />
+        </div>
+
+        <QCard class="q-ma-md q-pa-md q-mt-lg" v-if="rows?.length">
+            <QCardSection>
+                <div class="flex justify-center text-subtitle1 text-bold">
+                    {{ t('Total by company') }}
+                </div>
+                <div class="flex justify-center">
+                    <div class="q-mr-sm" v-if="clientRisks?.length">
+                        {{ clientRisks[0].company.code }}:
+                    </div>
+                    <div v-if="clientRisks?.length">
+                        {{ toCurrency(clientRisks[0].amount) }}
+                    </div>
+                </div>
+            </QCardSection>
+        </QCard>
+    </QDrawer>
+
+    <QPageSticky :offset="[18, 18]">
+        <QBtn @click.stop="showNewPaymentDialog()" color="primary" fab icon="add" />
+        <QTooltip>
+            {{ t('New payment') }}
+        </QTooltip>
+    </QPageSticky>
 </template>
+
+<i18n>
+es:
+    Company: Empresa
+    Total by company: Total por empresa
+    New payment: Añadir pago
+    Date: Fecha
+    Creation date: Fecha de creación
+    Employee: Empleado
+    Reference: Referencia
+    Bank: Caja
+    Debit: Debe
+    Havings: Haber
+    Balance: Balance
+    Conciliated: Conciliado
+</i18n>
diff --git a/src/pages/Customer/Card/CustomerConsignees.vue b/src/pages/Customer/Card/CustomerConsignees.vue
index bf61ea302..7e643208e 100644
--- a/src/pages/Customer/Card/CustomerConsignees.vue
+++ b/src/pages/Customer/Card/CustomerConsignees.vue
@@ -137,21 +137,15 @@ const toCustomerConsigneeEdit = (consigneeId) => {
                         </div>
                     </div>
                 </QCard>
-
-                <QPageSticky :offset="[18, 18]">
-                    <QBtn
-                        @click.stop="toCustomerConsigneeCreate()"
-                        color="primary"
-                        fab
-                        icon="add"
-                    />
-                    <QTooltip>
-                        {{ t('New consignee') }}
-                    </QTooltip>
-                </QPageSticky>
             </template>
         </VnPaginate>
     </QCard>
+    <QPageSticky :offset="[18, 18]">
+        <QBtn @click.stop="toCustomerConsigneeCreate()" color="primary" fab icon="add" />
+        <QTooltip>
+            {{ t('New consignee') }}
+        </QTooltip>
+    </QPageSticky>
 </template>
 
 <style lang="scss" scoped>
diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index 2d67737d4..d92d7b4ee 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -49,8 +49,8 @@ onBeforeMount(async () => {
         filter,
     });
     await arrayData.value.fetch({ append: false });
-    totalAmount.value = arrayData.value.store.data.reduce((acumulador, objetoActual) => {
-        return acumulador + objetoActual.amount;
+    totalAmount.value = arrayData.value.store.data.reduce((accumulator, currentValue) => {
+        return accumulator + currentValue.amount;
     }, 0);
     stateStore.rightDrawer = true;
 });
diff --git a/src/pages/Customer/Card/CustomerNotes.vue b/src/pages/Customer/Card/CustomerNotes.vue
index 303ea0980..0909758f3 100644
--- a/src/pages/Customer/Card/CustomerNotes.vue
+++ b/src/pages/Customer/Card/CustomerNotes.vue
@@ -60,7 +60,7 @@ const toCustomerNoteCreate = () => {
 
                 <QPageSticky :offset="[18, 18]">
                     <QBtn
-                        @click.stop="toCustomerConsigneeCreate()"
+                        @click.stop="toCustomerNoteCreate()"
                         color="primary"
                         fab
                         icon="add"
diff --git a/src/pages/Customer/components/CustomerConsigneeCreate.vue b/src/pages/Customer/components/CustomerConsigneeCreate.vue
index aadf554b3..c725742b7 100644
--- a/src/pages/Customer/components/CustomerConsigneeCreate.vue
+++ b/src/pages/Customer/components/CustomerConsigneeCreate.vue
@@ -12,7 +12,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import VnSelectCreate from 'src/components/common/VnSelectCreate.vue';
 import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
-import CustomsNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
+import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -233,7 +233,7 @@ const refreshData = () => {
                         v-model="data.customsAgentFk"
                     >
                         <template #form>
-                            <CustomsNewCustomsAgent @on-data-saved="refreshData()" />
+                            <CustomerNewCustomsAgent @on-data-saved="refreshData()" />
                         </template>
                     </VnSelectCreate>
                 </div>
diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue
new file mode 100644
index 000000000..92e3758f9
--- /dev/null
+++ b/src/pages/Customer/components/CustomerNewPayment.vue
@@ -0,0 +1,286 @@
+<script setup>
+import { onBeforeMount, reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const $props = defineProps({
+    companyId: {
+        type: Number,
+        required: true,
+    },
+    totalCredit: {
+        type: Number,
+        required: true,
+    },
+    promise: {
+        type: Function,
+        required: true,
+    },
+});
+
+const closeButton = ref(null);
+const urlCreate = ref([]);
+const companyOptions = ref([]);
+const bankOptions = ref([]);
+const clientFindOne = ref([]);
+const deliveredAmount = ref(null);
+const amountToReturn = ref(null);
+const viewRecipt = ref(true);
+const sendEmail = ref(false);
+const isLoading = ref(false);
+
+const filterBanks = {
+    fields: ['id', 'bank', 'accountingTypeFk'],
+    include: { relation: 'accountingType' },
+    order: 'id',
+    limit: 30,
+};
+
+const filterClientFindOne = {
+    fields: ['email'],
+    where: {
+        id: `${route.params.id}`,
+    },
+};
+
+const initialData = reactive({
+    amountPaid: $props.totalCredit,
+    bankFk: null,
+    clientFk: `${route.params.id}`,
+    companyFk: $props.companyId,
+    compensationAccount: null,
+    description: null,
+    email: clientFindOne.value.email,
+    payed: null,
+});
+
+onBeforeMount(() => {
+    urlCreate.value = `Clients/${route.params.id}/createReceipt`;
+});
+
+const setPaymentType = (id) => {
+    initialData.payed = '2001-01-01T11:00:00.000Z';
+    if (id === 1) initialData.description = 'Credit card';
+    if (id === 2) initialData.description = 'Cash';
+    if (id === 3 || id === 3117) initialData.description = '';
+    if (id === 4) initialData.description = 'Transfer';
+};
+
+const calculateFromAmount = (event) => {
+    amountToReturn.value = parseFloat(event) * -1 + parseFloat(deliveredAmount.value);
+};
+
+const calculateFromDeliveredAmount = (event) => {
+    amountToReturn.value = parseFloat($props.totalCredit) * -1 + parseFloat(event);
+};
+
+const setClientEmail = (data) => {
+    initialData.email = data.email;
+};
+
+const onDataSaved = async () => {
+    isLoading.value = true;
+    if ($props.promise) {
+        try {
+            await $props.promise();
+        } finally {
+            isLoading.value = false;
+            if (closeButton.value) closeButton.value.click();
+        }
+    }
+};
+</script>
+
+<template>
+    <QDialog ref="dialogRef">
+        <fetch-data
+            @on-fetch="(data) => (companyOptions = data)"
+            auto-load
+            url="Companies"
+        />
+        <fetch-data
+            :filter="filterBanks"
+            @on-fetch="(data) => (bankOptions = data)"
+            auto-load
+            url="Banks"
+        />
+        <fetch-data
+            :filter="filterClientFindOne"
+            @on-fetch="setClientEmail"
+            auto-load
+            url="Clients/findOne"
+        />
+
+        <FormModel
+            :default-actions="false"
+            :form-initial-data="initialData"
+            :observe-form-changes="false"
+            :url-create="urlCreate"
+            @on-data-saved="onDataSaved()"
+        >
+            <template #form="{ data }">
+                <span ref="closeButton" class="close-icon" v-close-popup>
+                    <QIcon name="close" size="sm" />
+                </span>
+
+                <h5 class="flex justify-center q-mt-xs">
+                    {{ t('New payment') }}
+                </h5>
+
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnInputDate
+                            :label="t('Date')"
+                            :required="true"
+                            v-model="data.payed"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('Company')"
+                            :options="companyOptions"
+                            :required="true"
+                            hide-selected
+                            option-label="code"
+                            option-value="id"
+                            v-model="data.companyFk"
+                        />
+                    </div>
+                </VnRow>
+
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col">
+                        <VnSelectFilter
+                            :label="t('Bank')"
+                            :options="bankOptions"
+                            :required="true"
+                            @update:model-value="setPaymentType($event)"
+                            hide-selected
+                            option-label="bank"
+                            option-value="id"
+                            v-model="data.bankFk"
+                        >
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection>
+                                        <QItemLabel>
+                                            {{ scope.opt.id }}:&ensp;{{ scope.opt.bank }}
+                                        </QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelectFilter>
+                    </div>
+                    <div class="col">
+                        <VnInput
+                            :label="t('Amount')"
+                            :required="true"
+                            @update:model-value="calculateFromAmount($event)"
+                            type="number"
+                            v-model.number="data.amountPaid"
+                        />
+                    </div>
+                </VnRow>
+
+                <div class="text-h6" v-if="data.bankFk === 3 || data.bankFk === 3117">
+                    {{ t('Compensation') }}
+                </div>
+
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <div class="col" v-if="data.bankFk === 3 || data.bankFk === 3117">
+                        <VnInput
+                            :label="t('Compensation account')"
+                            v-model="data.compensationAccount"
+                        />
+                    </div>
+                    <div class="col">
+                        <VnInput
+                            :label="t('Reference')"
+                            :required="true"
+                            v-model="data.description"
+                        />
+                    </div>
+                </VnRow>
+
+                <div class="q-mt-lg" v-if="data.bankFk === 2">
+                    <div class="text-h6">{{ t('Cash') }}</div>
+
+                    <VnRow class="row q-gutter-md q-mb-md">
+                        <div class="col">
+                            <VnInput
+                                :label="t('Delivered amount')"
+                                @update:model-value="calculateFromDeliveredAmount($event)"
+                                type="number"
+                                v-model="deliveredAmount"
+                            />
+                        </div>
+                        <div class="col">
+                            <VnInput
+                                :label="t('Amount to return')"
+                                disable
+                                type="number"
+                                v-model="amountToReturn"
+                            />
+                        </div>
+                    </VnRow>
+
+                    <VnRow class="row q-gutter-md q-mb-md">
+                        <div class="col">
+                            <QCheckbox v-model="viewRecipt" />
+                        </div>
+                        <div class="col">
+                            <QCheckbox v-model="sendEmail" />
+                        </div>
+                    </VnRow>
+                </div>
+
+                <div class="q-mt-lg row justify-end">
+                    <QBtn
+                        :disabled="isLoading"
+                        :label="t('globals.cancel')"
+                        :loading="isLoading"
+                        class="q-ml-sm"
+                        color="primary"
+                        flat
+                        type="reset"
+                        v-close-popup
+                    />
+                    <QBtn
+                        :disabled="isLoading"
+                        :label="t('globals.save')"
+                        :loading="isLoading"
+                        color="primary"
+                        type="submit"
+                    />
+                </div>
+            </template>
+        </FormModel>
+    </QDialog>
+</template>
+
+<i18n>
+es:
+    New payment: Añadir pago
+    Date: Fecha
+    Company: Empresa
+    Bank: Caja
+    Amount: Importe
+    Reference: Referencia
+    Cash: Efectivo
+    Delivered amount: Cantidad entregada
+    Amount to return: Cantidad a devolver
+    View recipt: Ver recibido
+    Send email: Enviar correo
+    Compensation: Compensación
+    Compensation account: Cuenta para compensar
+</i18n>

From b8a56391228a063af726c87c4313a28e1aab5909 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Thu, 25 Jan 2024 17:29:24 -0500
Subject: [PATCH 06/19] Se crea tarjeta de historial

---
 src/pages/Customer/Card/CustomerBalance.vue   |   3 +-
 src/pages/Customer/Card/CustomerLog.vue       | 252 +++++++++++++++++-
 src/pages/Customer/Card/CustomerNotes.vue     |  34 +++
 .../Customer/Card/CustomerRecoveries.vue      |  33 +++
 4 files changed, 319 insertions(+), 3 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 5d296881f..65c260a02 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -146,6 +146,7 @@ onBeforeMount(() => {
 });
 
 const getData = () => {
+    stateStore.rightDrawer = true;
     getReceipts();
     getClientRisks();
 };
@@ -158,7 +159,6 @@ const getReceipts = async () => {
     };
     const { data } = await axios.get('Receipts/filter', { params });
     rows.value = data;
-    stateStore.rightDrawer = true;
 };
 
 const getClientRisks = async () => {
@@ -170,7 +170,6 @@ const getClientRisks = async () => {
         params: { filter: JSON.stringify(filter) },
     });
     clientRisks.value = data;
-    console.log(clientRisks.value[0].amount);
 };
 
 const showNewPaymentDialog = () => {
diff --git a/src/pages/Customer/Card/CustomerLog.vue b/src/pages/Customer/Card/CustomerLog.vue
index fe59bf2dc..4d0a0c838 100644
--- a/src/pages/Customer/Card/CustomerLog.vue
+++ b/src/pages/Customer/Card/CustomerLog.vue
@@ -1,3 +1,253 @@
+<script setup>
+import { onBeforeMount, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import axios from 'axios';
+
+import { useStateStore } from 'stores/useStateStore';
+
+import VnInput from 'src/components/common/VnInput.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const stateStore = useStateStore();
+
+const clientLogsModelsOptions = ref([]);
+const clientLogsOptions = ref([]);
+const clientLogsEditorsOptions = ref([]);
+const radioButtonValue = ref('all');
+const insert = ref(false);
+const update = ref(false);
+const deletes = ref(false);
+const select = ref(false);
+const inq = ref([]);
+
+const filterClientLogsEditors = {
+    fields: ['id', 'nickname', 'name', 'image'],
+    order: 'nickname',
+    limit: 30,
+};
+
+onBeforeMount(() => {
+    getData();
+});
+
+const getData = () => {
+    stateStore.rightDrawer = true;
+    getClientLogsModels();
+    getClientLogs();
+};
+
+const getClientLogsModels = async () => {
+    const filter = { order: ['changedModel'] };
+    const { data } = await axios.get(`ClientLogs/${route.params.id}/models`, {
+        params: { filter: JSON.stringify(filter) },
+    });
+    clientLogsModelsOptions.value = data;
+};
+
+const getClientLogs = async (value, status) => {
+    let neq = 'all';
+    if (status === 'neq') {
+        neq = value;
+    } else {
+        setInq(value, status);
+    }
+    const filter = {
+        fields: [
+            'id',
+            'originFk',
+            'userFk',
+            'action',
+            'changedModel',
+            'oldInstance',
+            'newInstance',
+            'creationDate',
+            'changedModel',
+            'changedModelId',
+            'changedModelValue',
+            'description',
+        ],
+        include: [
+            {
+                relation: 'user',
+                scope: {
+                    fields: ['nickname', 'name', 'image'],
+                    include: { relation: 'worker', scope: { fields: ['id'] } },
+                },
+            },
+        ],
+        order: ['creationDate DESC', 'id DESC'],
+        limit: 20,
+        where: {
+            and: [
+                { originFk: `${route.params.id}` },
+                { userFk: { neq } },
+                { action: { inq: inq.value } },
+            ],
+        },
+    };
+    const { data } = await axios.get('ClientLogs', {
+        params: { filter: JSON.stringify(filter) },
+    });
+    clientLogsOptions.value = data;
+};
+
+const setInq = (value, status) => {
+    if (status) {
+        if (!inq.value.includes(value)) {
+            inq.value.push(value);
+        }
+    } else {
+        inq.value = inq.value.filter((item) => item !== value);
+    }
+};
+</script>
+
 <template>
-    <div class="flex justify-center">Log</div>
+    <FetchData
+        :filter="filterClientLogsEditors"
+        @on-fetch="(data) => (clientLogsEditorsOptions = data)"
+        auto-load
+        :url="`ClientLogs/${route.params.id}/editors`"
+    />
+
+    <h5 class="flex justify-center label-color">
+        {{ t('globals.noResults') }}
+    </h5>
+
+    <QDrawer :width="256" show-if-above side="right" v-model="stateStore.rightDrawer">
+        <div class="q-mt-sm q-px-md">
+            <VnInput :label="t('Search')">
+                <template #append>
+                    <QIcon name="info" class="cursor-pointer">
+                        <QTooltip>
+                            {{ t('Search by id or concept') }}
+                        </QTooltip>
+                    </QIcon>
+                </template>
+            </VnInput>
+            <VnSelectFilter
+                :label="t('Entity')"
+                :options="companiesOptions"
+                class="q-mt-md"
+                hide-selected
+                option-label="name"
+                option-value="id"
+            />
+
+            <div class="q-mt-lg">
+                <QRadio
+                    :dark="true"
+                    :label="t('All')"
+                    @update:model-value="getClientLogs($event, 'neq')"
+                    dense
+                    v-model="radioButtonValue"
+                    val="all"
+                />
+            </div>
+            <div class="q-mt-md">
+                <QRadio
+                    :dark="true"
+                    :label="t('User')"
+                    @update:model-value="getClientLogs($event, 'neq')"
+                    dense
+                    v-model="radioButtonValue"
+                    val="user"
+                />
+            </div>
+            <div class="q-mt-md">
+                <QRadio
+                    :dark="true"
+                    :label="t('System')"
+                    @update:model-value="getClientLogs($event, 'neq')"
+                    dense
+                    v-model="radioButtonValue"
+                    val="system"
+                />
+            </div>
+
+            <VnSelectFilter
+                :label="t('User')"
+                :options="[]"
+                class="q-mt-sm"
+                hide-selected
+                option-label="name"
+                option-value="id"
+            />
+            <VnInput :label="t('Changes')" class="q-mt-sm">
+                <template #append>
+                    <QIcon name="info" class="cursor-pointer">
+                        <QTooltip>
+                            {{ t('Search by changes') }}
+                        </QTooltip>
+                    </QIcon>
+                </template>
+            </VnInput>
+
+            <div class="q-mt-md">
+                <QCheckbox
+                    :label="t('Creates')"
+                    @update:model-value="getClientLogs('insert', $event)"
+                    v-model="insert"
+                />
+            </div>
+            <div>
+                <QCheckbox
+                    :label="t('Edits')"
+                    @update:model-value="getClientLogs('update', $event)"
+                    v-model="update"
+                />
+            </div>
+            <div>
+                <QCheckbox
+                    :label="t('Deletes')"
+                    @update:model-value="getClientLogs('delete', $event)"
+                    v-model="deletes"
+                />
+            </div>
+            <div>
+                <QCheckbox
+                    :label="t('Accesses')"
+                    @update:model-value="getClientLogs('select', $event)"
+                    v-model="select"
+                />
+            </div>
+
+            <VnInputDate :label="t('Date')" class="q-mt-sm" />
+            <VnInput :label="t('To')" class="q-mt-md" />
+        </div>
+    </QDrawer>
+
+    <QPageSticky
+        :offset="[18, 18]"
+        v-if="radioButtonValue !== 'all' || insert || update || deletes || select"
+    >
+        <QBtn color="primary" fab icon="filter_alt_off" />
+        <QTooltip>
+            {{ t('Quit filter') }}
+        </QTooltip>
+    </QPageSticky>
 </template>
+
+<i18n>
+es:
+    Search: Buscar
+    Search by id or concept: xxx
+    Entity: Entidad
+    All: Todo
+    User: Usuario
+    System: Sistema
+    Changes: Cambios
+    Search by changes: xxx
+    Creates: Crea
+    Edits: Modifica
+    Deletes: Elimina
+    Accesses: Accede
+    Date: Fecha
+    To: Hasta
+    Quit filter: Quitar filtro
+</i18n>
diff --git a/src/pages/Customer/Card/CustomerNotes.vue b/src/pages/Customer/Card/CustomerNotes.vue
index 0909758f3..95c3befe8 100644
--- a/src/pages/Customer/Card/CustomerNotes.vue
+++ b/src/pages/Customer/Card/CustomerNotes.vue
@@ -6,6 +6,40 @@ import { date } from 'quasar';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 
+const response = {
+    fields: [
+        'id',
+        'originFk',
+        'userFk',
+        'action',
+        'changedModel',
+        'oldInstance',
+        'newInstance',
+        'creationDate',
+        'changedModel',
+        'changedModelId',
+        'changedModelValue',
+        'description',
+    ],
+    include: [
+        {
+            relation: 'user',
+            scope: {
+                fields: ['nickname', 'name', 'image'],
+                include: { relation: 'worker', scope: { fields: ['id'] } },
+            },
+        },
+    ],
+    order: ['creationDate DESC', 'id DESC'],
+    limit: 20,
+    where: {
+        and: [
+            { originFk: '1' },
+            { userFk: { neq: null } },
+            { action: { inq: ['insert', 'update', 'delete', 'select'] } },
+        ],
+    },
+};
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
diff --git a/src/pages/Customer/Card/CustomerRecoveries.vue b/src/pages/Customer/Card/CustomerRecoveries.vue
index 7247145f2..df5c7f6e2 100644
--- a/src/pages/Customer/Card/CustomerRecoveries.vue
+++ b/src/pages/Customer/Card/CustomerRecoveries.vue
@@ -11,6 +11,39 @@ import { toCurrency } from 'src/filters';
 
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
+const response = {
+    fields: [
+        'id',
+        'originFk',
+        'userFk',
+        'action',
+        'changedModel',
+        'oldInstance',
+        'newInstance',
+        'creationDate',
+        'changedModel',
+        'changedModelId',
+        'changedModelValue',
+        'description',
+    ],
+    include: [
+        {
+            relation: 'user',
+            scope: {
+                fields: ['nickname', 'name', 'image'],
+                include: { relation: 'worker', scope: { fields: ['id'] } },
+            },
+        },
+    ],
+    order: ['creationDate DESC', 'id DESC'],
+    limit: 20,
+    where: {
+        and: [
+            { originFk: '1' },
+            { action: { inq: ['insert', 'update', 'delete', 'select'] } },
+        ],
+    },
+};
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();

From ed926189dde3128c6a90d66254030a7a840a4f7f Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Fri, 26 Jan 2024 10:47:36 -0500
Subject: [PATCH 07/19] Correcciones solicitadas en la revision del pr

---
 src/pages/Customer/Card/CustomerBalance.vue   | 64 +++++++++----------
 .../components/CustomerNewPayment.vue         |  2 +-
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 5d296881f..184667d6e 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -1,9 +1,8 @@
 <script setup>
-import { computed, onBeforeMount, ref } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import axios from 'axios';
 import { date, QCheckbox, QBtn, useQuasar } from 'quasar';
 
 import { toCurrency } from 'src/filters';
@@ -24,8 +23,19 @@ const companiesOptions = ref([]);
 const companyId = ref(442);
 const rows = ref(null);
 const workerId = ref(0);
+const receiptsRef = ref(null);
+const clientRisksRef = ref(null);
 
 const filterCompanies = { order: ['code'] };
+const params = {
+    clientId: `${route.params.id}`,
+    companyId: companyId.value,
+    filter: { limit: 20 },
+};
+const filter = {
+    include: { relation: 'company', scope: { fields: ['code'] } },
+    where: { clientFk: `${route.params.id}`, companyFk: companyId.value },
+};
 
 const tableColumnComponents = {
     payed: {
@@ -91,7 +101,7 @@ const columns = computed(() => [
     {
         align: 'left',
         field: 'created',
-        format: (value) => date.formatDate(value, 'DD/MM/YYYY hh:mm:ss'),
+        format: (value) => date.formatDate(value, 'DD/MM/YYYY hh:mm'),
         label: t('Creation date'),
         name: 'created',
     },
@@ -141,36 +151,10 @@ const columns = computed(() => [
     },
 ]);
 
-onBeforeMount(() => {
-    getData();
-});
-
 const getData = () => {
-    getReceipts();
-    getClientRisks();
-};
-
-const getReceipts = async () => {
-    const params = {
-        clientId: `${route.params.id}`,
-        companyId: companyId.value,
-        filter: { limit: 20 },
-    };
-    const { data } = await axios.get('Receipts/filter', { params });
-    rows.value = data;
     stateStore.rightDrawer = true;
-};
-
-const getClientRisks = async () => {
-    const filter = {
-        include: { relation: 'company', scope: { fields: ['code'] } },
-        where: { clientFk: `${route.params.id}`, companyFk: companyId.value },
-    };
-    const { data } = await axios.get('ClientRisks', {
-        params: { filter: JSON.stringify(filter) },
-    });
-    clientRisks.value = data;
-    console.log(clientRisks.value[0].amount);
+    receiptsRef.value?.fetch();
+    clientRisksRef.value?.fetch();
 };
 
 const showNewPaymentDialog = () => {
@@ -197,6 +181,20 @@ const updateCompanyId = (id) => {
         auto-load
         url="Companies"
     />
+    <FetchData
+        :params="params"
+        @on-fetch="(data) => (rows = data)"
+        auto-load
+        ref="receiptsRef"
+        url="Receipts/filter"
+    />
+    <FetchData
+        :filter="filter"
+        @on-fetch="(data) => (clientRisks = data)"
+        auto-load
+        ref="clientRisksRef"
+        url="ClientRisks"
+    />
 
     <QTable
         :columns="columns"
@@ -215,7 +213,9 @@ const updateCompanyId = (id) => {
                         v-bind="tableColumnComponents[props.col.name].props(props)"
                         @click="tableColumnComponents[props.col.name].event(props)"
                     >
-                        {{ props.value }}
+                        <template v-if="props.col.name !== 'isConciliate'">
+                            {{ props.value }}
+                        </template>
                         <WorkerDescriptorProxy :id="workerId" />
                     </component>
                 </QTr>
diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue
index 92e3758f9..fc0c52b0f 100644
--- a/src/pages/Customer/components/CustomerNewPayment.vue
+++ b/src/pages/Customer/components/CustomerNewPayment.vue
@@ -129,7 +129,7 @@ const onDataSaved = async () => {
             @on-data-saved="onDataSaved()"
         >
             <template #form="{ data }">
-                <span ref="closeButton" class="close-icon" v-close-popup>
+                <span ref="closeButton" class="row justify-end close-icon" v-close-popup>
                     <QIcon name="close" size="sm" />
                 </span>
 

From 41e5945021340a02f1dd45acd6b6c87f56d7e95f Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Fri, 26 Jan 2024 10:59:13 -0500
Subject: [PATCH 08/19] Correccion se elimina datos de prueba

---
 src/pages/Customer/Card/CustomerNotes.vue     | 34 -------------------
 .../Customer/Card/CustomerRecoveries.vue      | 33 ------------------
 2 files changed, 67 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerNotes.vue b/src/pages/Customer/Card/CustomerNotes.vue
index 95c3befe8..0909758f3 100644
--- a/src/pages/Customer/Card/CustomerNotes.vue
+++ b/src/pages/Customer/Card/CustomerNotes.vue
@@ -6,40 +6,6 @@ import { date } from 'quasar';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 
-const response = {
-    fields: [
-        'id',
-        'originFk',
-        'userFk',
-        'action',
-        'changedModel',
-        'oldInstance',
-        'newInstance',
-        'creationDate',
-        'changedModel',
-        'changedModelId',
-        'changedModelValue',
-        'description',
-    ],
-    include: [
-        {
-            relation: 'user',
-            scope: {
-                fields: ['nickname', 'name', 'image'],
-                include: { relation: 'worker', scope: { fields: ['id'] } },
-            },
-        },
-    ],
-    order: ['creationDate DESC', 'id DESC'],
-    limit: 20,
-    where: {
-        and: [
-            { originFk: '1' },
-            { userFk: { neq: null } },
-            { action: { inq: ['insert', 'update', 'delete', 'select'] } },
-        ],
-    },
-};
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
diff --git a/src/pages/Customer/Card/CustomerRecoveries.vue b/src/pages/Customer/Card/CustomerRecoveries.vue
index df5c7f6e2..7247145f2 100644
--- a/src/pages/Customer/Card/CustomerRecoveries.vue
+++ b/src/pages/Customer/Card/CustomerRecoveries.vue
@@ -11,39 +11,6 @@ import { toCurrency } from 'src/filters';
 
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
-const response = {
-    fields: [
-        'id',
-        'originFk',
-        'userFk',
-        'action',
-        'changedModel',
-        'oldInstance',
-        'newInstance',
-        'creationDate',
-        'changedModel',
-        'changedModelId',
-        'changedModelValue',
-        'description',
-    ],
-    include: [
-        {
-            relation: 'user',
-            scope: {
-                fields: ['nickname', 'name', 'image'],
-                include: { relation: 'worker', scope: { fields: ['id'] } },
-            },
-        },
-    ],
-    order: ['creationDate DESC', 'id DESC'],
-    limit: 20,
-    where: {
-        and: [
-            { originFk: '1' },
-            { action: { inq: ['insert', 'update', 'delete', 'select'] } },
-        ],
-    },
-};
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();

From 7b3e64f1296a2b17713c4d4be601dfc12d6d14fa Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Sat, 27 Jan 2024 09:31:49 -0500
Subject: [PATCH 09/19] Se crea rutas hijas y construccion inicial de los
 componentes

---
 .../Customer/Card/CustomerCreditContracts.vue |  3 +++
 .../Customer/Card/CustomerCreditOpinion.vue   |  3 +++
 src/router/modules/customer.js                | 26 +++++++++++++++++++
 3 files changed, 32 insertions(+)
 create mode 100644 src/pages/Customer/Card/CustomerCreditContracts.vue
 create mode 100644 src/pages/Customer/Card/CustomerCreditOpinion.vue

diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue
new file mode 100644
index 000000000..7f10678ed
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerCreditContracts.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Customer credit contracts</div>
+</template>
diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue
new file mode 100644
index 000000000..fcac76ccd
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue
@@ -0,0 +1,3 @@
+<template>
+    <div class="flex justify-center">Customer credit opinion</div>
+</template>
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index a17ef4271..25b54ca40 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -355,6 +355,32 @@ export default {
                     },
                     component: () =>
                         import('src/pages/Customer/Card/CustomerCreditManagement.vue'),
+                    children: [
+                        {
+                            path: 'credit-contracts',
+                            name: 'CustomerCreditContracts',
+                            meta: {
+                                title: 'creditContracts',
+                                icon: 'paid',
+                            },
+                            component: () =>
+                                import(
+                                    'src/pages/Customer/Card/CustomerCreditContracts.vue'
+                                ),
+                        },
+                        {
+                            path: 'credit-opinion',
+                            name: 'CustomerCreditOpinion',
+                            meta: {
+                                title: 'creditOpinion',
+                                icon: 'paid',
+                            },
+                            component: () =>
+                                import(
+                                    'src/pages/Customer/Card/CustomerCreditOpinion.vue'
+                                ),
+                        },
+                    ],
                 },
                 {
                     path: 'others',

From a01b80703ed7e24df405a762c840189ef6060f89 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sat, 27 Jan 2024 12:08:56 -0300
Subject: [PATCH 10/19] Create child submodules feature

---
 src/components/LeftMenu.vue                   | 10 +++++
 src/i18n/en/index.js                          |  4 +-
 src/i18n/es/index.js                          |  2 +
 .../Customer/Card/CustomerCreditContracts.vue |  1 +
 .../Customer/Card/CustomerCreditOpinion.vue   |  1 +
 src/router/modules/customer.js                | 39 +++++++++++++++++++
 src/stores/useNavigationStore.js              |  9 ++++-
 7 files changed, 64 insertions(+), 2 deletions(-)
 create mode 100644 src/pages/Customer/Card/CustomerCreditContracts.vue
 create mode 100644 src/pages/Customer/Card/CustomerCreditOpinion.vue

diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 2eac97c65..019e75f4b 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -206,6 +206,16 @@ async function togglePinned(item, event) {
         <template v-if="$props.source === 'card'">
             <template v-for="item in items" :key="item.name">
                 <LeftMenuItem v-if="!item.children" :item="item" />
+                <QList v-else>
+                    <QExpansionItem
+                        v-ripple
+                        clickable
+                        :icon="item.icon"
+                        :label="t(item.title)"
+                    >
+                        <LeftMenuItemGroup :item="item" />
+                    </QExpansionItem>
+                </QList>
             </template>
         </template>
     </QList>
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 742134ecd..ef2667b89 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -131,6 +131,8 @@ export default {
             log: 'Log',
             sms: 'Sms',
             creditManagement: 'Credit management',
+            creditContracts: 'Credit contracts',
+            creditOpinion: 'Credit opinion',
             others: 'Others',
         },
         list: {
@@ -886,7 +888,7 @@ export default {
             RouteList: 'List',
             create: 'Create',
             basicData: 'Basic Data',
-            summary: 'Summary'
+            summary: 'Summary',
         },
         cmr: {
             list: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index ed6633bd9..4991d8320 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -131,6 +131,8 @@ export default {
             log: 'Historial',
             sms: 'Sms',
             creditManagement: 'Gestión de crédito',
+            creditContracts: 'Contratos de crédito',
+            creditOpinion: 'Opinión de crédito',
             others: 'Otros',
         },
         list: {
diff --git a/src/pages/Customer/Card/CustomerCreditContracts.vue b/src/pages/Customer/Card/CustomerCreditContracts.vue
new file mode 100644
index 000000000..190307f13
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerCreditContracts.vue
@@ -0,0 +1 @@
+<template>Customer credit contracts</template>
diff --git a/src/pages/Customer/Card/CustomerCreditOpinion.vue b/src/pages/Customer/Card/CustomerCreditOpinion.vue
new file mode 100644
index 000000000..605f3db2e
--- /dev/null
+++ b/src/pages/Customer/Card/CustomerCreditOpinion.vue
@@ -0,0 +1 @@
+<template>Customer credit opinion</template>
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index a17ef4271..9a1abc8bd 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -352,10 +352,49 @@ export default {
                     meta: {
                         title: 'creditManagement',
                         icon: 'paid',
+                        children: [
+                            {
+                                name: 'CustomerCreditContracts',
+                                title: 'creditContracts',
+                                icon: 'paid',
+                            },
+                            {
+                                name: 'CustomerCreditOpinion',
+                                title: 'creditOpinion',
+                                icon: 'paid',
+                            },
+                        ],
                     },
                     component: () =>
                         import('src/pages/Customer/Card/CustomerCreditManagement.vue'),
+                    children: [
+                        {
+                            path: 'credit-contracts',
+                            name: 'CustomerCreditContracts',
+                            meta: {
+                                title: 'creditContracts',
+                                icon: 'paid',
+                            },
+                            component: () =>
+                                import(
+                                    'src/pages/Customer/Card/CustomerCreditContracts.vue'
+                                ),
+                        },
+                        {
+                            path: 'credit-opinion',
+                            name: 'CustomerCreditOpinion',
+                            meta: {
+                                title: 'creditOpinion',
+                                icon: 'paid',
+                            },
+                            component: () =>
+                                import(
+                                    'src/pages/Customer/Card/CustomerCreditOpinion.vue'
+                                ),
+                        },
+                    ],
                 },
+
                 {
                     path: 'others',
                     name: 'CustomerOthers',
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index 2eda6f686..aa3e95a1a 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -52,13 +52,20 @@ export const useNavigationStore = defineStore('navigationStore', () => {
 
     function addMenuItem(module, route, parent) {
         const { meta } = route;
+        let { children = null } = meta;
+        if (children)
+            children = children.map(({ name, title, icon }) => ({
+                name,
+                icon,
+                title: `${module}.pageTitles.${title}`,
+            }));
 
         if (meta && meta.roles && role.hasAny(meta.roles) === false) return;
 
         const item = {
             name: route.name,
+            children: children,
         };
-
         if (meta) {
             item.title = `${module}.pageTitles.${meta.title}`;
             item.icon = meta.icon;

From e9fe4a3cb97c1d250fd94c91e210d7981c6aa6e0 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sat, 27 Jan 2024 12:14:50 -0300
Subject: [PATCH 11/19] improvement

---
 src/components/LeftMenu.vue      | 1 +
 src/router/modules/customer.js   | 2 +-
 src/stores/useNavigationStore.js | 8 ++++----
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 019e75f4b..1721adfec 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -212,6 +212,7 @@ async function togglePinned(item, event) {
                         clickable
                         :icon="item.icon"
                         :label="t(item.title)"
+                        :content-inset-level="0.5"
                     >
                         <LeftMenuItemGroup :item="item" />
                     </QExpansionItem>
diff --git a/src/router/modules/customer.js b/src/router/modules/customer.js
index 9a1abc8bd..716b0fa6c 100644
--- a/src/router/modules/customer.js
+++ b/src/router/modules/customer.js
@@ -352,7 +352,7 @@ export default {
                     meta: {
                         title: 'creditManagement',
                         icon: 'paid',
-                        children: [
+                        menuChildren: [
                             {
                                 name: 'CustomerCreditContracts',
                                 title: 'creditContracts',
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index aa3e95a1a..1da7ca25c 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -52,9 +52,9 @@ export const useNavigationStore = defineStore('navigationStore', () => {
 
     function addMenuItem(module, route, parent) {
         const { meta } = route;
-        let { children = null } = meta;
-        if (children)
-            children = children.map(({ name, title, icon }) => ({
+        let { menuChildren = null } = meta;
+        if (menuChildren)
+            menuChildren = menuChildren.map(({ name, title, icon }) => ({
                 name,
                 icon,
                 title: `${module}.pageTitles.${title}`,
@@ -64,7 +64,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
 
         const item = {
             name: route.name,
-            children: children,
+            children: menuChildren,
         };
         if (meta) {
             item.title = `${module}.pageTitles.${meta.title}`;

From 9fcbd5bc402e33a09a0fcee4ee3fd0f134a59cf9 Mon Sep 17 00:00:00 2001
From: carlosfonseca <carlos.fonseca@mindshore.io>
Date: Sat, 27 Jan 2024 18:53:35 -0500
Subject: [PATCH 12/19] Se modifica las peticiones en el componente

---
 src/pages/Customer/Card/CustomerLog.vue | 123 +++++++++++++-----------
 1 file changed, 66 insertions(+), 57 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerLog.vue b/src/pages/Customer/Card/CustomerLog.vue
index 4d0a0c838..36d79959d 100644
--- a/src/pages/Customer/Card/CustomerLog.vue
+++ b/src/pages/Customer/Card/CustomerLog.vue
@@ -3,10 +3,9 @@ import { onBeforeMount, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
-import axios from 'axios';
-
 import { useStateStore } from 'stores/useStateStore';
 
+import FetchData from 'components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
@@ -15,6 +14,9 @@ const { t } = useI18n();
 const route = useRoute();
 const stateStore = useStateStore();
 
+const clientLogs = ref(null);
+const urlClientLogsEditors = ref(null);
+const urlClientLogsModels = ref(null);
 const clientLogsModelsOptions = ref([]);
 const clientLogsOptions = ref([]);
 const clientLogsEditorsOptions = ref([]);
@@ -23,77 +25,71 @@ const insert = ref(false);
 const update = ref(false);
 const deletes = ref(false);
 const select = ref(false);
+const neq = ref(null);
 const inq = ref([]);
 
+const filterClientLogs = {
+    fields: [
+        'id',
+        'originFk',
+        'userFk',
+        'action',
+        'changedModel',
+        'oldInstance',
+        'newInstance',
+        'creationDate',
+        'changedModel',
+        'changedModelId',
+        'changedModelValue',
+        'description',
+    ],
+    include: [
+        {
+            relation: 'user',
+            scope: {
+                fields: ['nickname', 'name', 'image'],
+                include: { relation: 'worker', scope: { fields: ['id'] } },
+            },
+        },
+    ],
+    order: ['creationDate DESC', 'id DESC'],
+    limit: 20,
+};
 const filterClientLogsEditors = {
     fields: ['id', 'nickname', 'name', 'image'],
     order: 'nickname',
     limit: 30,
 };
+const filterClientLogsModels = { order: ['changedModel'] };
+const urlBase = `ClientLogs/${route.params.id}`;
 
 onBeforeMount(() => {
-    getData();
+    stateStore.rightDrawer = true;
+    filterClientLogs.where = {
+        and: [
+            { originFk: `${route.params.id}` },
+            { userFk: { neq: radioButtonValue.value } },
+            { action: { inq: inq.value } },
+        ],
+    };
+    urlClientLogsEditors.value = `${urlBase}/editors`;
+    urlClientLogsModels.value = `${urlBase}/models`;
 });
 
-const getData = () => {
-    stateStore.rightDrawer = true;
-    getClientLogsModels();
-    getClientLogs();
-};
-
-const getClientLogsModels = async () => {
-    const filter = { order: ['changedModel'] };
-    const { data } = await axios.get(`ClientLogs/${route.params.id}/models`, {
-        params: { filter: JSON.stringify(filter) },
-    });
-    clientLogsModelsOptions.value = data;
-};
-
 const getClientLogs = async (value, status) => {
-    let neq = 'all';
     if (status === 'neq') {
-        neq = value;
+        neq.value = value;
     } else {
         setInq(value, status);
     }
-    const filter = {
-        fields: [
-            'id',
-            'originFk',
-            'userFk',
-            'action',
-            'changedModel',
-            'oldInstance',
-            'newInstance',
-            'creationDate',
-            'changedModel',
-            'changedModelId',
-            'changedModelValue',
-            'description',
+    filterClientLogs.where = {
+        and: [
+            { originFk: `${route.params.id}` },
+            { userFk: { neq: neq.value } },
+            { action: { inq: inq.value } },
         ],
-        include: [
-            {
-                relation: 'user',
-                scope: {
-                    fields: ['nickname', 'name', 'image'],
-                    include: { relation: 'worker', scope: { fields: ['id'] } },
-                },
-            },
-        ],
-        order: ['creationDate DESC', 'id DESC'],
-        limit: 20,
-        where: {
-            and: [
-                { originFk: `${route.params.id}` },
-                { userFk: { neq } },
-                { action: { inq: inq.value } },
-            ],
-        },
     };
-    const { data } = await axios.get('ClientLogs', {
-        params: { filter: JSON.stringify(filter) },
-    });
-    clientLogsOptions.value = data;
+    clientLogs.value?.fetch();
 };
 
 const setInq = (value, status) => {
@@ -108,11 +104,24 @@ const setInq = (value, status) => {
 </script>
 
 <template>
+    <FetchData
+        :filter="filterClientLogs"
+        @on-fetch="(data) => (clientLogsOptions = data)"
+        auto-load
+        url="ClientLogs"
+        ref="clientLogs"
+    />
     <FetchData
         :filter="filterClientLogsEditors"
         @on-fetch="(data) => (clientLogsEditorsOptions = data)"
         auto-load
-        :url="`ClientLogs/${route.params.id}/editors`"
+        :url="urlClientLogsEditors"
+    />
+    <FetchData
+        :filter="filterClientLogsModels"
+        @on-fetch="(data) => (clientLogsModelsOptions = data)"
+        auto-load
+        :url="urlClientLogsModels"
     />
 
     <h5 class="flex justify-center label-color">
@@ -132,7 +141,7 @@ const setInq = (value, status) => {
             </VnInput>
             <VnSelectFilter
                 :label="t('Entity')"
-                :options="companiesOptions"
+                :options="[]"
                 class="q-mt-md"
                 hide-selected
                 option-label="name"

From 5449b34fa0b1bb6b6f53a9d3263305701aa54c6e Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Sun, 28 Jan 2024 15:21:28 -0300
Subject: [PATCH 13/19] Fix searchbar redirection bug

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

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 8220aa3db..af6fedfa9 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -93,7 +93,7 @@ async function search() {
         const [firstRow] = rows;
         await router.push({ path: `${module.path}/${firstRow.id}` });
     } else if (route.matched.length > 3) {
-        await router.push({ path: `/${module.path}` });
+        await router.push({ path: `${module.path}` });
         arrayData.updateStateParams();
     }
 }

From 4cf954823485ebcfbf5bcf85466701e70690c5e7 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Sun, 28 Jan 2024 15:40:57 -0300
Subject: [PATCH 14/19] Fix shelving module

---
 .../Shelving/Card/ShelvingDescriptorMenu.vue  | 26 ++++++++-----------
 src/pages/Shelving/Card/ShelvingFilter.vue    |  2 ++
 src/pages/Shelving/Card/ShelvingSearchbar.vue |  2 +-
 src/pages/Shelving/Card/ShelvingSummary.vue   | 10 ++++---
 src/pages/Shelving/ShelvingList.vue           |  8 +-----
 5 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue b/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue
index 6290cda75..684a46807 100644
--- a/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue
+++ b/src/pages/Shelving/Card/ShelvingDescriptorMenu.vue
@@ -21,19 +21,19 @@ function confirmRemove() {
         .dialog({
             component: VnConfirm,
             componentProps: {
-                title: t('confirmDeletion'),
-                message: t('confirmDeletionMessage'),
-                promise: remove,
+                title: t('Confirm deletion'),
+                message: t('Are you sure you want to delete this shelving?'),
+                promise: remove
             },
         })
-        .onOk(async () => await router.push({ name: 'ShelvingList' }));
 }
 
 async function remove() {
-    if (!$props.shelving.value.id) {
+    if (!$props.shelving.id) {
         return;
     }
-    await axios.delete(`Shelvings/${$props.shelving.value.id}`);
+    await axios.delete(`Shelvings/${$props.shelving.id}`);
+    await router.push({ name: 'ShelvingList' });
     quasar.notify({
         message: t('globals.dataDeleted'),
         type: 'positive',
@@ -45,17 +45,13 @@ async function remove() {
         <QItemSection avatar>
             <QIcon name="delete" />
         </QItemSection>
-        <QItemSection>{{ t('deleteShelving') }}</QItemSection>
+        <QItemSection>{{ t('Delete Shelving') }}</QItemSection>
     </QItem>
 </template>
 
 <i18n>
-{
-    "en": {
-        "deleteShelving": "Delete Shelving"
-    },
-    "es": {
-        "deleteShelving": "Eliminar carro"
-    }
-}
+es:
+    Confirm deletion: Confirmar eliminación
+    Are you sure you want to delete this shelving?: ¿Seguro que quieres eliminar este carro?
+    Delete Shelving: Eliminar carro
 </i18n>
diff --git a/src/pages/Shelving/Card/ShelvingFilter.vue b/src/pages/Shelving/Card/ShelvingFilter.vue
index 423402f89..d4ec41e15 100644
--- a/src/pages/Shelving/Card/ShelvingFilter.vue
+++ b/src/pages/Shelving/Card/ShelvingFilter.vue
@@ -112,9 +112,11 @@ en:
         parkingFk: Parking
         userFk: Worker
         isRecyclable: Recyclable
+        search: Search
 es:
     params:
         parkingFk: Parking
         userFk: Trabajador
         isRecyclable: Reciclable
+        search: Contiene
 </i18n>
diff --git a/src/pages/Shelving/Card/ShelvingSearchbar.vue b/src/pages/Shelving/Card/ShelvingSearchbar.vue
index 89a4de01e..829d7719c 100644
--- a/src/pages/Shelving/Card/ShelvingSearchbar.vue
+++ b/src/pages/Shelving/Card/ShelvingSearchbar.vue
@@ -7,12 +7,12 @@ const { t } = useI18n();
 <template>
     <VnSearchbar
         data-key="ShelvingList"
+        url="Shelvings"
         :label="t('Search shelving')"
         :info="t('You can search by search reference')"
     />
 </template>
 
-<style scoped lang="scss"></style>
 <i18n>
 es:
     Search shelving: Buscar carros
diff --git a/src/pages/Shelving/Card/ShelvingSummary.vue b/src/pages/Shelving/Card/ShelvingSummary.vue
index f1f914385..5f93c4a02 100644
--- a/src/pages/Shelving/Card/ShelvingSummary.vue
+++ b/src/pages/Shelving/Card/ShelvingSummary.vue
@@ -24,7 +24,7 @@ const hideRightDrawer = () => {
     if (!isDialog) {
         stateStore.rightDrawer = false;
     }
-}
+};
 onMounted(hideRightDrawer);
 onUnmounted(hideRightDrawer);
 const filter = {
@@ -69,9 +69,13 @@ const filter = {
             </template>
             <template #body="{ entity }">
                 <QCard class="vn-one">
-                    <div class="header">
+                    <RouterLink
+                        class="header"
+                        :to="{ name: 'ShelvingBasicData', params: { id: entityId } }"
+                    >
                         {{ t('shelving.pageTitles.basicData') }}
-                    </div>
+                        <QIcon name="open_in_new" color="primary" />
+                    </RouterLink>
                     <VnLv :label="t('shelving.summary.code')" :value="entity.code" />
                     <VnLv
                         :label="t('shelving.summary.parking')"
diff --git a/src/pages/Shelving/ShelvingList.vue b/src/pages/Shelving/ShelvingList.vue
index 71b3a6ccf..10cbe0ff5 100644
--- a/src/pages/Shelving/ShelvingList.vue
+++ b/src/pages/Shelving/ShelvingList.vue
@@ -80,6 +80,7 @@ function exprBuilder(param, value) {
                 url="Shelvings"
                 :filter="filter"
                 :expr-builder="exprBuilder"
+                :limit="20"
                 auto-load
             >
                 <template #body="{ rows }">
@@ -102,17 +103,10 @@ function exprBuilder(param, value) {
                             />
                         </template>
                         <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openCard')"
-                                @click.stop="navigate(row.id)"
-                                class="bg-vn-dark"
-                                outline
-                            />
                             <QBtn
                                 :label="t('components.smartCard.openSummary')"
                                 @click.stop="viewSummary(row.id)"
                                 color="primary"
-                                style="margin-top: 15px"
                             />
                         </template>
                     </CardList>

From ea9a9323e72edb651163eda14daaf82bb7715e41 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Fri, 2 Feb 2024 08:33:37 -0300
Subject: [PATCH 15/19] Fix feedback

---
 src/pages/Shelving/Card/ShelvingForm.vue      | 12 ++++++++++--
 src/pages/Shelving/Card/ShelvingSearchbar.vue |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/pages/Shelving/Card/ShelvingForm.vue b/src/pages/Shelving/Card/ShelvingForm.vue
index e9e5e68c3..e36f48732 100644
--- a/src/pages/Shelving/Card/ShelvingForm.vue
+++ b/src/pages/Shelving/Card/ShelvingForm.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { ref } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
@@ -10,11 +10,12 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
 const route = useRoute();
+const router = useRouter();
 const shelvingId = route.params?.id || null;
 const isNew = Boolean(!shelvingId);
 const defaultInitialData = {
     parkingFk: null,
-    priority: 0,
+    priority: null,
     code: null,
     isRecyclable: false,
 };
@@ -58,6 +59,12 @@ const shelvingFilter = {
         { relation: 'parking' },
     ],
 };
+
+const onSave = () => {
+    if (isNew) {
+        router.push({ name: 'ShelvingList' });
+    }
+};
 </script>
 <template>
     <VnSubToolbar />
@@ -75,6 +82,7 @@ const shelvingFilter = {
         model="shelving"
         :auto-load="!isNew"
         :form-initial-data="defaultInitialData"
+        @on-data-saved="onSave"
     >
         <template #form="{ data, validate, filter }">
             <VnRow class="row q-gutter-md q-mb-md">
diff --git a/src/pages/Shelving/Card/ShelvingSearchbar.vue b/src/pages/Shelving/Card/ShelvingSearchbar.vue
index 829d7719c..bfc8ad4f5 100644
--- a/src/pages/Shelving/Card/ShelvingSearchbar.vue
+++ b/src/pages/Shelving/Card/ShelvingSearchbar.vue
@@ -9,7 +9,7 @@ const { t } = useI18n();
         data-key="ShelvingList"
         url="Shelvings"
         :label="t('Search shelving')"
-        :info="t('You can search by search reference')"
+        :info="t('You can search by shelving reference')"
     />
 </template>
 

From 1665dbf4006969b1134bfa5e85ac42be14e09a01 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Mon, 5 Feb 2024 22:00:44 -0300
Subject: [PATCH 16/19] Fix shelving priority field

---
 src/pages/Shelving/Card/ShelvingForm.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Shelving/Card/ShelvingForm.vue b/src/pages/Shelving/Card/ShelvingForm.vue
index e36f48732..77cdec28b 100644
--- a/src/pages/Shelving/Card/ShelvingForm.vue
+++ b/src/pages/Shelving/Card/ShelvingForm.vue
@@ -115,6 +115,7 @@ const onSave = () => {
                 <div class="col">
                     <VnInput
                         v-model="data.priority"
+                        type="number"
                         :label="t('shelving.basicData.priority')"
                         :rules="validate('Shelving.priority')"
                     />

From 7e45486abd649d96248bc59cda6dbdaed6172f9a Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Tue, 6 Feb 2024 08:16:10 -0300
Subject: [PATCH 17/19] Add missing worker descriptor

---
 src/pages/Shelving/Card/ShelvingSummary.vue | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/pages/Shelving/Card/ShelvingSummary.vue b/src/pages/Shelving/Card/ShelvingSummary.vue
index 5f93c4a02..409329c88 100644
--- a/src/pages/Shelving/Card/ShelvingSummary.vue
+++ b/src/pages/Shelving/Card/ShelvingSummary.vue
@@ -6,6 +6,7 @@ import { useStateStore } from 'stores/useStateStore';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import ShelvingFilter from 'pages/Shelving/Card/ShelvingFilter.vue';
+import VnUserLink from "components/ui/VnUserLink.vue";
 
 const $props = defineProps({
     id: {
@@ -85,10 +86,14 @@ const filter = {
                         :label="t('shelving.summary.priority')"
                         :value="entity.priority"
                     />
-                    <VnLv
-                        :label="t('shelving.summary.worker')"
-                        :value="entity.worker?.user?.nickname"
-                    />
+                    <VnLv v-if="entity.worker" :label="t('shelving.summary.worker')">
+                        <template #value>
+                            <VnUserLink
+                                :name="entity.worker?.user?.nickname"
+                                :worker-id="entity.worker?.id"
+                            />
+                        </template>
+                    </VnLv>
                     <VnLv
                         :label="t('shelving.summary.recyclable')"
                         :value="entity.isRecyclable"

From 011e15233e0b4ca84a44d02c49cc61c214f423fa Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Tue, 6 Feb 2024 10:54:06 -0300
Subject: [PATCH 18/19] Fix Shelving creation

---
 src/components/FormModel.vue             | 13 +++++++++++--
 src/pages/Shelving/Card/ShelvingForm.vue |  4 ++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 755cef77c..43ecc88b0 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { onMounted, onUnmounted, computed, ref, watch } from 'vue';
+import { onMounted, onUnmounted, computed, ref, watch, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useState } from 'src/composables/useState';
@@ -67,7 +67,13 @@ defineExpose({
     save,
 });
 
+const componentIsRendered = ref(false);
+
 onMounted(async () => {
+    nextTick(() => {
+        componentIsRendered.value = true;
+    });
+
     // Podemos enviarle al form la estructura de data inicial sin necesidad de fetchearla
     if ($props.formInitialData && !$props.autoLoad) {
         state.set($props.model, $props.formInitialData);
@@ -202,7 +208,10 @@ watch(formUrl, async () => {
             </QCard>
         </QForm>
     </div>
-    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
+    <Teleport
+        to="#st-actions"
+        v-if="stateStore?.isSubToolbarShown() && componentIsRendered"
+    >
         <div v-if="$props.defaultActions">
             <QBtnGroup push class="q-gutter-x-sm">
                 <slot name="moreActions" />
diff --git a/src/pages/Shelving/Card/ShelvingForm.vue b/src/pages/Shelving/Card/ShelvingForm.vue
index 77cdec28b..238879bd4 100644
--- a/src/pages/Shelving/Card/ShelvingForm.vue
+++ b/src/pages/Shelving/Card/ShelvingForm.vue
@@ -60,9 +60,9 @@ const shelvingFilter = {
     ],
 };
 
-const onSave = () => {
+const onSave = (shelving, newShelving) => {
     if (isNew) {
-        router.push({ name: 'ShelvingList' });
+        router.push({ name: 'ShelvingBasicData', params: { id: newShelving?.id } });
     }
 };
 </script>

From a0ba4ac017e455452cab2cee37109bdc61aadf95 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Thu, 8 Feb 2024 08:32:35 -0300
Subject: [PATCH 19/19] Fix LeftMenu Unit test

---
 test/vitest/__tests__/components/Leftmenu.spec.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/vitest/__tests__/components/Leftmenu.spec.js b/test/vitest/__tests__/components/Leftmenu.spec.js
index ffdaebe7b..ea1c51f8d 100644
--- a/test/vitest/__tests__/components/Leftmenu.spec.js
+++ b/test/vitest/__tests__/components/Leftmenu.spec.js
@@ -76,11 +76,13 @@ describe('Leftmenu', () => {
     it('should return a proper formated object with two child items', async () => {
         const expectedMenuItem = [
             {
+                children: null,
                 name: 'CustomerList',
                 title: 'customer.pageTitles.list',
                 icon: 'view_list',
             },
             {
+                children: null,
                 name: 'CustomerCreate',
                 title: 'customer.pageTitles.createCustomer',
                 icon: 'vn:addperson',