Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6598-getUserAcl

CHANGELOG.md

@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [2420.01]
 
+### Added
+
+-   (Item) => Se añade la opción de añadir un comentario del motivo de hacer una foto
+-   (Worker) => Se añade la opción de crear un trabajador ajeno a la empresa
+
 ## [2418.01]
 
 ## [2416.01] - 2024-04-18

Jenkinsfile

@@ -54,7 +54,6 @@ pipeline {
     }
     environment {
         PROJECT_NAME = 'lilium'
-        STACK_NAME   = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
     }
     stages {
         stage('Install') {
@@ -104,15 +103,18 @@ pipeline {
             when {
                 expression { PROTECTED_BRANCH }
             }
-            environment {
-                DOCKER_HOST = "${env.SWARM_HOST}"
-            }
             steps {
                 script {
                     def packageJson = readJSON file: 'package.json'
                     env.VERSION = packageJson.version
                 }
-                sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}"
+                withKubeConfig([
+                    serverUrl: "$KUBERNETES_API",
+                    credentialsId: 'kubernetes',
+                    namespace: 'lilium'
+                ]) {
+                    sh 'kubectl set image deployment/lilium-$BRANCH_NAME lilium-$BRANCH_NAME=$REGISTRY/salix-frontend:$VERSION'
+                }
             }
         }
     }

docker-compose.yml

@@ -1,17 +1,7 @@
 version: '3.7'
 services:
   main:
-    image: registry.verdnatura.es/salix-frontend:${BRANCH_NAME:?}
+    image: registry.verdnatura.es/salix-frontend:${VERSION:?}
     build:
       context: .
       dockerfile: ./Dockerfile
-    ports:
-      - 4000
-    deploy:
-      replicas: ${FRONT_REPLICAS:?}
-      placement:
-        constraints:
-          - node.role == worker
-      resources:
-        limits:
-          memory: 1G

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.22.0",
+    "version": "24.26.2",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

src/boot/qformMixin.js

@@ -1,21 +1,48 @@
 import { getCurrentInstance } from 'vue';
 
-const filterAvailableInput = element => element.classList.contains('q-field__native') && !element.disabled
-const filterAvailableText = element => element.__vueParentComponent.type.name === 'QInput' && element.__vueParentComponent?.attrs?.class !== 'vn-input-date';
-
+const filterAvailableInput = (element) => {
+    return element.classList.contains('q-field__native') && !element.disabled;
+};
+const filterAvailableText = (element) => {
+    return (
+        element.__vueParentComponent.type.name === 'QInput' &&
+        element.__vueParentComponent?.attrs?.class !== 'vn-input-date'
+    );
+};
 
 export default {
     mounted: function () {
         const vm = getCurrentInstance();
-        if (vm.type.name === 'QForm')
-            if (!['searchbarForm','filterPanelForm'].includes(this.$el?.id)) {
+        if (vm.type.name === 'QForm') {
+            if (!['searchbarForm', 'filterPanelForm'].includes(this.$el?.id)) {
                 // AUTOFOCUS
                 const elementsArray = Array.from(this.$el.elements);
-                const firstInputElement = elementsArray.filter(filterAvailableInput).find(filterAvailableText);
+                const availableInputs = elementsArray.filter(filterAvailableInput);
+                const firstInputElement = availableInputs.find(filterAvailableText);
 
                 if (firstInputElement) {
                     firstInputElement.focus();
                 }
+                const that = this;
+                this.$el.addEventListener('keyup', function (evt) {
+                    if (evt.key === 'Enter') {
+                        const input = evt.target;
+                        console.log('input', input);
+                        if (input.type == 'textarea' && evt.shiftKey) {
+                            evt.preventDefault();
+                            let { selectionStart, selectionEnd } = input;
+                            input.value =
+                                input.value.substring(0, selectionStart) +
+                                '\n' +
+                                input.value.substring(selectionEnd);
+                            selectionStart = selectionEnd = selectionStart + 1;
+                            return;
+                        }
+                        evt.preventDefault();
+                        that.onSubmit();
+                    }
+                });
+            }
         }
     },
 };

src/components/CreateManualInvoiceForm.vue

@@ -48,7 +48,11 @@ const onDataSaved = async (formData, requestResponse) => {
     />
     <FetchData
         url="Tickets"
-        :filter="{ fields: ['id', 'nickname'], order: 'shipped DESC', limit: 30 }"
+        :filter="{
+            fields: ['id', 'nickname'],
+            where: { refFk: null },
+            order: 'shipped DESC',
+        }"
         @on-fetch="(data) => (ticketsOptions = data)"
         auto-load
     />

src/components/CrudModel.vue

@@ -1,6 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { computed, ref, watch } from 'vue';
+import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useValidator } from 'src/composables/useValidator';
@@ -10,6 +11,7 @@ import VnConfirm from 'components/ui/VnConfirm.vue';
 import SkeletonTable from 'components/ui/SkeletonTable.vue';
 import { tMobile } from 'src/composables/tMobile';
 
+const { push } = useRouter();
 const quasar = useQuasar();
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -60,6 +62,11 @@ const $props = defineProps({
         type: Function,
         default: null,
     },
+    goTo: {
+        type: String,
+        default: '',
+        description: 'It is used for redirect on click "save and continue"',
+    },
 });
 
 const isLoading = ref(false);
@@ -128,6 +135,11 @@ async function onSubmit() {
     await saveChanges($props.saveFn ? formData.value : null);
 }
 
+async function onSumbitAndGo() {
+    await onSubmit();
+    push({ path: $props.goTo });
+}
+
 async function saveChanges(data) {
     if ($props.saveFn) {
         $props.saveFn(data, getChanges);
@@ -310,7 +322,40 @@ watch(formUrl, async () => {
                 :title="t('globals.reset')"
                 v-if="$props.defaultReset"
             />
+            <QBtnDropdown
+                v-if="$props.goTo && $props.defaultSave"
+                @click="onSumbitAndGo"
+                :label="tMobile('globals.saveAndContinue')"
+                :title="t('globals.saveAndContinue')"
+                :disable="!hasChanges"
+                color="primary"
+                icon="save"
+                split
+            >
+                <QList>
+                    <QItem
+                        color="primary"
+                        clickable
+                        v-close-popup
+                        @click="onSubmit"
+                        :title="t('globals.save')"
+                    >
+                        <QItemSection>
+                            <QItemLabel>
+                                <QIcon
+                                    name="save"
+                                    color="white"
+                                    class="q-mr-sm"
+                                    size="sm"
+                                />
+                                {{ t('globals.save').toUpperCase() }}
+                            </QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </QList>
+            </QBtnDropdown>
             <QBtn
+                v-else-if="!$props.goTo && $props.defaultSave"
                 :label="tMobile('globals.save')"
                 ref="saveButtonRef"
                 color="primary"
@@ -318,7 +363,6 @@ watch(formUrl, async () => {
                 @click="onSubmit"
                 :disable="!hasChanges"
                 :title="t('globals.save')"
-                v-if="$props.defaultSave"
             />
             <slot name="moreAfterActions" />
         </QBtnGroup>

src/components/EditPictureForm.vue

@@ -155,7 +155,7 @@ const rotateRight = () => {
     editor.value.rotate(-90);
 };
 
-const onUploadAccept = () => {
+const onSubmit = () => {
     try {
         if (!newPhoto.files && !newPhoto.url) {
             notify(t('Select an image'), 'negative');
@@ -206,7 +206,7 @@ const makeRequest = async () => {
         @on-fetch="(data) => (allowedContentTypes = data.join(', '))"
         auto-load
     />
-    <QForm @submit="onUploadAccept()" class="all-pointer-events">
+    <QForm @submit="onSubmit()" class="all-pointer-events">
         <QCard class="q-pa-lg">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />

src/components/EditTableCellValueForm.vue

@@ -50,7 +50,7 @@ const onDataSaved = () => {
     closeForm();
 };
 
-const submitData = async () => {
+const onSubmit = async () => {
     try {
         isLoading.value = true;
         const rowsToEdit = $props.rows.map((row) => ({ id: row.id, itemFk: row.itemFk }));
@@ -74,7 +74,7 @@ const closeForm = () => {
 </script>
 
 <template>
-    <QForm @submit="submitData()" class="all-pointer-events">
+    <QForm @submit="onSubmit()" class="all-pointer-events">
         <QCard class="q-pa-lg">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />

src/components/FetchData.vue

@@ -24,7 +24,7 @@ const $props = defineProps({
         default: '',
     },
     limit: {
-        type: String,
+        type: [String, Number],
         default: '',
     },
     params: {

src/components/FilterItemForm.vue

@@ -83,7 +83,7 @@ const tableColumns = computed(() => [
     },
 ]);
 
-const fetchResults = async () => {
+const onSubmit = async () => {
     try {
         let filter = itemFilter;
         const params = itemFilterParams;
@@ -145,7 +145,7 @@ const selectItem = ({ id }) => {
         @on-fetch="(data) => (InksOptions = data)"
         auto-load
     />
-    <QForm @submit="fetchResults()" class="all-pointer-events">
+    <QForm @submit="onSubmit()" class="all-pointer-events">
         <QCard class="column" style="padding: 32px; z-index: 100">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />

src/components/FilterTravelForm.vue

@@ -85,7 +85,7 @@ const tableColumns = computed(() => [
     },
 ]);
 
-const fetchResults = async () => {
+const onSubmit = async () => {
     try {
         let filter = travelFilter;
         const params = travelFilterParams;
@@ -138,7 +138,7 @@ const selectTravel = ({ id }) => {
         @on-fetch="(data) => (warehousesOptions = data)"
         auto-load
     />
-    <QForm @submit="fetchResults()" class="all-pointer-events">
+    <QForm @submit="onSubmit()" class="all-pointer-events">
         <QCard class="column" style="padding: 32px; z-index: 100">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />

src/components/FormModel.vue

@@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { onMounted, onUnmounted, computed, ref, watch, nextTick } from 'vue';
-import { onBeforeRouteLeave } from 'vue-router';
+import { onBeforeRouteLeave, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useState } from 'src/composables/useState';
@@ -11,7 +11,9 @@ import useNotify from 'src/composables/useNotify.js';
 import SkeletonForm from 'components/ui/SkeletonForm.vue';
 import VnConfirm from './ui/VnConfirm.vue';
 import { tMobile } from 'src/composables/tMobile';
+import { useArrayData } from 'src/composables/useArrayData';
 
+const { push } = useRouter();
 const quasar = useQuasar();
 const state = useState();
 const stateStore = useStateStore();
@@ -74,55 +76,17 @@ const $props = defineProps({
         type: Function,
         default: null,
     },
+    goTo: {
+        type: String,
+        default: '',
+        description: 'It is used for redirect on click "save and continue"',
+    },
 });
 
 const emit = defineEmits(['onFetch', 'onDataSaved']);
 
 const componentIsRendered = ref(false);
-
-onMounted(async () => {
-    originalData.value = $props.formInitialData;
-    nextTick(() => {
-        componentIsRendered.value = true;
-    });
-
-    // Podemos enviarle al form la estructura de data inicial sin necesidad de fetchearla
-    state.set($props.model, $props.formInitialData);
-    if ($props.autoLoad && !$props.formInitialData) {
-        await fetch();
-    }
-
-    // Si así se desea disparamos el watcher del form después de 100ms, asi darle tiempo de que se haya cargado la data inicial
-    // para evitar que detecte cambios cuando es data inicial default
-    if ($props.observeFormChanges) {
-        setTimeout(() => {
-            startFormWatcher();
-        }, 100);
-    }
-});
-
-onBeforeRouteLeave((to, from, next) => {
-    if (hasChanges.value && $props.observeFormChanges)
-        quasar.dialog({
-            component: VnConfirm,
-            componentProps: {
-                title: t('Unsaved changes will be lost'),
-                message: t('Are you sure exit without saving?'),
-                promise: () => next(),
-            },
-        });
-    else next();
-});
-
-onUnmounted(() => {
-    // Restauramos los datos originales en el store si se realizaron cambios en el formulario pero no se guardaron, evitando modificaciones erróneas.
-    if (hasChanges.value) {
-        state.set($props.model, originalData.value);
-        return;
-    }
-    if ($props.clearStoreOnUnmount) state.unset($props.model);
-});
-
+const arrayData = useArrayData($props.model);
 const isLoading = ref(false);
 // Si elegimos observar los cambios del form significa que inicialmente las actions estaran deshabilitadas
 const isResetting = ref(false);
@@ -143,68 +107,112 @@ const defaultButtons = computed(() => ({
     },
     ...$props.defaultButtons,
 }));
-const startFormWatcher = () => {
+
+onMounted(async () => {
+    originalData.value = JSON.parse(JSON.stringify($props.formInitialData ?? {}));
+
+    nextTick(() => (componentIsRendered.value = true));
+
+    // Podemos enviarle al form la estructura de data inicial sin necesidad de fetchearla
+    state.set($props.model, $props.formInitialData);
+
+    if ($props.autoLoad && !$props.formInitialData && $props.url) await fetch();
+    else if (arrayData.store.data) updateAndEmit('onFetch', arrayData.store.data);
+
+    if ($props.observeFormChanges) {
         watch(
             () => formData.value,
-        (val) => {
-            hasChanges.value = !isResetting.value && val;
+            (newVal, oldVal) => {
+                if (!oldVal) return;
+                hasChanges.value =
+                    !isResetting.value &&
+                    JSON.stringify(newVal) !== JSON.stringify(originalData.value);
                 isResetting.value = false;
             },
             { deep: true }
         );
-};
+    }
+});
+
+if (!$props.url)
+    watch(
+        () => arrayData.store.data,
+        (val) => updateAndEmit('onFetch', val)
+    );
+
+watch(formUrl, async () => {
+    originalData.value = null;
+    reset();
+    await fetch();
+});
+
+onBeforeRouteLeave((to, from, next) => {
+    if (hasChanges.value && $props.observeFormChanges)
+        quasar.dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t('Unsaved changes will be lost'),
+                message: t('Are you sure exit without saving?'),
+                promise: () => next(),
+            },
+        });
+    else next();
+});
+
+onUnmounted(() => {
+    // Restauramos los datos originales en el store si se realizaron cambios en el formulario pero no se guardaron, evitando modificaciones erróneas.
+    if (hasChanges.value) return state.set($props.model, originalData.value);
+    if ($props.clearStoreOnUnmount) state.unset($props.model);
+});
 
 async function fetch() {
     try {
         let { data } = await axios.get($props.url, {
             params: { filter: JSON.stringify($props.filter) },
         });
-
         if (Array.isArray(data)) data = data[0] ?? {};
 
-        state.set($props.model, data);
-        originalData.value = data && JSON.parse(JSON.stringify(data));
-
-        emit('onFetch', state.get($props.model));
-    } catch (error) {
+        updateAndEmit('onFetch', data);
+    } catch (e) {
         state.set($props.model, {});
         originalData.value = {};
     }
 }
 
 async function save() {
-    if ($props.observeFormChanges && !hasChanges.value) {
-        notify('globals.noChanges', 'negative');
-        return;
-    }
-    isLoading.value = true;
+    if ($props.observeFormChanges && !hasChanges.value)
+        return notify('globals.noChanges', 'negative');
 
+    isLoading.value = true;
     try {
         const body = $props.mapper ? $props.mapper(formData.value) : formData.value;
+        const method = $props.urlCreate ? 'post' : 'patch';
+        const url =
+            $props.urlCreate || $props.urlUpdate || $props.url || arrayData.store.url;
         let response;
+
         if ($props.saveFn) response = await $props.saveFn(body);
-        else
-            response = await axios[$props.urlCreate ? 'post' : 'patch'](
-                $props.urlCreate || $props.urlUpdate || $props.url,
-                body
-            );
+        else response = await axios[method](url, body);
+
         if ($props.urlCreate) notify('globals.dataCreated', 'positive');
 
-        emit('onDataSaved', formData.value, response?.data);
-        originalData.value = JSON.parse(JSON.stringify(formData.value));
-        hasChanges.value = false;
+        updateAndEmit('onDataSaved', formData.value, response?.data);
     } catch (err) {
         console.error(err);
         notify('errors.writeRequest', 'negative');
-    }
+    } finally {
+        hasChanges.value = false;
         isLoading.value = false;
+    }
+}
+
+async function saveAndGo() {
+    await save();
+    push({ path: $props.goTo });
 }
 
 function reset() {
-    state.set($props.model, originalData.value);
-    originalData.value = JSON.parse(JSON.stringify(originalData.value));
-
-    emit('onFetch', state.get($props.model));
+    updateAndEmit('onFetch', originalData.value);
     if ($props.observeFormChanges) {
         hasChanges.value = false;
         isResetting.value = true;
@@ -226,17 +234,15 @@ function filter(value, update, filterOptions) {
     );
 }
 
-watch(formUrl, async () => {
-    originalData.value = null;
-    reset();
-    fetch();
-});
+function updateAndEmit(evt, val, res) {
+    state.set($props.model, val);
+    originalData.value = val && JSON.parse(JSON.stringify(val));
+    if (!$props.url) arrayData.store.data = val;
 
-defineExpose({
-    save,
-    isLoading,
-    hasChanges,
-});
+    emit(evt, state.get($props.model), res);
+}
+
+defineExpose({ save, isLoading, hasChanges });
 </script>
 <template>
     <div class="column items-center full-width">
@@ -273,10 +279,42 @@ defineExpose({
                     :disable="!hasChanges"
                     :title="t(defaultButtons.reset.label)"
                 />
+                <QBtnDropdown
+                    v-if="$props.goTo"
+                    @click="saveAndGo"
+                    :label="tMobile('globals.saveAndContinue')"
+                    :title="t('globals.saveAndContinue')"
+                    :disable="!hasChanges"
+                    color="primary"
+                    icon="save"
+                    split
+                >
+                    <QList>
+                        <QItem
+                            clickable
+                            v-close-popup
+                            @click="save"
+                            :title="t('globals.save')"
+                        >
+                            <QItemSection>
+                                <QItemLabel>
+                                    <QIcon
+                                        name="save"
+                                        color="white"
+                                        class="q-mr-sm"
+                                        size="sm"
+                                    />
+                                    {{ t('globals.save').toUpperCase() }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </QList>
+                </QBtnDropdown>
                 <QBtn
-                    :label="tMobile(defaultButtons.save.label)"
-                    :color="defaultButtons.save.color"
-                    :icon="defaultButtons.save.icon"
+                    v-else
+                    :label="tMobile('globals.save')"
+                    color="primary"
+                    icon="save"
                     @click="save"
                     :disable="!hasChanges"
                     :title="t(defaultButtons.save.label)"

src/components/FormModelPopup.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 import FormModel from 'components/FormModel.vue';
 
-const emit = defineEmits(['onDataSaved']);
+const emit = defineEmits(['onDataSaved', 'onDataCanceled']);
 
 defineProps({
     title: {
@@ -15,26 +15,6 @@ defineProps({
         type: String,
         default: '',
     },
-    url: {
-        type: String,
-        default: '',
-    },
-    model: {
-        type: String,
-        default: '',
-    },
-    filter: {
-        type: Object,
-        default: null,
-    },
-    urlCreate: {
-        type: String,
-        default: null,
-    },
-    formInitialData: {
-        type: Object,
-        default: () => {},
-    },
 });
 
 const { t } = useI18n();
@@ -43,8 +23,8 @@ const formModelRef = ref(null);
 const closeButton = ref(null);
 
 const onDataSaved = (formData, requestResponse) => {
-    emit('onDataSaved', formData, requestResponse);
     closeForm();
+    emit('onDataSaved', formData, requestResponse);
 };
 
 const isLoading = computed(() => formModelRef.value?.isLoading);
@@ -61,11 +41,9 @@ defineExpose({
 <template>
     <FormModel
         ref="formModelRef"
-        :form-initial-data="formInitialData"
         :observe-form-changes="false"
         :default-actions="false"
-        :url-create="urlCreate"
-        :model="model"
+        v-bind="$attrs"
         @on-data-saved="onDataSaved"
     >
         <template #form="{ data, validate }">
@@ -84,6 +62,7 @@ defineExpose({
                     flat
                     :disabled="isLoading"
                     :loading="isLoading"
+                    @click="emit('onDataCanceled')"
                     v-close-popup
                 />
                 <QBtn

src/components/FormPopup.vue

@@ -74,7 +74,7 @@ const closeForm = () => {
                     :disabled="isLoading"
                     :loading="isLoading"
                 />
-                <slot name="customButtons" />
+                <slot name="custom-buttons" />
             </div>
         </QCard>
     </QForm>

src/components/LeftMenuItem.vue

@@ -20,7 +20,13 @@ const itemComputed = computed(() => {
 });
 </script>
 <template>
-    <QItem active-class="bg-hover" :to="{ name: itemComputed.name }" clickable v-ripple>
+    <QItem
+        active-class="bg-hover"
+        class="min-height"
+        :to="{ name: itemComputed.name }"
+        clickable
+        v-ripple
+    >
         <QItemSection avatar v-if="itemComputed.icon">
             <QIcon :name="itemComputed.icon" />
         </QItemSection>
@@ -33,3 +39,9 @@ const itemComputed = computed(() => {
         </QItemSection>
     </QItem>
 </template>
+
+<style lang="scss" scoped>
+.q-item {
+    min-height: 5vh;
+}
+</style>

src/components/UserPanel.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, computed } from 'vue';
+import { onMounted, computed, ref } from 'vue';
 import { Dark, Quasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
@@ -10,13 +10,12 @@ import { localeEquivalence } from 'src/i18n/index';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
+import { useClipboard } from 'src/composables/useClipboard';
 
 const state = useState();
 const session = useSession();
 const router = useRouter();
 const { t, locale } = useI18n();
-import { useClipboard } from 'src/composables/useClipboard';
-import { ref } from 'vue';
 const { copyText } = useClipboard();
 const userLocale = computed({
     get() {
@@ -91,6 +90,15 @@ function logout() {
 function copyUserToken() {
     copyText(session.getToken(), { label: 'components.userPanel.copyToken' });
 }
+
+function localUserData() {
+    state.setUser(user.value);
+}
+
+function saveUserData(param, value) {
+    axios.post('UserConfigs/setUserConfig', { [param]: value });
+    localUserData();
+}
 </script>
 
 <template>
@@ -180,6 +188,7 @@ function copyUserToken() {
                     option-value="id"
                     input-debounce="0"
                     hide-selected
+                    @update:model-value="localUserData"
                 />
                 <VnSelect
                     :label="t('components.userPanel.localBank')"
@@ -189,6 +198,7 @@ function copyUserToken() {
                     option-value="id"
                     input-debounce="0"
                     hide-selected
+                    @update:model-value="localUserData"
                 >
                     <template #option="{ itemProps, opt }">
                         <QItem v-bind="itemProps">
@@ -210,6 +220,7 @@ function copyUserToken() {
                     option-label="code"
                     option-value="id"
                     input-debounce="0"
+                    @update:model-value="localUserData"
                 />
                 <VnSelect
                     :label="t('components.userPanel.userWarehouse')"
@@ -219,6 +230,7 @@ function copyUserToken() {
                     option-label="name"
                     option-value="id"
                     input-debounce="0"
+                    @update:model-value="(v) => saveUserData('warehouseFk', v)"
                 />
             </VnRow>
             <VnRow>
@@ -232,6 +244,7 @@ function copyUserToken() {
                     style="flex: 0"
                     dense
                     input-debounce="0"
+                    @update:model-value="(v) => saveUserData('companyFk', v)"
                 />
             </VnRow>
         </div>

src/components/common/RightMenu.vue

@@ -9,14 +9,13 @@ const rightPanel = ref(null);
 
 onMounted(() => {
     rightPanel.value = document.querySelector('#right-panel');
-    if (rightPanel.value.childNodes.length) hasContent.value = true;
+    if (!rightPanel.value) return;
 
     // Check if there's content to display
     const observer = new MutationObserver(() => {
         hasContent.value = rightPanel.value.childNodes.length;
     });
 
-    if (rightPanel.value)
     observer.observe(rightPanel.value, {
         subtree: true,
         childList: true,
@@ -30,7 +29,7 @@ const { t } = useI18n();
 const stateStore = useStateStore();
 </script>
 <template>
-    <Teleport to="#actions-append">
+    <Teleport to="#actions-append" v-if="stateStore.isHeaderMounted()">
         <div class="row q-gutter-x-sm">
             <QBtn
                 v-if="hasContent || $slots['right-panel']"

src/components/common/VnCard.vue

@@ -20,6 +20,9 @@ const props = defineProps({
     searchUrl: { type: String, default: undefined },
     searchbarLabel: { type: String, default: '' },
     searchbarInfo: { type: String, default: '' },
+    searchCustomRouteRedirect: { type: String, default: undefined },
+    searchRedirect: { type: Boolean, default: true },
+    searchMakeFetch: { type: Boolean, default: true },
 });
 
 const stateStore = useStateStore();
@@ -42,7 +45,7 @@ onBeforeMount(async () => {
 if (props.baseUrl) {
     onBeforeRouteUpdate(async (to, from) => {
         if (to.params.id !== from.params.id) {
-            arrayData.store.url = `${props.baseUrl}/${route.params.id}`;
+            arrayData.store.url = `${props.baseUrl}/${to.params.id}`;
             await arrayData.fetch({ append: false });
         }
     });
@@ -54,31 +57,34 @@ watchEffect(() => {
 });
 </script>
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar" v-if="props.searchDataKey">
-            <slot name="searchbar">
-                <VnSearchbar
-                    :data-key="props.searchDataKey"
-                    :url="props.searchUrl"
-                    :label="props.searchbarLabel"
-                    :info="props.searchbarInfo"
-                />
-            </slot>
-        </Teleport>
-        <slot v-else name="searchbar" />
-        <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+    <QDrawer
+        v-model="stateStore.leftDrawer"
+        show-if-above
+        :width="256"
+        v-if="stateStore.isHeaderMounted()"
+    >
         <QScrollArea class="fit">
             <component :is="descriptor" />
             <QSeparator />
             <LeftMenu source="card" />
         </QScrollArea>
     </QDrawer>
+    <slot name="searchbar" v-if="props.searchDataKey">
+        <VnSearchbar
+            :data-key="props.searchDataKey"
+            :url="props.searchUrl"
+            :label="props.searchbarLabel"
+            :info="props.searchbarInfo"
+            :custom-route-redirect-name="searchCustomRouteRedirect"
+            :redirect="searchRedirect"
+        />
+    </slot>
+    <slot v-else name="searchbar" />
     <RightMenu>
         <template #right-panel v-if="props.filterPanel">
             <component :is="props.filterPanel" :data-key="props.searchDataKey" />
         </template>
     </RightMenu>
-    </template>
     <QPageContainer>
         <QPage>
             <VnSubToolbar />

src/components/common/VnDms.vue

@@ -78,6 +78,7 @@ async function save() {
     const body = mapperDms(dms.value);
     const response = await axios.post(getUrl(), body[0], body[1]);
     emit('onDataSaved', body[1].params, response);
+    return response;
 }
 
 function defaultData() {

src/components/common/VnDmsList.vue

@@ -35,7 +35,7 @@ const $props = defineProps({
     downloadModel: {
         type: String,
         required: false,
-        default: null,
+        default: undefined,
     },
     defaultDmsCode: {
         type: String,

src/components/common/VnInput.vue

@@ -80,7 +80,7 @@ const inputRules = [
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="$slots.append && hover && value && !$attrs.disabled"
+                    v-if="hover && value && !$attrs.disabled"
                     @click="value = null"
                 ></QIcon>
             </template>

src/components/common/VnInputTime.vue

@@ -74,7 +74,7 @@ const styleAttrs = computed(() => {
         @click="isPopupOpen = true"
     >
         <template #append>
-            <QIcon name="schedule" class="cursor-pointer">
+            <QIcon name="Schedule" class="cursor-pointer">
                 <QPopupProxy
                     v-model="isPopupOpen"
                     cover

src/components/common/VnLog.vue

@@ -622,23 +622,7 @@ setLogTree();
             </QList>
         </div>
     </div>
-    <Teleport v-if="stateStore.isHeaderMounted()" to="#actions-append">
-        <div class="row q-gutter-x-sm">
-            <QBtn
-                flat
-                @click.stop="stateStore.toggleRightDrawer()"
-                round
-                dense
-                icon="menu"
-            >
-                <QTooltip bottom anchor="bottom right">
-                    {{ t('globals.collapseMenu') }}
-                </QTooltip>
-            </QBtn>
-        </div>
-    </Teleport>
-    <QDrawer v-model="stateStore.rightDrawer" show-if-above side="right" :width="300">
-        <QScrollArea class="fit text-grey-8">
+    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted()">
         <QList dense>
             <QSeparator />
             <QItem class="q-mt-sm">
@@ -701,10 +685,7 @@ setLogTree();
                         hide-selected
                     >
                         <template #option="{ opt, itemProps }">
-                                <QItem
-                                    v-bind="itemProps"
-                                    class="q-pa-xs row items-center"
-                                >
+                            <QItem v-bind="itemProps" class="q-pa-xs row items-center">
                                 <QItemSection class="col-3 items-center">
                                     <VnAvatar :worker-id="opt.id" />
                                 </QItemSection>
@@ -774,8 +755,7 @@ setLogTree();
                 />
             </QItem>
         </QList>
-        </QScrollArea>
-    </QDrawer>
+    </Teleport>
     <QDialog v-model="dateFromDialog">
         <QDate
             :years-in-month-view="false"

src/components/common/VnRadio.vue

@@ -0,0 +1,6 @@
+<script setup>
+const model = defineModel({ type: Boolean, required: true });
+</script>
+<template>
+    <QRadio v-model="model" v-bind="$attrs" dense :dark="true" class="q-mr-sm" />
+</template>

src/components/common/VnSelect.vue

@@ -22,6 +22,10 @@ const $props = defineProps({
         type: String,
         default: '',
     },
+    optionFilter: {
+        type: String,
+        default: null,
+    },
     url: {
         type: String,
         default: '',
@@ -59,7 +63,7 @@ const $props = defineProps({
 const { t } = useI18n();
 const requiredFieldRule = (val) => val ?? t('globals.fieldRequired');
 
-const { optionLabel, optionValue, options, modelValue } = toRefs($props);
+const { optionLabel, optionValue, optionFilter, options, modelValue } = toRefs($props);
 const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
 const vnSelectRef = ref();
@@ -109,9 +113,9 @@ async function fetchFilter(val) {
     const { fields, sortBy, limit } = $props;
     let key = optionLabel.value;
 
-    if (new RegExp(/\d/g).test(val)) key = optionValue.value;
+    if (new RegExp(/\d/g).test(val)) key = optionFilter.value ?? optionValue.value;
 
-    const where = { [key]: { like: `%${val}%` } };
+    const where = { ...{ [key]: { like: `%${val}%` } }, ...$props.where };
     return dataRef.value.fetch({ fields, where, order: sortBy, limit });
 }
 

src/components/common/VnTitle.vue

@@ -1,16 +1,16 @@
 <script setup>
-const $props = defineProps({
+defineProps({
     url: { type: String, default: null },
     text: { type: String, default: null },
     icon: { type: String, default: 'open_in_new' },
 });
 </script>
 <template>
-    <div class="titleBox">
+    <div :class="$q.screen.gt.md ? 'q-pb-lg' : 'q-pb-md'">
         <div class="header-link">
-            <a :href="$props.url" :class="$props.url ? 'link' : 'color-vn-text'">
-                {{ $props.text }}
-                <QIcon v-if="url" :name="$props.icon" />
+            <a :href="url" :class="url ? 'link' : 'color-vn-text'">
+                {{ text }}
+                <QIcon v-if="url" :name="icon" />
             </a>
         </div>
     </div>
@@ -19,7 +19,4 @@ const $props = defineProps({
 a {
     font-size: large;
 }
-.titleBox {
-    padding-bottom: 2%;
-}
 </style>

src/components/common/VnWeekdayPicker.vue

@@ -0,0 +1,37 @@
+<script setup>
+import { computed } from 'vue';
+
+import { useWeekdayStore } from 'src/stores/useWeekdayStore';
+
+const props = defineProps({
+    wdays: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const emit = defineEmits(['update:wdays']);
+
+const weekdayStore = useWeekdayStore();
+
+const selectedWDays = computed({
+    get: () => props.wdays,
+    set: (value) => emit('update:wdays', value),
+});
+
+const toggleDay = (index) => (selectedWDays.value[index] = !selectedWDays.value[index]);
+</script>
+
+<template>
+    <div class="q-gutter-x-sm" style="width: max-content">
+        <QBtn
+            v-for="(weekday, index) in weekdayStore.getLocalesMap"
+            :key="index"
+            :label="weekday.localeChar"
+            rounded
+            style="max-width: 36px"
+            :color="selectedWDays[weekday.index] ? 'primary' : ''"
+            @click="toggleDay(weekday.index)"
+        />
+    </div>
+</template>

src/components/ui/CardDescriptor.vue

@@ -5,6 +5,7 @@ import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 import { useArrayData } from 'composables/useArrayData';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useState } from 'src/composables/useState';
+import { useRoute } from 'vue-router';
 
 const $props = defineProps({
     url: {
@@ -15,21 +16,21 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
-    module: {
-        type: String,
-        required: true,
-    },
     title: {
         type: String,
         default: '',
     },
     subtitle: {
         type: Number,
-        default: 0,
+        default: null,
     },
     dataKey: {
         type: String,
-        default: '',
+        default: null,
+    },
+    module: {
+        type: String,
+        default: null,
     },
     summary: {
         type: Object,
@@ -40,21 +41,27 @@ const $props = defineProps({
 const state = useState();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-const arrayData = useArrayData($props.dataKey || $props.module, {
+let arrayData;
+let store;
+let entity;
+const isLoading = ref(false);
+
+defineExpose({ getData });
+
+onBeforeMount(async () => {
+    arrayData = useArrayData($props.dataKey, {
         url: $props.url,
         filter: $props.filter,
         skip: 0,
-});
-const { store } = arrayData;
-const entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
-const isLoading = ref(false);
-
-defineExpose({
-    getData,
-});
-onBeforeMount(async () => {
-    await getData();
-    watch($props, async () => await getData());
+    });
+    store = arrayData.store;
+    entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
+    // It enables to load data only once if the module is the same as the dataKey
+    if ($props.dataKey !== useRoute().meta.moduleName) await getData();
+    watch(
+        () => [$props.url, $props.filter],
+        async () => await getData()
+    );
 });
 
 async function getData() {
@@ -132,7 +139,7 @@ const emit = defineEmits(['onFetch']);
                     <QItemLabel header class="ellipsis text-h5" :lines="1">
                         <div class="title">
                             <span v-if="$props.title" :title="$props.title">
-                                {{ $props.title }}
+                                {{ entity[title] ?? $props.title }}
                             </span>
                             <slot v-else name="description" :entity="entity">
                                 <span :title="entity.name">
@@ -235,6 +242,7 @@ const emit = defineEmits(['onFetch']);
     width: 256px;
     .header {
         display: flex;
+        align-items: center;
     }
     .icons {
         margin: 0 10px;

src/components/ui/CardSummary.vue

@@ -56,11 +56,20 @@ async function fetch() {
 }
 
 const showRedirectToSummaryIcon = computed(() => {
-    const routeExists = route.matched.some(
-        (route) => route.name === `${route.meta.moduleName}Summary`
-    );
-    return !isSummary.value && route.meta.moduleName && routeExists;
+    const exist = existSummary(route.matched);
+    return !isSummary.value && route.meta.moduleName && exist;
 });
+
+function existSummary(routes) {
+    const hasSummary = routes.some((r) => r.name === `${route.meta.moduleName}Summary`);
+    if (hasSummary) return hasSummary;
+    for (const current of routes) {
+        if (current.path != '/' && current.children) {
+            const exist = existSummary(current.children);
+            if (exist) return exist;
+        }
+    }
+}
 </script>
 
 <template>

src/components/ui/FetchedTags.vue

@@ -1,5 +1,7 @@
 <script setup>
-defineProps({
+import { computed } from 'vue';
+
+const $props = defineProps({
     maxLength: {
         type: Number,
         required: true,
@@ -8,53 +10,40 @@ defineProps({
         type: Object,
         required: true,
     },
+    tag: {
+        type: String,
+        required: false,
+        default: 'tag',
+    },
+    value: {
+        type: String,
+        required: false,
+        default: 'value',
+    },
+});
+const tags = computed(() => {
+    return Object.keys($props.item)
+        .filter((i) => i.startsWith(`${$props.tag}`))
+        .reduce((acc, tag) => {
+            const n = tag.split(`${$props.tag}`)[1];
+            const key = `${$props.tag}${n}`;
+            const value = `${$props.value}${n}`;
+            acc[$props.item[key] ?? key] = $props.item[value] ?? '';
+            return acc;
+        }, {});
 });
 </script>
 <template>
     <div class="fetchedTags">
         <div class="wrap">
             <div
+                v-for="(val, key) in tags"
+                :key="key"
                 class="inline-tag"
-                :class="{ empty: !$props.item.value5 }"
-                :title="$props.item.tag5 + ': ' + $props.item.value5"
+                :title="`${key}: ${val}`"
+                :class="{ empty: !val }"
             >
-                {{ $props.item.value5 }}
-            </div>
-            <div
-                class="inline-tag"
-                :class="{ empty: !$props.item.tag6 }"
-                :title="$props.item.tag6 + ': ' + $props.item.value6"
-            >
-                {{ $props.item.value6 }}
-            </div>
-
-            <div
-                class="inline-tag"
-                :class="{ empty: !$props.item.value7 }"
-                :title="$props.item.tag7 + ': ' + $props.item.value7"
-            >
-                {{ $props.item.value7 }}
-            </div>
-            <div
-                class="inline-tag"
-                :class="{ empty: !$props.item.value8 }"
-                :title="$props.item.tag8 + ': ' + $props.item.value8"
-            >
-                {{ $props.item.value8 }}
-            </div>
-            <div
-                class="inline-tag"
-                :class="{ empty: !$props.item.value9 }"
-                :title="$props.item.tag9 + ': ' + $props.item.value9"
-            >
-                {{ $props.item.value9 }}
-            </div>
-            <div
-                class="inline-tag"
-                :class="{ empty: !$props.item.value10 }"
-                :title="$props.item.tag10 + ': ' + $props.item.value10"
-            >
-                {{ $props.item.value10 }}
+                {{ val }}
             </div>
         </div>
     </div>
@@ -72,7 +61,7 @@ defineProps({
     .inline-tag {
         height: 1rem;
         margin: 0.05rem;
-        color: $secondary;
+        color: $color-font-secondary;
         text-align: center;
         font-size: smaller;
         padding: 1px;
@@ -83,9 +72,8 @@ defineProps({
         min-width: 4rem;
         max-width: 4rem;
     }
-
     .empty {
-        border: 1px solid $color-spacer-light;
+        border: 1px solid #2b2b2b;
     }
 }
 </style>

src/components/ui/QCalendarMonthWrapper.vue

@@ -59,12 +59,10 @@ const containerClasses = computed(() => {
 // Clases para modificar el color de fecha seleccionada en componente QCalendarMonth
 .q-dark div .q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
     background-color: $primary !important;
-    color: white !important;
 }
 
 .q-calendar-mini .q-calendar-month__day.q-selected .q-calendar__button {
     background-color: $primary !important;
-    color: white !important;
 }
 
 .q-calendar-month__head--weekday {
@@ -108,11 +106,10 @@ const containerClasses = computed(() => {
         font-size: 13px;
 
         &:hover {
-            background-color: var(--vn-accent-color);
+            background-color: var(--vn-label-color);
             cursor: pointer;
         }
     }
-
     .q-calendar-month__week--days > div:nth-child(6),
     .q-calendar-month__week--days > div:nth-child(7) {
         // Cambia el color de los días sábado y domingo
@@ -150,7 +147,7 @@ const containerClasses = computed(() => {
     .q-calendar-month__head--workweek,
     .q-calendar-month__head--weekday.q-calendar__center.q-calendar__ellipsis {
         text-transform: capitalize;
-        color: #777;
+        color: $color-font-secondary;
         font-weight: bold;
         font-size: 0.8rem;
         text-align: center;

src/components/ui/VnFilterPanel.vue

@@ -46,6 +46,10 @@ const props = defineProps({
         type: Array,
         default: () => [],
     },
+    redirect: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const emit = defineEmits(['refresh', 'clear', 'search', 'init', 'remove']);
@@ -93,7 +97,7 @@ async function search() {
 
     isLoading.value = false;
     emit('search');
-    navigate(store.data, {});
+    if (props.redirect) navigate(store.data, {});
 }
 
 async function reload() {
@@ -104,7 +108,7 @@ async function reload() {
     if (!props.showAll && !params.length) store.data = [];
     isLoading.value = false;
     emit('refresh');
-    navigate(store.data, {});
+    if (props.redirect) navigate(store.data, {});
 }
 
 async function clearFilters() {

src/components/ui/VnNotes.vue

@@ -20,7 +20,12 @@ const state = useState();
 const currentUser = ref(state.getUser());
 const newNote = ref('');
 const vnPaginateRef = ref();
-
+function handleKeyUp(event) {
+      if (event.key === 'Enter') {
+        event.preventDefault();
+        if (!event.shiftKey) insert();
+    }
+}
 async function insert() {
     const body = $props.body;
     Object.assign(body, { text: newNote.value });
@@ -48,12 +53,12 @@ async function insert() {
                 size="lg"
                 autogrow
                 autofocus
-                @keyup.ctrl.enter.stop="insert"
+                @keyup="handleKeyUp"
                 clearable
             >
-                <template #append
-                    ><QBtn
-                        :title="t('Save (ctrl + Enter)')"
+                <template #append>
+                    <QBtn
+                        :title="t('Save (Enter)')"
                         icon="save"
                         color="primary"
                         flat
@@ -130,6 +135,6 @@ async function insert() {
     es:
         Add note here...: Añadir nota aquí...
         New note: Nueva nota
-        Save (ctrl + Enter): Guardar (Ctrl + Intro)
+        Save (Enter): Guardar (Intro)
 
 </i18n>

src/components/ui/VnSearchbar.vue

@@ -1,13 +1,15 @@
 <script setup>
-import { onMounted, ref } from 'vue';
+import { onMounted, ref, watch } from 'vue';
 import { useQuasar } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
 import VnInput from 'src/components/common/VnInput.vue';
 import useRedirect from 'src/composables/useRedirect';
 import { useI18n } from 'vue-i18n';
+import { useStateStore } from 'src/stores/useStateStore';
 
 const quasar = useQuasar();
 const { t } = useI18n();
+const state = useStateStore();
 
 const props = defineProps({
     dataKey: {
@@ -65,13 +67,25 @@ const props = defineProps({
         type: String,
         default: '',
     },
+    makeFetch: {
+        type: Boolean,
+        default: true,
+    },
 });
 
-const arrayData = useArrayData(props.dataKey, { ...props });
-const { store } = arrayData;
+let arrayData = useArrayData(props.dataKey, { ...props });
+let store = arrayData.store;
 const searchText = ref('');
 const { navigate } = useRedirect();
 
+watch(
+    () => props.dataKey,
+    (val) => {
+        arrayData = useArrayData(val, { ...props });
+        store = arrayData.store;
+    }
+);
+
 onMounted(() => {
     const params = store.userParams;
     if (params && params.search) {
@@ -84,6 +98,8 @@ async function search() {
         ([key, value]) => value && (props.staticParams || []).includes(key)
     );
     store.skip = 0;
+
+    if (props.makeFetch)
         await arrayData.applyFilter({
             params: {
                 ...Object.fromEntries(staticParams),
@@ -99,8 +115,8 @@ async function search() {
     });
 }
 </script>
-
 <template>
+    <Teleport to="#searchbar" v-if="state.isHeaderMounted()">
         <QForm @submit="search" id="searchbarForm">
             <VnInput
                 id="searchbar"
@@ -129,6 +145,7 @@ async function search() {
                 </template>
             </VnInput>
         </QForm>
+    </Teleport>
 </template>
 
 <style lang="scss" scoped>

src/components/ui/VnSubToolbar.vue

@@ -18,7 +18,7 @@ onMounted(() => {
     const observer = new MutationObserver(
         () =>
             (hasContent.value =
-                actions.value.childNodes.length + data.value.childNodes.length)
+                actions.value?.childNodes?.length + data.value?.childNodes?.length)
     );
     if (actions.value) observer.observe(actions.value, opts);
     if (data.value) observer.observe(data.value, opts);

src/composables/useArrayData.js

@@ -6,7 +6,7 @@ import { buildFilter } from 'filters/filterPanel';
 
 const arrayDataStore = useArrayDataStore();
 
-export function useArrayData(key, userOptions) {
+export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     if (!key) throw new Error('ArrayData: A key is required to use this composable');
 
     if (!arrayDataStore.get(key)) arrayDataStore.set(key);
@@ -130,7 +130,8 @@ export function useArrayData(key, userOptions) {
         store.filter = {};
         if (params) store.userParams = Object.assign({}, params);
 
-        await fetch({ append: false });
+        const response = await fetch({ append: false });
+        return response;
     }
 
     async function addFilter({ filter, params }) {

src/composables/useState.js

@@ -11,6 +11,8 @@ const user = ref({
     companyFk: null,
     warehouseFk: null,
 });
+if (sessionStorage.getItem('user'))
+    user.value = JSON.parse(sessionStorage.getItem('user'));
 
 const roles = ref([]);
 const acls = ref([]);
@@ -26,7 +28,10 @@ export function useState() {
     }
 
     function setUser(data) {
-        user.value = data;
+        const currentUser = { ...JSON.parse(sessionStorage.getItem('user')), ...data };
+        sessionStorage.setItem('user', JSON.stringify(currentUser));
+        user.value = currentUser;
+        return currentUser;
     }
 
     function getRoles() {

src/css/app.scss

@@ -76,7 +76,7 @@ select:-webkit-autofill {
 }
 
 .color-vn-label {
-    color: var(--vn-label);
+    color: var(--vn-label-color);
 }
 
 .color-vn-text {
@@ -169,6 +169,13 @@ select:-webkit-autofill {
 
 /* q-notification row items-stretch q-notification--standard bg-negative text-white */
 
+.q-card,
+.q-table,
+.q-table__bottom,
+.q-drawer {
+    background-color: var(--vn-section-color);
+}
+
 input[type='number'] {
     -moz-appearance: textfield;
 }

src/css/icons.scss

@@ -1,17 +1,16 @@
 @font-face {
   font-family: 'icon';
-    src: url('fonts/icon.eot?2omjsr');
-    src: url('fonts/icon.eot?2omjsr#iefix') format('embedded-opentype'),
-        url('fonts/icon.ttf?2omjsr') format('truetype'),
-        url('fonts/icon.woff?2omjsr') format('woff'),
-        url('fonts/icon.svg?2omjsr#icon') format('svg');
+  src:  url('fonts/icon.eot?y0x93o');
+  src:  url('fonts/icon.eot?y0x93o#iefix') format('embedded-opentype'),
+    url('fonts/icon.ttf?y0x93o') format('truetype'),
+    url('fonts/icon.woff?y0x93o') format('woff'),
+    url('fonts/icon.svg?y0x93o#icon') format('svg');
   font-weight: normal;
   font-style: normal;
   font-display: block;
 }
 
-[class^='icon-'],
-[class*=' icon-'] {
+[class^="icon-"], [class*=" icon-"] {
   /* use !important to prevent issues with browser extensions that change fonts */
   font-family: 'icon' !important;
   speak: never;
@@ -26,393 +25,414 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-entry_lastbuys:before {
+  content: "\e91a";
+}
 .icon-100:before {
-    content: '\e926';
+  content: "\e901";
 }
 .icon-Client_unpaid:before {
-    content: '\e925';
-}
-.icon-Client_unpaid:before {
-    content: '\e925';
+  content: "\e98c";
 }
 .icon-History:before {
-    content: '\e964';
+  content: "\e902";
 }
 .icon-Person:before {
-    content: '\e984';
+  content: "\e903";
 }
 .icon-accessory:before {
-    content: '\e948';
+  content: "\e904";
 }
 .icon-account:before {
-    content: '\e927';
+  content: "\e905";
 }
 .icon-actions:before {
-    content: '\e928';
+  content: "\e907";
 }
 .icon-addperson:before {
-    content: '\e929';
+  content: "\e908";
 }
 .icon-agency:before {
-    content: '\e92a';
-}
-.icon-agency:before {
-    content: '\e92a';
+  content: "\e92a";
 }
 .icon-agency-term:before {
-    content: '\e92b';
+  content: "\e909";
 }
 .icon-albaran:before {
-    content: '\e92c';
-}
-.icon-albaran:before {
-    content: '\e92c';
+  content: "\e92c";
 }
 .icon-anonymous:before {
-    content: '\e92d';
+  content: "\e90b";
 }
 .icon-apps:before {
-    content: '\e92e';
+  content: "\e90c";
 }
 .icon-artificial:before {
-    content: '\e92f';
+  content: "\e90d";
 }
 .icon-attach:before {
-    content: '\e930';
+  content: "\e90e";
 }
 .icon-barcode:before {
-    content: '\e932';
+  content: "\e90f";
 }
 .icon-basket:before {
-    content: '\e933';
+  content: "\e910";
 }
 .icon-basketadd:before {
-    content: '\e934';
+  content: "\e911";
 }
 .icon-bin:before {
-    content: '\e935';
+  content: "\e913";
 }
 .icon-botanical:before {
-    content: '\e936';
+  content: "\e914";
 }
 .icon-bucket:before {
-    content: '\e937';
+  content: "\e915";
 }
 .icon-buscaman:before {
-    content: '\e938';
+  content: "\e916";
 }
 .icon-buyrequest:before {
-    content: '\e939';
+  content: "\e917";
 }
-.icon-calc_volum:before {
-    content: '\e93a';
+.icon-calc_volum .path1:before {
+  content: "\e918";
+  color: rgb(0, 0, 0);
+}
+.icon-calc_volum .path2:before {
+  content: "\e919";
+  margin-left: -1em;
+  color: rgb(0, 0, 0);
+}
+.icon-calc_volum .path3:before {
+  content: "\e91c";
+  margin-left: -1em;
+  color: rgb(0, 0, 0);
+}
+.icon-calc_volum .path4:before {
+  content: "\e91d";
+  margin-left: -1em;
+  color: rgb(0, 0, 0);
+}
+.icon-calc_volum .path5:before {
+  content: "\e91e";
+  margin-left: -1em;
+  color: rgb(0, 0, 0);
+}
+.icon-calc_volum .path6:before {
+  content: "\e91f";
+  margin-left: -1em;
+  color: rgb(255, 255, 255);
 }
 .icon-calendar:before {
-    content: '\e940';
+  content: "\e920";
 }
 .icon-catalog:before {
-    content: '\e941';
+  content: "\e921";
 }
 .icon-claims:before {
-    content: '\e942';
+  content: "\e922";
 }
 .icon-client:before {
-    content: '\e943';
+  content: "\e923";
 }
 .icon-clone:before {
-    content: '\e945';
+  content: "\e924";
 }
 .icon-columnadd:before {
-    content: '\e946';
+  content: "\e925";
 }
 .icon-columndelete:before {
-    content: '\e947';
+  content: "\e926";
 }
 .icon-components:before {
-    content: '\e949';
+  content: "\e927";
 }
 .icon-consignatarios:before {
-    content: '\e94b';
+  content: "\e928";
 }
 .icon-control:before {
-    content: '\e94c';
+  content: "\e929";
 }
 .icon-credit:before {
-    content: '\e94d';
+  content: "\e92b";
 }
 .icon-defaulter:before {
-    content: '\e94e';
+  content: "\e92d";
 }
 .icon-deletedTicket:before {
-    content: '\e94f';
+  content: "\e92e";
 }
 .icon-deleteline:before {
-    content: '\e950';
+  content: "\e92f";
 }
 .icon-delivery:before {
-    content: '\e951';
+  content: "\e930";
 }
 .icon-deliveryprices:before {
-    content: '\e952';
+  content: "\e932";
 }
 .icon-details:before {
-    content: '\e954';
+  content: "\e933";
 }
 .icon-dfiscales:before {
-    content: '\e955';
+  content: "\e934";
 }
 .icon-disabled:before {
-    content: '\e965';
+  content: "\e935";
 }
 .icon-doc:before {
-    content: '\e956';
+  content: "\e936";
 }
 .icon-entry:before {
-    content: '\e958';
+  content: "\e937";
 }
 .icon-exit:before {
-    content: '\e959';
+  content: "\e938";
 }
 .icon-eye:before {
-    content: '\e95a';
+  content: "\e939";
 }
 .icon-fixedPrice:before {
-    content: '\e95b';
+  content: "\e93a";
 }
 .icon-flower:before {
-    content: '\e95c';
+  content: "\e93b";
 }
 .icon-frozen:before {
-    content: '\e95d';
+  content: "\e93c";
 }
 .icon-fruit:before {
-    content: '\e95e';
+  content: "\e93d";
 }
 .icon-funeral:before {
-    content: '\e95f';
+  content: "\e93e";
 }
 .icon-grafana:before {
-    content: '\e931';
-}
-.icon-grafana:before {
-    content: '\e931';
+  content: "\e906";
 }
 .icon-greenery:before {
-    content: '\e91e';
+  content: "\e93f";
 }
 .icon-greuge:before {
-    content: '\e960';
+  content: "\e940";
 }
 .icon-grid:before {
-    content: '\e961';
+  content: "\e941";
 }
 .icon-handmade:before {
-    content: '\e94a';
+  content: "\e942";
 }
 .icon-handmadeArtificial:before {
-    content: '\e962';
+  content: "\e943";
 }
 .icon-headercol:before {
-    content: '\e963';
+  content: "\e945";
 }
 .icon-info:before {
-    content: '\e966';
+  content: "\e946";
 }
 .icon-inventory:before {
-    content: '\e967';
+  content: "\e947";
 }
 .icon-invoice:before {
-    content: '\e969';
+  content: "\e968";
+  color: #5f5f5f;
 }
 .icon-invoice-in:before {
-    content: '\e96a';
+  content: "\e949";
 }
 .icon-invoice-in-create:before {
-    content: '\e96b';
+  content: "\e94a";
 }
 .icon-invoice-out:before {
-    content: '\e96c';
+  content: "\e94b";
 }
 .icon-isTooLittle:before {
-    content: '\e96e';
+  content: "\e94c";
 }
 .icon-item:before {
-    content: '\e96f';
+  content: "\e94d";
 }
 .icon-languaje:before {
-    content: '\e912';
+  content: "\e970";
 }
 .icon-lines:before {
-    content: '\e971';
+  content: "\e94e";
 }
 .icon-linesprepaired:before {
-    content: '\e972';
+  content: "\e94f";
 }
 .icon-link-to-corrected:before {
-    content: '\e900';
+  content: "\e931";
 }
 .icon-link-to-correcting:before {
-    content: '\e906';
+  content: "\e944";
 }
 .icon-logout:before {
-    content: '\e90a';
+  content: "\e973";
 }
 .icon-mana:before {
-    content: '\e974';
+  content: "\e950";
 }
 .icon-mandatory:before {
-    content: '\e975';
+  content: "\e951";
 }
 .icon-net:before {
-    content: '\e976';
+  content: "\e952";
 }
 .icon-newalbaran:before {
-    content: '\e977';
+  content: "\e954";
 }
 .icon-niche:before {
-    content: '\e979';
+  content: "\e955";
 }
 .icon-no036:before {
-    content: '\e97a';
+  content: "\e956";
 }
 .icon-noPayMethod:before {
-    content: '\e97b';
+  content: "\e958";
 }
 .icon-notes:before {
-    content: '\e97c';
+  content: "\e959";
 }
 .icon-noweb:before {
-    content: '\e97e';
+  content: "\e95a";
 }
 .icon-onlinepayment:before {
-    content: '\e97f';
+  content: "\e95b";
 }
 .icon-package:before {
-    content: '\e980';
+  content: "\e95c";
 }
 .icon-payment:before {
-    content: '\e982';
+  content: "\e95d";
 }
 .icon-pbx:before {
-    content: '\e983';
+  content: "\e95e";
 }
 .icon-pets:before {
-    content: '\e985';
+  content: "\e95f";
 }
 .icon-photo:before {
-    content: '\e986';
+  content: "\e960";
 }
 .icon-plant:before {
-    content: '\e987';
+  content: "\e961";
 }
 .icon-polizon:before {
-    content: '\e989';
+  content: "\e962";
 }
 .icon-preserved:before {
-    content: '\e98a';
+  content: "\e963";
 }
 .icon-recovery:before {
-    content: '\e98b';
+  content: "\e964";
 }
 .icon-regentry:before {
-    content: '\e901';
+  content: "\e965";
 }
 .icon-reserva:before {
-    content: '\e902';
+  content: "\e966";
 }
 .icon-revision:before {
-    content: '\e903';
+  content: "\e967";
 }
 .icon-risk:before {
-    content: '\e904';
+  content: "\e969";
+}
+.icon-saysimple:before {
+  content: "\e912";
 }
 .icon-services:before {
-    content: '\e905';
+  content: "\e96a";
 }
 .icon-settings:before {
-    content: '\e907';
+  content: "\e96b";
 }
 .icon-shipment:before {
-    content: '\e908';
+  content: "\e96c";
 }
 .icon-sign:before {
-    content: '\e909';
+  content: "\e90a";
 }
 .icon-sms:before {
-    content: '\e90b';
+  content: "\e96e";
 }
 .icon-solclaim:before {
-    content: '\e90c';
+  content: "\e96f";
 }
 .icon-solunion:before {
-    content: '\e90d';
+  content: "\e971";
 }
 .icon-splitline:before {
-    content: '\e90e';
+  content: "\e972";
 }
 .icon-splur:before {
-    content: '\e90f';
+  content: "\e974";
 }
 .icon-stowaway:before {
-    content: '\e910';
+  content: "\e975";
 }
 .icon-supplier:before {
-    content: '\e911';
+  content: "\e976";
 }
 .icon-supplierfalse:before {
-    content: '\e913';
+  content: "\e977";
 }
 .icon-tags:before {
-    content: '\e914';
+  content: "\e979";
 }
 .icon-tax:before {
-    content: '\e915';
+  content: "\e97a";
 }
 .icon-thermometer:before {
-    content: '\e916';
+  content: "\e97b";
 }
 .icon-ticket:before {
-    content: '\e917';
+  content: "\e97c";
 }
 .icon-ticketAdd:before {
-    content: '\e918';
+  content: "\e97e";
 }
 .icon-traceability:before {
-    content: '\e919';
+  content: "\e97f";
 }
 .icon-transaction:before {
-    content: '\e93b';
-}
-.icon-transaction:before {
-    content: '\e93b';
+  content: "\e91b";
 }
 .icon-treatments:before {
-    content: '\e91c';
+  content: "\e980";
 }
 .icon-trolley:before {
-    content: '\e91a';
+  content: "\e900";
 }
 .icon-troncales:before {
-    content: '\e91b';
+  content: "\e982";
 }
 .icon-unavailable:before {
-    content: '\e91d';
+  content: "\e983";
+}
+.icon-visible_columns:before {
+  content: "\e984";
 }
 .icon-volume:before {
-    content: '\e91f';
+  content: "\e985";
 }
 .icon-wand:before {
-    content: '\e920';
+  content: "\e986";
 }
 .icon-web:before {
-    content: '\e921';
+  content: "\e987";
 }
 .icon-wiki:before {
-    content: '\e922';
+  content: "\e989";
 }
 .icon-worker:before {
-    content: '\e923';
+  content: "\e98a";
 }
 .icon-zone:before {
-    content: '\e924';
+  content: "\e98b";
 }

src/css/quasar.variables.scss

@@ -32,7 +32,7 @@ $primary-light: lighten($primary, 35%);
 $dark-shadow-color: black;
 $layout-shadow-dark: 0 0 10px 2px #00000033, 0 0px 10px #0000003d;
 $spacing-md: 16px;
-
+$color-font-secondary: #777;
 .bg-success {
     background-color: $positive;
 }

src/filters/dashOrCurrency.js

@@ -0,0 +1,6 @@
+import toCurrency from './toCurrency';
+
+export default function (value) {
+    if (value == null || value === '') return () => '-';
+    return () => toCurrency(value);
+}

src/filters/dateRange.js

@@ -1,7 +1,7 @@
 export default function dateRange(value) {
     const minHour = new Date(value);
     minHour.setHours(0, 0, 0, 0);
-    const maxHour = new Date(value);
+    const maxHour = new Date();
     maxHour.setHours(23, 59, 59, 59);
 
     return [minHour, maxHour];

src/filters/index.js

@@ -10,6 +10,7 @@ import toLowerCamel from './toLowerCamel';
 import dashIfEmpty from './dashIfEmpty';
 import dateRange from './dateRange';
 import toHour from './toHour';
+import dashOrCurrency from './dashOrCurrency';
 
 export {
     toLowerCase,
@@ -17,6 +18,7 @@ export {
     toDate,
     toHour,
     toDateString,
+    dashOrCurrency,
     toDateHourMin,
     toDateHourMinSec,
     toRelativeDate,

src/i18n/locale/en.yml

@@ -17,6 +17,7 @@ globals:
     date: Date
     dataSaved: Data saved
     dataDeleted: Data deleted
+    delete: Delete
     search: Search
     changes: Changes
     dataCreated: Data created
@@ -24,6 +25,7 @@ globals:
     create: Create
     edit: Edit
     save: Save
+    saveAndContinue: Save and continue
     remove: Remove
     reset: Reset
     close: Close
@@ -100,11 +102,17 @@ globals:
         zonesList: Zones
         deliveryList: Delivery days
         upcomingList: Upcoming deliveries
+        role: Role
+        alias: Alias
+        aliasUsers: Users
+        subRoles: Subroles
+        inheritedRoles: Inherited Roles
     created: Created
     worker: Worker
     now: Now
     name: Name
     new: New
+    comment: Comment
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
@@ -830,6 +838,7 @@ worker:
         calendar: Calendar
         timeControl: Time control
         locker: Locker
+
     list:
         name: Name
         email: Email
@@ -861,6 +870,15 @@ worker:
         role: Role
         sipExtension: Extension
         locker: Locker
+        fiDueDate: Fecha de caducidad del DNI
+        sex: Sexo
+        seniority: Antigüedad
+        fi: DNI/NIE/NIF
+        birth: Fecha de nacimiento
+        isFreelance: Autónomo
+        isSsDiscounted: Bonificación SS
+        hasMachineryAuthorized: Autorizado para llevar maquinaria
+        isDisable: Trabajador desactivado
     notificationsManager:
         activeNotifications: Active notifications
         availableNotifications: Available notifications
@@ -1242,6 +1260,13 @@ monitor:
     pageTitles:
         monitors: Monitors
         list: List
+zone:
+    pageTitles:
+        zones: Zones
+        zonesList: Zones
+        deliveryList: Delivery days
+        upcomingList: Upcoming deliveries
+
 components:
     topbar: {}
     itemsFilterPanel:

src/i18n/locale/es.yml

@@ -17,6 +17,7 @@ globals:
     date: Fecha
     dataSaved: Datos guardados
     dataDeleted: Datos eliminados
+    delete: Eliminar
     search: Buscar
     changes: Cambios
     dataCreated: Datos creados
@@ -24,6 +25,7 @@ globals:
     create: Crear
     edit: Modificar
     save: Guardar
+    saveAndContinue: Guardar y continuar
     remove: Eliminar
     reset: Restaurar
     close: Cerrar
@@ -100,11 +102,17 @@ globals:
         zonesList: Zonas
         deliveryList: Días de entrega
         upcomingList: Próximos repartos
+        role: Role
+        alias: Alias
+        aliasUsers: Usuarios
+        subRoles: Subroles
+        inheritedRoles: Roles heredados
     created: Fecha creación
     worker: Trabajador
     now: Ahora
     name: Nombre
     new: Nuevo
+    comment: Comentario
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -1239,8 +1247,14 @@ item/itemType:
         summary: Resumen
 zone:
     pageTitles:
-        zones: Zona
-        zonesList: Zonas
+        zones: Zonas
+        list: Zonas
+        deliveryList: Días de entrega
+        upcomingList: Próximos repartos
+role:
+    pageTitles:
+        zones: Zonas
+        list: Zonas
         deliveryList: Días de entrega
         upcomingList: Próximos repartos
 monitor:

src/pages/Account/AccountAcls.vue

@@ -0,0 +1,151 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { ref } from 'vue';
+import FetchData from 'components/FetchData.vue';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import AclFilter from './Acls/AclFilter.vue';
+
+import { useVnConfirm } from 'composables/useVnConfirm';
+import { useStateStore } from 'stores/useStateStore';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+import AclFormView from './Acls/AclFormView.vue';
+
+defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+
+const { notify } = useNotify();
+const { t } = useI18n();
+const stateStore = useStateStore();
+const { openConfirmationModal } = useVnConfirm();
+
+const paginateRef = ref();
+const formDialog = ref(false);
+const rolesOptions = ref([]);
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'search':
+            return { model: { like: `%${value}%` } };
+        default:
+            return { [param]: value };
+    }
+};
+
+const deleteAcl = async (id) => {
+    try {
+        await axios.delete(`ACLs/${id}`);
+        paginateRef.value.fetch();
+        notify('ACL removed', 'positive');
+    } catch (error) {
+        console.error('Error deleting Acl: ', error);
+    }
+};
+function showFormDialog(data) {
+    formDialog.value = {
+        show: true,
+        formInitialData: { ...data },
+    };
+}
+</script>
+
+<template>
+    <FetchData
+        url="VnRoles"
+        :filter="{ fields: ['name'], order: 'name ASC' }"
+        @on-fetch="(data) => (rolesOptions = data)"
+        auto-load
+    />
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="AccountAcls"
+                url="ACLs"
+                :expr-builder="exprBuilder"
+                :label="t('acls.search')"
+                :info="t('acls.searchInfo')"
+            />
+        </Teleport>
+    </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <AclFilter data-key="AccountAcls" />
+        </QScrollArea>
+    </QDrawer>
+
+    <QPage class="flex justify-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                ref="paginateRef"
+                data-key="AccountAcls"
+                url="ACLs"
+                :expr-builder="exprBuilder"
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        v-for="row of rows"
+                        :id="row.id"
+                        :key="row.id"
+                        :title="`${row.model}.${row.property}`"
+                        @click="showFormDialog(row)"
+                    >
+                        <template #list-items>
+                            <VnLv :label="t('acls.role')" :value="row.principalId" />
+                            <VnLv :label="t('acls.accessType')" :value="row.accessType" />
+                            <VnLv
+                                :label="t('acls.permissions')"
+                                :value="row.permission"
+                            />
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('globals.delete')"
+                                @click.stop="
+                                    openConfirmationModal(
+                                        t('ACL will be removed'),
+                                        t('Are you sure you want to continue?'),
+                                        () => deleteAcl(row.id)
+                                    )
+                                "
+                                color="primary"
+                                style="margin-top: 15px"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+        <QDialog
+            v-model="formDialog.show"
+            transition-show="scale"
+            transition-hide="scale"
+        >
+            <AclFormView
+                :form-initial-data="formDialog.formInitialData"
+                @on-data-change="paginateRef.fetch()"
+                :roles-options="rolesOptions"
+            />
+        </QDialog>
+        <QPageSticky position="bottom-right" :offset="[18, 18]">
+            <QBtn fab icon="add" color="primary" @click="showFormDialog()">
+                <QTooltip class="text-no-wrap">{{ t('New ACL') }}</QTooltip>
+            </QBtn>
+        </QPageSticky>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    New ACL: Nuevo ACL
+    ACL removed: ACL eliminado
+    ACL will be removed: El ACL será eliminado
+    Are you sure you want to continue?: ¿Seguro que quieres continuar?
+</i18n>

src/pages/Account/AccountAliasList.vue

@@ -0,0 +1,105 @@
+<script setup>
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { ref } from 'vue';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import AliasSummary from './Alias/Card/AliasSummary.vue';
+import AliasCreateForm from './Alias/AliasCreateForm.vue';
+
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useStateStore } from 'stores/useStateStore';
+
+defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+const router = useRouter();
+const stateStore = useStateStore();
+const aliasCreateDialogRef = ref(null);
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value)
+                ? { id: value }
+                : { alias: { like: `%${value}%` } };
+    }
+};
+
+const navigate = (id) => router.push({ name: 'AliasSummary', params: { id } });
+
+const openCreateModal = () => aliasCreateDialogRef.value.show();
+</script>
+
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="AccountAliasList"
+                url="MailAliases"
+                :expr-builder="exprBuilder"
+                :label="t('mailAlias.search')"
+                :info="t('mailAlias.searchInfo')"
+            />
+        </Teleport>
+    </template>
+    <QPage class="flex justify-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                ref="paginateRef"
+                data-key="AccountAliasList"
+                url="MailAliases"
+                :expr-builder="exprBuilder"
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        v-for="row of rows"
+                        :id="row.id"
+                        :key="row.id"
+                        :title="row.alias"
+                        @click="navigate(row.id)"
+                    >
+                        <template #list-items>
+                            <VnLv :label="t('mailAlias.alias')" :value="row.alias">
+                            </VnLv>
+                            <VnLv
+                                :label="t('mailAlias.description')"
+                                :value="row.description"
+                            >
+                            </VnLv>
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('components.smartCard.openSummary')"
+                                @click.stop="viewSummary(row.id, AliasSummary)"
+                                color="primary"
+                                style="margin-top: 15px"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+        <QDialog
+            ref="aliasCreateDialogRef"
+            transition-show="scale"
+            transition-hide="scale"
+        >
+            <AliasCreateForm />
+        </QDialog>
+        <QPageSticky position="bottom-right" :offset="[18, 18]">
+            <QBtn fab icon="add" color="primary" @click="openCreateModal()">
+                <QTooltip class="text-no-wrap">{{ t('mailAlias.newAlias') }}</QTooltip>
+            </QBtn>
+        </QPageSticky>
+    </QPage>
+</template>

src/pages/Account/AccountList.vue

@@ -0,0 +1 @@
+<template>Account list</template>

src/pages/Account/AccountMain.vue

@@ -0,0 +1,17 @@
+<script setup>
+import { useStateStore } from 'stores/useStateStore';
+import LeftMenu from 'components/LeftMenu.vue';
+
+const stateStore = useStateStore();
+</script>
+
+<template>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit text-grey-8">
+            <LeftMenu />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <RouterView></RouterView>
+    </QPageContainer>
+</template>

src/pages/Account/Acls/AclFilter.vue

@@ -0,0 +1,128 @@
+<script setup>
+import { ref, onBeforeMount } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import { useValidator } from 'src/composables/useValidator';
+
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const { t } = useI18n();
+const validationsStore = useValidator();
+const { models } = validationsStore;
+
+const validations = ref([]);
+const accessTypes = [{ name: '*' }, { name: 'READ' }, { name: 'WRITE' }];
+const permissions = [{ name: 'ALLOW' }, { name: 'DENY' }];
+const rolesOptions = ref([]);
+
+onBeforeMount(() => {
+    for (let model in models) validations.value.push({ name: model });
+});
+</script>
+
+<template>
+    <FetchData
+        url="VnRoles"
+        :filter="{ fields: ['name'], order: 'name ASC' }"
+        @on-fetch="(data) => (rolesOptions = data)"
+        auto-load
+    />
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :hidden-tags="['search']"
+    >
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`acls.aclFilter.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params, searchFn }">
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnSelect
+                        :label="t('acls.aclFilter.principalId')"
+                        v-model="params.principalId"
+                        @update:model-value="searchFn()"
+                        :options="rolesOptions"
+                        option-value="name"
+                        option-label="name"
+                        use-input
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnSelect
+                        :label="t('acls.aclFilter.model')"
+                        v-model="params.model"
+                        @update:model-value="searchFn()"
+                        :options="validations"
+                        option-value="name"
+                        option-label="name"
+                        use-input
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('acls.aclFilter.property')"
+                        v-model="params.property"
+                        lazy-rules
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnSelect
+                        :label="t('acls.aclFilter.accessType')"
+                        v-model="params.accessType"
+                        @update:model-value="searchFn()"
+                        :options="accessTypes"
+                        option-value="name"
+                        option-label="name"
+                        use-input
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnSelect
+                        :label="t('acls.aclFilter.permission')"
+                        v-model="params.permission"
+                        @update:model-value="searchFn()"
+                        :options="permissions"
+                        option-value="name"
+                        option-label="name"
+                        use-input
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>

src/pages/Account/Acls/AclFormView.vue

@@ -0,0 +1,126 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { ref, onBeforeMount, onMounted } from 'vue';
+
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+
+import { useValidator } from 'src/composables/useValidator';
+import { useArrayData } from 'src/composables/useArrayData';
+
+const emit = defineEmits(['onDataChange']);
+const { t } = useI18n();
+const validationsStore = useValidator();
+const { models } = validationsStore;
+const arrayData = useArrayData('aclCreate');
+const { store } = arrayData;
+
+const accessTypes = [{ name: '*' }, { name: 'READ' }, { name: 'WRITE' }];
+const permissions = [{ name: 'ALLOW' }, { name: 'DENY' }];
+const validations = ref([]);
+
+const url = ref();
+const urlCreate = ref('ACLs');
+const urlUpdate = ref();
+const action = ref('New');
+
+const $props = defineProps({
+    formInitialData: {
+        type: Object,
+        default: () => {
+            return {
+                property: '*',
+                principalType: 'ROLE',
+                accessType: 'READ',
+                permission: 'ALLOW',
+            };
+        },
+    },
+    rolesOptions: {
+        type: Array,
+        required: true,
+    },
+});
+
+onBeforeMount(() => {
+    for (let model in models) validations.value.push({ name: model });
+});
+
+onMounted(() => {
+    store.data = $props.formInitialData;
+    if ($props.formInitialData.id) {
+        urlCreate.value = null;
+        urlUpdate.value = 'ACLs';
+        action.value = 'Edit';
+    }
+});
+</script>
+
+<template>
+    <FormModelPopup
+        v-if="urlCreate || urlUpdate"
+        :title="t(`${action} ACL`)"
+        :url="url"
+        :url-update="urlUpdate"
+        :url-create="urlCreate"
+        :form-initial-data="formInitialData"
+        auto-load
+        model="aclCreate"
+        @on-data-saved="emit('onDataChange')"
+        @on-data-canceled="emit('onDataChange')"
+    >
+        <template #form-inputs="{ data }">
+            <div class="column q-gutter-y-md">
+                <VnSelect
+                    :label="t('acls.aclFilter.principalId')"
+                    v-model="data.principalId"
+                    :options="$props.rolesOptions"
+                    option-value="name"
+                    option-label="name"
+                    use-input
+                    rounded
+                />
+                <VnSelect
+                    :label="t('acls.aclFilter.model')"
+                    v-model="data.model"
+                    :options="validations"
+                    option-value="name"
+                    option-label="name"
+                    use-input
+                    rounded
+                />
+
+                <VnInput
+                    :label="t('acls.aclFilter.property')"
+                    v-model="data.property"
+                    lazy-rules
+                >
+                    <template #append>
+                        <QIcon name="info" class="cursor-pointer">
+                            <QTooltip>{{ t('acls.tooltip') }}</QTooltip>
+                        </QIcon>
+                    </template></VnInput
+                >
+                <VnSelect
+                    :label="t('acls.aclFilter.accessType')"
+                    v-model="data.accessType"
+                    :options="accessTypes"
+                    option-value="name"
+                    option-label="name"
+                    use-input
+                    rounded
+                />
+                <VnSelect
+                    :label="t('acls.aclFilter.permission')"
+                    v-model="data.permission"
+                    :options="permissions"
+                    option-value="name"
+                    option-label="name"
+                    use-input
+                    rounded
+                />
+            </div>
+        </template>
+    </FormModelPopup>
+</template>

src/pages/Account/Alias/AliasCreateForm.vue

@@ -0,0 +1,57 @@
+<script setup>
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FormModelPopup from 'components/FormModelPopup.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import { useArrayData } from 'src/composables/useArrayData';
+
+const router = useRouter();
+const { t } = useI18n();
+const arrayData = useArrayData('AliasCreate');
+const { store } = arrayData;
+
+const defaultInitialData = {
+    alias: null,
+    description: null,
+};
+
+const onDataSaved = ({ id }) => {
+    router.push({ name: 'AliasBasicData', params: { id } });
+    store.data = null;
+};
+</script>
+
+<template>
+    <FormModelPopup
+        :title="t('Create alias')"
+        ref="formModelPopupRef"
+        url-create="MailAliases"
+        model="AliasCreate"
+        :form-initial-data="defaultInitialData"
+        @on-data-saved="onDataSaved"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.description"
+                        :label="t('mailAlias.description')"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+    es:
+        Create alias: Crear alias
+</i18n>

src/pages/Account/Alias/Card/AliasBasicData.vue

@@ -0,0 +1,22 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FormModel from 'components/FormModel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const route = useRoute();
+const { t } = useI18n();
+</script>
+
+<template>
+    <FormModel model="Alias">
+        <template #form="{ data }">
+            <div class="column q-gutter-y-md">
+                <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
+                <VnInput v-model="data.description" :label="t('mailAlias.description')" />
+                <QCheckbox :label="t('mailAlias.isPublic')" v-model="data.isPublic" />
+            </div>
+        </template>
+    </FormModel>
+</template>

src/pages/Account/Alias/Card/AliasCard.vue

@@ -0,0 +1,33 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import { computed } from 'vue';
+
+import VnCard from 'components/common/VnCard.vue';
+import AliasDescriptor from './AliasDescriptor.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const routeName = computed(() => route.name);
+const customRouteRedirectName = computed(() => {
+    return routeName.value;
+});
+const searchBarDataKeys = {
+    AliasBasicData: 'AliasBasicData',
+    AliasUsers: 'AliasUsers',
+};
+</script>
+
+<template>
+    <VnCard
+        data-key="Alias"
+        base-url="MailAliases"
+        :descriptor="AliasDescriptor"
+        :search-data-key="searchBarDataKeys[routeName]"
+        :search-custom-route-redirect="customRouteRedirectName"
+        :search-redirect="!!customRouteRedirectName"
+        :searchbar-label="t('mailAlias.search')"
+        :searchbar-info="t('mailAlias.searchInfo')"
+    />
+</template>

src/pages/Account/Alias/Card/AliasDescriptor.vue

@@ -0,0 +1,88 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
+
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+import useCardDescription from 'src/composables/useCardDescription';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+const { t } = useI18n();
+const route = useRoute();
+const quasar = useQuasar();
+const router = useRouter();
+const { notify } = useNotify();
+
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.alias, entity.id));
+
+const removeAlias = () => {
+    quasar
+        .dialog({
+            title: t('Alias will be removed'),
+            message: t('Are you sure you want to continue?'),
+            ok: {
+                push: true,
+                color: 'primary',
+            },
+            cancel: true,
+        })
+        .onOk(async () => {
+            try {
+                await axios.delete(`MailAliases/${entityId.value}`);
+                notify(t('Alias removed'), 'positive');
+                router.push({ name: 'AccountAlias' });
+            } catch (err) {
+                console.error('Error removing alias');
+            }
+        });
+};
+</script>
+
+<template>
+    <CardDescriptor
+        ref="descriptor"
+        :url="`MailAliases/${entityId}`"
+        module="Alias"
+        @on-fetch="setData"
+        data-key="aliasData"
+        :title="data.title"
+        :subtitle="data.subtitle"
+    >
+        <template #menu>
+            <QItem v-ripple clickable @click="removeAlias()">
+                <QItemSection>{{ t('Delete') }}</QItemSection>
+            </QItem>
+        </template>
+        <template #body="{ entity }">
+            <VnLv :label="t('mailAlias.description')" :value="entity.description" />
+        </template>
+    </CardDescriptor>
+</template>
+
+<i18n>
+    en:
+        accountRate: Claming rate
+    es:
+        accountRate: Ratio de reclamación
+        Delete: Eliminar
+        Alias will be removed: El alias será eliminado
+        Are you sure you want to continue?: ¿Seguro que quieres continuar?
+        Alias removed: Alias eliminado
+</i18n>

src/pages/Account/Alias/Card/AliasSummary.vue

@@ -0,0 +1,49 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+
+import { useArrayData } from 'src/composables/useArrayData';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+
+const { store } = useArrayData('Alias');
+const alias = ref(store.data);
+const entityId = computed(() => $props.id || route.params.id);
+</script>
+
+<template>
+    <CardSummary
+        ref="summary"
+        :url="`MailAliases/${entityId}`"
+        @on-fetch="(data) => (alias = data)"
+    >
+        <template #header> {{ alias.id }} - {{ alias.alias }} </template>
+        <template #body>
+            <QCard class="vn-one">
+                <QCardSection class="q-pa-none">
+                    <router-link
+                        :to="{ name: 'AliasBasicData', params: { id: entityId } }"
+                        class="header header-link"
+                    >
+                        {{ t('globals.summary.basicData') }}
+                        <QIcon name="open_in_new" />
+                    </router-link>
+                </QCardSection>
+                <VnLv :label="t('mailAlias.id')" :value="alias.id" />
+                <VnLv :label="t('mailAlias.description')" :value="alias.description" />
+            </QCard>
+        </template>
+    </CardSummary>
+</template>

src/pages/Account/Alias/Card/AliasUsers.vue

@@ -0,0 +1,122 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import { computed, ref, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+
+import { useVnConfirm } from 'composables/useVnConfirm';
+import { useArrayData } from 'composables/useArrayData';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const { t } = useI18n();
+const { notify } = useNotify();
+const route = useRoute();
+const { openConfirmationModal } = useVnConfirm();
+
+const paginateRef = ref(null);
+
+const arrayData = useArrayData('AliasUsers');
+const { store } = arrayData;
+
+const data = computed(() => {
+    const dataCopy = JSON.parse(JSON.stringify(store.data));
+    return dataCopy.sort((a, b) => a.user?.name.localeCompare(b.user?.name));
+});
+
+const filter = {
+    include: {
+        relation: 'user',
+        scope: {
+            fields: ['id', 'name'],
+        },
+    },
+};
+
+const urlPath = computed(() => `MailAliases/${route.params.id}/accounts`);
+
+const columns = computed(() => [
+    {
+        name: 'alias',
+    },
+    {
+        name: 'action',
+    },
+]);
+
+const deleteAlias = async (row) => {
+    try {
+        await axios.delete(`${urlPath.value}/${row.id}`);
+        notify(t('User removed'), 'positive');
+        fetchAliases();
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+watch(
+    () => route.params.id,
+    () => {
+        store.url = urlPath.value;
+        store.filter = filter;
+        fetchAliases();
+    }
+);
+
+const fetchAliases = () => paginateRef.value.fetch();
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <div class="full-width" style="max-width: 400px">
+            <VnPaginate
+                ref="paginateRef"
+                data-key="AliasUsers"
+                :filter="filter"
+                :url="urlPath"
+                :limit="0"
+                auto-load
+            >
+                <template #body>
+                    <QTable :rows="data" :columns="columns" hide-header>
+                        <template #body="{ row }">
+                            <QTr>
+                                <QTd>
+                                    <span>{{ row.user?.name }}</span>
+                                </QTd>
+                                <QTd style="width: 50px !important">
+                                    <QIcon
+                                        name="delete"
+                                        size="sm"
+                                        class="cursor-pointer"
+                                        color="primary"
+                                        @click="
+                                            openConfirmationModal(
+                                                t('User will be removed from alias'),
+                                                t('Are you sure you want to continue?'),
+                                                () => deleteAlias(row)
+                                            )
+                                        "
+                                    >
+                                        <QTooltip>
+                                            {{ t('Delete') }}
+                                        </QTooltip>
+                                    </QIcon>
+                                </QTd>
+                            </QTr>
+                        </template>
+                    </QTable>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    User will be removed from alias: El usuario será borrado del alias
+    Are you sure you want to continue?: ¿Seguro que quieres continuar?
+    User removed: Usuario borrado
+    Delete: Eliminar
+</i18n>

src/pages/Account/Role/AccountRoles.vue

@@ -0,0 +1,131 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+import { ref } from 'vue';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import RoleSummary from './Card/RoleSummary.vue';
+import RoleForm from './Card/RoleForm.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import AccountRolesFilter from './AccountRolesFilter.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+
+const stateStore = useStateStore();
+const router = useRouter();
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+
+const roleCreateDialogRef = ref(null);
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value)
+                ? { id: value }
+                : {
+                      or: [
+                          { name: { like: `%${value}%` } },
+                          { nickname: { like: `%${value}%` } },
+                      ],
+                  };
+        case 'name':
+        case 'description':
+            return { [param]: { like: `%${value}%` } };
+    }
+};
+
+const openCreateModal = () => roleCreateDialogRef.value.show();
+
+const getApiUrl = () => new URL(window.location).origin;
+
+const navigate = (event, id) => {
+    if (event.ctrlKey || event.metaKey)
+        return window.open(`${getApiUrl()}/#/account/role/${id}/summary`);
+    router.push({ name: 'RoleSummary', params: { id } });
+};
+</script>
+
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="RolesList"
+                url="VnRoles"
+                :label="t('role.searchRoles')"
+                :info="t('role.searchInfo')"
+            />
+        </Teleport>
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <AccountRolesFilter data-key="RolesList" :expr-builder="exprBuilder" />
+        </QScrollArea>
+    </QDrawer>
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate data-key="RolesList" url="VnRoles">
+                <template #body="{ rows }">
+                    <CardList
+                        :id="row.id"
+                        :key="row.id"
+                        :title="row.name"
+                        @click="navigate($event, row.id)"
+                        v-for="row of rows"
+                    >
+                        <template #list-items>
+                            <div style="flex-direction: column; width: 100%">
+                                <VnLv :label="t('role.card.name')" :value="row.name">
+                                </VnLv>
+                                <VnLv
+                                    :label="t('role.card.description')"
+                                    :value="row.description"
+                                >
+                                </VnLv>
+                            </div>
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('components.smartCard.openSummary')"
+                                @click.stop="viewSummary(row.id, RoleSummary)"
+                                color="primary"
+                                style="margin-top: 15px"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+        <QDialog
+            ref="roleCreateDialogRef"
+            transition-show="scale"
+            transition-hide="scale"
+        >
+            <RoleForm />
+        </QDialog>
+        <QPageSticky :offset="[20, 20]">
+            <QBtn fab icon="add" color="primary" @click="openCreateModal()" />
+            <QTooltip>
+                {{ t('role.newRole') }}
+            </QTooltip>
+        </QPageSticky>
+    </QPage>
+</template>

src/pages/Account/Role/AccountRolesFilter.vue

@@ -0,0 +1,52 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+</script>
+
+<template>
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :hidden-tags="['search']"
+        :redirect="false"
+    >
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`role.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params }">
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('role.name')"
+                        v-model="params.name"
+                        lazy-rules
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('role.description')"
+                        v-model="params.description"
+                        lazy-rules
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>

src/pages/Account/Role/Card/InheritedRoles.vue

@@ -0,0 +1,96 @@
+<script setup>
+import { useRoute, useRouter } from 'vue-router';
+import { computed, ref, watch } from 'vue';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+
+import { useArrayData } from 'composables/useArrayData';
+
+const route = useRoute();
+const router = useRouter();
+
+const paginateRef = ref(null);
+
+const arrayData = useArrayData('InheritedRoles');
+const store = arrayData.store;
+
+const data = computed(() => {
+    const dataCopy = store.data;
+    return dataCopy.sort((a, b) => a.inherits?.name.localeCompare(b.inherits?.name));
+});
+
+const filter = computed(() => ({
+    where: { role: route.params.id },
+    include: {
+        relation: 'inherits',
+        scope: {
+            fields: ['id', 'name', 'description'],
+        },
+    },
+}));
+
+const urlPath = computed(() => 'RoleRoles');
+
+const columns = computed(() => [
+    {
+        name: 'name',
+    },
+]);
+
+watch(
+    () => route.params.id,
+    () => {
+        store.url = urlPath.value;
+        store.filter = filter.value;
+        fetchSubRoles();
+    }
+);
+
+const fetchSubRoles = () => paginateRef.value.fetch();
+
+const redirectToRoleSummary = (id) =>
+    router.push({ name: 'RoleSummary', params: { id } });
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <div class="full-width" style="max-width: 400px">
+            <VnPaginate
+                ref="paginateRef"
+                data-key="InheritedRoles"
+                :filter="filter"
+                :url="urlPath"
+                :limit="0"
+                auto-load
+            >
+                <template #body>
+                    <QTable :rows="data" :columns="columns" hide-header>
+                        <template #body="{ row }">
+                            <QTr
+                                @click="redirectToRoleSummary(row.inherits?.id)"
+                                class="cursor-pointer"
+                            >
+                                <QTd>
+                                    <div class="column">
+                                        <span>{{ row.inherits?.name }}</span>
+                                        <span class="color-vn-label">{{
+                                            row.inherits?.description
+                                        }}</span>
+                                    </div>
+                                </QTd>
+                            </QTr>
+                        </template>
+                    </QTable>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Role removed. Changes will take a while to fully propagate.: Rol eliminado. Los cambios tardaran un tiempo en propagarse completamente.
+    Role added! Changes will take a while to fully propagate.: ¡Rol añadido! Los cambios tardaran un tiempo en propagarse completamente.
+    El rol va a ser eliminado: Role will be removed
+    ¿Seguro que quieres continuar?: Are you sure you want to continue?
+</i18n>

src/pages/Account/Role/Card/RoleBasicData.vue

@@ -0,0 +1,33 @@
+<script setup>
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+const route = useRoute();
+const { t } = useI18n();
+</script>
+<template>
+    <FormModel :url="`VnRoles/${route.params.id}`" model="VnRole" auto-load>
+        <template #form="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput v-model="data.name" :label="t('role.card.name')" />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.description"
+                        :label="t('role.card.description')"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QCheckbox :label="t('mailAlias.isPublic')" v-model="data.isPublic" />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>

src/pages/Account/Role/Card/RoleCard.vue

@@ -0,0 +1,32 @@
+<script setup>
+import { computed } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import VnCard from 'components/common/VnCard.vue';
+import RoleDescriptor from './RoleDescriptor.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const routeName = computed(() => route.name);
+const customRouteRedirectName = computed(() => routeName.value);
+const searchBarDataKeys = {
+    RoleSummary: 'RoleSummary',
+    RoleBasicData: 'RoleBasicData',
+    SubRoles: 'SubRoles',
+    InheritedRoles: 'InheritedRoles',
+    RoleLog: 'RoleLog',
+};
+</script>
+<template>
+    <VnCard
+        data-key="Role"
+        :descriptor="RoleDescriptor"
+        :search-data-key="searchBarDataKeys[routeName]"
+        :search-custom-route-redirect="customRouteRedirectName"
+        :search-redirect="!!customRouteRedirectName"
+        :searchbar-label="t('role.searchRoles')"
+        :searchbar-info="t('role.searchInfo')"
+    />
+</template>

src/pages/Account/Role/Card/RoleDescriptor.vue

@@ -0,0 +1,92 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
+import { useQuasar } from 'quasar';
+
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+const route = useRoute();
+
+const quasar = useQuasar();
+const router = useRouter();
+
+const { notify } = useNotify();
+const { t } = useI18n();
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.name, entity.id));
+const filter = {
+    where: { id: entityId },
+};
+const removeRole = () => {
+    quasar
+        .dialog({
+            title: 'Are you sure you want to delete it?',
+            message: 'Delete department',
+            ok: {
+                push: true,
+                color: 'primary',
+            },
+            cancel: true,
+        })
+        .onOk(async () => {
+            try {
+                await axios.post(
+                    `/Departments/${entityId.value}/removeChild`,
+                    entityId.value
+                );
+                router.push({ name: 'WorkerDepartment' });
+                notify('department.departmentRemoved', 'positive');
+            } catch (err) {
+                console.error('Error removing department');
+            }
+        });
+};
+</script>
+
+<template>
+    <CardDescriptor
+        ref="descriptor"
+        :url="`VnRoles`"
+        :filter="filter"
+        module="Role"
+        @on-fetch="setData"
+        data-key="accountData"
+        :title="data.title"
+        :subtitle="data.subtitle"
+    >
+        <template #menu>
+            <QItem v-ripple clickable @click="removeRole()">
+                <QItemSection>{{ t('Delete') }}</QItemSection>
+            </QItem>
+        </template>
+        <template #body="{ entity }">
+            <VnLv :label="t('role.card.description')" :value="entity.description" />
+        </template>
+    </CardDescriptor>
+</template>
+<style scoped>
+.q-item__label {
+    margin-top: 0;
+}
+</style>
+<i18n>
+    en:
+        accountRate: Claming rate
+    es:
+        accountRate: Ratio de reclamación
+</i18n>

src/pages/Account/Role/Card/RoleForm.vue

@@ -0,0 +1,44 @@
+<script setup>
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FormModelPopup from 'components/FormModelPopup.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const router = useRouter();
+const { t } = useI18n();
+</script>
+<template>
+    <FormModelPopup
+        :title="t('Create role')"
+        ref="formModelPopupRef"
+        url-create="VnRoles"
+        model="VnRole"
+        :form-initial-data="{}"
+        @on-data-saved="
+            (_, { id }) => router.push({ name: 'RoleBasicData', params: { id } })
+        "
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput v-model="data.name" :label="t('role.card.name')" />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput
+                        v-model="data.description"
+                        :label="t('role.card.description')"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+    es:
+        Create role: Crear role
+</i18n>

src/pages/Account/Role/Card/RoleLog.vue

@@ -0,0 +1,6 @@
+<script setup>
+import VnLog from 'src/components/common/VnLog.vue';
+</script>
+<template>
+    <VnLog model="Role" url="/RoleLogs"></VnLog>
+</template>

src/pages/Account/Role/Card/RoleSummary.vue

@@ -0,0 +1,52 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import { useArrayData } from 'src/composables/useArrayData';
+
+const route = useRoute();
+const { t } = useI18n();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+
+const { store } = useArrayData('Role');
+const role = ref(store.data);
+const entityId = computed(() => $props.id || route.params.id);
+const filter = {
+    where: { id: entityId },
+};
+</script>
+
+<template>
+    <CardSummary
+        ref="summary"
+        :url="`VnRoles`"
+        :filter="filter"
+        @on-fetch="(data) => (role = data)"
+    >
+        <template #header> {{ role.id }} - {{ role.name }} </template>
+        <template #body>
+            <QCard class="vn-one">
+                <QCardSection class="q-pa-none">
+                    <a
+                        class="header header-link"
+                        :href="`#/VnUser/${entityId}/basic-data`"
+                    >
+                        {{ t('globals.pageTitles.basicData') }}
+                        <QIcon name="open_in_new" />
+                    </a>
+                </QCardSection>
+                <VnLv :label="t('role.card.id')" :value="role.id" />
+                <VnLv :label="t('role.card.name')" :value="role.name" />
+                <VnLv :label="t('role.card.description')" :value="role.description" />
+            </QCard>
+        </template>
+    </CardSummary>
+</template>

src/pages/Account/Role/Card/SubRoleCreateForm.vue

@@ -0,0 +1,51 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import FormPopup from 'components/FormPopup.vue';
+
+const emit = defineEmits(['onSubmitCreateSubrole']);
+
+const { t } = useI18n();
+const route = useRoute();
+
+const subRoleFormData = reactive({
+    inheritsFrom: null,
+    role: route.params.id,
+});
+
+const rolesOptions = ref([]);
+</script>
+
+<template>
+    <FetchData
+        url="VnRoles"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        auto-load
+        @on-fetch="(data) => (rolesOptions = data)"
+    />
+    <FormPopup
+        model="ZoneWarehouse"
+        @on-submit="emit('onSubmitCreateSubrole', subRoleFormData)"
+    >
+        <template #form-inputs>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelect
+                        :label="t('account.card.role')"
+                        v-model="subRoleFormData.inheritsFrom"
+                        :options="rolesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        :required="true"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormPopup>
+</template>

src/pages/Account/Role/Card/SubRoles.vue

@@ -0,0 +1,162 @@
+<script setup>
+import { useRoute, useRouter } from 'vue-router';
+import { computed, ref, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import SubRoleCreateForm from './SubRoleCreateForm.vue';
+
+import { useVnConfirm } from 'composables/useVnConfirm';
+import { useArrayData } from 'composables/useArrayData';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const { t } = useI18n();
+const route = useRoute();
+const router = useRouter();
+const { openConfirmationModal } = useVnConfirm();
+const { notify } = useNotify();
+
+const paginateRef = ref(null);
+const createSubRoleDialogRef = ref(null);
+
+const arrayData = useArrayData('SubRoles');
+const store = arrayData.store;
+
+const data = computed(() => {
+    const dataCopy = store.data;
+    return dataCopy.sort((a, b) => a.inherits?.name.localeCompare(b.inherits?.name));
+});
+
+const filter = computed(() => ({
+    where: { role: route.params.id },
+    include: {
+        relation: 'inherits',
+        scope: {
+            fields: ['id', 'name', 'description'],
+        },
+    },
+}));
+
+const urlPath = computed(() => `RoleInherits`);
+
+const columns = computed(() => [
+    {
+        name: 'name',
+    },
+    {
+        name: 'action',
+    },
+]);
+
+const deleteSubRole = async (row) => {
+    try {
+        await axios.delete(`${urlPath.value}/${row.id}`);
+        fetchSubRoles();
+        notify(
+            t('Role removed. Changes will take a while to fully propagate.'),
+            'positive'
+        );
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const createSubRole = async (subRoleFormData) => {
+    try {
+        await axios.post(urlPath.value, subRoleFormData);
+        notify(
+            t('Role added! Changes will take a while to fully propagate.'),
+            'positive'
+        );
+        fetchSubRoles();
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+watch(
+    () => route.params.id,
+    () => {
+        store.url = urlPath.value;
+        store.filter = filter.value;
+        fetchSubRoles();
+    }
+);
+
+const fetchSubRoles = () => paginateRef.value.fetch();
+
+const openCreateSubRoleForm = () => createSubRoleDialogRef.value.show();
+
+const redirectToRoleSummary = (id) =>
+    router.push({ name: 'RoleSummary', params: { id } });
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <div class="full-width" style="max-width: 400px">
+            <VnPaginate
+                ref="paginateRef"
+                data-key="SubRoles"
+                :filter="filter"
+                :url="urlPath"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <QTable :rows="data" :columns="columns" hide-header>
+                        <template #body="{ row, rowIndex }">
+                            <QTr
+                                @click="redirectToRoleSummary(row.inherits?.id)"
+                                class="cursor-pointer"
+                            >
+                                <QTd>
+                                    <div class="column">
+                                        <span>{{ row.inherits?.name }}</span>
+                                        <span class="color-vn-label">{{
+                                            row.inherits?.description
+                                        }}</span>
+                                    </div>
+                                </QTd>
+                                <QTd style="width: 50px !important">
+                                    <QIcon
+                                        name="delete"
+                                        size="sm"
+                                        class="cursor-pointer"
+                                        color="primary"
+                                        @click.stop.prevent="
+                                            openConfirmationModal(
+                                                t('El rol va a ser eliminado'),
+                                                t('¿Seguro que quieres continuar?'),
+                                                () => deleteSubRole(row, rows, rowIndex)
+                                            )
+                                        "
+                                    >
+                                        <QTooltip>
+                                            {{ t('globals.delete') }}
+                                        </QTooltip>
+                                    </QIcon>
+                                </QTd>
+                            </QTr>
+                        </template>
+                    </QTable>
+                </template>
+            </VnPaginate>
+        </div>
+        <QDialog ref="createSubRoleDialogRef">
+            <SubRoleCreateForm @on-submit-create-subrole="createSubRole" />
+        </QDialog>
+        <QPageSticky position="bottom-right" :offset="[18, 18]">
+            <QBtn fab icon="add" color="primary" @click="openCreateSubRoleForm()">
+                <QTooltip>{{ t('warehouses.add') }}</QTooltip>
+            </QBtn>
+        </QPageSticky>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Role removed. Changes will take a while to fully propagate.: Rol eliminado. Los cambios tardaran un tiempo en propagarse completamente.
+    Role added! Changes will take a while to fully propagate.: ¡Rol añadido! Los cambios tardaran un tiempo en propagarse completamente.
+    El rol va a ser eliminado: Role will be removed
+    ¿Seguro que quieres continuar?: Are you sure you want to continue?
+</i18n>

src/pages/Account/locale/en.yml

@@ -0,0 +1,93 @@
+account:
+    pageTitles:
+        users: Users
+        list: Users
+        roles: Roles
+        alias: Mail aliasses
+        accounts: Accounts
+        ldap: LDAP
+        samba: Samba
+        acls: ACLs
+        connections: Connections
+        inheritedRoles: Inherited Roles
+        subRoles: Sub Roles
+        newRole: New role
+        privileges: Privileges
+        mailAlias: Mail Alias
+        mailForwarding: Mail Forwarding
+        aliasUsers: Users
+    card:
+        name: Name
+        nickname: User
+        role: Rol
+        email: Email
+        alias: Alias
+        lang: Language
+        actions:
+            setPassword: Set password
+            disableAccount:
+                name: Disable account
+                title: La cuenta será deshabilitada
+                subtitle: ¿Seguro que quieres continuar?
+            disableUser: Disable user
+            sync: Sync
+            delete: Delete
+    search: Search user
+role:
+    pageTitles:
+        inheritedRoles: Inherited Roles
+        subRoles: Sub Roles
+    card:
+        description: Description
+        id: Id
+        name: Name
+    newRole: New role
+    searchRoles: Search role
+    searchInfo: Search role by id or name
+    name: Name
+    description: Description
+    id: Id
+mailAlias:
+    pageTitles:
+        aliasUsers: Users
+    search: Search mail alias
+    searchInfo: Search alias by id or name
+    alias: Alias
+    description: Description
+    id: Id
+    newAlias: New alias
+    name: Name
+    isPublic: Public
+ldap:
+    enableSync: Enable synchronization
+    server: Server
+    rdn: RDN
+    userDN: User DN
+    filter: Filter
+    groupDN: Group DN
+    testConnection: Test connection
+    success: LDAP connection established!
+samba:
+    enableSync: Enable synchronization
+    domainController: Domain controller
+    domainAD: AD domain
+    userAD: AD user
+    groupDN: Group DN
+    passwordAD: AD password
+    domainPart: User DN (without domain part)
+    verifyCertificate: Verify certificate
+    testConnection: Test connection
+    success: Samba connection established!
+acls:
+    role: Role
+    accessType: Access type
+    permissions: Permission
+    search: Search acls
+    searchInfo: Search acls by model name
+    tooltip: Use * to match all properties
+    aclFilter:
+        principalId: Role
+        model: Model
+        property: Property
+        accessType: Access type
+        permission: Permission

src/pages/Account/locale/es.yml

@@ -0,0 +1,104 @@
+account:
+    pageTitles:
+        users: Usuarios
+        list: Usuarios
+        roles: Roles
+        alias: Alias de correo
+        accounts: Cuentas
+        ldap: LDAP
+        samba: Samba
+        acls: ACLs
+        connections: Conexiones
+        inheritedRoles: Roles heredados
+        newRole: Nuevo rol
+        subRoles: Subroles
+        privileges: Privilegios
+        mailAlias: Alias de correo
+        mailForwarding: Reenvío de correo
+        aliasUsers: Usuarios
+    card:
+        nickname: Usuario
+        name: Nombre
+        role: Rol
+        email: Mail
+        alias: Alias
+        lang: dioma
+        actions:
+            setPassword: Establecer contraseña
+            disableAccount:
+                name: Deshabilitar cuenta
+                title: La cuenta será deshabilitada
+                subtitle: ¿Seguro que quieres continuar?
+            disableUser:
+                name: Desactivar usuario
+                title: El usuario será deshabilitado
+                subtitle: ¿Seguro que quieres continuar?
+            sync:
+                name: Sincronizar
+                title: El usuario será sincronizado
+                subtitle: ¿Seguro que quieres continuar?
+            delete:
+                name: Eliminar
+                title: El usuario será eliminado
+                subtitle: ¿Seguro que quieres continuar?
+
+    search: Buscar usuario
+role:
+    pageTitles:
+        inheritedRoles: Roles heredados
+        subRoles: Subroles
+        newRole: Nuevo rol
+    card:
+        description: Descripción
+        id: Id
+        name: Nombre
+    newRole: Nuevo rol
+    searchRoles: Buscar roles
+    searchInfo: Buscar rol por id o nombre
+    name: Nombre
+    description: Descripción
+    id: Id
+mailAlias:
+    pageTitles:
+        aliasUsers: Usuarios
+    search: Buscar alias de correo
+    searchInfo: Buscar alias por id o nombre
+    alias: Alias
+    description: Descripción
+    id: Id
+    newAlias: Nuevo alias
+    name: Nombre
+    isPublic: Público
+ldap:
+    enableSync: Habilitar sincronización
+    server: Servidor
+    rdn: RDN
+    userDN: DN usuarios
+    filter: Filtro
+    groupDN: DN grupos
+    testConnection: Probar conexión
+    success: ¡Conexión con LDAP establecida!
+samba:
+    enableSync: Habilitar sincronización
+    domainController: Controlador de dominio
+    domainAD: Dominio AD
+    groupDN: DN grupos
+    userAD: Usuario AD
+    passwordAD: Contraseña AD
+    domainPart: DN usuarios (sin la parte del dominio)
+    Verify certificate: Verificar certificado
+    testConnection: Probar conexión
+    success: ¡Conexión con Samba establecida!
+acls:
+    role: Rol
+    accessType: Tipo de acceso
+    permissions: Permiso
+    search: Buscar acls
+    searchInfo: Buscar acls por nombre
+    tooltip: Usa * para marcar todas las propiedades
+    aclFilter:
+        principalId: Rol
+        model: Modelo
+        property: Propiedad
+        accessType: Tipo de acceso
+        permission: Permiso

src/pages/Agency/AgencyList.vue

@@ -2,13 +2,11 @@
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import { useStateStore } from 'stores/useStateStore';
 import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
 const { t } = useI18n();
 const router = useRouter();
-const stateStore = useStateStore();
 function navigate(id) {
     router.push({ path: `/agency/${id}` });
 }
@@ -22,16 +20,12 @@ function exprBuilder(param, value) {
 }
 </script>
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
     <VnSearchbar
         :info="t('You can search by name')"
         :label="t('Search agency')"
         data-key="AgencyList"
         url="Agencies"
     />
-        </Teleport>
-    </template>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate

src/pages/Claim/Card/ClaimBasicData.vue

@@ -158,8 +158,7 @@ const statesFilter = {
                     map-options
                     use-input
                     :input-debounce="0"
-                >
-                </QSelect>
+                />
             </VnRow>
         </template>
     </FormModel>

src/pages/Claim/ClaimList.vue

@@ -1,7 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'filters/index';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
@@ -12,8 +11,8 @@ import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorP
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import ClaimSummary from './Card/ClaimSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
-const stateStore = useStateStore();
 const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -37,35 +36,16 @@ function navigate(event, id) {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
     <VnSearchbar
         data-key="ClaimList"
         :label="t('Search claim')"
         :info="t('You can search by claim id or customer name')"
     />
-        </Teleport>
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+    <RightMenu>
+        <template #right-panel>
             <ClaimFilter data-key="ClaimList" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate

src/pages/Customer/Card/CustomerBalance.vue

@@ -234,7 +234,7 @@ const showBalancePdf = (balance) => {
                 <template #body-cell-employee="{ row }">
                     <QTd auto-width @click.stop>
                         <QBtn color="blue" flat no-caps>{{ row.userName }}</QBtn>
-                        <WorkerDescriptorProxy :id="row.clientFk" />
+                        <WorkerDescriptorProxy :id="row.workerFk" />
                     </QTd>
                 </template>
 

src/pages/Customer/CustomerList.vue

@@ -1,7 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
-import { useStateStore } from 'stores/useStateStore';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import CustomerFilter from './CustomerFilter.vue';
@@ -10,8 +9,8 @@ import CardList from 'src/components/ui/CardList.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import CustomerSummary from './Card/CustomerSummary.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
-const stateStore = useStateStore();
 const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -26,35 +25,16 @@ const redirectToCreateView = () => {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
     <VnSearchbar
         :info="t('You can search by customer id or name')"
         :label="t('Search customer')"
         data-key="CustomerList"
     />
-        </Teleport>
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    @click="stateStore.toggleRightDrawer()"
-                    dense
-                    flat
-                    icon="menu"
-                    round
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
-    <QDrawer :width="256" show-if-above side="right" v-model="stateStore.rightDrawer">
-        <QScrollArea class="fit text-grey-8">
+    <RightMenu>
+        <template #right-panel>
             <CustomerFilter data-key="CustomerList" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate

src/pages/Customer/Defaulter/CustomerDefaulter.vue

@@ -1,10 +1,7 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import { QBtn, QCheckbox, useQuasar } from 'quasar';
-import { useStateStore } from 'stores/useStateStore';
-
 import { toCurrency, toDate, dateRange } from 'filters/index';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
@@ -14,9 +11,10 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
-const stateStore = useStateStore();
+import axios from 'axios';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
-const { t, locale } = useI18n();
+const { t } = useI18n();
 const quasar = useQuasar();
 const dataRef = ref(null);
 
@@ -26,7 +24,7 @@ const selected = ref([]);
 const tableColumnComponents = {
     client: {
         component: QBtn,
-        props: () => ({ flat: true, color: 'blue', noCaps: true }),
+        props: () => ({ flat: true, class: 'link', noCaps: true }),
         event: () => {},
     },
     isWorker: {
@@ -39,7 +37,12 @@ const tableColumnComponents = {
     },
     salesPerson: {
         component: QBtn,
-        props: () => ({ flat: true, color: 'blue', noCaps: true }),
+        props: () => ({ flat: true, class: 'link', noCaps: true }),
+        event: () => {},
+    },
+    department: {
+        component: 'span',
+        props: () => {},
         event: () => {},
     },
     country: {
@@ -59,7 +62,7 @@ const tableColumnComponents = {
     },
     author: {
         component: QBtn,
-        props: () => ({ flat: true, color: 'blue', noCaps: true }),
+        props: () => ({ flat: true, class: 'link', noCaps: true }),
         event: () => {},
     },
     lastObservation: {
@@ -82,6 +85,16 @@ const tableColumnComponents = {
         props: () => {},
         event: () => {},
     },
+    finished: {
+        component: QCheckbox,
+
+        props: (prop) => ({
+            disable: true,
+            'model-value': prop.value,
+            class: 'disabled-checkbox',
+        }),
+        event: () => {},
+    },
 };
 
 const columns = computed(() => [
@@ -105,6 +118,13 @@ const columns = computed(() => [
         name: 'salesPerson',
         sortable: true,
     },
+    {
+        align: 'left',
+        field: 'departmentName',
+        label: t('Department'),
+        name: 'department',
+        sortable: true,
+    },
     {
         align: 'left',
         field: 'country',
@@ -166,6 +186,12 @@ const columns = computed(() => [
         name: 'from',
         sortable: true,
     },
+    {
+        align: 'left',
+        field: 'finished',
+        label: t('Has recover'),
+        name: 'finished',
+    },
 ]);
 
 const viewAddObservation = (rowsSelected) => {
@@ -178,7 +204,39 @@ const viewAddObservation = (rowsSelected) => {
     });
 };
 
-const onFetch = (data) => {
+const departments = ref(new Map());
+
+const onFetch = async (data) => {
+    const salesPersonFks = data.map((item) => item.salesPersonFk);
+    const departmentNames = salesPersonFks.map(async (salesPersonFk) => {
+        try {
+            const { data: workerDepartment } = await axios.get(
+                `WorkerDepartments/${salesPersonFk}`
+            );
+            const { data: department } = await axios.get(
+                `Departments/${workerDepartment.departmentFk}`
+            );
+            departments.value.set(salesPersonFk, department.name);
+        } catch (error) {
+            console.error('Err: ', error);
+        }
+    });
+    const recoveryData = await axios.get('Recoveries');
+
+    const recoveries = recoveryData.data.map(({ clientFk, finished }) => ({
+        clientFk,
+        finished,
+    }));
+
+    await Promise.all(departmentNames);
+
+    data.forEach((item) => {
+        item.departmentName = departments.value.get(item.salesPersonFk);
+        item.isWorker = item.businessTypeFk === 'worker';
+        const recovery = recoveries.find(({ clientFk }) => clientFk === item.clientFk);
+        item.finished = recovery?.finished === null;
+    });
+
     for (const element of data) element.isWorker = element.businessTypeFk === 'worker';
 
     balanceDueTotal.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
@@ -191,6 +249,7 @@ function exprBuilder(param, value) {
         case 'creditInsurance':
         case 'amount':
         case 'workerFk':
+        case 'departmentFk':
         case 'countryFk':
         case 'payMethod':
         case 'salesPersonFk':
@@ -204,30 +263,11 @@ function exprBuilder(param, value) {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
-
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+    <RightMenu>
+        <template #right-panel>
             <CustomerNotificationsFilter data-key="CustomerDefaulter" />
-        </QScrollArea>
-    </QDrawer>
-
+        </template>
+    </RightMenu>
     <VnSubToolbar>
         <template #st-data>
             <CustomerBalanceDueTotal :amount="balanceDueTotal" />
@@ -243,7 +283,6 @@ function exprBuilder(param, value) {
             </div>
         </template>
     </VnSubToolbar>
-
     <QPage class="column items-center q-pa-md">
         <VnPaginate
             ref="dataRef"
@@ -259,13 +298,13 @@ function exprBuilder(param, value) {
                     <QTable
                         :columns="columns"
                         :rows="rows"
-                        class="full-width q-mt-md"
+                        class="full-width"
                         row-key="clientFk"
                         selection="multiple"
                         v-model:selected="selected"
                     >
                         <template #header="props">
-                            <QTr :props="props" class="bg">
+                            <QTr :props="props" class="bg" style="min-height: 200px">
                                 <QTh>
                                     <QCheckbox v-model="props.selected" />
                                 </QTh>
@@ -302,7 +341,7 @@ function exprBuilder(param, value) {
                                             )
                                         "
                                     >
-                                        <template v-if="props.col.name !== 'isWorker'">
+                                        <template v-if="typeof props.value !== 'boolean'">
                                             <div
                                                 v-if="
                                                     props.col.name === 'lastObservation'
@@ -311,8 +350,9 @@ function exprBuilder(param, value) {
                                                 <VnInput
                                                     type="textarea"
                                                     v-model="props.value"
-                                                    autogrow
-                                                    :disable="true"
+                                                    readonly
+                                                    dense
+                                                    rows="2"
                                                 />
                                             </div>
                                             <div v-else>{{ props.value }}</div>
@@ -354,6 +394,7 @@ es:
     Client: Cliente
     Is worker: Es trabajador
     Salesperson: Comercial
+    Department: Departamento
     Country: País
     P. Method: F. Pago
     Pay method: Forma de pago

src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue

@@ -45,11 +45,10 @@ const authors = ref();
             </div>
         </template>
 
-        <template #body="{ params }">
-            <QItem class="q-mb-sm q-mt-sm">
+        <template #body="{ params, searchFn }">
+            <QItem class="q-mb-sm">
                 <QItemSection v-if="clients">
                     <VnSelect
-                        :input-debounce="0"
                         :label="t('Client')"
                         :options="clients"
                         dense
@@ -62,6 +61,8 @@ const authors = ref();
                         rounded
                         use-input
                         v-model="params.clientFk"
+                        @update:model-value="searchFn()"
+                        auto-load
                     />
                 </QItemSection>
                 <QItemSection v-else>
@@ -85,6 +86,7 @@ const authors = ref();
                         rounded
                         use-input
                         v-model="params.salesPersonFk"
+                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
                 <QItemSection v-else>
@@ -108,6 +110,7 @@ const authors = ref();
                         rounded
                         use-input
                         v-model="params.countryFk"
+                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
                 <QItemSection v-else>
@@ -153,6 +156,7 @@ const authors = ref();
                         rounded
                         use-input
                         v-model="params.workerFk"
+                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
                 <QItemSection v-else>

src/pages/Customer/ExtendedList/CustomerExtendedList.vue

@@ -14,6 +14,7 @@ import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import { useArrayData } from 'composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const { t } = useI18n();
 const router = useRouter();
@@ -494,32 +495,15 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport></template
-    >
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+    <RightMenu>
+        <template #right-panel>
             <CustomerExtendedListFilter
                 v-if="visibleColumns.length !== 0"
                 data-key="CustomerExtendedList"
                 :visible-columns="visibleColumns"
             />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
     <VnSubToolbar>
         <template #st-data>
             <TableVisibleColumns
@@ -532,7 +516,6 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
             />
         </template>
     </VnSubToolbar>
-
     <QPage class="column items-center q-pa-md">
         <VnPaginate
             data-key="CustomerExtendedList"

src/pages/Customer/Notifications/CustomerNotifications.vue

@@ -5,11 +5,10 @@ import { QBtn } from 'quasar';
 import CustomerNotificationsFilter from './CustomerNotificationsFilter.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import { useStateStore } from 'stores/useStateStore';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CustomerNotificationsCampaignConsumption from './CustomerNotificationsCampaignConsumption.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
-const stateStore = useStateStore();
 const { t } = useI18n();
 const selected = ref([]);
 const selectedCustomerId = ref(0);
@@ -81,29 +80,11 @@ const selectCustomerId = (id) => {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
-
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+    <RightMenu>
+        <template #right-panel>
             <CustomerNotificationsFilter data-key="CustomerNotifications" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
     <VnSubToolbar class="justify-end">
         <template #st-data>
             <CustomerNotificationsCampaignConsumption

src/pages/Customer/Payments/CustomerPayments.vue

@@ -3,15 +3,14 @@ import axios from 'axios';
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'composables/useArrayData';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 import { toDate, toCurrency } from 'filters/index';
 import CustomerPaymentsFilter from './CustomerPaymentsFilter.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
-const stateStore = useStateStore();
 const quasar = useQuasar();
 const { t } = useI18n();
 const arrayData = useArrayData('CustomerTransactions');
@@ -93,28 +92,11 @@ function stateColor(row) {
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+    <RightMenu>
+        <template #right-panel>
             <CustomerPaymentsFilter data-key="CustomerTransactions" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
     <QPage class="column items-center q-pa-md customer-payments">
         <div class="vn-card-list">
             <QToolbar class="q-pa-none justify-end">

src/pages/Department/Card/DepartmentDescriptor.vue

@@ -2,8 +2,7 @@
 import { computed, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useQuasar } from 'quasar';
-
+import { useVnConfirm } from 'composables/useVnConfirm';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
 import useCardDescription from 'src/composables/useCardDescription';
@@ -23,7 +22,6 @@ const $props = defineProps({
     },
 });
 
-const quasar = useQuasar();
 const route = useRoute();
 const router = useRouter();
 
@@ -43,30 +41,17 @@ const setData = (entity) => {
     data.value = useCardDescription(entity.name, entity.id);
 };
 
-const removeDepartment = () => {
-    quasar
-        .dialog({
-            title: 'Are you sure you want to delete it?',
-            message: 'Delete department',
-            ok: {
-                push: true,
-                color: 'primary',
-            },
-            cancel: true,
-        })
-        .onOk(async () => {
+const removeDepartment = async () => {
     try {
-                await axios.post(
-                    `/Departments/${entityId.value}/removeChild`,
-                    entityId.value
-                );
+        await axios.post(`/Departments/${entityId.value}/removeChild`, entityId.value);
         router.push({ name: 'WorkerDepartment' });
         notify('department.departmentRemoved', 'positive');
     } catch (err) {
         console.error('Error removing department');
     }
-        });
 };
+
+const { openConfirmationModal } = useVnConfirm();
 </script>
 <template>
     <CardDescriptor
@@ -84,7 +69,17 @@ const removeDepartment = () => {
         "
     >
         <template #menu="{}">
-            <QItem v-ripple clickable @click="removeDepartment()">
+            <QItem
+                v-ripple
+                clickable
+                @click="
+                    openConfirmationModal(
+                        t('Are you sure you want to delete it?'),
+                        t('Delete department'),
+                        removeDepartment
+                    )
+                "
+            >
                 <QItemSection>{{ t('Delete') }}</QItemSection>
             </QItem>
         </template>

src/pages/Entry/Card/EntryBuys.vue

@@ -410,7 +410,7 @@ const lockIconType = (groupingMode, mode) => {
                             <span v-if="props.row.item.subName" class="subName">
                                 {{ props.row.item.subName }}
                             </span>
-                            <fetched-tags :item="props.row.item" :max-length="5" />
+                            <FetchedTags :item="props.row.item" :max-length="5" />
                         </QTd>
                     </QTr>
                     <!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->

src/pages/Entry/Card/EntryBuysImport.vue

@@ -174,7 +174,7 @@ const redirectToBuysView = () => {
         @on-fetch="(data) => (packagingsOptions = data)"
         auto-load
     />
-    <QForm>
+    <QForm @submit="onSubmit()">
         <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
             <div>
                 <QBtnGroup push class="q-gutter-x-sm">

src/pages/Entry/Card/EntryDescriptor.vue

@@ -34,7 +34,7 @@ const entryFilter = {
         {
             relation: 'travel',
             scope: {
-                fields: ['id', 'landed', 'agencyModeFk', 'warehouseOutFk'],
+                fields: ['id', 'landed', 'shipped', 'agencyModeFk', 'warehouseOutFk'],
                 include: [
                     {
                         relation: 'agency',
@@ -125,10 +125,8 @@ watch;
                 :label="t('entry.descriptor.agency')"
                 :value="entity.travel?.agency?.name"
             />
-            <VnLv
-                :label="t('entry.descriptor.landed')"
-                :value="toDate(entity.travel?.landed)"
-            />
+            <VnLv :label="t('shipped')" :value="toDate(entity.travel?.shipped)" />
+            <VnLv :label="t('landed')" :value="toDate(entity.travel?.landed)" />
             <VnLv
                 :label="t('entry.descriptor.warehouseOut')"
                 :value="entity.travel?.warehouseOut?.name"

src/pages/Entry/Card/EntrySummary.vue

@@ -221,10 +221,7 @@ const fetchEntryBuys = async () => {
                     :value="entry.travel.agency.name"
                 />
 
-                <VnLv
-                    :label="t('entry.summary.travelShipped')"
-                    :value="toDate(entry.travel.shipped)"
-                />
+                <VnLv :label="t('shipped')" :value="toDate(entry.travel.shipped)" />
 
                 <VnLv
                     :label="t('entry.summary.travelWarehouseOut')"
@@ -236,10 +233,7 @@ const fetchEntryBuys = async () => {
                     v-model="entry.travel.isDelivered"
                     :disable="true"
                 />
-                <VnLv
-                    :label="t('entry.summary.travelLanded')"
-                    :value="toDate(entry.travel.landed)"
-                />
+                <VnLv :label="t('landed')" :value="toDate(entry.travel.landed)" />
 
                 <VnLv
                     :label="t('entry.summary.travelWarehouseIn')"
@@ -338,7 +332,7 @@ const fetchEntryBuys = async () => {
                                 <span v-if="row.item.subName" class="subName">
                                     {{ row.item.subName }}
                                 </span>
-                                <fetched-tags :item="row.item" :max-length="5" />
+                                <FetchedTags :item="row.item" :max-length="5" />
                             </QTd>
                         </QTr>
                         <!-- Esta última row es utilizada para agregar un espaciado y así marcar una diferencia visual entre los diferentes buys -->

src/pages/Entry/EntryLatestBuys.vue

@@ -19,6 +19,7 @@ import { toDate, toCurrency } from 'src/filters';
 import { useSession } from 'composables/useSession';
 import { dashIfEmpty } from 'src/filters';
 import { useArrayData } from 'composables/useArrayData';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const router = useRouter();
 const { getTokenMultimedia } = useSession();
@@ -646,14 +647,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 @on-config-saved="visibleColumns = ['picture', ...$event]"
             />
         </template>
-        <QSpace />
-        <div id="st-actions"></div>
     </VnSubToolbar>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+    <RightMenu>
+        <template #right-panel>
             <EntryLatestBuysFilter data-key="EntryLatestBuys" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <QTable
             :rows="rows"
@@ -707,7 +706,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </template>
             <template #body-cell-tags="{ row }">
                 <QTd>
-                    <fetched-tags :item="row" :max-length="6" />
+                    <FetchedTags :item="row" :max-length="6" />
                 </QTd>
             </template>
             <template #body-cell-entryFk="{ row }">

src/pages/Entry/EntryList.vue

@@ -11,6 +11,7 @@ import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters/index';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import RightMenu from 'src/components/common/RightMenu.vue';
 
 const stateStore = useStateStore();
 const router = useRouter();
@@ -29,23 +30,18 @@ onMounted(async () => {
     stateStore.rightDrawer = true;
 });
 </script>
-
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
     <VnSearchbar
         data-key="EntryList"
         url="Entries/filter"
         :label="t('Search entries')"
         :info="t('You can search by entry reference')"
     />
-        </Teleport>
-    </template>
-    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+    <RightMenu>
+        <template #right-panel>
             <EntryFilter data-key="EntryList" />
-        </QScrollArea>
-    </QDrawer>
+        </template>
+    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnPaginate
@@ -82,10 +78,7 @@ onMounted(async () => {
                             </QIcon>
                         </template>
                         <template #list-items>
-                            <VnLv
-                                :label="t('entry.list.landed')"
-                                :value="toDate(row.landed)"
-                            />
+                            <VnLv :label="t('landed')" :value="toDate(row.landed)" />
                             <VnLv
                                 :label="t('entry.list.booked')"
                                 :value="!!row.isBooked"

src/pages/Entry/locale/en.yml

@@ -6,3 +6,5 @@ entryFilter:
     filter:
         search: General search
         reference: Reference
+landed: Landed
+shipped: Shipped

src/pages/Entry/locale/es.yml

@@ -8,3 +8,6 @@ entryFilter:
     filter:
         search: Búsqueda general
         reference: Referencia
+
+landed: F. llegada
+shipped: F. salida

src/pages/InvoiceIn/Card/InvoiceInBasicData.vue

@@ -9,18 +9,22 @@ import { downloadFile } from 'src/composables/downloadFile';
 import FormModel from 'components/FormModel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'src/components/FetchData.vue';
-import VnRow from 'src/components/ui/VnRow.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 
 const quasar = useQuasar();
-const route = useRoute();
 const { t } = useI18n();
 
 const dms = ref({});
+const route = useRoute();
 const editDownloadDisabled = ref(false);
-const arrayData = useArrayData('InvoiceIn');
+const arrayData = useArrayData();
 const invoiceIn = computed(() => arrayData.store.data);
 const userConfig = ref(null);
+const invoiceId = computed(() => +route.params.id);
 
+const expenses = ref([]);
 const currencies = ref([]);
 const currenciesRef = ref();
 const companies = ref([]);
@@ -31,14 +35,11 @@ const warehouses = ref([]);
 const warehousesRef = ref();
 const allowTypesRef = ref();
 const allowedContentTypes = ref([]);
+const sageWithholdings = ref([]);
 const inputFileRef = ref();
 const editDmsRef = ref();
 const createDmsRef = ref();
 
-const requiredFieldRule = (val) => val || t('globals.requiredField');
-const dateMask = '####-##-##';
-const fillMask = '_';
-
 async function checkFileExists(dmsId) {
     if (!dmsId) return;
     try {
@@ -81,7 +82,7 @@ async function setCreateDms() {
     createDmsRef.value.show();
 }
 
-async function upsert() {
+async function onSubmit() {
     try {
         const isEdit = !!dms.value.id;
         const errors = {
@@ -173,11 +174,17 @@ async function upsert() {
         @on-fetch="(data) => (userConfig = data)"
         auto-load
     />
+    <FetchData url="Expenses" auto-load @on-fetch="(data) => (expenses = data)" />
+    <FetchData
+        url="SageWithholdings"
+        auto-load
+        @on-fetch="(data) => (sageWithholdings = data)"
+    />
     <FormModel
-        v-if="invoiceIn"
-        :url="`InvoiceIns/${route.params.id}`"
-        model="invoiceIn"
-        :auto-load="true"
+        model="InvoiceIn"
+        :go-to="`/invoice-in/${invoiceId}/vat`"
+        auto-load
+        :url-update="`InvoiceIns/${invoiceId}/updateInvoiceIn`"
     >
         <template #form="{ data }">
             <VnRow>
@@ -201,7 +208,7 @@ async function upsert() {
                         </QItem>
                     </template>
                 </VnSelect>
-                <QInput
+                <VnInput
                     clearable
                     clear-icon="close"
                     :label="t('Supplier ref')"
@@ -209,69 +216,29 @@ async function upsert() {
                 />
             </VnRow>
             <VnRow>
-                <QInput
-                    :label="t('Expedition date')"
-                    v-model="data.issued"
-                    :mask="dateMask"
-                >
-                    <template #append>
-                        <QIcon name="event" class="cursor-pointer" :fill-mask="fillMask">
-                            <QPopupProxy
-                                cover
-                                transition-show="scale"
-                                transition-hide="scale"
-                            >
-                                <QDate v-model="data.issued">
-                                    <div class="row items-center justify-end">
-                                        <QBtn
-                                            v-close-popup
-                                            label="Close"
-                                            color="primary"
-                                            flat
-                                        />
-                                    </div>
-                                </QDate>
-                            </QPopupProxy>
-                        </QIcon>
-                    </template>
-                </QInput>
-                <QInput
+                <VnInputDate :label="t('Expedition date')" v-model="data.issued" />
+                <VnInputDate
                     :label="t('Operation date')"
                     v-model="data.operated"
-                    :mask="dateMask"
-                    :fill-mask="fillMask"
                     autofocus
-                >
-                    <template #append>
-                        <QIcon name="event" class="cursor-pointer">
-                            <QPopupProxy
-                                cover
-                                transition-show="scale"
-                                transition-hide="scale"
-                            >
-                                <QDate v-model="data.operated" :mask="dateMask">
-                                    <div class="row items-center justify-end">
-                                        <QBtn
-                                            v-close-popup
-                                            label="Close"
-                                            color="primary"
-                                            flat
                 />
-                                    </div>
-                                </QDate>
-                            </QPopupProxy>
-                        </QIcon>
-                    </template>
-                </QInput>
             </VnRow>
             <VnRow>
-                <QInput
+                <VnSelect
                     :label="t('Undeductible VAT')"
                     v-model="data.deductibleExpenseFk"
-                    clearable
-                    clear-icon="close"
-                />
-                <QInput
+                    :options="expenses"
+                    option-value="id"
+                    option-label="id"
+                    :filter-options="['id', 'name']"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            {{ `${scope.opt.id}: ${scope.opt.name}` }}
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnInput
                     :label="t('Document')"
                     v-model="data.dmsFk"
                     clearable
@@ -316,67 +283,11 @@ async function upsert() {
                             <QTooltip>{{ t('Create document') }}</QTooltip>
                         </QBtn>
                     </template>
-                </QInput>
+                </VnInput>
             </VnRow>
             <VnRow>
-                <QInput
-                    :label="t('Entry date')"
-                    v-model="data.bookEntried"
-                    clearable
-                    clear-icon="close"
-                    :mask="dateMask"
-                    :fill-mask="fillMask"
-                >
-                    <template #append>
-                        <QIcon name="event" class="cursor-pointer">
-                            <QPopupProxy
-                                cover
-                                transition-show="scale"
-                                transition-hide="scale"
-                            >
-                                <QDate v-model="data.bookEntried" :mask="dateMask">
-                                    <div class="row items-center justify-end">
-                                        <QBtn
-                                            v-close-popup
-                                            label="Close"
-                                            color="primary"
-                                            flat
-                                        />
-                                    </div>
-                                </QDate>
-                            </QPopupProxy>
-                        </QIcon>
-                    </template>
-                </QInput>
-                <QInput
-                    :label="t('Accounted date')"
-                    v-model="data.booked"
-                    clearable
-                    clear-icon="close"
-                    :mask="dateMask"
-                    :fill-mask="fillMask"
-                >
-                    <template #append>
-                        <QIcon name="event" class="cursor-pointer">
-                            <QPopupProxy
-                                cover
-                                transition-show="scale"
-                                transition-hide="scale"
-                            >
-                                <QDate v-model="data.booked" :mask="maskDate">
-                                    <div class="row items-center justify-end">
-                                        <QBtn
-                                            v-close-popup
-                                            label="Close"
-                                            color="primary"
-                                            flat
-                                        />
-                                    </div>
-                                </QDate>
-                            </QPopupProxy>
-                        </QIcon>
-                    </template>
-                </QInput>
+                <VnInputDate :label="t('Entry date')" v-model="data.bookEntried" />
+                <VnInputDate :label="t('Accounted date')" v-model="data.booked" />
             </VnRow>
             <VnRow>
                 <VnSelect
@@ -386,6 +297,7 @@ async function upsert() {
                     option-value="id"
                     option-label="code"
                 />
+
                 <VnSelect
                     v-if="companiesRef"
                     :label="t('Company')"
@@ -395,23 +307,31 @@ async function upsert() {
                     option-label="code"
                 />
             </VnRow>
-            <QCheckbox :label="t('invoiceIn.summary.booked')" v-model="data.isBooked" />
+            <VnRow>
+                <VnSelect
+                    :label="t('invoiceIn.summary.sage')"
+                    v-model="data.withholdingSageFk"
+                    :options="sageWithholdings"
+                    option-value="id"
+                    option-label="withholding"
+                />
+            </VnRow>
         </template>
     </FormModel>
     <QDialog ref="editDmsRef">
-        <QCard>
-            <QCardSection class="q-pb-none">
-                <QItem class="q-px-none">
-                    <span class="text-primary text-h6 full-width">
+        <QForm @submit="onSubmit()" class="all-pointer-events">
+            <QCard class="q-pa-sm">
+                <QCardSection class="row items-center q-pb-none">
+                    <span class="text-primary text-h6">
                         <QIcon name="edit" class="q-mr-xs" />
                         {{ t('Edit document') }}
                     </span>
+                    <QSpace />
                     <QBtn icon="close" flat round dense v-close-popup />
-                </QItem>
                 </QCardSection>
                 <QCardSection class="q-py-none">
                     <QItem>
-                    <QInput
+                        <VnInput
                             class="full-width q-pa-xs"
                             :label="t('Reference')"
                             v-model="dms.reference"
@@ -420,45 +340,45 @@ async function upsert() {
                         />
                         <VnSelect
                             class="full-width q-pa-xs"
-                        :label="`${t('Company')}*`"
+                            :label="t('Company')"
                             v-model="dms.companyId"
                             :options="companies"
                             option-value="id"
                             option-label="code"
-                        :rules="[requiredFieldRule]"
+                            :required="true"
                         />
                     </QItem>
                     <QItem>
                         <VnSelect
                             class="full-width q-pa-xs"
-                        :label="`${t('Warehouse')}*`"
+                            :label="t('Warehouse')"
                             v-model="dms.warehouseId"
                             :options="warehouses"
                             option-value="id"
                             option-label="name"
-                        :rules="[requiredFieldRule]"
+                            :required="true"
                         />
                         <VnSelect
                             class="full-width q-pa-xs"
-                        :label="`${t('Type')}*`"
+                            :label="t('Type')"
                             v-model="dms.dmsTypeId"
                             :options="dmsTypes"
                             option-value="id"
                             option-label="name"
-                        :rules="[requiredFieldRule]"
+                            :required="true"
                         />
                     </QItem>
                     <QItem>
-                    <QInput
-                        class="full-width q-pa-xs"
+                        <VnInput
+                            :label="t('Description')"
+                            v-model="dms.description"
+                            :required="true"
                             type="textarea"
+                            class="full-width q-pa-xs"
                             size="lg"
                             autogrow
-                        :label="`${t('Description')}*`"
-                        v-model="dms.description"
                             clearable
                             clear-icon="close"
-                        :rules="[(val) => val.length || t('Required field')]"
                         />
                     </QItem>
                     <QItem>
@@ -504,25 +424,31 @@ async function upsert() {
                     </QItem>
                 </QCardSection>
                 <QCardActions class="justify-end">
-                <QBtn flat :label="t('globals.close')" color="primary" v-close-popup />
-                <QBtn :label="t('globals.save')" color="primary" @click="upsert" />
+                    <QBtn
+                        flat
+                        :label="t('globals.close')"
+                        color="primary"
+                        v-close-popup
+                    />
+                    <QBtn :label="t('globals.save')" color="primary" @click="onSubmit" />
                 </QCardActions>
             </QCard>
+        </QForm>
     </QDialog>
     <QDialog ref="createDmsRef">
-        <QCard>
-            <QCardSection class="q-pb-none">
-                <QItem>
-                    <span class="text-primary text-h6 full-width">
+        <QForm @submit="onSubmit()" class="all-pointer-events">
+            <QCard class="q-pa-sm">
+                <QCardSection class="row items-center q-pb-none">
+                    <span class="text-primary text-h6">
                         <QIcon name="edit" class="q-mr-xs" />
                         {{ t('Create document') }}
                     </span>
-                    <QBtn icon="close" flat round dense v-close-popup align="right" />
-                </QItem>
+                    <QSpace />
+                    <QBtn icon="close" flat round dense v-close-popup />
                 </QCardSection>
                 <QCardSection class="q-pb-none">
                     <QItem>
-                    <QInput
+                        <VnInput
                             class="full-width q-pa-xs"
                             :label="t('Reference')"
                             v-model="dms.reference"
@@ -534,7 +460,7 @@ async function upsert() {
                             :options="companies"
                             option-value="id"
                             option-label="code"
-                        :rules="[requiredFieldRule]"
+                            :required="true"
                         />
                     </QItem>
                     <QItem>
@@ -545,7 +471,7 @@ async function upsert() {
                             :options="warehouses"
                             option-value="id"
                             option-label="name"
-                        :rules="[requiredFieldRule]"
+                            :required="true"
                         />
                         <VnSelect
                             class="full-width q-pa-xs"
@@ -554,11 +480,11 @@ async function upsert() {
                             :options="dmsTypes"
                             option-value="id"
                             option-label="name"
-                        :rules="[requiredFieldRule]"
+                            :required="true"
                         />
                     </QItem>
                     <QItem>
-                    <QInput
+                        <VnInput
                             class="full-width q-pa-xs"
                             type="textarea"
                             size="lg"
@@ -613,10 +539,16 @@ async function upsert() {
                     </QItem>
                 </QCardSection>
                 <QCardActions align="right">
-                <QBtn flat :label="t('globals.close')" color="primary" v-close-popup />
-                <QBtn :label="t('globals.save')" color="primary" @click="upsert" />
+                    <QBtn
+                        flat
+                        :label="t('globals.close')"
+                        color="primary"
+                        v-close-popup
+                    />
+                    <QBtn :label="t('globals.save')" color="primary" @click="onSubmit" />
                 </QCardActions>
             </QCard>
+        </QForm>
     </QDialog>
 </template>
 <style lang="scss" scoped>

src/pages/InvoiceIn/Card/InvoiceInCorrective.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { ref, computed } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useCapitalize } from 'src/composables/useCapitalize';
@@ -8,12 +8,11 @@ import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 
-const router = useRouter();
-const route = useRoute();
+const { push, currentRoute } = useRouter();
 const { t } = useI18n();
 
-const invoiceId = route.params.id;
-const arrayData = useArrayData('InvoiceIn');
+const invoiceId = +currentRoute.value.params.id;
+const arrayData = useArrayData();
 const invoiceIn = computed(() => arrayData.store.data);
 const invoiceInCorrectionRef = ref();
 const filter = {
@@ -74,7 +73,7 @@ const rowsSelected = ref([]);
 
 const requiredFieldRule = (val) => val || t('globals.requiredField');
 
-const onSave = (data) => data.deletes && router.push(`/invoice-in/${invoiceId}/summary`);
+const onSave = (data) => data.deletes && push(`/invoice-in/${invoiceId}/summary`);
 </script>
 <template>
     <FetchData

src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue

@@ -1,12 +1,11 @@
 <script setup>
-import { ref, reactive, computed, onBeforeMount, watch } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { ref, reactive, computed, onBeforeMount } from 'vue';
+import { useRouter, onBeforeRouteLeave } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import axios from 'axios';
 import { toCurrency, toDate } from 'src/filters';
 import { useRole } from 'src/composables/useRole';
-import useCardDescription from 'src/composables/useCardDescription';
 import { downloadFile } from 'src/composables/downloadFile';
 import { useArrayData } from 'src/composables/useArrayData';
 import { usePrintService } from 'composables/usePrintService';
@@ -17,27 +16,23 @@ import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import { useCapitalize } from 'src/composables/useCapitalize';
+import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
+import InvoiceInToBook from '../InvoiceInToBook.vue';
 
-const $props = defineProps({
-    id: {
-        type: Number,
-        required: false,
-        default: null,
-    },
-});
+const $props = defineProps({ id: { type: Number, default: null } });
+
+const { push, currentRoute } = useRouter();
 
-const route = useRoute();
-const router = useRouter();
 const quasar = useQuasar();
 const { hasAny } = useRole();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
-const arrayData = useArrayData('InvoiceIn');
+const arrayData = useArrayData();
 
 const invoiceIn = computed(() => arrayData.store.data);
 const cardDescriptorRef = ref();
 const correctionDialogRef = ref();
-const entityId = computed(() => $props.id || +route.params.id);
+const entityId = computed(() => $props.id || +currentRoute.value.params.id);
 const totalAmount = ref();
 const currentAction = ref();
 const config = ref();
@@ -45,28 +40,21 @@ const cplusRectificationTypes = ref([]);
 const siiTypeInvoiceOuts = ref([]);
 const invoiceCorrectionTypes = ref([]);
 const actions = {
-    book: {
-        title: 'Are you sure you want to book this invoice?',
-        cb: checkToBook,
-        action: toBook,
+    unbook: {
+        title: t('assertAction', { action: t('unbook') }),
+        action: toUnbook,
     },
     delete: {
-        title: 'Are you sure you want to delete this invoice?',
+        title: t('assertAction', { action: t('delete') }),
         action: deleteInvoice,
     },
     clone: {
-        title: 'Are you sure you want to clone this invoice?',
+        title: t('assertAction', { action: t('clone') }),
         action: cloneInvoice,
     },
-    showPdf: {
-        cb: showPdfInvoice,
-    },
-    sendPdf: {
-        cb: sendPdfInvoiceConfirmation,
-    },
-    correct: {
-        cb: () => correctionDialogRef.value.show(),
-    },
+    showPdf: { cb: showPdfInvoice },
+    sendPdf: { cb: sendPdfInvoiceConfirmation },
+    correct: { cb: () => correctionDialogRef.value.show() },
 };
 const filter = {
     include: [
@@ -94,11 +82,7 @@ const filter = {
         },
     ],
 };
-const data = ref(useCardDescription());
-const invoiceInCorrection = reactive({
-    correcting: [],
-    corrected: null,
-});
+const invoiceInCorrection = reactive({ correcting: [], corrected: null });
 const routes = reactive({
     getSupplier: (id) => {
         return { name: 'SupplierCard', params: { id } };
@@ -139,16 +123,17 @@ const correctionFormData = reactive({
 });
 const isNotFilled = computed(() => Object.values(correctionFormData).includes(null));
 
-onBeforeMount(async () => await setInvoiceCorrection(entityId.value));
+onBeforeMount(async () => {
+    await setInvoiceCorrection(entityId.value);
+    const { data } = await axios.get(`InvoiceIns/${entityId.value}/getTotals`);
+    totalAmount.value = data.totalDueDay;
+});
 
-watch(
-    () => route.params.id,
-    async (newId) => {
+onBeforeRouteLeave(async (to, from) => {
     invoiceInCorrection.correcting.length = 0;
     invoiceInCorrection.corrected = null;
-        if (newId) await setInvoiceCorrection(entityId.value);
-    }
-);
+    if (to.params.id !== from.params.id) await setInvoiceCorrection(entityId.value);
+});
 
 async function setInvoiceCorrection(id) {
     const [{ data: correctingData }, { data: correctedData }] = await Promise.all([
@@ -179,17 +164,6 @@ async function setInvoiceCorrection(id) {
     );
 }
 
-async function setData(entity) {
-    data.value = useCardDescription(entity.supplierRef, entity.id);
-    const { totalDueDay } = await getTotals();
-    totalAmount.value = totalDueDay;
-}
-
-async function getTotals() {
-    const { data } = await axios.get(`InvoiceIns/${entityId.value}/getTotals`);
-    return data;
-}
-
 function openDialog() {
     quasar.dialog({
         component: VnConfirm,
@@ -200,38 +174,17 @@ function openDialog() {
     });
 }
 
-async function checkToBook() {
-    let directBooking = true;
+async function toUnbook() {
+    const { data } = await axios.post(`InvoiceIns/${entityId.value}/toUnbook`);
+    const { isLinked, bookEntry, accountingEntries } = data;
 
-    const totals = await getTotals();
-    const taxableBaseNotEqualDueDay = totals.totalDueDay != totals.totalTaxableBase;
-    const vatNotEqualDueDay = totals.totalDueDay != totals.totalVat;
+    const type = isLinked ? 'warning' : 'positive';
+    const message = isLinked
+        ? t('isLinked', { bookEntry, accountingEntries })
+        : t('isNotLinked', { bookEntry });
 
-    if (taxableBaseNotEqualDueDay && vatNotEqualDueDay) directBooking = false;
-
-    const { data: dueDaysCount } = await axios.get('InvoiceInDueDays/count', {
-        where: {
-            invoiceInFk: entityId.value,
-            dueDated: { gte: Date.vnNew() },
-        },
-    });
-
-    if (dueDaysCount) directBooking = false;
-
-    if (!directBooking) openDialog();
-    else toBook();
-}
-
-async function toBook() {
-    await axios.post(`InvoiceIns/${entityId.value}/toBook`);
-
-    quasar.notify({
-        type: 'positive',
-        message: t('globals.dataSaved'),
-    });
-
-    await cardDescriptorRef.value.getData();
-    setTimeout(() => location.reload(), 500);
+    quasar.notify({ type, message });
+    if (!isLinked) arrayData.store.data.isBooked = false;
 }
 
 async function deleteInvoice() {
@@ -240,7 +193,7 @@ async function deleteInvoice() {
         type: 'positive',
         message: t('Invoice deleted'),
     });
-    router.push({ path: '/invoice-in' });
+    push({ path: '/invoice-in' });
 }
 
 async function cloneInvoice() {
@@ -249,11 +202,9 @@ async function cloneInvoice() {
         type: 'positive',
         message: t('Invoice cloned'),
     });
-    router.push({ path: `/invoice-in/${data.id}/summary` });
+    push({ path: `/invoice-in/${data.id}/summary` });
 }
 
-const requiredFieldRule = (val) => val || t('globals.requiredField');
-
 const isAdministrative = () => hasAny(['administrative']);
 
 const isAgricultural = () =>
@@ -299,10 +250,9 @@ const createInvoiceInCorrection = async () => {
         'InvoiceIns/corrective',
         Object.assign(correctionFormData, { id: entityId.value })
     );
-    router.push({ path: `/invoice-in/${correctingId}/summary` });
+    push({ path: `/invoice-in/${correctingId}/summary` });
 };
 </script>
-
 <template>
     <FetchData
         url="InvoiceInConfigs"
@@ -329,22 +279,34 @@ const createInvoiceInCorrection = async () => {
     <CardDescriptor
         ref="cardDescriptorRef"
         module="InvoiceIn"
+        data-key="InvoiceIn"
         :url="`InvoiceIns/${entityId}`"
         :filter="filter"
-        :title="data.title"
-        :subtitle="data.subtitle"
-        @on-fetch="setData"
-        data-key="invoiceInData"
+        title="supplierRef"
     >
         <template #menu="{ entity }">
+            <InvoiceInToBook>
+                <template #content="{ book }">
                     <QItem
-                v-if="!entity.isBooked && isAdministrative()"
+                        v-if="!entity?.isBooked && isAdministrative()"
                         v-ripple
                         clickable
-                @click="triggerMenu('book')"
+                        @click="book(entityId)"
                     >
                         <QItemSection>{{ t('To book') }}</QItemSection>
                     </QItem>
+                </template>
+            </InvoiceInToBook>
+            <QItem
+                v-if="entity?.isBooked && isAdministrative()"
+                v-ripple
+                clickable
+                @click="triggerMenu('unbook')"
+            >
+                <QItemSection>
+                    {{ t('To unbook') }}
+                </QItemSection>
+            </QItem>
             <QItem
                 v-if="isAdministrative()"
                 v-ripple
@@ -395,25 +357,24 @@ const createInvoiceInCorrection = async () => {
             >
                 <QItemSection>{{ t('components.smartCard.downloadFile') }}</QItemSection>
             </QItem>
-            <QItem
-                v-if="entity.dmsFk"
-                v-ripple
-                clickable
-                @click="downloadFile(entity.dmsFk)"
-            >
-                <QItemSection>{{ t('components.smartCard.downloadFile') }}</QItemSection>
-            </QItem>
         </template>
         <template #body="{ entity }">
             <VnLv :label="t('invoiceIn.card.issued')" :value="toDate(entity.issued)" />
             <VnLv :label="t('invoiceIn.summary.booked')" :value="toDate(entity.booked)" />
-            <VnLv :label="t('invoiceIn.card.amount')" :value="toCurrency(totalAmount)" />
             <VnLv
-                :label="t('invoiceIn.summary.supplier')"
-                :value="entity.supplier?.nickname"
+                :label="t('invoiceIn.card.amount')"
+                :value="toCurrency(totalAmount, entity.currency?.code)"
             />
+            <VnLv :label="t('invoiceIn.summary.supplier')">
+                <template #value>
+                    <span class="link">
+                        {{ entity?.supplier?.nickname }}
+                        <SupplierDescriptorProxy :id="entity?.supplierFk" />
+                    </span>
                 </template>
-        <template #actions="{ entity }">
+            </VnLv>
+        </template>
+        <template #action="{ entity }">
             <QCardActions>
                 <QBtn
                     size="md"
@@ -486,7 +447,7 @@ const createInvoiceInCorrection = async () => {
                             :options="siiTypeInvoiceOuts"
                             option-value="id"
                             option-label="code"
-                            :rules="[requiredFieldRule]"
+                            :required="true"
                         />
                     </QItemSection>
                     <QItemSection>
@@ -496,7 +457,7 @@ const createInvoiceInCorrection = async () => {
                             :options="cplusRectificationTypes"
                             option-value="id"
                             option-label="description"
-                            :rules="[requiredFieldRule]"
+                            :required="true"
                         />
                         <VnSelect
                             :label="`${useCapitalize(t('globals.reason'))}*`"
@@ -504,7 +465,7 @@ const createInvoiceInCorrection = async () => {
                             :options="invoiceCorrectionTypes"
                             option-value="id"
                             option-label="description"
-                            :rules="[requiredFieldRule]"
+                            :required="true"
                         />
                     </QItemSection>
                 </QItem>
@@ -526,9 +487,6 @@ const createInvoiceInCorrection = async () => {
 .q-dialog {
     .q-card {
         max-width: 45em;
-        .q-item__section > .q-input {
-            padding-bottom: 1.4em;
-        }
     }
 }
 
@@ -544,11 +502,18 @@ const createInvoiceInCorrection = async () => {
 }
 </style>
 <i18n>
+en:
+    isNotLinked: The entry {bookEntry} has been deleted with {accountingEntries} entries
+    isLinked: The entry {bookEntry} has been linked to Sage. Please contact administration for further information
+    assertAction: Are you sure you want to {action} this invoice?
 es:
+    book: asentar
+    unbook: desasentar
+    delete: eliminar
+    clone: clonar
     To book: Contabilizar
-    Are you sure you want to book this invoice?: Estas seguro de querer asentar esta factura?
+    To unbook: Descontabilizar
     Delete invoice: Eliminar factura
-    Are you sure you want to delete this invoice?:  Estas seguro de querer eliminar esta factura?
     Invoice deleted: Factura eliminada
     Clone invoice: Clonar factura
     Invoice cloned: Factura clonada
@@ -560,4 +525,7 @@ es:
     Rectificative invoice: Factura rectificativa
     Original invoice: Factura origen
     Entry: entrada
+    isNotLinked: Se ha eliminado el asiento nº {bookEntry} con {accountingEntries} apuntes
+    isLinked: El asiento {bookEntry} fue enlazado a Sage, por favor contacta con administración
+    assertAction: Estas seguro de querer {action} esta factura?
 </i18n>

src/pages/InvoiceIn/Card/InvoiceInDueDay.vue

@@ -9,24 +9,21 @@ import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnCurrency from 'src/components/common/VnCurrency.vue';
+import { toCurrency } from 'src/filters';
 
 const route = useRoute();
 const { t } = useI18n();
-const arrayData = useArrayData('InvoiceIn');
+const arrayData = useArrayData();
 const invoiceIn = computed(() => arrayData.store.data);
 
 const rowsSelected = ref([]);
 const banks = ref([]);
 const invoiceInFormRef = ref();
-const invoiceId = route.params.id;
+const invoiceId = +route.params.id;
 
 const placeholder = 'yyyy/mm/dd';
 
-const filter = {
-    where: {
-        invoiceInFk: invoiceId,
-    },
-};
+const filter = { where: { invoiceInFk: invoiceId } };
 
 const columns = computed(() => [
     {
@@ -73,6 +70,7 @@ async function insert() {
     await axios.post('/InvoiceInDueDays/new', { id: +invoiceId });
     await invoiceInFormRef.value.reload();
 }
+const getTotalAmount = (rows) => rows.reduce((acc, { amount }) => acc + +amount, 0);
 </script>
 <template>
     <FetchData
@@ -184,6 +182,19 @@ async function insert() {
                         />
                     </QTd>
                 </template>
+                <template #bottom-row>
+                    <QTr class="bg">
+                        <QTd />
+                        <QTd />
+                        <QTd />
+                        <QTd>
+                            {{
+                                toCurrency(getTotalAmount(rows), invoiceIn.currency.code)
+                            }}
+                        </QTd>
+                        <QTd />
+                    </QTr>
+                </template>
                 <template #item="props">
                     <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
                         <QCard>
@@ -294,7 +305,11 @@ async function insert() {
         <QBtn color="primary" icon="add" size="lg" round @click="insert" />
     </QPageSticky>
 </template>
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.bg {
+    background-color: var(--vn-light-gray);
+}
+</style>
 <i18n>
     es:
         Date: Fecha

src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue

@@ -6,26 +6,20 @@ import { toCurrency } from 'src/filters';
 import CrudModel from 'src/components/CrudModel.vue';
 import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const { t } = useI18n();
-const route = useRoute();
 
+const route = useRoute();
+const arrayData = useArrayData();
+const currency = computed(() => arrayData.store.data?.currency?.code);
 const invoceInIntrastat = ref([]);
-const amountTotal = computed(() => getTotal('amount'));
-const netTotal = computed(() => getTotal('net'));
-const stemsTotal = computed(() => getTotal('stems'));
 const rowsSelected = ref([]);
 const countries = ref([]);
 const intrastats = ref([]);
 const invoiceInFormRef = ref();
-
-const filter = {
-    where: {
-        invoiceInFk: route.params.id,
-    },
-};
-
+const invoiceInId = computed(() => +route.params.id);
+const filter = { where: { invoiceInFk: invoiceInId.value } };
 const columns = computed(() => [
     {
         name: 'code',
@@ -77,13 +71,8 @@ const columns = computed(() => [
     },
 ]);
 
-function getTotal(type) {
-    if (!invoceInIntrastat.value.length) return 0.0;
-    return invoceInIntrastat.value.reduce(
-        (total, intrastat) => total + intrastat[type],
-        0.0
-    );
-}
+const getTotal = (data, key) =>
+    data.reduce((acc, cur) => acc + +String(cur[key]).replace(',', '.'), 0);
 </script>
 <template>
     <FetchData
@@ -99,30 +88,12 @@ function getTotal(type) {
         @on-fetch="(data) => (intrastats = data)"
     />
     <div class="invoiceIn-intrastat">
-        <QCard v-if="invoceInIntrastat.length" class="full-width q-mb-md q-pa-sm">
-            <QItem class="justify-end">
-                <div>
-                    <QItemLabel>
-                        <VnLv
-                            :label="t('Total amount')"
-                            :value="toCurrency(amountTotal)"
-                        />
-                    </QItemLabel>
-                    <QItemLabel>
-                        <VnLv :label="t('Total net')" :value="netTotal" />
-                    </QItemLabel>
-                    <QItemLabel>
-                        <VnLv :label="t('Total stems')" :value="stemsTotal" />
-                    </QItemLabel>
-                </div>
-            </QItem>
-        </QCard>
         <CrudModel
             ref="invoiceInFormRef"
             data-key="InvoiceInIntrastats"
             url="InvoiceInIntrastats"
-            auto-load
-            :data-required="{ invoiceInFk: route.params.id }"
+            :auto-load="!currency"
+            :data-required="{ invoiceInFk: invoiceInId }"
             :filter="filter"
             v-model:selected="rowsSelected"
             @on-fetch="(data) => (invoceInIntrastat = data)"
@@ -172,6 +143,22 @@ function getTotal(type) {
                             />
                         </QTd>
                     </template>
+                    <template #bottom-row>
+                        <QTr class="bg">
+                            <QTd />
+                            <QTd />
+                            <QTd>
+                                {{ toCurrency(getTotal(rows, 'amount'), currency) }}
+                            </QTd>
+                            <QTd>
+                                {{ getTotal(rows, 'net') }}
+                            </QTd>
+                            <QTd>
+                                {{ getTotal(rows, 'stems') }}
+                            </QTd>
+                            <QTd />
+                        </QTr>
+                    </template>
                     <template #item="props">
                         <div class="q-pa-xs col-xs-12 col-sm-6 grid-style-transition">
                             <QCard>