Jenkinsfile

@@ -126,7 +126,7 @@ pipeline {
                             sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
 
                             image.inside("--network ${env.COMPOSE_PROJECT}_default -e CI -e TZ --init") {
-                                sh 'sh test/cypress/cypressParallel.sh 2'
+                                sh 'sh test/cypress/cypressParallel.sh 1'
                             }
                         }
                     }

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "25.16.0",
+    "version": "25.14.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
@@ -76,4 +76,4 @@
         "vite": "^6.0.11",
         "vitest": "^0.31.1"
     }
-}
+}

src/components/NavBar.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed } from 'vue';
+import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
@@ -18,14 +18,6 @@ const state = useState();
 const user = state.getUser();
 const appName = 'Lilium';
 const pinnedModulesRef = ref();
-const hostname = window.location.hostname;
-const env = ref();
-
-const getEnvironment = computed(() => {
-    env.value = hostname.split('-');
-    if (env.value.length <= 1) return;
-    return env.value[0];
-});
 
 onMounted(() => stateStore.setMounted());
 const refresh = () => window.location.reload();
@@ -57,9 +49,6 @@ const refresh = () => window.location.reload();
                         {{ t('globals.backToDashboard') }}
                     </QTooltip>
                 </QBtn>
-                <QBadge v-if="getEnvironment" color="primary" align="top">
-                    {{ getEnvironment }}
-                </QBadge>
             </RouterLink>
             <VnBreadcrumbs v-if="$q.screen.gt.sm" />
             <QSpinner

src/components/TicketProblems.vue

@@ -17,6 +17,17 @@ defineProps({ row: { type: Object, required: true } });
                 </QTooltip>
             </QIcon>
         </router-link>
+        <QIcon
+            v-if="row?.reserved"
+            color="primary"
+            name="vn:reserva"
+            size="xs"
+            data-cy="ticketSaleReservedIcon"
+        >
+            <QTooltip>
+                {{ t('ticketSale.reserved') }}
+            </QTooltip>
+        </QIcon>
         <QIcon
             v-if="row?.isDeleted"
             color="primary"

src/components/VnTable/VnColumn.vue

@@ -55,8 +55,6 @@ const $props = defineProps({
     },
 });
 
-const label = $props.showLabel && $props.column.label ? $props.column.label : '';
-
 const defaultSelect = {
     attrs: {
         row: $props.row,
@@ -64,7 +62,7 @@ const defaultSelect = {
         class: 'fit',
     },
     forceAttrs: {
-        label,
+        label: $props.showLabel && $props.column.label,
     },
 };
 
@@ -76,7 +74,7 @@ const defaultComponents = {
             class: 'fit',
         },
         forceAttrs: {
-            label,
+            label: $props.showLabel && $props.column.label,
         },
     },
     number: {
@@ -86,7 +84,7 @@ const defaultComponents = {
             class: 'fit',
         },
         forceAttrs: {
-            label,
+            label: $props.showLabel && $props.column.label,
         },
     },
     date: {
@@ -98,7 +96,7 @@ const defaultComponents = {
             class: 'fit',
         },
         forceAttrs: {
-            label,
+            label: $props.showLabel && $props.column.label,
         },
     },
     time: {
@@ -107,7 +105,7 @@ const defaultComponents = {
             disable: !$props.isEditable,
         },
         forceAttrs: {
-            label,
+            label: $props.showLabel && $props.column.label,
         },
     },
     checkbox: {
@@ -127,7 +125,7 @@ const defaultComponents = {
             return defaultAttrs;
         },
         forceAttrs: {
-            label,
+            label: $props.showLabel && $props.column.label,
             autofocus: true,
         },
         events: {

src/components/VnTable/VnOrder.vue

@@ -70,7 +70,7 @@ function textAlignToFlex(textAlign) {
         :style="textAlignToFlex(align)"
     >
         <span :title="label">{{ label }}</span>
-        <div v-if="name && (model?.index || vertical)">
+        <div v-if="name && model?.index">
             <QChip
                 :label="!vertical ? model?.index : ''"
                 :icon="
@@ -83,14 +83,14 @@ function textAlignToFlex(textAlign) {
                 :size="vertical ? '' : 'sm'"
                 :class="[
                     model?.index ? 'color-vn-text' : 'bg-transparent',
-                    vertical ? 'q-mx-none q-py-lg' : '',
+                    vertical ? 'q-px-none' : '',
                 ]"
                 class="no-box-shadow"
                 :clickable="true"
                 style="min-width: 40px; max-height: 30px"
             >
                 <div
-                    class="column justify-center text-center"
+                    class="column flex-center"
                     v-if="vertical"
                     :style="!model?.index && 'color: #5d5d5d'"
                 >

src/components/VnTable/VnTableFilter.vue

@@ -26,12 +26,7 @@ function columnName(col) {
 }
 </script>
 <template>
-    <VnFilterPanel
+    <VnFilterPanel v-bind="$attrs" :search-button="true" :disable-submit-event="true">
-        v-bind="$attrs"
-        :search-button="true"
-        :disable-submit-event="true"
-        :search-url
-    >
         <template #body="{ params, orders, searchFn }">
             <div
                 class="container"
@@ -39,20 +34,13 @@ function columnName(col) {
                 :key="col.id"
             >
                 <div class="filter">
-                    <slot
+                    <VnFilter
-                        :name="`filter-${col.name}`"
+                        ref="tableFilterRef"
-                        :params="params"
+                        :column="col"
-                        :column-name="columnName(col)"
+                        :data-key="$attrs['data-key']"
-                        :search-fn
+                        v-model="params[columnName(col)]"
-                    >
+                        :search-url="searchUrl"
-                        <VnFilter
+                    />
-                            ref="tableFilterRef"
-                            :column="col"
-                            :data-key="$attrs['data-key']"
-                            v-model="params[columnName(col)]"
-                            :search-url="searchUrl"
-                        />
-                    </slot>
                 </div>
                 <div class="order">
                     <VnTableOrder
@@ -89,13 +77,13 @@ function columnName(col) {
     display: flex;
     justify-content: center;
     align-items: center;
-    min-height: 45px;
+    height: 45px;
     gap: 10px;
 }
 
 .filter {
     width: 70%;
-    min-height: 40px;
+    height: 40px;
     text-align: center;
 }
 .order {

src/components/common/SendEmailDialog.vue

@@ -60,7 +60,7 @@ async function confirm() {
                     v-model="address"
                     is-outlined
                     autofocus
-                    data-cy="SendEmailNotificationDialogInput"
+                    data-cy="SendEmailNotifiactionDialogInput"
                 />
             </QCardSection>
             <QCardActions align="right">

src/components/common/VnAccountNumber.vue

@@ -1,14 +1,35 @@
 <script setup>
+import { nextTick, ref } from 'vue';
 import VnInput from './VnInput.vue';
 import { useAccountShortToStandard } from 'src/composables/useAccountShortToStandard';
 
+const $props = defineProps({
+    insertable: {
+        type: Boolean,
+        default: false,
+    },
+});
+
+const emit = defineEmits(['update:modelValue', 'accountShortToStandard']);
 const model = defineModel({ prop: 'modelValue' });
+const inputRef = ref(false);
+
+function setCursorPosition(pos) {
+    const input = inputRef.value.vnInputRef.$el.querySelector('input');
+    input.focus();
+    input.setSelectionRange(pos, pos);
+}
+
+async function handleUpdateModel(val) {
+    model.value = val?.at(-1) === '.' ? useAccountShortToStandard(val) : val;
+    await nextTick(() => setCursorPosition(0));
+}
 </script>
 <template>
     <VnInput
         v-model="model"
         ref="inputRef"
-        @keydown.tab="model = useAccountShortToStandard($event.target.value) ?? model"
+        :insertable
-        @input="model = $event.target.value.replace(/[^\d.]/g, '')"
+        @update:model-value="handleUpdateModel"
     />
 </template>

src/components/common/VnCard.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onBeforeMount, computed, markRaw } from 'vue';
+import { onBeforeMount, computed } from 'vue';
 import { useRoute, useRouter, onBeforeRouteUpdate, onBeforeRouteLeave } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
@@ -26,14 +26,18 @@ const route = useRoute();
 const stateStore = useStateStore();
 const router = useRouter();
 const entityId = computed(() => props.id || route?.params?.id);
-let arrayData = getArrayData(entityId.value, props.url);
+const arrayData = useArrayData(props.dataKey, {
+    url: props.url,
+    userFilter: props.filter,
+    oneRecord: true,
+});
 
 onBeforeRouteLeave(() => {
     stateStore.cardDescriptorChangeValue(null);
 });
 
 onBeforeMount(async () => {
-    stateStore.cardDescriptorChangeValue(markRaw(props.descriptor));
+    stateStore.cardDescriptorChangeValue(props.descriptor);
 
     const route = router.currentRoute.value;
     try {
@@ -57,31 +61,16 @@ onBeforeRouteUpdate(async (to, from) => {
 });
 
 async function fetch(id, append = false) {
+    const regex = /\/(\d+)/;
     if (props.idInWhere) arrayData.store.filter.where = { id };
-    else {
+    else if (!regex.test(props.url)) arrayData.store.url = `${props.url}/${id}`;
-        arrayData = getArrayData(id);
+    else arrayData.store.url = props.url.replace(regex, `/${id}`);
-    }
     await arrayData.fetch({ append, updateRouter: false });
     emit('onFetch', arrayData.store.data);
 }
 function hasRouteParam(params, valueToCheck = ':addressId') {
     return Object.values(params).includes(valueToCheck);
 }
-
-function formatUrl(id) {
-    const newId = id || entityId.value;
-    const regex = /\/(\d+)/;
-    if (!regex.test(props.url)) return `${props.url}/${newId}`;
-    return props.url.replace(regex, `/${newId}`);
-}
-
-function getArrayData(id, url) {
-    return useArrayData(props.dataKey, {
-        url: url ?? formatUrl(id),
-        userFilter: props.filter,
-        oneRecord: true,
-    });
-}
 </script>
 <template>
     <template v-if="visual">

src/components/common/VnLog.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, onMounted, onUnmounted, watch, computed } from 'vue';
+import { ref, onUnmounted, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 import axios from 'axios';
@@ -11,11 +11,11 @@ import { useCapitalize } from 'src/composables/useCapitalize';
 import { useValidator } from 'src/composables/useValidator';
 import VnAvatar from '../ui/VnAvatar.vue';
 import VnLogValue from './VnLogValue.vue';
+import FetchData from '../FetchData.vue';
+import VnSelect from './VnSelect.vue';
 import VnUserLink from '../ui/VnUserLink.vue';
 import VnPaginate from '../ui/VnPaginate.vue';
-import VnLogFilter from 'src/components/common/VnLogFilter.vue';
 import RightMenu from './RightMenu.vue';
-import { useFilterParams } from 'src/composables/useFilterParams';
 
 const stateStore = useStateStore();
 const validationsStore = useValidator();
@@ -72,8 +72,39 @@ const filter = {
 };
 
 const paginate = ref();
-const dataKey = computed(() => `${props.model}Log`);
+const actions = ref();
-const userParams = ref(useFilterParams(dataKey.value).params);
+const changeInput = ref();
+const searchInput = ref();
+const userRadio = ref();
+const userSelect = ref();
+const dateFrom = ref();
+const dateFromDialog = ref(false);
+const dateTo = ref();
+const dateToDialog = ref(false);
+const selectedFilters = ref({});
+const userTypes = [
+    { label: 'All', value: undefined },
+    { label: 'User', value: { neq: null } },
+    { label: 'System', value: null },
+];
+const checkboxOptions = ref({
+    insert: {
+        label: 'Creates',
+        selected: false,
+    },
+    update: {
+        label: 'Edits',
+        selected: false,
+    },
+    delete: {
+        label: 'Deletes',
+        selected: false,
+    },
+    select: {
+        label: 'Accesses',
+        selected: false,
+    },
+});
 
 let validations = models;
 let pointRecord = ref(null);
@@ -215,55 +246,131 @@ async function setLogTree(data) {
 function filterByRecord(modelLog) {
     byRecord.value = true;
     const { id, model } = modelLog;
-    applyFilter({ changedModelId: id, changedModel: model });
+
+    searchInput.value = id;
+    selectedFilters.value.changedModelId = id;
+    selectedFilters.value.changedModel = model;
+    applyFilter();
 }
 
-async function applyFilter(params = {}) {
+async function applyFilter() {
-    paginate.value.arrayData.resetPagination();
+    filter.where = { and: [] };
-    paginate.value.arrayData.applyFilter({
+    if (
-        filter: {},
+        !selectedFilters.value.changedModel ||
-        params: { originFk: route.params.id, ...params },
+        (!selectedFilters.value.changedModelValue &&
-    });
+            !selectedFilters.value.changedModelId)
+    )
+        byRecord.value = false;
+
+    if (!byRecord.value) filter.where.and.push({ originFk: route.params.id });
+
+    if (Object.keys(selectedFilters.value).length) {
+        filter.where.and.push(selectedFilters.value);
+    }
+
+    paginate.value.fetch({ filter });
 }
 
-function exprBuilder(param, value) {
+function setDate(type) {
-    switch (param) {
+    let from = dateFrom.value
-        case 'changedModelValue':
+        ? date.formatDate(dateFrom.value.split('-').reverse().join('-'), 'YYYY-MM-DD')
-            return { [param]: { like: `%${value}%` } };
+        : undefined;
-        case 'change':
+    from = date.adjustDate(from, { hour: 0, minute: 0, second: 0, millisecond: 0 }, true);
-            if (value)
+
-                return {
+    let to = dateTo.value
-                    or: [
+        ? date.formatDate(dateTo.value.split('-').reverse().join('-'), 'YYYY-MM-DD')
-                        { oldJson: { like: `%${value}%` } },
+        : date.formatDate(dateFrom.value.split('-').reverse().join('-'), 'YYYY-MM-DD');
-                        { newJson: { like: `%${value}%` } },
+    to = date.adjustDate(
-                        { description: { like: `%${value}%` } },
+        to,
-                    ],
+        { hour: 21, minute: 59, second: 59, millisecond: 999 },
-                };
+        true,
-            break;
+    );
-        case 'action':
+
-            if (value?.length) return { [param]: { inq: value } };
+    switch (type) {
-            break;
         case 'from':
-            return { creationDate: { gte: value } };
+            return { between: [from, to] };
-        case 'to':
+        case 'to': {
-            return { creationDate: { lte: value } };
+            if (dateFrom.value) {
-        case 'userType':
+                return {
-            if (value === 'User') return { userFk: { neq: null } };
+                    between: [from, to],
-            if (value === 'System') return { userFk: null };
+                };
-            break;
+            }
-        default:
+            return { lte: to };
-            return { [param]: value };
+        }
     }
 }
 
+function selectFilter(type, dateType) {
+    const filter = {};
+    const actions = { inq: [] };
+    let reload = true;
+
+    if (type === 'search') {
+        if (/^\s*[0-9]+\s*$/.test(searchInput.value) || props.byRecord) {
+            selectedFilters.value.changedModelId = searchInput.value.trim();
+        } else if (!searchInput.value) {
+            selectedFilters.value.changedModelId = undefined;
+            selectedFilters.value.changedModelValue = undefined;
+        } else {
+            selectedFilters.value.changedModelValue = { like: `%${searchInput.value}%` };
+        }
+    }
+    if (type === 'action' && selectedFilters.value.changedModel === null) {
+        selectedFilters.value.changedModel = undefined;
+    }
+    if (type === 'userRadio') {
+        selectedFilters.value.userFk = userRadio.value;
+    }
+    if (type === 'change') {
+        if (changeInput.value)
+            selectedFilters.value.or = [
+                { oldJson: { like: `%${changeInput.value}%` } },
+                { newJson: { like: `%${changeInput.value}%` } },
+                { description: { like: `%${changeInput.value}%` } },
+            ];
+        else selectedFilters.value.or = undefined;
+    }
+    if (type === 'userSelect') {
+        selectedFilters.value.userFk =
+            userSelect.value !== null ? userSelect.value : undefined;
+    }
+    if (type === 'date') {
+        if (!dateFrom.value && !dateTo.value) {
+            selectedFilters.value.creationDate = undefined;
+        } else if (dateType === 'to') {
+            selectedFilters.value.creationDate = setDate('to');
+        } else if (dateType === 'from') {
+            selectedFilters.value.creationDate = setDate('from');
+        }
+    }
+
+    Object.keys(checkboxOptions.value).forEach((key) => {
+        if (checkboxOptions.value[key].selected) actions.inq.push(key);
+    });
+    selectedFilters.value.action = actions.inq.length ? actions : undefined;
+
+    Object.keys(selectedFilters.value).forEach((key) => {
+        if (selectedFilters.value[key]) filter[key] = selectedFilters.value[key];
+    });
+
+    if (reload) applyFilter(filter);
+}
+
 async function clearFilter() {
+    selectedFilters.value = {};
     byRecord.value = false;
+    userSelect.value = undefined;
+    searchInput.value = undefined;
+    changeInput.value = undefined;
+    dateFrom.value = undefined;
+    dateTo.value = undefined;
+    userRadio.value = undefined;
+    Object.keys(checkboxOptions.value).forEach(
+        (opt) => (checkboxOptions.value[opt].selected = false),
+    );
     await applyFilter();
 }
 
-onMounted(() => {
-    stateStore.rightDrawerChangeValue(true);
-});
 onUnmounted(() => {
     stateStore.rightDrawer = false;
 });
@@ -276,18 +383,32 @@ watch(
 );
 </script>
 <template>
+    <FetchData
+        :url="`${props.model}Logs/${route.params.id}/models`"
+        :filter="{ order: ['changedModel'] }"
+        @on-fetch="
+            (data) =>
+                (actions = data.map((item) => {
+                    const changedModel = item.changedModel;
+                    return {
+                        locale: useCapitalize(
+                            validations[changedModel]?.locale?.name ?? changedModel,
+                        ),
+                        value: changedModel,
+                    };
+                }))
+        "
+        auto-load
+    />
     <VnPaginate
         ref="paginate"
-        :data-key
+        :data-key="`${model}Log`"
-        :url="dataKey + 's'"
+        :url="`${model}Logs`"
         :user-filter="filter"
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"
-        @on-change="setLogTree"
         search-url="logs"
-        :exprBuilder
-        :order="['creationDate DESC', 'id DESC']"
     >
         <template #body>
             <div
@@ -346,7 +467,6 @@ watch(
                                             backgroundColor: useColor(modelLog.model),
                                         }"
                                         :title="`${modelLog.model} #${modelLog.id}`"
-                                        data-cy="vnLog-model-chip"
                                     >
                                         {{ t(modelLog.modelI18n) }}
                                     </QChip>
@@ -460,7 +580,6 @@ watch(
                                                             }`,
                                                         )
                                                     "
-                                                    data-cy="vnLog-action-icon"
                                                 />
                                             </div>
                                         </QItem>
@@ -578,12 +697,181 @@ watch(
     </VnPaginate>
     <RightMenu>
         <template #right-panel>
-            <VnLogFilter :data-key />
+            <QList dense>
+                <QSeparator />
+                <QItem class="q-mt-sm">
+                    <QInput
+                        :label="t('globals.search')"
+                        v-model="searchInput"
+                        class="full-width"
+                        clearable
+                        filled
+                        clear-icon="close"
+                        @keyup.enter="() => selectFilter('search')"
+                        @focusout="() => selectFilter('search')"
+                        @clear="() => selectFilter('search')"
+                    >
+                        <template #append>
+                            <QIcon name="info" class="cursor-pointer">
+                                <QTooltip>{{ t('tooltips.search') }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </QInput>
+                </QItem>
+                <QItem>
+                    <VnSelect
+                        class="full-width"
+                        :label="t('globals.entity')"
+                        v-model="selectedFilters.changedModel"
+                        option-label="locale"
+                        option-value="value"
+                        filled
+                        :options="actions"
+                        @update:model-value="selectFilter('action')"
+                        hide-selected
+                    />
+                </QItem>
+                <QItem class="q-mt-sm">
+                    <QOptionGroup
+                        size="sm"
+                        v-model="userRadio"
+                        :options="userTypes"
+                        color="primary"
+                        @update:model-value="selectFilter('userRadio')"
+                        right-label
+                    >
+                        <template #label="{ label }">
+                            {{ t(`Users.${label}`) }}
+                        </template>
+                    </QOptionGroup>
+                </QItem>
+                <QItem class="q-mt-sm">
+                    <QItemSection v-if="userRadio !== null">
+                        <VnSelect
+                            class="full-width"
+                            :label="t('globals.user')"
+                            v-model="userSelect"
+                            filled
+                            :url="`${model}Logs/${route.params.id}/editors`"
+                            :fields="['id', 'nickname', 'name', 'image']"
+                            sort-by="nickname"
+                            @update:model-value="selectFilter('userSelect')"
+                            hide-selected
+                        >
+                            <template #option="{ opt, itemProps }">
+                                <QItem
+                                    v-bind="itemProps"
+                                    class="q-pa-xs row items-center"
+                                >
+                                    <QItemSection class="col-3 items-center">
+                                        <VnAvatar :worker-id="opt.id" />
+                                    </QItemSection>
+                                    <QItemSection class="col-9 justify-center">
+                                        <span>{{ opt.name }}</span>
+                                        <span class="text-grey">{{ opt.nickname }}</span>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelect>
+                    </QItemSection>
+                </QItem>
+                <QItem class="q-mt-sm">
+                    <QInput
+                        :label="t('globals.changes')"
+                        v-model="changeInput"
+                        class="full-width"
+                        filled
+                        clearable
+                        clear-icon="close"
+                        @keyup.enter="selectFilter('change')"
+                        @focusout="selectFilter('change')"
+                        @clear="selectFilter('change')"
+                    >
+                        <template #append>
+                            <QIcon name="info" class="cursor-pointer">
+                                <QTooltip max-width="250px">{{
+                                    t('tooltips.changes')
+                                }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </QInput>
+                </QItem>
+                <QItem
+                    :class="index == 'create' ? 'q-mt-md' : 'q-mt-xs'"
+                    v-for="(checkboxOption, index) in checkboxOptions"
+                    :key="index"
+                >
+                    <QCheckbox
+                        size="sm"
+                        v-model="checkboxOption.selected"
+                        :label="t(`actions.${checkboxOption.label}`)"
+                        @update:model-value="selectFilter"
+                    />
+                </QItem>
+                <QItem class="q-mt-sm">
+                    <QInput
+                        class="full-width"
+                        :label="t('globals.date')"
+                        @click="dateFromDialog = true"
+                        @focus="(evt) => evt.target.blur()"
+                        @clear="selectFilter('date', 'to')"
+                        v-model="dateFrom"
+                        clearable
+                        filled
+                        clear-icon="close"
+                    />
+                </QItem>
+                <QItem class="q-mt-sm">
+                    <QInput
+                        class="full-width"
+                        :label="t('globals.to')"
+                        @click="dateToDialog = true"
+                        @focus="(evt) => evt.target.blur()"
+                        @clear="selectFilter('date', 'from')"
+                        v-model="dateTo"
+                        clearable
+                        filled
+                        clear-icon="close"
+                    />
+                </QItem>
+            </QList>
         </template>
     </RightMenu>
+    <QDialog v-model="dateFromDialog">
+        <QDate
+            :years-in-month-view="false"
+            v-model="dateFrom"
+            dense
+            flat
+            minimal
+            filled
+            @update:model-value="
+                (value) => {
+                    dateFromDialog = false;
+                    dateFrom = date.formatDate(value, 'DD-MM-YYYY');
+                    selectFilter('date', 'from');
+                }
+            "
+        />
+    </QDialog>
+    <QDialog v-model="dateToDialog">
+        <QDate
+            v-model="dateTo"
+            dense
+            flat
+            minimal
+            @update:model-value="
+                (value) => {
+                    dateToDialog = false;
+                    dateTo = date.formatDate(value, 'DD-MM-YYYY');
+                    selectFilter('date', 'to');
+                }
+            "
+        />
+    </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
         <QBtn
-            v-if="Object.keys(userParams).some((filter) => filter !== 'originFk')"
+            v-if="Object.values(selectedFilters).some((filter) => filter !== undefined)"
             color="primary"
             icon="filter_alt_off"
             size="md"

src/components/common/VnLogFilter.vue

@@ -1,249 +1,77 @@
 <script setup>
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import VnTableFilter from '../VnTable/VnTableFilter.vue';
+import FetchData from 'components/FetchData.vue';
-import VnSelect from './VnSelect.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import { useRoute } from 'vue-router';
-import VnInput from './VnInput.vue';
-import { ref, computed, watch } from 'vue';
-import VnInputDate from './VnInputDate.vue';
-import { useFilterParams } from 'src/composables/useFilterParams';
-import FetchData from '../FetchData.vue';
-import { useValidator } from 'src/composables/useValidator';
-import { useCapitalize } from 'src/composables/useCapitalize';
-import VnAvatar from '../ui/VnAvatar.vue';
 
-const $props = defineProps({
+const { t } = useI18n();
+const props = defineProps({
     dataKey: {
         type: String,
-        default: null,
+        required: true,
     },
 });
 
-const { t } = useI18n();
+const workers = ref();
-const route = useRoute();
-const validationsStore = useValidator();
-const { models } = validationsStore;
-const entities = ref([]);
-const editors = ref([]);
-const userParams = ref(useFilterParams($props.dataKey).params);
-let validations = models;
-const userTypes = [
-    { value: 'All', label: t(`Users.All`) },
-    { value: 'User', label: t(`Users.User`) },
-    { value: 'System', label: t(`Users.System`) },
-];
-const checkboxOptions = ref([
-    { name: 'insert', label: 'Creates', selected: false },
-    { name: 'update', label: 'Edits', selected: false },
-    { name: 'delete', label: 'Deletes', selected: false },
-    { name: 'select', label: 'Accesses', selected: false },
-]);
-const columns = computed(() => [
-    { name: 'changedModelValue' },
-    { name: 'changedModel' },
-    { name: 'userType', orderBy: false },
-    { name: 'userFk' },
-    { name: 'change', orderBy: false },
-    { name: 'action' },
-    { name: 'from', orderBy: 'creationDate' },
-    { name: 'to', orderBy: 'creationDate' },
-]);
-
-const userParamsWatcher = watch(
-    () => userParams.value,
-    (params) => {
-        if (params.action) {
-            params.action.forEach((option) => {
-                checkboxOptions.value.find((o) => o.name === option).selected = true;
-            });
-            userParamsWatcher();
-        }
-    },
-);
-
-function getActions() {
-    const actions = checkboxOptions.value
-        .filter((option) => option.selected)
-        ?.map((o) => o.name);
-    return actions.length ? actions : null;
-}
 </script>
 
 <template>
     <FetchData
-        :url="`${dataKey}s/${route.params.id}/models`"
+        url="Workers/activeWithInheritedRole"
-        :filter="{ order: ['changedModel'] }"
+        :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="
+        @on-fetch="(data) => (workers = data)"
-            (data) =>
-                (entities = data.map((item) => {
-                    const changedModel = item.changedModel;
-                    return {
-                        locale: useCapitalize(
-                            validations[changedModel]?.locale?.name ?? changedModel,
-                        ),
-                        value: changedModel,
-                    };
-                }))
-        "
         auto-load
     />
-    <FetchData
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
-        :url="`${dataKey}s/${route.params.id}/editors`"
+        <template #tags="{ tag, formatFn }">
-        :filter="{ fields: ['id', 'nickname', 'name', 'image'] }"
+            <div class="q-gutter-x-xs">
-        sort-by="nickname"
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-        @on-fetch="(data) => (editors = data)"
+                <span>{{ formatFn(tag.value) }}</span>
-        auto-load
-    />
-    <VnTableFilter
-        v-if="dataKey"
-        :data-key
-        :columns="columns"
-        :redirect="false"
-        :hiddenTags="['originFk', 'creationDate']"
-        search-url="logs"
-        :showTagChips="false"
-    >
-        <template #filter-changedModelValue="{ params, columnName, searchFn }">
-            <VnInput
-                :label="t('globals.search')"
-                v-model="params[columnName]"
-                @keyup.enter="searchFn"
-                @blur="searchFn"
-                @remove="searchFn"
-                :info="t('tooltips.search')"
-                dense
-                filled
-                data-cy="vnLog-search"
-            />
-        </template>
-        <template #filter-changedModel="{ params, columnName, searchFn }">
-            <VnSelect
-                :label="t('globals.entity')"
-                v-model="params[columnName]"
-                option-label="locale"
-                option-value="value"
-                :options="entities"
-                @update:model-value="() => searchFn()"
-                dense
-                filled
-                data-cy="vnLog-entity"
-            />
-        </template>
-        <template #filter-userType="{ params, columnName, searchFn }">
-            <QOptionGroup
-                class="text-left"
-                size="sm"
-                v-model="params[columnName]"
-                :options="userTypes"
-                color="primary"
-                @update:model-value="
-                    () => {
-                        params.userFk = null;
-                        searchFn();
-                    }
-                "
-            />
-        </template>
-        <template #filter-userFk="{ params, columnName, searchFn }">
-            <VnSelect
-                :label="t('globals.user')"
-                v-model="params[columnName]"
-                :options="editors"
-                @update:modelValue="() => searchFn()"
-                :disable="params.userType === 'System'"
-                dense
-                filled
-            >
-                <template #option="{ opt, itemProps }">
-                    <QItem v-bind="itemProps" class="q-pa-xs row items-center">
-                        <QItemSection class="col-3 items-center">
-                            <VnAvatar :worker-id="opt.id" />
-                        </QItemSection>
-                        <QItemSection class="col-9 justify-center">
-                            <span>{{ opt.name }}</span>
-                            <span class="text-grey">{{ opt.nickname }}</span>
-                        </QItemSection>
-                    </QItem>
-                </template>
-            </VnSelect>
-        </template>
-        <template #filter-change="{ params, columnName, searchFn }">
-            <VnInput
-                :label="t('globals.changes')"
-                v-model="params[columnName]"
-                @keyup.enter="searchFn"
-                @blur="searchFn"
-                @remove="searchFn"
-                :info="t('tooltips.changes')"
-                dense
-                filled
-            />
-        </template>
-        <template #filter-action="{ searchFn }">
-            <div class="column">
-                <QCheckbox
-                    v-for="checkboxOption in checkboxOptions"
-                    :key="checkboxOption"
-                    size="sm"
-                    v-model="checkboxOption.selected"
-                    :label="t(`actions.${checkboxOption.label}`)"
-                    @update:model-value="
-                        () => searchFn(undefined, 'action', getActions())
-                    "
-                    data-cy="vnLog-checkbox"
-                />
             </div>
         </template>
-        <template #filter-from="{ params, columnName, searchFn }">
+        <template #body="{ params, searchFn }">
-            <VnInputDate
+            <QDate
-                :label="t('globals.from')"
+                v-model="params.created"
-                v-model="params[columnName]"
+                @update:model-value="searchFn()"
                 dense
-                filled
+                flat
-                @update:modelValue="() => searchFn()"
+                minimal
-            />
+            >
+            </QDate>
+            <QSeparator />
+            <QItem>
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers">
+                    <QSelect
+                        :label="t('User')"
+                        v-model="params.userFk"
+                        @update:model-value="searchFn()"
+                        :options="workers"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
         </template>
-        <template #filter-to="{ params, columnName, searchFn }">
+    </VnFilterPanel>
-            <VnInputDate
-                :label="t('globals.to')"
-                v-model="params[columnName]"
-                dense
-                filled
-                @update:modelValue="() => searchFn()"
-            />
-        </template>
-    </VnTableFilter>
 </template>
-<i18n>
-es:
-    tooltips:
-        search: Buscar por identificador o concepto
-        changes: Buscar por cambios. Los atributos deben buscarse por su nombre interno, para obtenerlo situar el cursor sobre el atributo.
-    actions:
-        Creates: Crea
-        Edits: Modifica
-        Deletes: Elimina
-        Accesses: Accede
-    Users:
-        User: Usuario
-        All: Todo
-        System: Sistema
-    params:
-        changedModel: Entity
 
+<i18n>
 en:
-    tooltips:
-        search: Search by identifier or concept
-        changes: Search by changes. Attributes must be searched by their internal name, to get it place the cursor over the attribute.
-    actions:
-        Creates: Creates
-        Edits: Edits
-        Deletes: Deletes
-        Accesses: Accesses
-    Users:
-        User: User
-        All: All
-        System: System
     params:
-        changedModel: Entidad
+        search: Contains
+        userFk: User
+        created: Created
+es:
+    params:
+        search: Contiene
+        userFk: Usuario
+        created: Creada
+    User: Usuario
 </i18n>

src/components/common/VnSection.vue

@@ -40,6 +40,10 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    keepData: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const route = useRoute();
@@ -57,6 +61,7 @@ onBeforeMount(() => {
     if ($props.dataKey)
         arrayData = useArrayData($props.dataKey, {
             searchUrl: 'table',
+            keepData: $props.keepData,
             ...$props.arrayDataProps,
             navigate: $props.redirect,
         });

src/components/common/__tests__/VnLog.spec.js

@@ -108,4 +108,27 @@ describe('VnLog', () => {
         expect(vm.logTree[0].originFk).toEqual(1);
         expect(vm.logTree[0].logs[0].user.name).toEqual('salesPerson');
     });
+
+    it('should correctly set the selectedFilters when filtering', () => {
+        vm.searchInput = '1';
+        vm.userSelect = '21';
+        vm.checkboxOptions.insert.selected = true;
+        vm.checkboxOptions.update.selected = true;
+
+        vm.selectFilter('search');
+        vm.selectFilter('userSelect');
+
+        expect(vm.selectedFilters.changedModelId).toEqual('1');
+        expect(vm.selectedFilters.userFk).toEqual('21');
+        expect(vm.selectedFilters.action).toEqual({ inq: ['insert', 'update'] });
+    });
+
+    it('should correctly set the date from', () => {
+        vm.dateFrom = '18-09-2023';
+        vm.selectFilter('date', 'from');
+        expect(vm.selectedFilters.creationDate.between).toEqual([
+            new Date('2023-09-18T00:00:00.000Z'),
+            new Date('2023-09-18T21:59:59.999Z'),
+        ]);
+    });
 });

src/components/common/__tests__/VnLogFilter.spec.js

@@ -1,28 +0,0 @@
-import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
-import { createWrapper } from 'app/test/vitest/helper';
-import VnLogFilter from 'src/components/common/VnLogFilter.vue';
-
-describe('VnLogFilter', () => {
-    let vm;
-    beforeAll(async () => {
-        vm = createWrapper(VnLogFilter, {
-            props: {
-                dataKey: 'ClaimLog',
-            },
-        }).vm;
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    it('should getActions selected', async () => {
-        vm.checkboxOptions.find((o) => o.name == 'insert').selected = true;
-        vm.checkboxOptions.find((o) => o.name == 'update').selected = true;
-
-        const actions = vm.getActions();
-
-        expect(actions.length).toEqual(2);
-        expect(actions).toEqual(['insert', 'update']);
-    });
-});

src/components/common/__tests__/VnNotes.spec.js

@@ -1,6 +1,16 @@
-import { describe, it, expect, vi, afterEach, beforeEach, afterAll } from 'vitest';
+import {
+    describe,
+    it,
+    expect,
+    vi,
+    beforeAll,
+    afterEach,
+    beforeEach,
+    afterAll,
+} from 'vitest';
 import { createWrapper, axios } from 'app/test/vitest/helper';
 import VnNotes from 'src/components/ui/VnNotes.vue';
+import vnDate from 'src/boot/vnDate';
 
 describe('VnNotes', () => {
     let vm;
@@ -8,7 +18,6 @@ describe('VnNotes', () => {
     let spyFetch;
     let postMock;
     let patchMock;
-    let deleteMock;
     let expectedInsertBody;
     let expectedUpdateBody;
     const defaultOptions = {
@@ -48,7 +57,6 @@ describe('VnNotes', () => {
     beforeEach(() => {
         postMock = vi.spyOn(axios, 'post');
         patchMock = vi.spyOn(axios, 'patch');
-        deleteMock = vi.spyOn(axios, 'delete');
     });
 
     afterEach(() => {
@@ -145,16 +153,4 @@ describe('VnNotes', () => {
             );
         });
     });
-
-    describe('delete', () => {
-        it('Should call axios.delete with url and vnPaginateRef.fetch', async () => {
-            generateWrapper();
-            createSpyFetch();
-
-            await vm.deleteNote({ id: 1 });
-
-            expect(deleteMock).toHaveBeenCalledWith(`${vm.$props.url}/1`);
-            expect(spyFetch).toHaveBeenCalled();
-        });
-    });
 });

src/components/ui/CardSummary.vue

@@ -159,7 +159,6 @@ async function fetch() {
                 display: flex;
                 flex-direction: row;
                 margin-top: 2px;
-                align-items: start;
                 .label {
                     color: var(--vn-label-color);
                     width: 9em;
@@ -170,15 +169,9 @@ async function fetch() {
                     flex-grow: 0;
                     flex-shrink: 0;
                 }
-                &.ellipsis > .value {
-                    text-overflow: ellipsis;
-                    white-space: pre;
-                }
                 .value {
                     color: var(--vn-text-color);
                     overflow: hidden;
-                    white-space: nowrap;
-                    text-overflow: ellipsis;
                 }
             }
             .header {
@@ -210,21 +203,27 @@ async function fetch() {
 }
 
 .vn-card-group {
-    display: grid;
+    display: flex;
-    grid-template-columns: repeat(auto-fit, minmax(250px, 1fr));
+    flex-direction: column;
-    gap: 16px;
 }
 
 .vn-card-content {
     display: flex;
     flex-direction: column;
-    overflow: hidden;
-    white-space: nowrap;
     text-overflow: ellipsis;
     > div {
         max-height: 70px;
     }
 }
+
+@media (min-width: 1010px) {
+    .vn-card-group {
+        flex-direction: row;
+    }
+    .vn-card-content {
+        flex: 1;
+    }
+}
 </style>
 <style lang="scss" scoped>
 .summaryHeader .vn-label-value {

src/components/ui/VnDescriptor.vue

@@ -30,7 +30,7 @@ const $props = defineProps({
         default: null,
     },
     toModule: {
-        type: Object,
+        type: String,
         default: null,
     },
 });
@@ -252,10 +252,6 @@ const toModule = computed(() => {
                 content: ':';
             }
         }
-        &.ellipsis > .value {
-            text-overflow: ellipsis;
-            white-space: pre;
-        }
         .value {
             color: var(--vn-text-color);
             font-size: 14px;

src/components/ui/VnFilterPanel.vue

@@ -61,10 +61,6 @@ const $props = defineProps({
         type: Object,
         default: null,
     },
-    showTagChips: {
-        type: Boolean,
-        default: true,
-    },
 });
 
 const emit = defineEmits([
@@ -92,14 +88,13 @@ const userOrders = ref(useFilterParams($props.dataKey).orders);
 defineExpose({ search, params: userParams, remove });
 
 const isLoading = ref(false);
-async function search(evt, name, value) {
+async function search(evt) {
     try {
         if (evt && $props.disableSubmitEvent) return;
 
         store.filter.where = {};
         isLoading.value = true;
         const filter = { ...userParams.value, ...$props.modelValue };
-        if (name) filter[name] = value;
         store.userParamsChanged = true;
         await arrayData.addFilter({
             params: filter,
@@ -219,7 +214,7 @@ const getLocale = (label) => {
         </QTooltip>
     </QBtn>
     <QForm @submit="search" id="filterPanelForm" @keyup.enter="search()">
-        <QList dense v-if="showTagChips">
+        <QList dense>
             <QItem class="q-mt-xs">
                 <QItemSection top>
                     <QItemLabel header lines="1" class="text-uppercase q-py-xs q-px-none">

src/components/ui/VnLinkMail.vue

@@ -1,11 +1,8 @@
 <script setup>
-import { dashIfEmpty } from 'src/filters';
-
 defineProps({ email: { type: [String], default: null } });
 </script>
 <template>
     <QBtn
-        class="q-pr-xs"
         v-if="email"
         flat
         round
@@ -16,5 +13,4 @@ defineProps({ email: { type: [String], default: null } });
         :href="`mailto:${email}`"
         @click.stop
     />
-    <span>{{ dashIfEmpty(email) }}</span>
 </template>

src/components/ui/VnLinkPhone.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { ref, reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
 import axios from 'axios';
-import { dashIfEmpty, parsePhone } from 'src/filters';
+import { parsePhone } from 'src/filters';
 import useOpenURL from 'src/composables/useOpenURL';
 
 const props = defineProps({
@@ -12,65 +12,49 @@ const props = defineProps({
 
 const phone = ref(props.phoneNumber);
 const config = reactive({
+    sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
     'say-simple': {
         icon: 'vn:saysimple',
         url: null,
         channel: props.channel,
     },
-    sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
 });
-
+const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
-const attrs = useAttrs();
-const types = Object.keys(config)
-    .filter((key) => key in attrs)
-    .sort();
-const activeTypes = types.length ? types : ['sip'];
 
 onBeforeMount(async () => {
     if (!phone.value) return;
+    let { channel } = config[type];
 
-    for (const type of activeTypes) {
+    if (type === 'say-simple') {
-        if (type === 'say-simple') {
+        const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
-            let { channel } = config[type];
+            .data;
-            const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
+        if (!channel) channel = defaultChannel;
-                .data;
-            if (!channel) channel = defaultChannel;
 
-            phone.value = await parsePhone(
+        phone.value = await parsePhone(props.phoneNumber, props.country?.toLowerCase());
-                props.phoneNumber,
+        config[
-                props.country?.toLowerCase(),
+            type
-            );
+        ].url = `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
-            config[type].url =
-                `${url}?customerIdentity=%2B${phone.value}&channelId=${channel}`;
-        }
     }
 });
 
-function handleClick(type) {
+function handleClick() {
     if (config[type].url) useOpenURL(config[type].url);
     else if (config[type].href) window.location.href = config[type].href;
 }
 </script>
-
 <template>
-    <div class="flex items-center gap-2">
+    <QBtn
-        <template v-for="type in activeTypes">
+        v-if="phone"
-            <QBtn
+        flat
-                :key="type"
+        round
-                v-if="phone"
+        :icon="config[type].icon"
-                flat
+        size="sm"
-                round
+        color="primary"
-                :icon="config[type].icon"
+        padding="none"
-                size="sm"
+        @click.stop="handleClick"
-                color="primary"
+    >
-                padding="none"
+        <QTooltip>
-                @click.stop="() => handleClick(type)"
+            {{ capitalize(type).replace('-', '') }}
-            >
+        </QTooltip>
-                <QTooltip>
+    </QBtn>
-                    {{ capitalize(type).replace('-', '') }}
-                </QTooltip>
-            </QBtn></template
-        >
-        <span>{{ dashIfEmpty(phone) }}</span>
-    </div>
 </template>

src/components/ui/VnLv.vue

@@ -43,7 +43,7 @@ const val = computed(() => $props.value);
                     <span style="color: var(--vn-label-color)">{{ label }}</span>
                 </slot>
             </div>
-            <div class="value" v-if="value || $slots.value">
+            <div class="value">
                 <slot name="value">
                     <span :title="value" style="text-overflow: ellipsis">
                         {{ dash ? dashIfEmpty(value) : value }}

src/components/ui/VnMoreOptions.vue

@@ -9,7 +9,7 @@
         data-cy="descriptor-more-opts"
     >
         <QTooltip>
-            {{ $t('components.vnDescriptor.moreOptions') }}
+            {{ $t('components.cardDescriptor.moreOptions') }}
         </QTooltip>
         <QMenu ref="menuRef" data-cy="descriptor-more-opts-menu">
             <QList data-cy="descriptor-more-opts_list">

src/components/ui/VnNotes.vue

@@ -18,10 +18,10 @@ import VnInput from 'components/common/VnInput.vue';
 
 const emit = defineEmits(['onFetch']);
 
-const originalAttrs = useAttrs();
+const $attrs = useAttrs();
-const $attrs = computed(() => {
+
-    const { required, deletable, ...rest } = originalAttrs;
+const isRequired = computed(() => {
-    return rest;
+    return Object.keys($attrs).includes('required');
 });
 
 const $props = defineProps({
@@ -53,11 +53,6 @@ function handleClick(e) {
     else insert();
 }
 
-async function deleteNote(e) {
-    await axios.delete(`${$props.url}/${e.id}`);
-    await vnPaginateRef.value.fetch();
-}
-
 async function insert() {
     if (!newNote.text || ($props.selectType && !newNote.observationTypeFk)) return;
 
@@ -162,7 +157,7 @@ const handleObservationTypes = (data) => {
                     v-model="newNote.observationTypeFk"
                     option-label="description"
                     style="flex: 0.15"
-                    :required="'required' in originalAttrs"
+                    :required="isRequired"
                     @keyup.enter.stop="insert"
                 />
                 <VnInput
@@ -170,10 +165,11 @@ const handleObservationTypes = (data) => {
                     type="textarea"
                     :label="$props.justInput && newNote.text ? '' : t('Add note here...')"
                     filled
+                    size="lg"
                     autogrow
                     autofocus
                     @keyup.enter.stop="handleClick"
-                    :required="'required' in originalAttrs"
+                    :required="isRequired"
                     clearable
                 >
                     <template #append>
@@ -243,21 +239,6 @@ const handleObservationTypes = (data) => {
                                 </QBadge>
                             </div>
                             <span v-text="toDateHourMin(note.created)" />
-                            <div>
-                                <QIcon
-                                    v-if="'deletable' in originalAttrs"
-                                    name="delete"
-                                    size="sm"
-                                    class="cursor-pointer"
-                                    color="primary"
-                                    @click="deleteNote(note)"
-                                    data-cy="notesRemoveNoteBtn"
-                                >
-                                    <QTooltip>
-                                        {{ t('ticketNotes.removeNote') }}
-                                    </QTooltip>
-                                </QIcon>
-                            </div>
                         </div>
                     </QCardSection>
                     <QCardSection class="q-pa-xs q-my-none q-py-none">

src/components/ui/VnPaginate.vue

@@ -115,7 +115,7 @@ onMounted(async () => {
 });
 
 onBeforeUnmount(() => {
-    arrayData.reset(['data']);
+    if (!store.keepData) arrayData.reset(['data']);
     arrayData.resetPagination();
 });
 
@@ -215,7 +215,6 @@ defineExpose({
     paginate,
     userParams: arrayData.store.userParams,
     currentFilter: arrayData.store.currentFilter,
-    arrayData,
 });
 </script>
 

src/composables/__tests__/useRole.spec.js

@@ -23,19 +23,18 @@ describe('useRole', () => {
                 name: `T'Challa`,
                 nickname: 'Black Panther',
                 lang: 'en',
-                worker: { department: { departmentFk: 155 } },
             };
             const expectedUser = {
                 id: 999,
                 name: `T'Challa`,
                 nickname: 'Black Panther',
                 lang: 'en',
-                departmentFk: 155,
             };
             const expectedRoles = ['salesPerson', 'admin'];
-            vi.spyOn(axios, 'get').mockResolvedValueOnce({
+            vi.spyOn(axios, 'get')
+            .mockResolvedValueOnce({
                 data: { roles: rolesData, user: fetchedUser },
-            });
+            })
 
             vi.spyOn(role.state, 'setUser');
             vi.spyOn(role.state, 'setRoles');

src/composables/__tests__/useSession.spec.js

@@ -75,7 +75,6 @@ describe('session', () => {
                 userConfig: {
                     darkMode: false,
                 },
-                worker: { department: { departmentFk: 155 } },
             };
             const rolesData = [
                 {
@@ -144,7 +143,7 @@ describe('session', () => {
                 await session.destroy(); // this clears token and user for any other test
             });
         },
-        {},
+        {}
     );
 
     describe('RenewToken', () => {
@@ -176,7 +175,7 @@ describe('session', () => {
             await session.checkValidity();
             expect(sessionStorage.getItem('token')).toEqual(expectedToken);
             expect(sessionStorage.getItem('tokenMultimedia')).toEqual(
-                expectedTokenMultimedia,
+                expectedTokenMultimedia
             );
         });
         it('Should renewToken', async () => {
@@ -205,7 +204,7 @@ describe('session', () => {
             await session.checkValidity();
             expect(sessionStorage.getItem('token')).not.toEqual(expectedToken);
             expect(sessionStorage.getItem('tokenMultimedia')).not.toEqual(
-                expectedTokenMultimedia,
+                expectedTokenMultimedia
             );
         });
     });

src/composables/useAcl.js

@@ -30,16 +30,9 @@ export function useAcl() {
         return false;
     }
 
-    function hasAcl(model, prop, accessType) {
-        const modelAcl = state.getAcls().value[model];
-        const propAcl = modelAcl?.[prop] || modelAcl?.['*'];
-        return !!(propAcl?.[accessType] || propAcl?.['*']);
-    }
-
     return {
         fetch,
         hasAny,
         state,
-        hasAcl,
     };
 }

src/composables/useArrayData.js

@@ -56,6 +56,7 @@ export function useArrayData(key, userOptions) {
             'searchUrl',
             'navigate',
             'mapKey',
+            'keepData',
             'oneRecord',
         ];
         if (typeof userOptions === 'object') {
@@ -107,7 +108,7 @@ export function useArrayData(key, userOptions) {
         store.hasMoreData = limit && response.data.length >= limit;
 
         if (!append && !isDialogOpened() && updateRouter) {
-            if (updateStateParams(response.data)?.redirect) return;
+            if (updateStateParams(response.data)?.redirect && !store.keepData) return;
         }
         store.isLoading = false;
         canceller = null;
@@ -188,7 +189,7 @@ export function useArrayData(key, userOptions) {
 
         store.order = order;
         resetPagination();
-        await fetch({});
+        fetch({});
         index++;
 
         return { index, order };

src/composables/useFilterParams.js

@@ -14,7 +14,7 @@ export function useFilterParams(key) {
     watch(
         () => arrayData.value.store?.currentFilter,
         (val, oldValue) => (val || oldValue) && setUserParams(val),
-        { immediate: true, deep: true },
+        { immediate: true, deep: true }
     );
 
     function parseOrder(urlOrders) {
@@ -54,7 +54,7 @@ export function useFilterParams(key) {
                     Object.assign(params, item);
                 });
                 delete params[key];
-            } else if (value && typeof value === 'object' && !Array.isArray(value)) {
+            } else if (value && typeof value === 'object') {
                 const param = Object.values(value)[0];
                 if (typeof param == 'string') params[key] = param.replaceAll('%', '');
             }

src/composables/useRole.js

@@ -13,7 +13,6 @@ export function useRole() {
             name: data.user.name,
             nickname: data.user.nickname,
             lang: data.user.lang || 'es',
-            departmentFk: data.user?.worker?.department?.departmentFk,
         };
         state.setUser(userData);
         state.setRoles(roles);

src/i18n/locale/en.yml

@@ -370,11 +370,6 @@ globals:
         countryCodeFk: Country
         companyFk: Company
         nickname: Alias
-        changedModel: Entity
-        changedModelValue: Search
-        changedModelId: Entity id
-        userFk: User
-        action: Action
     model: Model
     fuel: Fuel
     active: Active
@@ -847,7 +842,6 @@ travel:
         availabledHour: Availabled hour
         thermographs: Thermographs
         hb: HB
-        roundedCc: Rounded CC
     basicData:
         daysInForward: Automatic movement (Raid)
         isRaid: Raid

src/i18n/locale/es.yml

@@ -371,11 +371,6 @@ globals:
         countryCodeFk: País
         companyFk: Empresa
         nickname: Alias
-        changedModel: Entidad
-        changedModelValue: Buscar
-        changedModelId: Id de entidad
-        userFk: Usuario
-        action: Acción
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
@@ -930,7 +925,6 @@ travel:
         availabled: F. Disponible
         availabledHour: Hora Disponible
         hb: HB
-        roundedCc: CC redondeado
     basicData:
         daysInForward: Desplazamiento automatico (redada)
         isRaid: Redada

src/pages/Account/Card/AccountDescriptorMenu.vue

@@ -100,8 +100,12 @@ const onChangePass = (oldPass) => {
 };
 
 onMounted(() => {
-    hasitManagementAccess.value = useAcl().hasAcl('VnUser', 'higherPrivileges', 'WRITE');
+    hasitManagementAccess.value = useAcl().hasAny([
-    hasSysadminAccess.value = useAcl().hasAcl('VnUser', 'adminUser', 'WRITE');
+        { model: 'VnUser', props: 'higherPrivileges', accessType: 'WRITE' },
+    ]);
+    hasSysadminAccess.value = useAcl().hasAny([
+        { model: 'VnUser', props: 'adminUser', accessType: 'WRITE' },
+    ]);
 });
 </script>
 <template>
@@ -223,7 +227,7 @@ onMounted(() => {
         <QItemSection>{{ t('account.card.actions.deactivateUser.name') }}</QItemSection>
     </QItem>
     <QItem
-        v-if="useAcl().hasAcl('VnRole', '*', 'WRITE')"
+        v-if="useAcl().hasAny([{ model: 'VnRole', props: '*', accessType: 'WRITE' }])"
         v-ripple
         clickable
         @click="showSyncDialog = true"

src/pages/Account/Card/AccountDescriptorProxy.vue

@@ -6,7 +6,7 @@ import AccountSummary from './AccountSummary.vue';
     <QPopupProxy style="max-width: 10px">
         <AccountDescriptor
             v-if="$attrs.id"
-            v-bind="$attrs"
+            v-bind="$attrs.id"
             :summary="AccountSummary"
             :proxy-render="true"
         />

src/pages/Claim/ClaimFilter.vue

@@ -115,7 +115,6 @@ const props = defineProps({
 <i18n>
 en:
     params:
-        departmentFk: Department
         search: Contains
         clientFk: Customer
         clientName: Customer
@@ -128,7 +127,6 @@ en:
         zoneFk: Zone
 es:
     params:
-        departmentFk: Departamento
         search: Contiene
         clientFk: Cliente
         clientName: Cliente

src/pages/Claim/ClaimList.vue

@@ -134,7 +134,7 @@ const columns = computed(() => [
 
 const STATE_COLOR = {
     pending: 'bg-warning',
-    loses: 'bg-negative',
+    managed: 'bg-info',
     resolved: 'bg-positive',
 };
 </script>

src/pages/Customer/Card/CustomerBalance.vue

@@ -20,12 +20,11 @@ import VnFilter from 'components/VnTable/VnFilter.vue';
 
 import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
-import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 const { openConfirmationModal } = useVnConfirm();
 const { sendEmail, openReport } = usePrintService();
 const { t } = useI18n();
-const { hasAcl } = useAcl();
+const { hasAny } = useAcl();
 
 const quasar = useQuasar();
 const route = useRoute();
@@ -90,7 +89,15 @@ const columns = computed(() => [
     {
         align: 'left',
         label: t('Employee'),
-        name: 'workerFk',
+        columnField: {
+            component: 'userLink',
+            attrs: ({ row }) => {
+                return {
+                    workerId: row.workerFk,
+                    name: row.userName,
+                };
+            },
+        },
         cardVisible: true,
     },
     {
@@ -124,6 +131,7 @@ const columns = computed(() => [
         align: 'left',
         name: 'balance',
         label: t('Balance'),
+        format: ({ balance }) => toCurrency(balance),
         cardVisible: true,
     },
     {
@@ -138,14 +146,12 @@ const columns = computed(() => [
         actions: [
             {
                 title: t('globals.downloadPdf'),
-                isPrimary: true,
                 icon: 'cloud_download',
                 show: (row) => row.isInvoice,
                 action: (row) => showBalancePdf(row),
             },
             {
                 title: t('Send compensation'),
-                isPrimary: true,
                 icon: 'outgoing_mail',
                 show: (row) => !!row.isCompensation,
                 action: ({ id }) =>
@@ -250,12 +256,6 @@ const showBalancePdf = ({ id }) => {
         <template #column-balance="{ rowIndex }">
             {{ toCurrency(balances[rowIndex]?.balance) }}
         </template>
-        <template #column-workerFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row.userName }}
-                <WorkerDescriptorProxy :id="row.workerFk" />
-            </span>
-        </template>
         <template #column-description="{ row }">
             <span class="link" v-if="row.isInvoice" @click.stop>
                 {{ t('bill', { ref: row.description }) }}
@@ -276,7 +276,9 @@ const showBalancePdf = ({ id }) => {
             >
                 <VnInput
                     v-model="scope.value"
-                    :disable="!hasAcl('Receipt', '*', 'WRITE')"
+                    :disable="
+                        !hasAny([{ model: 'Receipt', props: '*', accessType: 'WRITE' }])
+                    "
                     @keypress.enter="scope.set"
                     autofocus
                 />

src/pages/Customer/Card/CustomerSummary.vue

@@ -84,31 +84,29 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv :label="t('customer.summary.customerId')" :value="entity.id" />
                 <VnLv :label="t('globals.name')" :value="entity.name" />
                 <VnLv :label="t('customer.summary.contact')" :value="entity.contact" />
-                <VnLv :label="t('customer.extendedList.tableVisibleColumns.phone')">
+                <VnLv :value="entity.phone">
-                    <template #value>
+                    <template #label>
+                        {{ t('customer.extendedList.tableVisibleColumns.phone') }}
                         <VnLinkPhone :phone-number="entity.phone" />
                     </template>
                 </VnLv>
-                <VnLv :label="t('customer.summary.mobile')">
+                <VnLv :value="entity.mobile">
-                    <template #value>
+                    <template #label>
+                        {{ t('customer.summary.mobile') }}
+                        <VnLinkPhone :phone-number="entity.mobile" />
                         <VnLinkPhone
-                            sip
                             say-simple
                             :phone-number="entity.mobile"
                             :channel="entity.country?.saySimpleCountry?.channel"
+                            class="q-ml-xs"
                         />
                     </template>
                 </VnLv>
-                <VnLv
+                <VnLv :value="entity.email" copy
-                    :label="t('globals.params.email')"
+                    ><template #label>
-                    :value="entity.email"
+                        {{ t('globals.params.email') }}
-                    class="ellipsis"
+                        <VnLinkMail email="entity.email"></VnLinkMail> </template
-                    copy
+                ></VnLv>
-                >
-                    <template #value>
-                        <VnLinkMail :email="entity.email" />
-                    </template>
-                </VnLv>
                 <VnLv :label="t('globals.department')">
                     <template #value>
                         <span class="link" v-text="entity.department?.name" />

src/pages/Customer/CustomerFilter.vue

@@ -72,7 +72,6 @@ const exprBuilder = (param, value) => {
                         option-value="id"
                         option-label="name"
                         url="Departments"
-                        no-one="true"
                     />
                 </QItemSection>
             </QItem>
@@ -155,7 +154,6 @@ en:
         city: City
         phone: Phone
         email: Email
-        departmentFk: Department
         isToBeMailed: Mailed
         isEqualizated: Equailized
         businessTypeFk: Business type
@@ -168,7 +166,6 @@ en:
         postcode: Postcode
 es:
     params:
-        departmentFk: Departamento
         search: Contiene
         fi: NIF
         isActive: Activo

src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue

@@ -192,10 +192,8 @@ en:
         date: L. O. Date
         credit: Credit I.
         defaulterSinced: From
-        departmentFk: Department
 es:
     params:
-        departmentFk: Departamento
         clientFk: Cliente
         countryFk: País
         paymentMethod: F. Pago

src/pages/Customer/Notifications/CustomerNotifications.vue

@@ -127,7 +127,6 @@ es:
     Identifier: Identificador
     Social name: Razón social
     Phone: Teléfono
-    Postcode: Código postal
     City: Población
     Email: Email
     Campaign consumption: Consumo campaña

src/pages/Customer/components/CustomerAddressEdit.vue

@@ -93,26 +93,10 @@ const updateAddressTicket = async () => {
 };
 
 const updateObservations = async (payload) => {
-    await axios.post('AddressObservations/crud', cleanPayload(payload));
+    await axios.post('AddressObservations/crud', payload);
     notes.value = [];
     deletes.value = [];
 };
-
-function cleanPayload(payload) {
-    ['creates', 'deletes', 'updates'].forEach((prop) => {
-        if (prop === 'creates' || prop === 'updates') {
-            payload[prop] = payload[prop].filter(
-                (item) => item.description !== '' && item.observationTypeFk !== '',
-            );
-        } else {
-            payload[prop] = payload[prop].filter(
-                (item) => item !== null && item !== undefined,
-            );
-        }
-    });
-    return payload;
-}
-
 async function updateAll({ data, payload }) {
     await updateObservations(payload);
     await updateAddress(data);

src/pages/Customer/components/CustomerNewPayment.vue

@@ -3,20 +3,18 @@ import { onBeforeMount, reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
-import { useDialogPluginComponent } from 'quasar';
-
 import { getClientRisk } from '../composables/getClientRisk';
+import { useDialogPluginComponent } from 'quasar';
+import FormModelPopup from 'components/FormModelPopup.vue';
 import { usePrintService } from 'composables/usePrintService';
 import useNotify from 'src/composables/useNotify.js';
-
-import FormModelPopup from 'components/FormModelPopup.vue';
 import FetchData from 'components/FetchData.vue';
+import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInputNumber from 'components/common/VnInputNumber.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnAccountNumber from 'src/components/common/VnAccountNumber.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -50,7 +48,7 @@ const maxAmount = ref();
 const accountingType = ref({});
 const isCash = ref(false);
 const formModelRef = ref(false);
-const amountToReturn = ref();
+
 const filterBanks = {
     fields: ['id', 'bank', 'accountingTypeFk'],
     include: { relation: 'accountingType' },
@@ -92,7 +90,7 @@ function setPaymentType(data, accounting) {
     let descriptions = [];
     if (accountingType.value.receiptDescription)
         descriptions.push(accountingType.value.receiptDescription);
-    if (data.description > 0) descriptions.push(data.description);
+    if (data.description) descriptions.push(data.description);
     data.description = descriptions.join(', ');
 }
 
@@ -102,7 +100,7 @@ const calculateFromAmount = (event) => {
 };
 
 const calculateFromDeliveredAmount = (event) => {
-    amountToReturn.value = event - initialData.amountPaid;
+    initialData.amountToReturn = parseFloat(event) - initialData.amountPaid;
 };
 
 function onBeforeSave(data) {
@@ -123,16 +121,17 @@ async function onDataSaved(formData, { id }) {
                 recipient: formData.email,
             });
 
-        if (viewReceipt.value) openReport(`Receipts/${id}/receipt-pdf`, {}, '_blank');
+        if (viewReceipt.value) openReport(`Receipts/${id}/receipt-pdf`);
     } finally {
         if ($props.promise) $props.promise();
         if (closeButton.value) closeButton.value.click();
     }
 }
 
-async function getSupplierClientReferences(value) {
+async function accountShortToStandard({ target: { value } }) {
     if (!value) return (initialData.description = '');
-    const params = { bankAccount: value };
+    initialData.compensationAccount = value.replace('.', '0'.repeat(11 - value.length));
+    const params = { bankAccount: initialData.compensationAccount };
     const { data } = await axios(`Clients/getClientOrSupplierReference`, { params });
     if (!data.clientId) {
         initialData.description = t('Supplier Compensation Reference', {
@@ -242,16 +241,17 @@ async function getAmountPaid() {
                         @update:model-value="getAmountPaid()"
                     />
                 </VnRow>
-                <div v-if="accountingType.code == 'compensation'">
+
+                <div v-if="data.bankFk?.accountingType?.code == 'compensation'">
                     <div class="text-h6">
                         {{ t('Compensation') }}
                     </div>
                     <VnRow>
-                        <VnAccountNumber
+                        <VnInputNumber
                             :label="t('Compensation account')"
                             clearable
                             v-model="data.compensationAccount"
-                            @blur="getSupplierClientReferences(data.compensationAccount)"
+                            @blur="accountShortToStandard"
                         />
                     </VnRow>
                 </div>
@@ -261,7 +261,8 @@ async function getAmountPaid() {
                     clearable
                     v-model="data.description"
                 />
-                <div v-if="accountingType.code == 'cash'">
+
+                <div v-if="data.bankFk?.accountingType?.code == 'cash'">
                     <div class="text-h6">{{ t('Cash') }}</div>
                     <VnRow>
                         <VnInputNumber
@@ -273,7 +274,7 @@ async function getAmountPaid() {
                         <VnInputNumber
                             :label="t('Amount to return')"
                             disable
-                            v-model="amountToReturn"
+                            v-model="data.amountToReturn"
                         />
                     </VnRow>
                     <VnRow>

src/pages/Customer/components/CustomerSummaryTable.vue

@@ -191,7 +191,7 @@ const getItemPackagingType = (ticketSales) => {
         :without-header="true"
         auto-load
         :row-click="rowClick"
-        order="shipped DESC, id DESC"
+        order="shipped DESC, id"
         :disable-option="{ card: true, table: true }"
         class="full-width"
         :disable-infinite-scroll="true"

src/pages/Entry/Card/EntryCard.vue

@@ -8,6 +8,6 @@ import filter from './EntryFilter.js';
         data-key="Entry"
         url="Entries"
         :descriptor="EntryDescriptor"
-        :filter="{ ...filter, where: { id: $route.params.id } }"
+        :filter="filter"
     />
 </template>

src/pages/Entry/Card/EntrySummary.vue

@@ -70,8 +70,8 @@ onMounted(async () => {
                     :url="`#/entry/${entityId}/basic-data`"
                     :text="t('globals.summary.basicData')"
                 />
-                <div class="vn-card-group">
+                <div class="card-group">
-                    <div class="vn-card-content">
+                    <div class="card-content">
                         <VnLv
                             :label="t('entry.summary.commission')"
                             :value="entry?.commission"
@@ -93,7 +93,7 @@ onMounted(async () => {
                             :value="entry?.invoiceNumber"
                         />
                     </div>
-                    <div class="vn-card-content">
+                    <div class="card-content">
                         <VnCheckbox
                             :label="t('entry.list.tableVisibleColumns.isOrdered')"
                             v-model="entry.isOrdered"
@@ -130,8 +130,8 @@ onMounted(async () => {
                     :url="`#/travel/${entry.travel.id}/summary`"
                     :text="t('Travel')"
                 />
-                <div class="vn-card-group">
+                <div class="card-group">
-                    <div class="vn-card-content">
+                    <div class="card-content">
                         <VnLv :label="t('entry.summary.travelReference')">
                             <template #value>
                                 <span class="link">
@@ -161,7 +161,7 @@ onMounted(async () => {
                             :value="entry.travel.warehouseIn?.name"
                         />
                     </div>
-                    <div class="vn-card-content">
+                    <div class="card-content">
                         <VnLv :label="t('travel.awbFk')" :value="entry.travel.awbFk" />
                         <VnCheckbox
                             :label="t('entry.summary.travelDelivered')"
@@ -193,6 +193,31 @@ onMounted(async () => {
         </template>
     </CardSummary>
 </template>
+<style lang="scss" scoped>
+.card-group {
+    display: flex;
+    flex-direction: column;
+}
+
+.card-content {
+    display: flex;
+    flex-direction: column;
+    text-overflow: ellipsis;
+    > div {
+        max-height: 24px;
+    }
+}
+
+@media (min-width: 1010px) {
+    .card-group {
+        flex-direction: row;
+    }
+    .card-content {
+        flex: 1;
+        margin-right: 16px;
+    }
+}
+</style>
 <i18n>
 es:
     Travel: Envío

src/pages/Entry/EntryList.vue

@@ -248,6 +248,7 @@ function getBadgeAttrs(row) {
 
     let timeDiff = today - timeTicket;
 
+    if (timeDiff > 0) return { color: 'info', 'text-color': 'black' };
     if (timeDiff < 0) return { color: 'warning', 'text-color': 'black' };
     switch (row.entryTypeCode) {
         case 'regularization':
@@ -273,7 +274,6 @@ function getBadgeAttrs(row) {
         default:
             break;
     }
-    if (timeDiff > 0) return { color: 'info', 'text-color': 'black' };
     return { color: 'transparent' };
 }
 

src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue

@@ -22,7 +22,7 @@ const routes = reactive({
     getSupplier: (id) => {
         return { name: 'SupplierCard', params: { id } };
     },
-    getInvoices: (id) => {
+    getTickets: (id) => {
         return {
             name: 'InvoiceInList',
             query: {
@@ -131,11 +131,11 @@ async function setInvoiceCorrection(id) {
                 </QBtn>
                 <QBtn
                     size="md"
-                    icon="vn:invoice-in"
+                    icon="vn:ticket"
                     color="primary"
-                    :to="routes.getInvoices(entity.supplierFk)"
+                    :to="routes.getTickets(entity.supplierFk)"
                 >
-                    <QTooltip>{{ t('invoiceIn.descriptor.invoices') }}</QTooltip>
+                    <QTooltip>{{ t('globals.ticketList') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     v-if="

src/pages/InvoiceIn/locale/en.yml

@@ -15,7 +15,6 @@ invoiceIn:
         amount: Amount
     descriptor:
         ticketList: Ticket list
-        invoices: Supplier invoices
     descriptorMenu:
         book: Book
         unbook: Unbook

src/pages/InvoiceIn/locale/es.yml

@@ -14,7 +14,7 @@ invoiceIn:
         awb: AWB
         amount: Importe
     descriptor:
-        invoices: Facturas de proveedor
+        ticketList: Listado de tickets
     descriptorMenu:
         book: Contabilizar
         unbook: Descontabilizar

src/pages/Monitor/MonitorClients.vue

@@ -1,22 +1,19 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import DepartmentDescriptorProxy from '../Worker/Department/Card/DepartmentDescriptorProxy.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import { toDateFormat } from 'src/filters/date.js';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
 import { dateRange } from 'src/filters';
-import useOpenURL from 'src/composables/useOpenURL';
-import { useState } from 'src/composables/useState';
 const { t } = useI18n();
 
 const dates = dateRange(Date.vnNew());
 const from = ref(dates[0]);
 const to = ref(dates[1]);
 
-const state = useState();
 const filter = computed(() => {
     const obj = {};
     const formatFrom = setHours(from.value, 'from');
@@ -26,18 +23,16 @@ const filter = computed(() => {
     if (!formatFrom && formatTo) stamp = { lte: formatTo };
     else if (formatFrom && !formatTo) stamp = { gte: formatFrom };
     else if (formatFrom && formatTo) stamp = { between: [formatFrom, formatTo] };
-    return Object.assign(obj, {
+
-        where: {
+    return Object.assign(obj, { where: { 'v.stamp': stamp } });
-            'v.stamp': stamp,
-            'c.departmentFk': state.getUser().value.departmentFk,
-        },
-    });
 });
 
 function exprBuilder(param, value) {
     switch (param) {
         case 'clientFk':
             return { [`c.id`]: value };
+        case 'departmentFk':
+            return { [`c.${param}`]: value };
     }
 }
 
@@ -70,13 +65,9 @@ const columns = computed(() => [
         align: 'left',
         name: 'departmentFk',
         label: t('customer.summary.team'),
-        columnFilter: {
+        component: 'select',
-            component: 'select',
+        attrs: {
-            attrs: {
+            url: 'Departments',
-                url: 'Departments',
-            },
-            alias: 'c',
-            inWhere: true,
         },
         columnField: {
             component: null,
@@ -103,7 +94,6 @@ const columns = computed(() => [
         columnClass: 'no-padding',
     },
 ]);
-const openTab = (id) => useOpenURL(`#/customer/${id}/summary`);
 </script>
 
 <template>
@@ -123,8 +113,6 @@ const openTab = (id) => useOpenURL(`#/customer/${id}/summary`);
         :disable-option="{ card: true }"
         dense
         class="q-px-none"
-        :row-click="({ id }) => openTab(id)"
-        :row-ctrl-click="(_, { id }) => openTab(id)"
     >
         <template #top-left>
             <VnRow>
@@ -133,16 +121,12 @@ const openTab = (id) => useOpenURL(`#/customer/${id}/summary`);
             </VnRow>
         </template>
         <template #column-departmentFk="{ row }">
-            <span @click.stop.prevent class="link" :title="row.department">
+            <span class="link" :title="row.department" v-text="row.department" />
-                {{ row.department }}
+            <WorkerDescriptorProxy :id="row.departmentFk" dense />
-                <DepartmentDescriptorProxy :id="row.departmentFk" dense
-            /></span>
         </template>
         <template #column-clientFk="{ row }">
-            <span @click.stop.prevent class="link" :title="row.clientName">
+            <span class="link" :title="row.clientName" v-text="row.clientName" />
-                {{ row.clientName }}
+            <CustomerDescriptorProxy :id="row.clientFk" />
-                <CustomerDescriptorProxy :id="row.clientFk" dense
-            /></span>
         </template>
     </VnTable>
 </template>

src/pages/Monitor/MonitorOrders.vue

@@ -9,7 +9,6 @@ import { toDateFormat, toDateTimeFormat } from 'src/filters/date.js';
 import { toCurrency } from 'src/filters';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import axios from 'axios';
-import useOpenURL from 'src/composables/useOpenURL';
 
 const { t } = useI18n();
 const { openConfirmationModal } = useVnConfirm();
@@ -109,7 +108,8 @@ const removeOrders = async () => {
     await table.value.reload();
 };
 
-const openTab = (id) => useOpenURL(`#/order/${id}/summary`);
+const openTab = (id) =>
+    window.open(`#/order/${id}/summary`, '_blank', 'noopener, noreferrer');
 </script>
 <template>
     <VnTable
@@ -129,7 +129,6 @@ const openTab = (id) => useOpenURL(`#/order/${id}/summary`);
         }"
         default-mode="table"
         :row-click="({ id }) => openTab(id)"
-        :row-ctrl-click="(_, { id }) => openTab(id)"
         v-model:selected="selectedRows"
         :disable-option="{ card: true }"
     >
@@ -178,16 +177,16 @@ const openTab = (id) => useOpenURL(`#/order/${id}/summary`);
         </template>
 
         <template #column-clientFk="{ row }">
-            <span class="link" @click.stop :title="row.clientName">
+            <QTd @click.stop>
-                {{ row.clientName }}
+                <span class="link" v-text="row.clientName" :title="row.clientName" />
-                <CustomerDescriptorProxy :id="row.clientFk" dense
+                <CustomerDescriptorProxy :id="row.clientFk" />
-            /></span>
+            </QTd>
         </template>
         <template #column-departmentFk="{ row }">
-            <span class="link" @click.stop :title="row.departmentName">
+            <QTd @click.stop>
-                {{ row.departmentName }}
+                <span class="link" v-text="row.departmentName" />
-                <DepartmentDescriptorProxy :id="row.departmentFk" dense
+                <DepartmentDescriptorProxy :id="row.departmentFk" dense />
-            /></span>
+            </QTd>
         </template>
     </VnTable>
 </template>

src/pages/Monitor/Ticket/MonitorTicketFilter.vue

@@ -198,7 +198,7 @@ const getLocale = (label) => {
                 <QItemSection>
                     <VnSelect
                         dense
-                        filled
+                        rounded
                         :label="t('globals.params.packing')"
                         v-model="params.packing"
                         url="ItemPackingTypes"

src/pages/Monitor/Ticket/MonitorTickets.vue

@@ -449,19 +449,21 @@ const openTab = (id) => useOpenURL(`#/ticket/${id}/sale`);
             <span :title="row.province" v-text="row.province" />
         </template>
         <template #column-state="{ row }">
-            <div v-if="row.refFk" @click.stop.prevent>
+            <div @click.stop.prevent>
-                <span class="link">{{ row.refFk }}</span>
+                <div v-if="row.refFk">
-                <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
+                    <span class="link">{{ row.refFk }}</span>
+                    <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
+                </div>
+                <QBadge
+                    v-else
+                    :color="stateColors[row.classColor] || 'transparent'"
+                    :text-color="stateColors[row.classColor] ? 'black' : 'white'"
+                    class="q-pa-sm"
+                    style="font-size: 14px"
+                >
+                    {{ row.state }}
+                </QBadge>
             </div>
-            <QBadge
-                v-else
-                :color="stateColors[row.classColor] || 'transparent'"
-                :text-color="stateColors[row.classColor] ? 'black' : 'white'"
-                class="q-pa-sm"
-                style="font-size: 14px"
-            >
-                {{ row.state }}
-            </QBadge>
         </template>
         <template #column-isFragile="{ row }">
             <QIcon v-if="row.isFragile" name="local_bar" color="primary" size="sm">

src/pages/Order/Card/OrderFilter.vue

@@ -130,10 +130,8 @@ en:
     myTeam: My Team
     isConfirmed: Order Confirmed
     showEmpty: Show Empty
-    departmentFk: Department
 es:
     params:
-        departmentFk: Departamento
         search: Búsqueda
         clientFk: Cliente
         agencyModeFk: Agencia

src/pages/Route/Agency/Card/AgencyCard.vue

@@ -3,5 +3,5 @@ import AgencyDescriptor from 'pages/Route/Agency/Card/AgencyDescriptor.vue';
 import VnCard from 'src/components/common/VnCard.vue';
 </script>
 <template>
-    <VnCard data-key="Agency" url="Agencies" :descriptor="AgencyDescriptor" :filter="{ where: { id: $route.params.id } }" />
+    <VnCard data-key="Agency" url="Agencies" :descriptor="AgencyDescriptor" />
 </template>

src/pages/Route/Roadmap/RoadmapSummary.vue

@@ -112,9 +112,12 @@ const filter = {
                         :label="t('Trailer Plate')"
                         :value="dashIfEmpty(entity?.trailerPlate)"
                     />
-                    <VnLv :label="t('Phone')">
+                    <VnLv :label="t('Phone')" :value="dashIfEmpty(entity?.phone)">
                         <template #value>
-                            <VnLinkPhone :phone-number="entity?.phone" />
+                            <span>
+                                {{ dashIfEmpty(entity?.phone) }}
+                                <VnLinkPhone :phone-number="entity?.phone" />
+                            </span>
                         </template>
                     </VnLv>
                     <VnLv

src/pages/Route/RouteRoadmap.vue

@@ -213,7 +213,7 @@ function exprBuilder(param, value) {
         }"
     >
         <template #advanced-menu>
-            <RoadmapFilter :data-key />
+            <RoadmapFilter :dataKey />
         </template>
         <template #body>
             <VnTable

src/pages/Route/Vehicle/Card/VehicleNotes.vue

@@ -1,35 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import { useRoute } from 'vue-router';
-import { useState } from 'src/composables/useState';
-import VnNotes from 'src/components/ui/VnNotes.vue';
-
-const route = useRoute();
-const state = useState();
-const user = state.getUser();
-const vehicleId = computed(() => route.params.id);
-
-const noteFilter = computed(() => {
-    return {
-        order: 'created DESC',
-        where: { vehicleFk: vehicleId.value },
-    };
-});
-
-const body = {
-    vehicleFk: vehicleId.value,
-    workerFk: user.value.id,
-};
-</script>
-
-<template>
-    <VnNotes
-        url="vehicleObservations"
-        :add-note="true"
-        :filter="noteFilter"
-        :body="body"
-        style="overflow-y: auto"
-        required
-        deletable
-    />
-</template>

src/pages/Route/locale/en.yml

@@ -50,7 +50,7 @@ route:
         agencyAgreement: Agency agreement
         agencyModeName: Agency route
         isOwn: Own
-        isAnyVolumeAllowed: Any volume allowed
+        isAnyVolumeallowed: Any volume allowed
     Worker: Worker
     Agency: Agency
     Vehicle: Vehicle

src/pages/Supplier/Card/SupplierDescriptor.vue

@@ -106,7 +106,7 @@ const getEntryQueryParams = (supplier) => {
                 <QBtn
                     :to="{
                         name: 'EntryList',
-                        query: { table: JSON.stringify(getEntryQueryParams(entity)) },
+                        query: { params: JSON.stringify(getEntryQueryParams(entity)) },
                     }"
                     size="md"
                     icon="vn:entry"

src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue

@@ -25,7 +25,9 @@ const { validate } = useValidator();
 const { notify } = useNotify();
 const router = useRouter();
 const { t } = useI18n();
-const canEditZone = useAcl().hasAcl('Ticket', 'editZone', 'WRITE');
+const canEditZone = useAcl().hasAny([
+    { model: 'Ticket', props: 'editZone', accessType: 'WRITE' },
+]);
 
 const agencyFetchRef = ref();
 const warehousesOptions = ref([]);

src/pages/Ticket/Card/TicketSale.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, watch, inject } from 'vue';
+import { onMounted, ref, computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter, useRoute } from 'vue-router';
 import { useQuasar } from 'quasar';
@@ -25,7 +25,7 @@ import VnTable from 'src/components/VnTable/VnTable.vue';
 import VnConfirm from 'src/components/ui/VnConfirm.vue';
 import TicketProblems from 'src/components/TicketProblems.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
-const app = inject('app');
+
 const route = useRoute();
 const router = useRouter();
 const { t } = useI18n();
@@ -187,26 +187,20 @@ const getRowUpdateInputEvents = (sale) => {
 
 const resetChanges = async () => {
     arrayData.fetch({ append: false });
-    tableRef.value.CrudModelRef.hasChanges = false;
+    tableRef.value.reload();
-    await tableRef.value.reload();
-
     selectedRows.value = [];
 };
 const changeQuantity = async (sale) => {
     if (!sale.itemFk || sale.quantity == null || sale?.originalQuantity === sale.quantity)
         return;
     else sale.originalQuantity = sale.quantity;
-    try {
+    if (!sale.id) return addSale(sale);
-        if (!sale.id) await addSale(sale);
-    } catch (e) {
-        app.config.errorHandler(e);
-        return;
-    }
 
     if (await isSalePrepared(sale)) {
         await confirmUpdate(() => updateQuantity(sale));
     } else await updateQuantity(sale);
 };
+
 const updateQuantity = async (sale) => {
     try {
         let { quantity, id } = sale;
@@ -219,7 +213,7 @@ const updateQuantity = async (sale) => {
             (s) => s.id === sale.id,
         );
         sale.quantity = quantity;
-        app.config.errorHandler(e);
+        throw e;
     }
 };
 
@@ -228,27 +222,24 @@ const addSale = async (sale) => {
         barcode: sale.itemFk,
         quantity: sale.quantity,
     };
-    try {
-        const { data } = await axios.post(`tickets/${route.params.id}/addSale`, params);
 
-        if (!data) return;
+    const { data } = await axios.post(`tickets/${route.params.id}/addSale`, params);
 
-        const newSale = data;
+    if (!data) return;
-        sale.id = newSale.id;
-        sale.image = newSale.item.image;
-        sale.subName = newSale.item.subName;
-        sale.concept = newSale.concept;
-        sale.quantity = newSale.quantity;
-        sale.discount = newSale.discount;
-        sale.price = newSale.price;
-        sale.item = newSale.item;
 
-        notify('globals.dataSaved', 'positive');
+    const newSale = data;
-        sale.isNew = false;
+    sale.id = newSale.id;
-        resetChanges();
+    sale.image = newSale.item.image;
-    } catch (e) {
+    sale.subName = newSale.item.subName;
-        app.config.errorHandler(e);
+    sale.concept = newSale.concept;
-    }
+    sale.quantity = newSale.quantity;
+    sale.discount = newSale.discount;
+    sale.price = newSale.price;
+    sale.item = newSale.item;
+
+    notify('globals.dataSaved', 'positive');
+    sale.isNew = false;
+    resetChanges();
 };
 const changeConcept = async (sale) => {
     if (await isSalePrepared(sale)) {
@@ -257,14 +248,10 @@ const changeConcept = async (sale) => {
 };
 
 const updateConcept = async (sale) => {
-    try {
+    const data = { newConcept: sale.concept };
-        const data = { newConcept: sale.concept };
+    await axios.post(`Sales/${sale.id}/updateConcept`, data);
-        await axios.post(`Sales/${sale.id}/updateConcept`, data);
+    notify('globals.dataSaved', 'positive');
-        notify('globals.dataSaved', 'positive');
+    resetChanges();
-        resetChanges();
-    } catch (e) {
-        app.config.errorHandler(e);
-    }
 };
 
 const DEFAULT_EDIT = {
@@ -275,6 +262,18 @@ const DEFAULT_EDIT = {
     oldQuantity: null,
 };
 const edit = ref({ ...DEFAULT_EDIT });
+const usesMana = ref(null);
+
+const getUsesMana = async () => {
+    const { data } = await axios.get('Sales/usesMana');
+    usesMana.value = data;
+};
+
+const getMana = async () => {
+    const { data } = await axios.get(`Tickets/${route.params.id}/getDepartmentMana`);
+    mana.value = data;
+    await getUsesMana();
+};
 
 const selectedValidSales = computed(() => {
     if (!sales.value) return;
@@ -311,15 +310,11 @@ const changePrice = async (sale) => {
     }
 };
 const updatePrice = async (sale, newPrice) => {
-    try {
+    await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
-        await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
+    sale.price = newPrice;
-        sale.price = newPrice;
+    edit.value = { ...DEFAULT_EDIT };
-        edit.value = { ...DEFAULT_EDIT };
+    notify('globals.dataSaved', 'positive');
-        notify('globals.dataSaved', 'positive');
+    resetChanges();
-        resetChanges();
-    } catch (e) {
-        app.config.errorHandler(e);
-    }
 };
 
 const changeDiscount = async (sale) => {
@@ -342,20 +337,15 @@ const updateDiscounts = async (sales, newDiscount) => {
 };
 
 const updateDiscount = async (sales, newDiscount = 0) => {
-    try {
+    const salesIds = sales.map(({ id }) => id);
-        const salesIds = sales.map(({ id }) => id);
+    const params = {
-        const params = {
+        salesIds,
-            salesIds,
+        newDiscount,
-            newDiscount,
+        manaCode: manaCode.value,
-            manaCode: manaCode.value,
+    };
-        };
+    await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
-        await axios.post(`Tickets/${route.params.id}/updateDiscount`, params);
+    notify('globals.dataSaved', 'positive');
-        notify('globals.dataSaved', 'positive');
+    resetChanges();
-        resetChanges();
-    } catch (e) {
-        app.config.errorHandler(e);
-        return;
-    }
 };
 
 const getNewPrice = computed(() => {
@@ -377,40 +367,30 @@ const getNewPrice = computed(() => {
 });
 
 const newOrderFromTicket = async () => {
-    try {
+    const { data } = await axios.post(`Orders/newFromTicket`, {
-        const { data } = await axios.post(`Orders/newFromTicket`, {
+        ticketFk: Number(route.params.id),
-            ticketFk: Number(route.params.id),
+    });
-        });
+    const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
-        const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
+    window.open(routeData.href, '_blank');
-        window.open(routeData.href, '_blank');
-    } catch (e) {
-        app.config.errorHandler(e);
-    }
 };
 
 const goToLog = (saleId) => {
     router.push({
         name: 'TicketLog',
-        query: {
+        params: {
-            logs: JSON.stringify({
+            originId: route.params.id,
-                originFk: route.params.id,
+            changedModel: 'Sale',
-                changedModel: 'Sale',
+            changedModelId: saleId,
-                changedModelId: saleId,
-            }),
         },
     });
 };
 
 const changeTicketState = async (val) => {
-    try {
+    stateBtnDropdownRef.value.hide();
-        stateBtnDropdownRef.value.hide();
+    const params = { ticketFk: route.params.id, code: val };
-        const params = { ticketFk: route.params.id, code: val };
+    await axios.post('Tickets/state', params);
-        await axios.post('Tickets/state', params);
+    notify('globals.dataSaved', 'positive');
-        notify('globals.dataSaved', 'positive');
+    await resetChanges();
-        resetChanges();
-    } catch (e) {
-        app.config.errorHandler(e);
-    }
 };
 
 const removeSelectedSales = () => {
@@ -430,14 +410,10 @@ const removeSales = async () => {
         .forEach((sale) => tableRef.value.CrudModelRef.formData.splice(sale.$index, 1));
 
     if (params.sales.length == 0) return;
-    try {
+    await axios.post('Sales/deleteSales', params);
-        await axios.post('Sales/deleteSales', params);
+    removeSelectedSales();
-        removeSelectedSales();
+    notify('globals.dataSaved', 'positive');
-        notify('globals.dataSaved', 'positive');
+    resetChanges();
-        resetChanges();
-    } catch (e) {
-        app.config.errorHandler(e);
-    }
 };
 
 const setTransferParams = async () => {

src/pages/Ticket/Card/TicketSaleMoreActions.vue

@@ -55,12 +55,13 @@ const isClaimable = computed(() => {
     if (ticket.value) {
         const landedPlusWeek = new Date(ticket.value.landed);
         landedPlusWeek.setDate(landedPlusWeek.getDate() + 7);
-        const createAfterDeadline = acl.hasAcl('Claim', 'createAfterDeadline', 'WRITE');
+        const createAfterDeadline = acl.hasAny([
+            { model: 'Claim', props: 'createAfterDeadline', accessType: 'WRITE' },
+        ]);
         return landedPlusWeek >= Date.vnNew() || createAfterDeadline;
     }
     return false;
 });
-
 const sendSms = async (params) => {
     await axios.post(`Tickets/${ticket.value.id}/sendSms`, params);
     notify(t('SMS sent'), 'positive');
@@ -229,6 +230,18 @@ const createRefund = async (withWarehouse) => {
                     <QItemLabel>{{ t('Add claim') }}</QItemLabel>
                 </QItemSection>
             </QItem>
+            <QItem
+                v-if="isTicketEditable"
+                clickable
+                v-close-popup
+                v-ripple
+                @click="setReserved(true)"
+                data-cy="markAsReservedItem"
+            >
+                <QItemSection>
+                    <QItemLabel>{{ t('Mark as reserved') }}</QItemLabel>
+                </QItemSection>
+            </QItem>
             <QItem clickable v-ripple data-cy="ticketSaleRefundItem">
                 <QItemSection>
                     <QItemLabel>{{ t('Refund') }}</QItemLabel>
@@ -274,6 +287,8 @@ es:
     Recalculate price: Recalcular precio
     Update discount: Actualizar descuento
     Add claim: Crear reclamación
+    Mark as reserved: Marcar como reservado
+    Unmark as reserved: Desmarcar como reservado
     Refund: Abono
     with warehouse: con almacén
     without warehouse: sin almacén

src/pages/Ticket/Card/TicketSummary.vue

@@ -216,23 +216,27 @@ onMounted(async () => {
                             :value="toDate(entity.landed)"
                         />
                         <VnLv :label="t('globals.packages')" :value="entity.packages" />
-                        <VnLv :label="t('ticket.summary.consigneePhone')">
+                        <VnLv :value="entity.address.phone">
-                            <template #value>
+                            <template #label>
+                                {{ t('ticket.summary.consigneePhone') }}
                                 <VnLinkPhone :phone-number="entity.address.phone" />
                             </template>
                         </VnLv>
-                        <VnLv :label="t('ticket.summary.consigneeMobile')">
+                        <VnLv :value="entity.address.mobile">
-                            <template #value>
+                            <template #label>
+                                {{ t('ticket.summary.consigneeMobile') }}
                                 <VnLinkPhone :phone-number="entity.address.mobile" />
                             </template>
                         </VnLv>
-                        <VnLv :label="t('ticket.summary.clientPhone')">
+                        <VnLv :value="entity.client.phone">
-                            <template #value>
+                            <template #label>
+                                {{ t('ticket.summary.clientPhone') }}
                                 <VnLinkPhone :phone-number="entity.client.phone" />
                             </template>
                         </VnLv>
-                        <VnLv :label="t('ticket.summary.clientMobile')">
+                        <VnLv :value="entity.client.mobile">
-                            <template #value>
+                            <template #label>
+                                {{ t('ticket.summary.clientMobile') }}
                                 <VnLinkPhone :phone-number="entity.client.mobile" />
                             </template>
                         </VnLv>

src/pages/Ticket/TicketFilter.vue

@@ -22,6 +22,16 @@ const states = ref([]);
 const agencies = ref([]);
 const warehouses = ref([]);
 const groupedStates = ref([]);
+
+const getGroupedStates = (data) => {
+    for (const state of data) {
+        groupedStates.value.push({
+            id: state.id,
+            name: t(`${state.code}`),
+            code: state.code,
+        });
+    }
+};
 </script>
 
 <template>
@@ -29,11 +39,12 @@ const groupedStates = ref([]);
     <FetchData url="States" @on-fetch="(data) => (states = data)" auto-load />
     <FetchData
         url="AlertLevels"
-        auto-load
         @on-fetch="
-            (data) =>
+            (data) => {
-                (groupedStates = data.map((x) => Object.assign(x, { code: t(x.code) })))
+                getGroupedStates(data);
+            }
         "
+        auto-load
     />
     <FetchData
         url="AgencyModes"
@@ -115,11 +126,12 @@ const groupedStates = ref([]);
                 </QItemSection>
                 <QItemSection v-if="groupedStates">
                     <VnSelect
-                        :label="t('params.groupedStates')"
+                        :label="t('Grouped state')"
                         v-model="params.groupedStates"
                         @update:model-value="searchFn()"
                         :options="groupedStates"
-                        option-label="code"
+                        option-value="id"
+                        option-label="name"
                         emit-value
                         map-options
                         use-input
@@ -292,7 +304,7 @@ en:
     ON_PREPARATION: On preparation
     PACKED: Packed
     DELIVERED: Delivered
-    ON_PREVIOUS: On previous
+    ON_PREVIOUS: ON_PREVIOUS
 es:
     params:
         search: Contiene
@@ -337,7 +349,7 @@ es:
     ON_PREPARATION: En preparación
     PACKED: Encajado
     DELIVERED: Servido
-    ON_PREVIOUS: En previa
+    ON_PREVIOUS: ON_PREVIOUS
     Collection: Colección
     Nickname: Nombre mostrado
 </i18n>

src/pages/Ticket/TicketList.vue

@@ -113,7 +113,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'shippedDate',
+        name: 'shipped',
         cardVisible: true,
         label: t('ticketList.shipped'),
         columnFilter: {
@@ -123,7 +123,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'shippedHour',
+        name: 'shipped',
         component: 'time',
         columnFilter: false,
         label: t('ticketList.hour'),

src/pages/Ticket/locale/en.yml

@@ -205,7 +205,6 @@ ticketList:
     toLines: Go to lines
     addressNickname: Address nickname
     ref: Reference
-    hour: Hour
     rounding: Rounding
     noVerifiedData: No verified data
     purchaseRequest: Purchase request

src/pages/Travel/Card/TravelCard.vue

@@ -8,6 +8,6 @@ import filter from './TravelFilter.js';
         data-key="Travel"
         url="Travels"
         :descriptor="TravelDescriptor"
-        :filter="{ ...filter, where: { id: $route.params.id } }"
+        :filter="filter"
     />
 </template>

src/pages/Travel/Card/TravelDescriptor.vue

@@ -66,7 +66,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
                     :to="{
                         name: 'TravelList',
                         query: {
-                            table: JSON.stringify({
+                            params: JSON.stringify({
                                 agencyModeFk: entity.agencyModeFk,
                             }),
                         },

src/pages/Travel/Card/TravelDescriptorMenuItems.vue

@@ -37,7 +37,7 @@ const cloneTravelWithEntries = async () => {
     router.push({ name: 'TravelBasicData', params: { id: data.id } });
 };
 
-const canDelete = computed(() => useAcl().hasAcl('Travel', '*', 'WRITE'));
+const canDelete = computed(() => useAcl().hasAny('Travel', '*', 'WRITE'));
 
 const openDeleteEntryDialog = (id) => {
     quasar

src/pages/Travel/Card/TravelSummary.vue

@@ -89,13 +89,6 @@ const entriesTableColumns = computed(() => {
             showValue: true,
         },
         { label: 'CC', field: 'cc', name: 'cc', align: 'left', showValue: true },
-        {
-            label: t('travel.summary.roundedCc'),
-            field: 'cc',
-            name: 'roundedCc',
-            align: 'left',
-            showValue: true,
-        },
         {
             label: 'Pallet',
             field: 'pallet',
@@ -198,15 +191,14 @@ const entriesTotals = computed(() => {
         freightValue: 0,
         packageValue: 0,
         cc: 0,
-        roundedCc: 0,
         pallet: 0,
         m3: 0,
     };
 
     entriesTableRows.value.forEach((row) => {
         for (const key in totals) {
-            if (key === 'roundedCc') {
+            if (key === 'cc') {
-                totals['roundedCc'] += Math.ceil(row['cc'] || 0);
+                totals[key] += Math.ceil(row[key] || 0);
             } else {
                 totals[key] += row[key] || 0;
             }
@@ -218,7 +210,6 @@ const entriesTotals = computed(() => {
         freight: toCurrency(totals.freightValue),
         packageValue: toCurrency(totals.packageValue),
         cc: totals.cc.toFixed(2),
-        roundedCc: totals.roundedCc,
         pallet: totals.pallet.toFixed(2),
         m3: totals.m3.toFixed(2),
     };
@@ -383,11 +374,6 @@ onMounted(async () => {
                             </QBtn>
                         </QTd>
                     </template>
-                    <template #body-cell-roundedCc="{ col, value }">
-                        <QTd>
-                            {{ Math.ceil(value) || 0 }}
-                        </QTd>
-                    </template>
                     <template #body-cell-observation="{ value }">
                         <QTd>
                             <QIcon name="insert_drive_file" color="primary" size="24px">
@@ -404,24 +390,23 @@ onMounted(async () => {
                         <QTd class="text-bold">{{ entriesTotals.freight }}</QTd>
                         <QTd class="text-bold">{{ entriesTotals.packageValue }}</QTd>
                         <QTd class="text-bold">{{ entriesTotals.cc }}</QTd>
-                        <QTd class="text-bold">{{ entriesTotals.roundedCc }}</QTd>
                         <QTd class="text-bold">{{ entriesTotals.pallet }}</QTd>
                         <QTd class="text-bold">{{ entriesTotals.m3 }}</QTd>
                     </template>
                 </QTable>
             </QCard>
+
             <QCard class="full-width" v-if="thermographs.length > 0">
-                <FetchData
+                <RouterLink
-                    url="Warehouses"
+                    class="header header-link"
-                    :filter="{ fields: ['id', 'name'] }"
+                    :to="{
-                    order="name"
+                        name: 'TravelThermographsIndex',
-                    @on-fetch="(data) => (warehouses = data)"
+                        params: { id: travel.id },
-                    auto-load
+                    }"
-                />
+                >
-                <VnTitle
+                    {{ t('travel.summary.thermographs') }}
-                    :url="getLink('thermographs')"
+                    <QIcon name="open_in_new" />
-                    :text="t('travel.summary.thermographs')"
+                </RouterLink>
-                />
                 <QTable
                     :rows="thermographs"
                     :columns="thermographsTableColumns"

src/pages/Travel/ExtraCommunity.vue

@@ -18,6 +18,7 @@ import { usePrintService } from 'composables/usePrintService';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import axios from 'axios';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import VnPopup from 'src/components/common/VnPopup.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -140,6 +141,7 @@ const columns = computed(() => [
         label: 'id',
         field: 'id',
         name: 'id',
+        align: 'center',
         showValue: true,
         sortable: true,
     },
@@ -163,7 +165,7 @@ const columns = computed(() => [
         label: t('globals.amount'),
         name: 'invoiceAmount',
         field: 'entries',
-        align: 'right',
+        align: 'left',
         showValue: true,
         sortable: true,
         format: (value) =>
@@ -182,12 +184,13 @@ const columns = computed(() => [
         align: 'left',
         showValue: false,
         sortable: true,
+        style: 'min-width: 170px;',
     },
     {
         label: t('globals.packages'),
         field: 'stickers',
         name: 'stickers',
-        align: 'right',
+        align: 'left',
         showValue: true,
         sortable: true,
     },
@@ -195,7 +198,7 @@ const columns = computed(() => [
         label: '%',
         field: '',
         name: 'percentage',
-        align: 'right',
+        align: 'center',
         showValue: false,
         sortable: true,
     },
@@ -211,7 +214,7 @@ const columns = computed(() => [
         label: t('extraCommunity.physicKg'),
         field: 'loadedKg',
         name: 'loadedKg',
-        align: 'right',
+        align: 'left',
         showValue: true,
         sortable: true,
     },
@@ -219,7 +222,7 @@ const columns = computed(() => [
         label: 'KG Vol.',
         field: 'volumeKg',
         name: 'volumeKg',
-        align: 'right',
+        align: 'left',
         showValue: true,
         sortable: true,
     },
@@ -274,6 +277,7 @@ async function getData() {
 const onStoreDataChange = () => {
     const newData = JSON.parse(JSON.stringify(arrayData.store.data)) || [];
     rows.value = newData;
+    // el objetivo de esto es guardar una copia de los valores iniciales de todas las rows para corroborar si la data cambio antes de guardar los cambios
     originalRowDataCopy.value = JSON.parse(JSON.stringify(newData));
 };
 
@@ -296,17 +300,20 @@ const openReportPdf = () => {
 };
 
 const saveFieldValue = async (val, field, index) => {
+    // Evitar la solicitud de guardado si el valor no ha cambiado
     if (originalRowDataCopy.value[index][field] == val) return;
 
     const id = rows.value[index].id;
     const params = { [field]: val };
     await axios.patch(`Travels/${id}`, params);
+    // Actualizar la copia de los datos originales con el nuevo valor
     originalRowDataCopy.value[index][field] = val;
 
     await arrayData.fetch({ append: false });
 };
 
 const stopEventPropagation = (event, col) => {
+    // Detener la propagación del evento de los siguientes elementos para evitar el click sobre la row que dispararía  la función navigateToTravelId
     if (!['ref', 'id', 'cargoSupplierNickname', 'kg'].includes(col.name)) return;
     event.preventDefault();
     event.stopPropagation();
@@ -328,12 +335,14 @@ onMounted(async () => {
     await getData();
 });
 
+// Handler del evento @dragstart (inicio del drag) y guarda información inicial
 const handleDragStart = (event, rowIndex, entryIndex) => {
     draggedRowIndex.value = rowIndex;
     entryRowIndex.value = entryIndex;
     event.dataTransfer.effectAllowed = 'move';
 };
 
+// Handler del evento @dragenter (cuando haces drag sobre une elemento y lo arrastras sobre un posible target de drop) y actualiza el targetIndex
 const handleDragEnter = (_, targetIndex) => {
     targetRowIndex.value = targetIndex;
 };
@@ -347,8 +356,11 @@ const saveRowDrop = async (targetRowIndex) => {
 const moveRow = async (draggedRowIndex, targetRowIndex, entryIndex) => {
     try {
         if (draggedRowIndex === targetRowIndex) return;
+        // Remover entry de la row original
         draggedEntry.value = rows.value[draggedRowIndex].entries.splice(entryIndex, 1)[0];
+        //Si la row de destino por alguna razón no tiene la propiedad entry la creamos
         if (!rows.value[targetRowIndex].entries) rows.value[targetRowIndex].entries = [];
+        // Añadir entry a la row de destino
         rows.value[targetRowIndex].entries.push(draggedEntry.value);
 
         await saveRowDrop(targetRowIndex);
@@ -358,11 +370,13 @@ const moveRow = async (draggedRowIndex, targetRowIndex, entryIndex) => {
     }
 };
 
+// Handler de cuando haces un drop tanto dentro como fuera de la tabla para limpiar acciones y data
 const handleDragEnd = () => {
     stopScroll();
     cleanDragAndDropData();
 };
 
+// Handler del evento @drop (cuando soltas el elemento draggeado sobre un target)
 const handleDrop = () => {
     if (
         !draggedRowIndex.value &&
@@ -385,6 +399,7 @@ const cleanDragAndDropData = () => {
 const scrollInterval = ref(null);
 
 const startScroll = (direction) => {
+    // Iniciar el scroll en la dirección especificada
     if (!scrollInterval.value) {
         scrollInterval.value = requestAnimationFrame(() => scroll(direction));
     }
@@ -398,12 +413,14 @@ const stopScroll = () => {
 };
 
 const scroll = (direction) => {
+    // Controlar el desplazamiento en la dirección especificada
     const yOffset = direction === 'up' ? -2 : 2;
     window.scrollBy(0, yOffset);
 
     const windowHeight = window.innerHeight;
     const documentHeight = document.body.offsetHeight;
 
+    // Verificar si se alcanzaron los límites de la ventana para detener el desplazamiento
     if (
         (direction === 'up' && window.scrollY > 0) ||
         (direction === 'down' && windowHeight + window.scrollY < documentHeight)
@@ -414,10 +431,13 @@ const scroll = (direction) => {
     }
 };
 
+// Handler del scroll mientras se hace el drag de una row
 const handleDragScroll = (event) => {
+    // Obtener la posición y dimensiones del cursor
     const y = event.clientY;
     const windowHeight = window.innerHeight;
 
+    // Verificar si el cursor está cerca del borde superior o inferior de la ventana
     const nearTop = y < 150;
     const nearBottom = y > windowHeight - 100;
 
@@ -527,7 +547,7 @@ watch(route, () => {
                                         ? `${props.row.percentageKg}%`
                                         : '-'
                                 "
-                                class="text-right q-py-xs q-px-sm"
+                                class="text-left q-py-xs q-px-sm"
                                 :color="getColor(props.row.percentageKg)"
                             />
                             <span
@@ -546,6 +566,7 @@ watch(route, () => {
                                 ]"
                                 v-text="col.value"
                             />
+                            <!-- Main Row Descriptors -->
                             <TravelDescriptorProxy
                                 v-if="col.name === 'id'"
                                 :id="props.row.id"
@@ -576,46 +597,58 @@ watch(route, () => {
                             index === props.row.entries.length - 1,
                     }"
                 >
-                    <QTd class="text-right">
+                    <QTd>
                         <QBtn dense flat class="link">{{ entry.id }} </QBtn>
                         <EntryDescriptorProxy :id="entry.id" />
                     </QTd>
-                    <QTd :colspan="2">
+                    <QTd>
-                        <div style="display: flex">
+                        <QBtn flat class="link" dense>{{ entry.supplierName }}</QBtn>
-                            <span class="link">
+                        <SupplierDescriptorProxy :id="entry.supplierFk" />
-                                {{ entry.supplierName }}
-                                <SupplierDescriptorProxy :id="entry.supplierFk" />
-                            </span>
-                            <QIcon
-                                v-if="entry.isCustomInspectionRequired"
-                                name="warning"
-                                color="negative"
-                                size="md"
-                                :title="t('extraCommunity.requiresInspection')"
-                            />
-                        </div>
                     </QTd>
-                    <QTd class="text-right">
+                    <QTd>
+                        <QIcon
+                            v-if="entry.isCustomInspectionRequired"
+                            name="warning"
+                            color="negative"
+                            size="md"
+                            :title="t('extraCommunity.requiresInspection')"
+                        >
+                        </QIcon>
+                    </QTd>
+                    <QTd>
                         <span>{{ toCurrency(entry.invoiceAmount) }}</span>
                     </QTd>
                     <QTd>
                         <span>{{ entry.reference }}</span>
                     </QTd>
-                    <QTd class="text-right">
+                    <QTd>
                         <span>{{ entry.stickers }}</span>
                     </QTd>
                     <QTd />
                     <QTd></QTd>
-                    <QTd class="text-right">
+                    <QTd>
                         <span>{{ entry.loadedkg }}</span>
                     </QTd>
-                    <QTd class="text-right">
+                    <QTd>
                         <span>{{ entry.volumeKg }}</span>
                     </QTd>
-                    <QTd :colspan="5" class="text-right">
+                    <QTd />
-                        <span>
+                    <QTd />
-                            {{ entry.evaNotes }}
+                    <QTd />
-                        </span>
+                    <QTd />
+                    <QTd>
+                        <QBtn
+                            v-if="entry.evaNotes"
+                            icon="comment"
+                            size="md"
+                            flat
+                            color="primary"
+                        >
+                            <VnPopup
+                                :title="t('globals.observations')"
+                                :content="entry.evaNotes"
+                            />
+                        </QBtn>
                     </QTd>
                 </QTr>
             </template>
@@ -629,21 +662,18 @@ watch(route, () => {
 }
 
 :deep(.q-table) {
-    table-layout: auto;
-    width: 100%;
     border-collapse: collapse;
-    overflow: hidden;
-    text-overflow: ellipsis;
 
+    th {
+        padding: 0;
+    }
     tbody tr td {
         &:nth-child(1) {
             max-width: 65px;
         }
-        padding: 0 5px 0;
+        &:nth-child(4) {
-    }
+            padding: 0;
-    thead > tr > th {
+        }
-        padding: 3px;
-        color: var(--vn-label-color);
     }
 }
 

src/pages/Worker/Card/WorkerCalendar.vue

@@ -18,7 +18,9 @@ const router = useRouter();
 const route = useRoute();
 const { t } = useI18n();
 const acl = useAcl();
-const canSeeNotes = computed(() => acl.hasAcl('Worker', '__get__business', 'READ'));
+const canSeeNotes = computed(() =>
+    acl.hasAny([{ model: 'Worker', props: '__get__business', accessType: 'READ' }]),
+);
 const workerIsFreelance = ref();
 const WorkerFreelanceRef = ref();
 const workerCalendarFilterRef = ref(null);

src/pages/Worker/Card/WorkerDescriptor.vue

@@ -116,7 +116,7 @@ const handlePhotoUpdated = (evt = false) => {
         <template #body="{ entity }">
             <VnLv :label="t('globals.user')" :value="entity.user?.name" />
             <VnLv
-                class="ellipsis"
+                class="ellipsis-text"
                 :label="t('globals.params.email')"
                 :value="entity.user?.emailUser?.email"
                 copy
@@ -128,13 +128,15 @@ const handlePhotoUpdated = (evt = false) => {
                 </template>
             </VnLv>
 
-            <VnLv :label="t('globals.phone')">
+            <VnLv :value="entity.phone">
-                <template #value>
+                <template #label>
+                    {{ t('globals.phone') }}
                     <VnLinkPhone :phone-number="entity.phone" />
                 </template>
             </VnLv>
-            <VnLv :label="t('worker.summary.sipExtension')">
+            <VnLv :value="entity?.sip?.extension">
-                <template #value>
+                <template #label>
+                    {{ t('worker.summary.sipExtension') }}
                     <VnLinkPhone :phone-number="entity?.sip?.extension" />
                 </template>
             </VnLv>

src/pages/Worker/Card/WorkerLocker.vue

@@ -9,7 +9,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import { useArrayData } from 'src/composables/useArrayData';
 import FetchData from 'components/FetchData.vue';
 
-const { hasAcl } = useAcl();
+const { hasAny } = useAcl();
 const { t } = useI18n();
 const fetchData = ref();
 const originaLockerId = ref();
@@ -58,7 +58,11 @@ const init = async (data) => {
                 option-label="code"
                 option-value="id"
                 hide-selected
-                :readonly="!hasAcl('Worker', '__get__locker', 'READ')"
+                :readonly="
+                    !hasAny([
+                        { model: 'Worker', props: '__get__locker', accessType: 'READ' },
+                    ])
+                "
             />
         </template>
     </FormModel>

src/pages/Worker/Card/WorkerSummary.vue

@@ -73,25 +73,28 @@ onBeforeMount(async () => {
                                 />
                             </template>
                         </VnLv>
-                        <VnLv :label="t('worker.summary.phoneExtension')">
+                        <VnLv :value="worker.mobileExtension">
-                            <template #value>
+                            <template #label>
+                                {{ t('worker.summary.phoneExtension') }}
                                 <VnLinkPhone :phone-number="worker.mobileExtension" />
                             </template>
                         </VnLv>
-                        <VnLv :label="t('worker.summary.entPhone')">
+                        <VnLv :value="worker.phone">
-                            <template #value>
+                            <template #label>
+                                {{ t('worker.summary.entPhone') }}
                                 <VnLinkPhone :phone-number="worker.phone" />
                             </template>
                         </VnLv>
-                        <VnLv :label="t('worker.summary.personalPhone')">
+                        <VnLv :value="advancedSummary?.client?.phone">
-                            <template #value>
+                            <template #label>
+                                {{ t('worker.summary.personalPhone') }}
                                 <VnLinkPhone
                                     :phone-number="advancedSummary?.client?.phone"
                                 />
                             </template>
                         </VnLv>
                     </div>
-                    <div class="vn-card-content" v-if="advancedSummary">
+                    <div class="vn-card-content">
                         <VnLv
                             :label="t('worker.summary.fiDueDate')"
                             :value="toDate(advancedSummary.fiDueDate)"
@@ -132,7 +135,6 @@ onBeforeMount(async () => {
                 <VnTitle :text="t('worker.summary.userData')" />
                 <VnLv :label="t('globals.name')" :value="worker?.user?.nickname" />
                 <VnLv
-                    class="ellipsis"
                     :label="t('globals.params.email')"
                     :value="worker.user?.emailUser?.email"
                     copy
@@ -145,8 +147,9 @@ onBeforeMount(async () => {
                         </span>
                     </template>
                 </VnLv>
-                <VnLv :label="t('worker.summary.sipExtension')">
+                <VnLv :value="worker?.sip?.extension">
-                    <template #value>
+                    <template #label>
+                        {{ t('worker.summary.sipExtension') }}
                         <VnLinkPhone :phone-number="worker?.sip?.extension" />
                     </template>
                 </VnLv>

src/pages/Worker/Card/WorkerTimeControl.vue

@@ -68,9 +68,13 @@ const arrayData = useArrayData('Worker');
 const acl = useAcl();
 const selectedDateYear = computed(() => moment(selectedDate.value).isoWeekYear());
 const worker = computed(() => arrayData.store?.data);
-const canSend = computed(() => acl.hasAcl('WorkerTimeControl', 'sendMail', 'WRITE'));
+const canSend = computed(() =>
+    acl.hasAny([{ model: 'WorkerTimeControl', props: 'sendMail', accessType: 'WRITE' }]),
+);
 const canUpdate = computed(() =>
-    acl.hasAcl('WorkerTimeControl', 'updateMailState', 'WRITE'),
+    acl.hasAny([
+        { model: 'WorkerTimeControl', props: 'updateMailState', accessType: 'WRITE' },
+    ]),
 );
 const isHimself = computed(() => user.value.id === Number(route.params.id));
 

src/pages/Worker/WorkerFilter.vue

@@ -102,11 +102,8 @@ en:
         lastName: Last name
         userName: User
         extension: Extension
-        departmentFk: Department
 es:
-
     params:
-        departmentFk: Departamento
         search: Contiene
         firstName: Nombre
         lastName: Apellidos

src/pages/Zone/Card/ZoneSummary.vue

@@ -75,13 +75,13 @@ onMounted(async () => {
         <template #body="{ entity: zone }">
             <QCard class="vn-one">
                 <VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" />
-                <div class="vn-card-group">
+                <div class="card-group">
-                    <div class="vn-card-content">
+                    <div class="card-content">
                         <VnLv :label="t('list.agency')" :value="zone.agencyMode?.name" />
                         <VnLv :label="t('list.price')" :value="toCurrency(zone.price)" />
                         <VnLv :label="t('zone.bonus')" :value="toCurrency(zone.bonus)" />
                     </div>
-                    <div class="vn-card-content">
+                    <div class="card-content">
                         <VnLv
                             :label="t('summary.closeHour')"
                             :value="toTimeFormat(zone.hour)"
@@ -98,7 +98,7 @@ onMounted(async () => {
                     </div>
                 </div>
             </QCard>
-            <QCard class="vn-max">
+            <QCard class="vn-one">
                 <VnTitle :url="zoneUrl + `warehouses`" :text="t('list.warehouse')" />
                 <QTable
                     :columns="columns"
@@ -109,3 +109,15 @@ onMounted(async () => {
         </template>
     </CardSummary>
 </template>
+
+<style lang="scss" scoped>
+.card-group {
+    display: flex;
+    flex-direction: column;
+}
+
+.card-content {
+    display: flex;
+    flex-direction: column;
+}
+</style>

src/router/__tests__/hooks.spec.js

@@ -1,36 +0,0 @@
-import { describe, it, expect, vi } from 'vitest';
-import { ref, nextTick } from 'vue';
-import { stateQueryGuard } from 'src/router/hooks';
-import { useStateQueryStore } from 'src/stores/useStateQueryStore';
-
-vi.mock('src/stores/useStateQueryStore', () => {
-    const isLoading = ref(true);
-    return {
-        useStateQueryStore: () => ({
-            isLoading: () => isLoading,
-            setLoading: isLoading,
-        }),
-    };
-});
-
-describe('hooks', () => {
-    describe('stateQueryGuard', () => {
-        const foo = { name: 'foo' };
-        it('should wait until the state query is not loading and then call next()', async () => {
-            const next = vi.fn();
-
-            stateQueryGuard(foo, { name: 'bar' }, next);
-            expect(next).not.toHaveBeenCalled();
-
-            useStateQueryStore().setLoading.value = false;
-            await nextTick();
-            expect(next).toHaveBeenCalled();
-        });
-
-        it('should ignore if both routes are the same', () => {
-            const next = vi.fn();
-            stateQueryGuard(foo, foo, next);
-            expect(next).toHaveBeenCalled();
-        });
-    });
-});

src/router/hooks.js

@@ -1,95 +0,0 @@
-import { useRole } from 'src/composables/useRole';
-import { useUserConfig } from 'src/composables/useUserConfig';
-import { useTokenConfig } from 'src/composables/useTokenConfig';
-import { useAcl } from 'src/composables/useAcl';
-import { isLoggedIn } from 'src/utils/session';
-import { useSession } from 'src/composables/useSession';
-import { useStateQueryStore } from 'src/stores/useStateQueryStore';
-import { watch } from 'vue';
-import { i18n } from 'src/boot/i18n';
-
-let session = null;
-const { t, te } = i18n.global;
-
-export async function navigationGuard(to, from, next, Router, state) {
-    if (!session) session = useSession();
-    const outLayout = Router.options.routes[0].children.map((r) => r.name);
-    if (!session.isLoggedIn() && !outLayout.includes(to.name)) {
-        return next({ name: 'Login', query: { redirect: to.fullPath } });
-    }
-
-    if (isLoggedIn()) {
-        const stateRoles = state.getRoles().value;
-        if (stateRoles.length === 0) {
-            await useRole().fetch();
-            await useAcl().fetch();
-            await useUserConfig().fetch();
-            await useTokenConfig().fetch();
-        }
-        const matches = to.matched;
-        const hasRequiredAcls = matches.every((route) => {
-            const meta = route.meta;
-            if (!meta?.acls) return true;
-            return useAcl().hasAny(meta.acls);
-        });
-        if (!hasRequiredAcls) return next({ path: '/' });
-    }
-
-    next();
-}
-
-export async function stateQueryGuard(to, from, next) {
-    if (to.name !== from.name) {
-        const stateQuery = useStateQueryStore();
-        await waitUntilFalse(stateQuery.isLoading());
-    }
-
-    next();
-}
-
-export function setPageTitle(to) {
-    let title = t(`login.title`);
-
-    const matches = to.matched;
-    if (matches && matches.length > 1) {
-        const module = matches[1];
-        const moduleTitle = module.meta?.title;
-        if (moduleTitle) {
-            title = t(`globals.pageTitles.${moduleTitle}`);
-        }
-    }
-
-    const childPage = to.meta;
-    const childPageTitle = childPage?.title;
-    if (childPageTitle && matches.length > 2) {
-        if (title != '') title += ': ';
-
-        const moduleLocale = `globals.pageTitles.${childPageTitle}`;
-        const pageTitle = te(moduleLocale)
-            ? t(moduleLocale)
-            : t(`globals.pageTitles.${childPageTitle}`);
-        const idParam = to.params?.id;
-        const idPageTitle = `${idParam} - ${pageTitle}`;
-        const builtTitle = idParam ? idPageTitle : pageTitle;
-
-        title += builtTitle;
-    }
-
-    document.title = title;
-}
-
-function waitUntilFalse(ref) {
-    return new Promise((resolve) => {
-        if (!ref.value) return resolve();
-        const stop = watch(
-            ref,
-            (val) => {
-                if (!val) {
-                    stop();
-                    resolve();
-                }
-            },
-            { immediate: true },
-        );
-    });
-}

src/router/index.js

@@ -6,25 +6,101 @@ import {
     createWebHashHistory,
 } from 'vue-router';
 import routes from './routes';
+import { i18n } from 'src/boot/i18n';
 import { useState } from 'src/composables/useState';
-import { navigationGuard, setPageTitle, stateQueryGuard } from './hooks';
+import { useRole } from 'src/composables/useRole';
+import { useUserConfig } from 'src/composables/useUserConfig';
+import { useTokenConfig } from 'src/composables/useTokenConfig';
+import { useAcl } from 'src/composables/useAcl';
+import { isLoggedIn } from 'src/utils/session';
+import { useSession } from 'src/composables/useSession';
 
-const webHistory =
+let session = null;
-    process.env.VUE_ROUTER_MODE === 'history' ? createWebHistory : createWebHashHistory;
+const { t, te } = i18n.global;
-const createHistory = process.env.SERVER ? createMemoryHistory : webHistory;
+
+const createHistory = process.env.SERVER
+    ? createMemoryHistory
+    : process.env.VUE_ROUTER_MODE === 'history'
+      ? createWebHistory
+      : createWebHashHistory;
 
 const Router = createRouter({
     scrollBehavior: () => ({ left: 0, top: 0 }),
     routes,
+
+    // Leave this as is and make changes in quasar.conf.js instead!
+    // quasar.conf.js -> build -> vueRouterMode
+    // quasar.conf.js -> build -> publicPath
     history: createHistory(process.env.VUE_ROUTER_BASE),
 });
 
+/*
+ * If not building with SSR mode, you can
+ * directly export the Router instantiation;
+ *
+ * The function below can be async too; either use
+ * async/await or return a Promise which resolves
+ * with the Router instance.
+ */
 export { Router };
-export default defineRouter(() => {
+export default defineRouter(function (/* { store, ssrContext } */) {
     const state = useState();
-    Router.beforeEach((to, from, next) => navigationGuard(to, from, next, Router, state));
+    Router.beforeEach(async (to, from, next) => {
-    Router.beforeEach(stateQueryGuard);
+        if (!session) session = useSession();
-    Router.afterEach(setPageTitle);
+        const outLayout = Router.options.routes[0].children.map((r) => r.name);
+        if (!session.isLoggedIn() && !outLayout.includes(to.name)) {
+            return next({ name: 'Login', query: { redirect: to.fullPath } });
+        }
+
+        if (isLoggedIn()) {
+            const stateRoles = state.getRoles().value;
+            if (stateRoles.length === 0) {
+                await useRole().fetch();
+                await useAcl().fetch();
+                await useUserConfig().fetch();
+                await useTokenConfig().fetch();
+            }
+            const matches = to.matched;
+            const hasRequiredAcls = matches.every((route) => {
+                const meta = route.meta;
+                if (!meta?.acls) return true;
+                return useAcl().hasAny(meta.acls);
+            });
+            if (!hasRequiredAcls) return next({ path: '/' });
+        }
+
+        next();
+    });
+
+    Router.afterEach((to) => {
+        let title = t(`login.title`);
+
+        const matches = to.matched;
+        if (matches && matches.length > 1) {
+            const module = matches[1];
+            const moduleTitle = module.meta && module.meta.title;
+            if (moduleTitle) {
+                title = t(`globals.pageTitles.${moduleTitle}`);
+            }
+        }
+
+        const childPage = to.meta;
+        const childPageTitle = childPage && childPage.title;
+        if (childPageTitle && matches.length > 2) {
+            if (title != '') title += ': ';
+
+            const moduleLocale = `globals.pageTitles.${childPageTitle}`;
+            const pageTitle = te(moduleLocale)
+                ? t(moduleLocale)
+                : t(`globals.pageTitles.${childPageTitle}`);
+            const idParam = to.params && to.params.id;
+            const idPageTitle = `${idParam} - ${pageTitle}`;
+            const builtTitle = idParam ? idPageTitle : pageTitle;
+
+            title += builtTitle;
+        }
+        document.title = title;
+    });
 
     Router.onError(({ message }) => {
         const errorMessages = [

src/router/modules/route.js

@@ -166,7 +166,7 @@ const vehicleCard = {
     component: () => import('src/pages/Route/Vehicle/Card/VehicleCard.vue'),
     redirect: { name: 'VehicleSummary' },
     meta: {
-        menu: ['VehicleBasicData', 'VehicleNotes'],
+        menu: ['VehicleBasicData'],
     },
     children: [
         {
@@ -187,15 +187,6 @@ const vehicleCard = {
             },
             component: () => import('src/pages/Route/Vehicle/Card/VehicleBasicData.vue'),
         },
-        {
-            name: 'VehicleNotes',
-            path: 'notes',
-            meta: {
-                title: 'notes',
-                icon: 'vn:notes',
-            },
-            component: () => import('src/pages/Route/Vehicle/Card/VehicleNotes.vue'),
-        }
     ],
 };
 
@@ -238,7 +229,6 @@ export default {
                                 title: 'list',
                                 icon: 'view_list',
                             },
-                            component: () => import('src/pages/Route/RouteList.vue'),
                         },
                         routeCard,
                     ],
@@ -287,7 +277,6 @@ export default {
                                 title: 'list',
                                 icon: 'view_list',
                             },
-                            component: () => import('src/pages/Route/RouteRoadmap.vue'),
                         },
                         roadmapCard,
                     ],
@@ -318,8 +307,6 @@ export default {
                                 title: 'list',
                                 icon: 'view_list',
                             },
-                            component: () =>
-                                import('src/pages/Route/Agency/AgencyList.vue'),
                         },
                         agencyCard,
                     ],
@@ -341,8 +328,6 @@ export default {
                                 title: 'vehicleList',
                                 icon: 'directions_car',
                             },
-                            component: () =>
-                                import('src/pages/Route/Vehicle/VehicleList.vue'),
                         },
                         vehicleCard,
                     ],

src/stores/useArrayDataStore.js

@@ -18,6 +18,7 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
         navigate: null,
         page: 1,
         mapKey: 'id',
+        keepData: false,
         oneRecord: false,
     };
 

test/cypress/integration/account/accountDescriptorMenu.spec.js

@@ -1,4 +1,4 @@
-describe('Account descriptor', () => {
+describe('ClaimNotes', () => {
     const descriptorOptions = '[data-cy="descriptor-more-opts-menu"] > .q-list';
     const url = '/#/account/1/summary';
 
@@ -7,9 +7,6 @@ describe('Account descriptor', () => {
         cy.visit(url);
         cy.dataCy('descriptor-more-opts').click();
         cy.get(descriptorOptions)
-            .should('exist')
-            .should('be.visible')
-
             .find('.q-item')
             .its('length')
             .then((count) => {

test/cypress/integration/entry/commands.js

@@ -1,6 +1,6 @@
 Cypress.Commands.add('selectTravel', (warehouse = '1') => {
     cy.get('i[data-cy="Travel_icon"]').click();
-    cy.selectOption('input[data-cy="Warehouse Out_select"]', warehouse);
+    cy.get('input[data-cy="Warehouse Out_select"]').type(warehouse);
     cy.get('div[role="listbox"] > div > div[role="option"]').eq(0).click();
     cy.get('button[data-cy="save-filter-travel-form"]').click();
     cy.get('tr').eq(1).click();
@@ -9,6 +9,7 @@ Cypress.Commands.add('selectTravel', (warehouse = '1') => {
 Cypress.Commands.add('deleteEntry', () => {
     cy.get('[data-cy="descriptor-more-opts"]').should('be.visible').click();
     cy.waitForElement('div[data-cy="delete-entry"]').click();
+    cy.url().should('include', 'list');
 });
 
 Cypress.Commands.add('createEntry', () => {

test/cypress/integration/entry/entryCard/entryDescriptor.spec.js

@@ -28,8 +28,12 @@ describe('EntryDescriptor', () => {
                     cy.get('.q-notification__message')
                         .eq(2)
                         .should('have.text', 'Entry prices recalculated');
+
+                    cy.get('[data-cy="descriptor-more-opts"]').click();
                     cy.deleteEntry();
 
+                    cy.log(previousUrl);
+
                     cy.visit(previousUrl);
 
                     cy.waitForElement('[data-cy="entry-buys"]');

test/cypress/integration/entry/entryList.spec.js

@@ -44,12 +44,11 @@ describe('EntryList', () => {
             },
         );
 
-        // fix on task https://redmine.verdnatura.es/issues/8638
+        checkBadgeDate(
-        /* checkBadgeDate(
             'td[data-col-field="landed"] > div .bg-info',
             (badgeDate, compareDate) => {
                 expect(badgeDate.getTime()).to.be.lessThan(compareDate.getTime());
             },
-        ); */
+        );
     });
 });

test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js

@@ -40,7 +40,7 @@ describe('InvoiceInDescriptor', () => {
             cy.visit('/#/invoice-in/6/summary');
             cy.selectDescriptorOption(5);
 
-            cy.dataCy('SendEmailNotificationDialogInput_input').type(
+            cy.dataCy('SendEmailNotifiactionDialogInput_input').type(
                 '{selectall}jorgito@gmail.mx',
             );
             cy.clickConfirm();

test/cypress/integration/invoiceOut/invoiceOutSummary.spec.js

@@ -37,7 +37,7 @@ describe('InvoiceOut summary', () => {
         });
     });
 
-    it.skip('should transfer the invoice ', () => {
+    it('should transfer the invoice ', () => {
         cy.typeSearchbar('T1111111{enter}');
         cy.dataCy('descriptor-more-opts').click();
         cy.get(selectMenuOption(1)).click();
@@ -50,7 +50,7 @@ describe('InvoiceOut summary', () => {
         cy.dataCy('descriptor-more-opts').click();
         cy.get(selectMenuOption(3)).click();
         cy.dataCy('InvoiceOutDescriptorMenuSendPdfOption').click();
-        cy.dataCy('SendEmailNotificationDialogInput').should('be.visible');
+        cy.dataCy('SendEmailNotifiactionDialogInput').should('be.visible');
         cy.get(confirmSend).click();
         cy.checkNotification('Notification sent');
     });
@@ -59,7 +59,7 @@ describe('InvoiceOut summary', () => {
         cy.dataCy('descriptor-more-opts').click();
         cy.get(selectMenuOption(3)).click();
         cy.dataCy('InvoiceOutDescriptorMenuSendCsvOption').click();
-        cy.dataCy('SendEmailNotificationDialogInput').should('be.visible');
+        cy.dataCy('SendEmailNotifiactionDialogInput').should('be.visible');
         cy.get(confirmSend).click();
         cy.checkNotification('Notification sent');
     });

test/cypress/integration/order/orderList.spec.js

@@ -30,11 +30,9 @@ describe('OrderList', () => {
         cy.url().should('include', `/order`);
     });
 
-    it('filter list and create order', () => {
+    it.skip('filter list and create order', () => {
         cy.dataCy('Customer ID_input').type('1101{enter}');
-        cy.intercept('GET', /\/api\/Clients/).as('clientFilter');
         cy.dataCy('vnTableCreateBtn').click();
-        cy.wait('@clientFilter');
         cy.dataCy('landedDate').find('input').type('06/01/2001');
         cy.selectOption(agencyCreateSelect, 1);
 

test/cypress/integration/route/agency/agencyModes.spec.js

@@ -1,15 +0,0 @@
-describe('Agency modes', () => {
-    const name = 'inhouse pickup';
-
-    beforeEach(() => {
-        cy.viewport(1920, 1080);
-        cy.login('developer');
-        cy.visit(`/#/route/agency/1/modes`);
-    });
-
-    it('should display the agency modes page', () => {
-        cy.get('.flex > .title').should('have.text', name);
-        cy.get('.flex > .q-chip > .q-chip__content').should('have.text', 'ID: 1');
-        cy.get('.list-items > :nth-child(1) > .value').should('have.text', name);
-    });
-});

test/cypress/integration/route/routeAutonomous.spec.js

@@ -49,12 +49,12 @@ describe.skip('RouteAutonomous', () => {
         cy.get(selectors.firstRowCheckbox).click();
         cy.get(selectors.createInvoiceBtn).click();
         cy.dataCy(selectors.reference).type(data.reference);
-        cy.dataCy('attachFile').click();
         cy.get('.q-file').selectFile('test/cypress/fixtures/image.jpg', {
             force: true,
         });
-        cy.dataCy(selectors.saveFormBtn).should('be.visible').click();
+        cy.dataCy(selectors.saveFormBtn).click();
         cy.checkNotification(dataSaved);
+        cy.typeSearchbar('{enter}');
     });
 
     it('Should display the total price of the selected rows', () => {

test/cypress/integration/route/routeExtendedList.spec.js

@@ -53,20 +53,17 @@ describe('Route extended list', () => {
     function fillField(selector, type, value) {
         switch (type) {
             case 'select':
-                cy.get(selector).should('be.visible').click().clear().type(value);
+                cy.get(selector).should('be.visible').click();
+                cy.dataCy('null_select').clear().type(value);
                 cy.get('.q-item').contains(value).click();
                 break;
             case 'input':
-                cy.get(selector)
+                cy.get(selector).should('be.visible').click();
-                    .should('be.visible')
+                cy.dataCy('null_input').clear().type(`${value}`);
-                    .click()
-                    .type(`{selectall}{backspace}${value}`);
                 break;
             case 'date':
-                cy.get(selector)
+                cy.get(selector).should('be.visible').click();
-                    .should('be.visible')
+                cy.dataCy('null_inputDate').clear().type(`${value}`);
-                    .click()
-                    .type(`{selectall}{backspace}${value}`);
                 break;
             case 'checkbox':
                 cy.get(selector).should('be.visible').click().click();
@@ -106,8 +103,8 @@ describe('Route extended list', () => {
         cy.fillInForm(data);
 
         cy.dataCy(selectors.saveFormBtn).click();
-        cy.url().should('include', '/summary');
         cy.checkNotification(dataCreated);
+        cy.url().should('include', '/summary');
     });
 
     it('Should reset changed values when click reset button', () => {
@@ -143,7 +140,7 @@ describe('Route extended list', () => {
         const downloadsFolder = Cypress.config('downloadsFolder');
         cy.get(selectors.lastRowSelectCheckBox).click();
         cy.get(selectors.downloadBtn).click();
-        cy.wait(3000);
+        cy.wait(5000);
 
         const fileName = 'download.zip';
         cy.readFile(`${downloadsFolder}/${fileName}`).should('exist');
@@ -180,7 +177,7 @@ describe('Route extended list', () => {
                 const [month, day, year] = value.split('/');
                 value = `${day}/${month}/${year}`;
             }
-            cy.get(selector).should('contain', value);
+            cy.validateContent(selector, value);
         });
     });
 

test/cypress/integration/route/vehicle/vehicleNotes.spec.js

@@ -1,28 +0,0 @@
-describe('Vehicle Notes', () => {
-    const selectors = {
-        addNoteInput: 'Add note here..._input',
-        saveNoteBtn: 'saveNote',
-        deleteNoteBtn: 'notesRemoveNoteBtn',
-        noteCard: '.column.full-width > :nth-child(1) > .q-card__section--vert',
-    };
-
-    const noteText = 'Golpe parachoques trasero';
-    const newNoteText = 'probando';
-
-    beforeEach(() => {
-        cy.viewport(1920, 1080);
-        cy.login('developer');
-        cy.visit(`/#/route/vehicle/1/notes`);
-    });
-
-    it('Should add new note', () => {
-        cy.dataCy(selectors.addNoteInput).should('be.visible').type(newNoteText);
-        cy.dataCy(selectors.saveNoteBtn).click();
-        cy.validateContent(selectors.noteCard, newNoteText);
-    });
-
-    it('Should delete note', () => {
-        cy.dataCy(selectors.deleteNoteBtn).first().should('be.visible').click();
-        cy.get(selectors.noteCard).first().should('have.text', noteText);
-    });
-});

test/cypress/integration/vnComponent/VnAccountNumber.spec.js

@@ -0,0 +1,37 @@
+describe('VnAccountNumber', () => {
+    const accountInput = 'input[data-cy="supplierFiscalDataAccount_input"]';
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+        cy.visit('/#/supplier/1/fiscal-data');
+    });
+
+    describe('VnInput handleInsertMode()', () => {
+        it('should replace character at cursor position in insert mode', () => {
+            cy.get(accountInput).type('{selectall}4100000001');
+            cy.get(accountInput).type('{movetostart}');
+            cy.get(accountInput).type('999');
+            cy.get(accountInput).should('have.value', '9990000001');
+        });
+
+        it('should replace character at cursor position in insert mode', () => {
+            cy.get(accountInput).clear();
+            cy.get(accountInput).type('4100000001');
+            cy.get(accountInput).type('{movetostart}');
+            cy.get(accountInput).type('999');
+            cy.get(accountInput).should('have.value', '9990000001');
+        });
+
+        it('should respect maxlength prop', () => {
+            cy.get(accountInput).clear();
+            cy.get(accountInput).type('123456789012345');
+            cy.get(accountInput).should('have.value', '1234567890');
+        });
+    });
+
+    it('should convert short account number to standard format', () => {
+        cy.get(accountInput).clear();
+        cy.get(accountInput).type('123.');
+        cy.get(accountInput).should('have.value', '1230000000');
+    });
+});

test/cypress/integration/vnComponent/VnLog.spec.js

@@ -1,23 +1,26 @@
 /// <reference types="cypress" />
 describe('VnLog', () => {
+    const chips = [
+        ':nth-child(1) > :nth-child(1) > .q-item__label > .q-chip > .q-chip__content',
+        ':nth-child(2) > :nth-child(1) > .q-item__label > .q-chip > .q-chip__content',
+    ];
     beforeEach(() => {
         cy.login('developer');
         cy.visit(`/#/claim/${1}/log`);
+        cy.openRightMenu();
     });
 
     it('should filter by insert actions', () => {
-        cy.get('[data-cy="vnLog-checkbox"]').eq(0).click();
+        cy.checkOption(':nth-child(7) > .q-checkbox');
-        cy.get('[data-cy="vnLog-action-icon"]').each(($el) => {
+        cy.get('.q-page').click();
-            cy.wrap($el).should('have.attr', 'title', 'Creates');
+        cy.validateContent(chips[0], 'Document');
-        });
+        cy.validateContent(chips[1], 'Beginning');
     });
 
     it('should filter by entity', () => {
-        const entity = 'Document';
+        cy.selectOption('.q-drawer--right .q-item > .q-select', 'Claim');
-        cy.selectOption('[data-cy="vnLog-entity"]', entity);
+        cy.get('.q-page').click();
-        cy.get('[data-cy="vnLog-model-chip"]').each(($el) => {
+        cy.validateContent(chips[0], 'Beginning');
-            cy.wrap($el).should('have.text', entity);
-        });
     });
 
     it('should show claimDescriptor', () => {

test/cypress/integration/vnComponent/VnShortcut.spec.js

@@ -1,6 +1,6 @@
 /// <reference types="cypress" />
-// https://redmine.verdnatura.es/issues/8848
+
-describe.skip('VnShortcuts', () => {
+describe('VnShortcuts', () => {
     const modules = {
         item: 'a',
         customer: 'c',
@@ -27,15 +27,12 @@ describe.skip('VnShortcuts', () => {
                 code: `Key${shortcut.toUpperCase()}`,
             });
 
-            cy.waitSpinner();
             cy.url().should('include', module);
             if (['monitor', 'claim'].includes(module)) {
                 return;
             }
             cy.waitForElement('.q-page').should('exist');
             cy.dataCy('vnTableCreateBtn').should('exist');
-            cy.waitSpinner();
-
             cy.get('.q-page').trigger('keydown', {
                 ctrlKey: true,
                 altKey: true,