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

2024-06-21 10:32:44 +02:00 · 2024-06-21 10:32:44 +02:00 · f88fffa89c
parent 35c4b423a5 d23dbca7bf
commit f88fffa89c
30 changed files with 628 additions and 419 deletions
--- a/src/components/VnTable/VnChip.vue
+++ b/src/components/VnTable/VnChip.vue
@ -16,10 +16,11 @@ function stopEventPropagation(event) {
 }
 </script>
 <template>
+    <slot name="beforeChip" :row="row"></slot>
    <span
        v-for="col of columns"
        :key="col.name"
-        @click="stopEventPropagation($event)"
+        @click="stopEventPropagation"
        class="cursor-text"
    >
        <QChip
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@ -9,7 +9,7 @@ import VnInput from 'components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnComponent from 'components/common/VnComponent.vue';

-const model = defineModel();
+const model = defineModel(undefined, { required: true });
 const $props = defineProps({
    column: {
        type: Object,
@ -17,7 +17,7 @@ const $props = defineProps({
    },
    row: {
        type: Object,
-        required: true,
+        default: () => {},
    },
    default: {
        type: [Object, String],
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@ -27,7 +27,7 @@ const $props = defineProps({
        default: 'params',
    },
 });
-const model = defineModel();
+const model = defineModel(undefined, { required: true });
 const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl });
 const columnFilter = computed(() => $props.column?.columnFilter);

@ -36,45 +36,44 @@ const enterEvent = {
    'keyup.enter': () => addFilter(model.value),
    remove: () => addFilter(null),
 };
+
+const defaultAttrs = {
+    filled: !$props.showTitle,
+    class: 'q-px-sm q-pb-xs q-pt-none',
+    dense: true,
+};
+
+const forceAttrs = {
+    label: $props.showTitle ? '' : $props.column.label,
+};
+
 const components = {
    input: {
        component: markRaw(VnInput),
        event: enterEvent,
        attrs: {
-            class: 'q-px-sm q-pb-xs q-pt-none',
-            dense: true,
-            filled: !$props.showTitle,
+            ...defaultAttrs,
            clearable: true,
        },
-        forceAttrs: {
-            label: $props.showTitle ? '' : $props.column.label,
-        },
+        forceAttrs,
    },
    number: {
        component: markRaw(VnInput),
        event: enterEvent,
        attrs: {
-            dense: true,
-            class: 'q-px-sm q-pb-xs q-pt-none',
+            ...defaultAttrs,
            clearable: true,
-            filled: !$props.showTitle,
-        },
-        forceAttrs: {
-            label: $props.showTitle ? '' : $props.column.label,
        },
+        forceAttrs,
    },
    date: {
        component: markRaw(VnInputDate),
        event: updateEvent,
        attrs: {
-            dense: true,
-            class: 'q-px-sm q-pb-xs q-pt-none',
-            filled: !$props.showTitle,
+            ...defaultAttrs,
            style: 'min-width: 150px',
        },
-        forceAttrs: {
-            label: $props.showTitle ? '' : $props.column.label,
-        },
+        forceAttrs,
    },
    checkbox: {
        component: markRaw(QCheckbox),
@ -84,9 +83,7 @@ const components = {
            class: $props.showTitle ? 'q-py-sm q-mt-md' : 'q-px-md q-py-xs',
            'toggle-indeterminate': true,
        },
-        forceAttrs: {
-            label: $props.showTitle ? '' : $props.column.label,
-        },
+        forceAttrs,
    },
    select: {
        component: markRaw(VnSelect),
@ -96,9 +93,7 @@ const components = {
            dense: true,
            filled: !$props.showTitle,
        },
-        forceAttrs: {
-            label: $props.showTitle ? '' : $props.column.label,
-        },
+        forceAttrs,
    },
 };

@ -116,32 +111,36 @@ async function addFilter(value) {
 }

 function alignRow() {
-    if ($props.column.align == 'left') return 'justify-start items-start';
-    if ($props.column.align == 'right') return 'justify-end items-end';
-    return 'flex-center';
+    switch ($props.column.align) {
+        case 'left':
+            return 'justify-start items-start';
+        case 'right':
+            return 'justify-end items-end';
+        default:
+            return 'flex-center';
+    }
 }
+
+const showFilter = computed(
+    () => $props.column?.columnFilter !== false && $props.column.name != 'tableActions'
+);
 </script>
 <template>
    <div
-        v-if="showTitle && column"
+        v-if="showTitle"
        class="q-pt-sm q-px-sm ellipsis"
-        :class="`text-${column.align ?? 'left'}`"
+        :class="`text-${column?.align ?? 'left'}`"
+        :style="!showFilter ? { 'min-height': 72 + 'px' } : ''"
    >
-        {{ column.label }}
+        {{ column?.label }}
    </div>
-    <div
-        v-if="columnFilter !== false && column.name != 'tableActions'"
-        class="full-width"
-        :class="alignRow()"
-    >
+    <div v-if="showFilter" class="full-width" :class="alignRow()">
        <VnTableColumn
            :column="$props.column"
-            :row="{}"
            default="input"
            v-model="model"
            :components="components"
            component-prop="columnFilter"
        />
    </div>
-    <div v-else-if="showTitle" style="height: 45px"><!-- fixme! --></div>
 </template>
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@ -66,7 +66,9 @@ const route = useRoute();
 const router = useRouter();
 const quasar = useQuasar();

-const mode = ref('card');
+const DEFAULT_MODE = 'card';
+const TABLE_MODE = 'table';
+const mode = ref(DEFAULT_MODE);
 const selected = ref([]);
 const routeQuery = JSON.parse(route?.query[$props.searchUrl] ?? '{}');
 const params = ref({ ...routeQuery, ...routeQuery.filter?.where });
@ -77,17 +79,17 @@ const tableModes = [
    {
        icon: 'view_column',
        title: t('table view'),
-        value: 'table',
+        value: TABLE_MODE,
    },
    {
        icon: 'grid_view',
        title: t('grid view'),
-        value: 'card',
+        value: DEFAULT_MODE,
    },
 ];

 onMounted(() => {
-    mode.value = quasar.platform.is.mobile ? 'card' : $props.defaultMode;
+    mode.value = quasar.platform.is.mobile ? DEFAULT_MODE : $props.defaultMode;
    stateStore.rightDrawer = true;
    setUserParams(route.query[$props.searchUrl]);
 });
@ -172,6 +174,9 @@ function columnName(col) {
    return name;
 }

+function getColAlign(col) {
+    return 'text-' + (col.align ?? 'left')
+}
 defineExpose({
    reload,
    redirect: redirectFn,
@ -218,7 +223,7 @@ defineExpose({
            :limit="20"
            ref="CrudModelRef"
            :search-url="searchUrl"
-            :disable-infinite-scroll="mode == 'table'"
+            :disable-infinite-scroll="mode == TABLE_MODE"
            @save-changes="reload"
            :has-subtoolbar="isEditable"
        >
@ -229,11 +234,11 @@ defineExpose({
                    :columns="splittedColumns.columns"
                    :rows="rows"
                    v-model:selected="selected"
-                    :grid="mode != 'table'"
+                    :grid="mode != TABLE_MODE"
                    table-header-class="bg-header"
                    card-container-class="grid-three"
                    flat
-                    :style="mode == 'table' && 'max-height: 90vh'"
+                    :style="mode == TABLE_MODE && 'max-height: 90vh'"
                    virtual-scroll
                    @virtual-scroll="
                        (event) =>
@ -287,7 +292,7 @@ defineExpose({
                        <QTh auto-width class="sticky" />
                    </template>
                    <template #body-cell-tableStatus="{ col, row }">
-                        <QTd auto-width :class="`text-${col.align ?? 'left'}`">
+                        <QTd auto-width :class="getColAlign(col)">
                            <VnTableChip
                                :columns="splittedColumns.columnChips"
                                :row="row"
@ -303,7 +308,7 @@ defineExpose({
                        <QTd
                            auto-width
                            class="no-margin q-px-xs"
-                            :class="`text-${col.align ?? 'left'}`"
+                            :class="getColAlign(col)"
                        >
                            <VnTableColumn
                                :column="col"
@ -317,7 +322,7 @@ defineExpose({
                    <template #body-cell-tableActions="{ col, row }">
                        <QTd
                            auto-width
-                            :class="`text-${col.align ?? 'left'}`"
+                            :class="getColAlign(col)"
                            class="sticky no-padding"
                            @click="stopEventPropagation($event)"
                        >
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@ -1,5 +1,5 @@
 <script setup>
-import { computed } from 'vue';
+import { onBeforeMount, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
@ -32,10 +32,15 @@ const url = computed(() => {
    return props.customUrl;
 });

-useArrayData(props.dataKey, {
+const arrayData = useArrayData(props.dataKey, {
    url: url.value,
    filter: props.filter,
 });
+
+onBeforeMount(async () => {
+    if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
+    await arrayData.fetch({ append: false });
+});
 </script>
 <template>
    <QDrawer
--- a/src/components/common/VnComponent.vue
+++ b/src/components/common/VnComponent.vue
@ -1,7 +1,7 @@
 <script setup>
 import { computed, defineModel } from 'vue';

-const model = defineModel();
+const model = defineModel(undefined, { required: true });
 const $props = defineProps({
    prop: {
        type: Object,
--- a/src/components/ui/VnImg.vue
+++ b/src/components/ui/VnImg.vue
@ -0,0 +1,60 @@
+<script setup>
+import { ref, computed, onMounted } from 'vue';
+import { useSession } from 'src/composables/useSession';
+
+const $props = defineProps({
+    collection: {
+        type: [String, Number],
+        default: 'Images',
+    },
+    size: {
+        type: String,
+        default: '200x200',
+    },
+    zoomSize: {
+        type: String,
+        required: true,
+        default: 'lg',
+    },
+    id: {
+        type: Boolean,
+        default: false,
+    },
+});
+const show = ref(false);
+const token = useSession().getTokenMultimedia();
+const timeStamp = ref(`timestamp=${Date.now()}`);
+const url = computed(
+    () =>
+        `/api/${$props.collection}/catalog/${$props.size}/${$props.id}/download?access_token=${token}&${timeStamp.value}`
+);
+const emits = defineEmits(['refresh']);
+const reload = (emit = false) => {
+    timeStamp.value = `timestamp=${Date.now()}`;
+};
+defineExpose({
+    reload,
+});
+
+onMounted(() => {});
+</script>
+<template>
+    <QImg :src="url" v-bind="$attrs" @click="show = !show" spinner-color="primary" />
+    <QDialog v-model="show" v-if="$props.zoomSize">
+        <QImg :src="url" class="img_zoom" v-bind="$attrs" spinner-color="primary" />
+    </QDialog>
+</template>
+
+<style lang="scss" scoped>
+.q-img {
+    cursor: zoom-in;
+}
+.rounded {
+    border-radius: 50%;
+}
+.img_zoom {
+    width: 100%;
+    height: auto;
+    border-radius: 0%;
+}
+</style>
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@ -992,6 +992,18 @@ route:
            shipped: Preparation date
            viewCmr: View CMR
            downloadCmrs: Download CMRs
+    columnLabels:
+        Id: Id
+        vehicle: Vehicle
+        description: Description
+        isServed: Served
+        worker: Worker
+        date: Date
+        started: Started
+        actions: Actions
+        agency: Agency
+        volume: Volume
+        finished: Finished
 supplier:
    pageTitles:
        suppliers: Suppliers
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@ -107,6 +107,7 @@ globals:
        aliasUsers: Usuarios
        subRoles: Subroles
        inheritedRoles: Roles heredados
+        workers: Trabajadores
    created: Fecha creación
    worker: Trabajador
    now: Ahora
@ -977,6 +978,18 @@ route:
            shipped: Fecha preparación
            viewCmr: Ver CMR
            downloadCmrs: Descargar CMRs
+    columnLabels:
+        Id: Id
+        vehicle: Vehículo
+        description: Descripción
+        isServed: Servida
+        worker: Trabajador
+        date: Fecha
+        started: Iniciada
+        actions: Acciones
+        agency: Agencia
+        volume: Volumen
+        finished: Finalizada
 supplier:
    pageTitles:
        suppliers: Proveedores
--- a/src/pages/Agency/AgencyList.vue
+++ b/src/pages/Agency/AgencyList.vue
@ -33,7 +33,6 @@ function exprBuilder(param, value) {
                url="Agencies"
                order="name"
                :expr-builder="exprBuilder"
-                auto-load
            >
                <template #body="{ rows }">
                    <CardList
--- a/src/pages/Customer/Card/CustomerCard.vue
+++ b/src/pages/Customer/Card/CustomerCard.vue
@ -10,7 +10,7 @@ import CustomerFilter from '../CustomerFilter.vue';
        :descriptor="CustomerDescriptor"
        :filter-panel="CustomerFilter"
        search-data-key="CustomerList"
-        search-url="Clients/filter"
+        search-url="Clients/extendedListFilter"
        searchbar-label="Search customer"
        searchbar-info="You can search by customer id or name"
    />
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import VnTable from 'components/VnTable/VnTable.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import CustomerSummary from './Card/CustomerSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';

@ -382,9 +383,14 @@ function handleLocation(data, location) {
 </script>

 <template>
+    <VnSearchbar
+        :info="t('You can search by customer id or name')"
+        :label="t('Search customer')"
+        data-key="Customer"
+    />
    <VnTable
        ref="tableRef"
-        data-key="CustomerExtendedList"
+        data-key="Customer"
        url="Clients/extendedListFilter"
        :create="{
            urlCreate: 'Clients/createWithUser',
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@ -11,9 +11,9 @@ import VnInput from 'src/components/common/VnInput.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';

 import { useQuasar } from 'quasar';
-import { useStateStore } from 'stores/useStateStore';
 import { toCurrency } from 'src/filters';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
@ -22,7 +22,6 @@ const quasar = useQuasar();
 const route = useRoute();
 const router = useRouter();
 const { t } = useI18n();
-const stateStore = useStateStore();
 const { notify } = useNotify();

 const rowsSelected = ref([]);
@ -312,20 +311,22 @@ const lockIconType = (groupingMode, mode) => {
        auto-load
        @on-fetch="(data) => (packagingsOptions = data)"
    />
-    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
-        <QBtnGroup push style="column-gap: 10px">
-            <slot name="moreBeforeActions" />
-            <QBtn
-                :label="t('globals.remove')"
-                color="primary"
-                icon="delete"
-                flat
-                @click="openRemoveDialog()"
-                :disable="!rowsSelected?.length"
-                :title="t('globals.remove')"
-            />
-        </QBtnGroup>
-    </Teleport>
+    <VnSubToolbar>
+        <template #st-actions>
+            <QBtnGroup push style="column-gap: 10px">
+                <slot name="moreBeforeActions" />
+                <QBtn
+                    :label="t('globals.remove')"
+                    color="primary"
+                    icon="delete"
+                    flat
+                    @click="openRemoveDialog()"
+                    :disable="!rowsSelected?.length"
+                    :title="t('globals.remove')"
+                />
+            </QBtnGroup>
+        </template>
+    </VnSubToolbar>
    <VnPaginate
        ref="entryBuysPaginateRef"
        data-key="EntryBuys"
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@ -10,8 +10,10 @@ import FetchData from 'src/components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnCurrency from 'src/components/common/VnCurrency.vue';
 import { toCurrency } from 'src/filters';
+import useNotify from 'src/composables/useNotify.js';

 const route = useRoute();
+const { notify } = useNotify();
 const { t } = useI18n();
 const arrayData = useArrayData();
 const invoiceIn = computed(() => arrayData.store.data);
@ -69,6 +71,7 @@ const isNotEuro = (code) => code != 'EUR';
 async function insert() {
    await axios.post('/InvoiceInDueDays/new', { id: +invoiceId });
    await invoiceInFormRef.value.reload();
+    notify(t('globals.dataSaved'), 'positive');
 }
 const getTotalAmount = (rows) => rows.reduce((acc, { amount }) => acc + +amount, 0);
 </script>
--- a/src/pages/Item/Card/ItemDescriptorImage.vue
+++ b/src/pages/Item/Card/ItemDescriptorImage.vue
@ -3,8 +3,7 @@ import { ref, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';

 import EditPictureForm from 'components/EditPictureForm.vue';
-
-import { useSession } from 'src/composables/useSession';
+import VnImg from 'src/components/ui/VnImg.vue';
 import axios from 'axios';

 const $props = defineProps({
@ -27,19 +26,12 @@ const $props = defineProps({
 });

 const { t } = useI18n();
-const { getTokenMultimedia } = useSession();

 const image = ref(null);
 const editPhotoFormDialog = ref(null);
 const showEditPhotoForm = ref(false);
 const warehouseName = ref(null);

-const getItemAvatar = async () => {
-    const token = getTokenMultimedia();
-    const timeStamp = `timestamp=${Date.now()}`;
-    image.value = `/api/Images/catalog/200x200/${$props.entityId}/download?access_token=${token}&${timeStamp}`;
-};
-
 const toggleEditPictureForm = () => {
    showEditPhotoForm.value = !showEditPhotoForm.value;
 };
@ -62,14 +54,17 @@ const getWarehouseName = async (warehouseFk) => {
 };

 onMounted(async () => {
-    getItemAvatar();
    getItemConfigs();
 });
+
+const handlePhotoUpdated = (evt = false) => {
+    image.value.reload(evt);
+};
 </script>

 <template>
    <div class="relative-position">
-        <QImg :src="image" spinner-color="primary" style="min-height: 256px">
+        <VnImg ref="image" :id="$props.entityId" @refresh="handlePhotoUpdated(true)">
            <template #error>
                <div class="absolute-full picture text-center q-pa-md flex flex-center">
                    <div>
@ -82,7 +77,7 @@ onMounted(async () => {
                    </div>
                </div>
            </template>
-        </QImg>
+        </VnImg>
        <QBtn
            v-if="showEditButton"
            color="primary"
@ -97,7 +92,7 @@ onMounted(async () => {
                    collection="catalog"
                    :id="entityId"
                    @close-form="toggleEditPictureForm()"
-                    @on-photo-uploaded="getItemAvatar()"
+                    @on-photo-uploaded="handlePhotoUpdated"
                />
            </QDialog>
        </QBtn>
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@ -3,14 +3,15 @@ import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
-
-import VnInput from 'components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
+import { useValidator } from 'src/composables/useValidator';
+import VnInput from 'src/components/common/VnInput.vue';

 const { t } = useI18n();
+
 const route = useRoute();
 const props = defineProps({
    dataKey: {
@ -21,32 +22,34 @@ const props = defineProps({
        type: Array,
        required: true,
    },
+    tagValue: {
+        type: Array,
+        required: true,
+    },
 });

 const categoryList = ref(null);
 const selectedCategoryFk = ref(null);
 const typeList = ref(null);
 const selectedTypeFk = ref(null);
-
+const validationsStore = useValidator();
+const selectedOrder = ref(null);
+const selectedOrderField = ref(null);
+const moreFields = ref([]);
+const moreFieldsOrder = ref([]);
+const createValue = (val, done) => {
+    if (val.length > 2) {
+        if (!tagOptions.value.includes(val)) {
+            done(tagOptions.value, 'add-unique');
+        }
+        tagValues.value.push({ value: val });
+    }
+};
 const resetCategory = () => {
    selectedCategoryFk.value = null;
    typeList.value = null;
 };

-const selectedOrder = ref(null);
-const orderList = [
-    { way: 'ASC', name: 'Ascendant' },
-    { way: 'DESC', name: 'Descendant' },
-];
-
-const selectedOrderField = ref(null);
-const OrderFields = [
-    { field: 'relevancy DESC, name', name: 'Relevancy', priority: 999 },
-    { field: 'showOrder, price', name: 'Color and price', priority: 999 },
-    { field: 'name', name: 'Name', priority: 999 },
-    { field: 'price', name: 'Price', priority: 999 },
-];
-
 const clearFilter = (key) => {
    if (key === 'categoryFk') {
        resetCategory();
@ -72,21 +75,6 @@ const loadTypes = async (categoryFk) => {
    typeList.value = data;
 };

-const onFilterInit = async ({ params }) => {
-    if (params.typeFk) {
-        selectedTypeFk.value = params.typeFk;
-    }
-    if (params.categoryFk) {
-        await loadTypes(params.categoryFk);
-        selectedCategoryFk.value = params.categoryFk;
-    }
-    if (params.orderBy) {
-        orderByParam.value = JSON.parse(params.orderBy);
-        selectedOrder.value = orderByParam.value?.way;
-        selectedOrderField.value = orderByParam.value?.field;
-    }
-};
-
 const selectedCategory = computed(() =>
    (categoryList.value || []).find(
        (category) => category?.id === selectedCategoryFk.value
@ -109,10 +97,7 @@ function exprBuilder(param, value) {

 const selectedTag = ref(null);
 const tagValues = ref([{}]);
-const tagOptions = ref(null);
-const isButtonDisabled = computed(
-    () => !selectedTag.value || tagValues.value.some((item) => !item.value)
-);
+const tagOptions = ref([]);

 const applyTagFilter = (params, search) => {
    if (!tagValues.value?.length) {
@ -125,12 +110,12 @@ const applyTagFilter = (params, search) => {
    }
    params.tagGroups.push(
        JSON.stringify({
-            values: tagValues.value,
+            values: tagValues.value.filter((obj) => Object.keys(obj).length > 0),
            tagSelection: {
                ...selectedTag.value,
-                orgShowField: selectedTag.value.name,
+                orgShowField: selectedTag?.value?.name,
            },
-            tagFk: selectedTag.value.tagFk,
+            tagFk: selectedTag?.value?.tagFk,
        })
    );
    search();
@ -147,20 +132,52 @@ const removeTagChip = (selection, params, search) => {
    search();
 };

-const orderByParam = ref(null);
-
-const onOrderFieldChange = (value, params, search) => {
-    const orderBy = Object.assign({}, orderByParam.value, { field: value.field });
-    params.orderBy = JSON.stringify(orderBy);
-    search();
+const onOrderChange = (value, params) => {
+    const tagObj = JSON.parse(params.orderBy);
+    tagObj.way = value.name;
+    params.orderBy = JSON.stringify(tagObj);
 };

-const onOrderChange = (value, params, search) => {
-    const orderBy = Object.assign({}, orderByParam.value, { way: value.way });
-    params.orderBy = JSON.stringify(orderBy);
-    search();
+const onOrderFieldChange = (value, params) => {
+    const tagObj = JSON.parse(params.orderBy); // esto donde va
+    const fields = {
+        Relevancy: (value) => value + ' DESC, name',
+        ColorAndPrice: 'showOrder, price',
+        Name: 'name',
+        Price: 'price',
+    };
+    let tagField = fields[value];
+    if (!tagField) return;
+
+    if (typeof tagField === 'function') tagField = tagField(value);
+    tagObj.field = tagField;
+    params.orderBy = JSON.stringify(tagObj);
+    switch (value) {
+        case 'Relevancy':
+            tagObj.field = value + ' DESC, name';
+            params.orderBy = JSON.stringify(tagObj);
+            console.log('params: ', params);
+            break;
+        case 'ColorAndPrice':
+            tagObj.field = 'showOrder, price';
+            params.orderBy = JSON.stringify(tagObj);
+            console.log('params: ', params);
+            break;
+        case 'Name':
+            tagObj.field = 'name';
+            params.orderBy = JSON.stringify(tagObj);
+            console.log('params: ', params);
+            break;
+        case 'Price':
+            tagObj.field = 'price';
+            params.orderBy = JSON.stringify(tagObj);
+            console.log('params: ', params);
+            break;
+    }
 };

+const _moreFields = ['ASC', 'DESC'];
+const _moreFieldsTypes = ['Relevancy', 'ColorAndPrice', 'Name', 'Price'];
 const setCategoryList = (data) => {
    categoryList.value = (data || [])
        .filter((category) => category.display)
@ -168,6 +185,8 @@ const setCategoryList = (data) => {
            ...category,
            icon: `vn:${(category.icon || '').split('-')[1]}`,
        }));
+    moreFields.value = useLang(_moreFields);
+    moreFieldsOrder.value = useLang(_moreFieldsTypes);
 };

 const getCategoryClass = (category, params) => {
@ -175,6 +194,20 @@ const getCategoryClass = (category, params) => {
        return 'active';
    }
 };
+
+const useLang = (values) => {
+    const { models } = validationsStore;
+    const properties = models.Item?.properties || {};
+    return values.map((name) => {
+        let prop = properties[name];
+        const label = t(`params.${name}`);
+        return {
+            name,
+            label,
+            type: prop ? prop.type : null,
+        };
+    });
+};
 </script>

 <template>
@ -182,9 +215,9 @@ const getCategoryClass = (category, params) => {
    <VnFilterPanel
        :data-key="props.dataKey"
        :hidden-tags="['orderFk', 'orderBy']"
+        :unremovable-params="['orderFk', 'orderBy']"
        :expr-builder="exprBuilder"
        :custom-tags="['tagGroups']"
-        @init="onFilterInit"
        @remove="clearFilter"
    >
        <template #tags="{ tag, formatFn }">
@ -274,40 +307,29 @@ const getCategoryClass = (category, params) => {
            <QItem class="q-my-md">
                <QItemSection>
                    <VnSelect
-                        :label="t('params.order')"
+                        :label="t('Order')"
                        v-model="selectedOrder"
-                        :options="orderList || []"
-                        option-value="way"
-                        option-label="name"
+                        :options="moreFields"
+                        option-label="label"
                        dense
                        outlined
                        rounded
-                        :emit-value="false"
-                        use-input
-                        :is-clearable="false"
-                        @update:model-value="
-                            (value) => onOrderChange(value, params, searchFn)
-                        "
+                        @update:model-value="(value) => onOrderChange(value, params)"
                    />
                </QItemSection>
            </QItem>
            <QItem class="q-mb-md">
                <QItemSection>
                    <VnSelect
-                        :label="t('params.order')"
+                        :label="t('Order by')"
                        v-model="selectedOrderField"
-                        :options="OrderFields || []"
-                        option-value="field"
-                        option-label="name"
+                        :options="moreFieldsOrder"
+                        option-label="label"
+                        option-value="name"
                        dense
                        outlined
                        rounded
-                        :emit-value="false"
-                        use-input
-                        :is-clearable="false"
-                        @update:model-value="
-                            (value) => onOrderFieldChange(value, params, searchFn)
-                        "
+                        @update:model-value="(value) => onOrderFieldChange(value, params)"
                    />
                </QItemSection>
            </QItem>
@ -333,15 +355,30 @@ const getCategoryClass = (category, params) => {
                :key="value"
                class="q-mt-md filter-value"
            >
-                <VnInput
-                    v-if="selectedTag?.isFree"
-                    v-model="value.value"
-                    :label="t('params.value')"
-                    is-outlined
-                    class="filter-input"
+                <FetchData
+                    v-if="selectedTag"
+                    :url="`Tags/${selectedTag}/filterValue`"
+                    limit="30"
+                    auto-load
+                    @on-fetch="(data) => (tagOptions = data)"
                />
                <VnSelect
-                    v-else
+                    v-if="!selectedTag"
+                    :label="t('params.value')"
+                    v-model="value.value"
+                    :options="tagValue || []"
+                    option-value="value"
+                    option-label="value"
+                    dense
+                    outlined
+                    rounded
+                    emit-value
+                    use-input
+                    class="filter-input"
+                    @new-value="createValue"
+                />
+                <VnSelect
+                    v-else-if="selectedTag === 1"
                    :label="t('params.value')"
                    v-model="value.value"
                    :options="tagOptions || []"
@ -352,18 +389,18 @@ const getCategoryClass = (category, params) => {
                    rounded
                    emit-value
                    use-input
-                    :disable="!selectedTag"
+                    class="filter-input"
+                    @new-value="createValue"
+                />
+                <VnInput
+                    v-else
+                    :label="t('params.value')"
+                    v-model="value.value"
+                    dense
+                    outlined
+                    rounded
                    class="filter-input"
                />
-
-                <FetchData
-                    v-if="selectedTag && !selectedTag.isFree"
-                    :url="`Tags/${selectedTag?.id}/filterValue`"
-                    limit="30"
-                    auto-load
-                    @on-fetch="(data) => (tagOptions = data)"
-                />
-
                <QIcon
                    name="delete"
                    class="filter-icon"
@ -388,7 +425,6 @@ const getCategoryClass = (category, params) => {
                        rounded
                        type="button"
                        unelevated
-                        :disable="isButtonDisabled"
                        @click.stop="applyTagFilter(params, searchFn)"
                    />
                </QItemSection>
@ -453,6 +489,12 @@ en:
        tag: Tag
        value: Value
        order: Order
+        ASC: Ascendant
+        DESC: Descendant
+        Relevancy: Relevancy
+        ColorAndPrice: Color and price
+        Name: Name
+        Price: Price
 es:
    params:
        type: Tipo
@ -460,6 +502,14 @@ es:
        tag: Etiqueta
        value: Valor
        order: Orden
+        ASC: Ascendiente
+        DESC: Descendiente
+        Relevancy: Relevancia
+        ColorAndPrice: Color y precio
+        Name: Nombre
+        Price: Precio
+    Order: Orden
+    Order by: Ordenar por
    Plant: Planta
    Flower: Flor
    Handmade: Confección
--- a/src/pages/Order/Card/OrderCatalogItem.vue
+++ b/src/pages/Order/Card/OrderCatalogItem.vue
@ -3,16 +3,14 @@ import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';

 import VnLv from 'components/ui/VnLv.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
 import OrderCatalogItemDialog from 'pages/Order/Card/OrderCatalogItemDialog.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';

-import { useSession } from 'composables/useSession';
 import toCurrency from '../../../filters/toCurrency';

 const DEFAULT_PRICE_KG = 0;

-const { getTokenMultimedia } = useSession();
-const token = getTokenMultimedia();
 const { t } = useI18n();

 defineProps({
@ -29,14 +27,7 @@ const dialog = ref(null);
    <div class="container order-catalog-item overflow-hidden">
        <QCard class="card shadow-6">
            <div class="img-wrapper">
-                <QImg
-                    :src="`/api/Images/catalog/200x200/${item.id}/download?access_token=${token}`"
-                    spinner-color="primary"
-                    :ratio="1"
-                    height="192"
-                    width="192"
-                    class="image"
-                />
+                <VnImg :id="item.id" class="image" />
                <div v-if="item.hex" class="item-color-container">
                    <div
                        class="item-color"
@ -59,7 +50,10 @@ const dialog = ref(null);
                </template>
                <div class="footer">
                    <div class="price">
-                        <p>{{ item.available }} {{ t('to') }} {{ item.price }}</p>
+                        <p>
+                            {{ item.available }} {{ t('to') }}
+                            {{ toCurrency(item.price) }}
+                        </p>
                        <QIcon name="add_circle" class="icon">
                            <QTooltip>{{ t('globals.add') }}</QTooltip>
                            <QPopupProxy ref="dialog">
--- a/src/pages/Order/Card/OrderForm.vue
+++ b/src/pages/Order/Card/OrderForm.vue
@ -1,5 +1,5 @@
 <script setup>
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
@ -16,6 +16,7 @@ const route = useRoute();
 const state = useState();
 const ORDER_MODEL = 'order';

+const router = useRouter();
 const isNew = Boolean(!route.params.id);
 const initialFormState = reactive({
    clientFk: null,
@ -26,22 +27,19 @@ const initialFormState = reactive({
 const clientList = ref([]);
 const agencyList = ref([]);
 const addressList = ref([]);
+const clientId = ref(null);

-const onClientsFetched = async (data) => {
-    try {
-        clientList.value = data;
-        initialFormState.clientFk = Number(route.query?.clientFk) || null;
+const onClientsFetched = (data) => {
+    clientList.value = data;
+    initialFormState.clientFk = Number(route.query?.clientFk) || null;
+    clientId.value = initialFormState.clientFk;

-        if (initialFormState.clientFk) {
-            const { defaultAddressFk } = clientList.value.find(
-                (client) => client.id === initialFormState.clientFk
-            );
-
-            if (defaultAddressFk) await fetchAddressList(defaultAddressFk);
-        }
-    } catch (err) {
-        console.error('Error fetching clients', err);
-    }
+    const client = clientList.value.find(
+        (client) => client.id === initialFormState.clientFk
+    );
+    if (!client?.defaultAddressFk)
+        throw new Error(t(`No default address found for the client`));
+    fetchAddressList(client.defaultAddressFk);
 };

 const fetchAddressList = async (addressId) => {
@ -55,7 +53,6 @@ const fetchAddressList = async (addressId) => {
            },
        });
        addressList.value = data;
-        //  Set address by default
        if (addressList.value?.length === 1) {
            state.get(ORDER_MODEL).addressFk = addressList.value[0].id;
        }
@ -121,6 +118,21 @@ const orderFilter = {
        },
    ],
 };
+
+const onClientChange = async (clientId) => {
+    try {
+        const { data } = await axios.get(`Clients/${clientId}`);
+        console.log('info cliente: ', data);
+
+        await fetchAddressList(data.defaultAddressFk);
+    } catch (error) {
+        console.error('Error al cambiar el cliente:', error);
+    }
+};
+
+async function onDataSaved(data) {
+    await router.push({ path: `/order/${data}/catalog` });
+}
 </script>

 <template>
@ -134,13 +146,15 @@ const orderFilter = {
    <div class="q-pa-md">
        <FormModel
            :url="!isNew ? `Orders/${route.params.id}` : null"
-            :url-create="isNew ? 'Orders/new' : null"
+            url-create="Orders/new"
+            @on-data-saved="onDataSaved"
            :model="ORDER_MODEL"
            :form-initial-data="isNew ? initialFormState : null"
            :observe-form-changes="!isNew"
            :mapper="isNew ? orderMapper : null"
            :filter="orderFilter"
            @on-fetch="fetchOrderDetails"
+            auto-load
        >
            <template #form="{ data }">
                <VnRow class="row q-gutter-md q-mb-md">
@ -151,9 +165,7 @@ const orderFilter = {
                        option-value="id"
                        option-label="name"
                        hide-selected
-                        @update:model-value="
-                            (client) => fetchAddressList(client.defaultAddressFk)
-                        "
+                        @update:model-value="onClientChange"
                    >
                        <template #option="scope">
                            <QItem v-bind="scope.itemProps">
@ -170,12 +182,10 @@ const orderFilter = {
                        v-model="data.addressFk"
                        :options="addressList"
                        option-value="id"
-                        option-label="nickname"
+                        option-label="street"
                        hide-selected
                        :disable="!addressList?.length"
-                        @update:model-value="
-                            () => fetchAgencyList(data.landed, data.addressFk)
-                        "
+                        @update:model-value="onAddressChange"
                    >
                        <template #option="scope">
                            <QItem v-bind="scope.itemProps">
@ -216,3 +226,8 @@ const orderFilter = {
        </FormModel>
    </div>
 </template>
+
+<i18n>
+    es:
+        No default address found for the client: No hay ninguna dirección asociada a este cliente.
+</i18n>
--- a/src/pages/Order/OrderCatalog.vue
+++ b/src/pages/Order/OrderCatalog.vue
@ -4,7 +4,6 @@ import { useRoute } from 'vue-router';
 import { onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from 'components/ui/VnPaginate.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import OrderCatalogItem from 'pages/Order/Card/OrderCatalogItem.vue';
 import OrderCatalogFilter from 'pages/Order/Card/OrderCatalogFilter.vue';

@ -35,38 +34,31 @@ function extractTags(items) {
        });
    });
    tags.value = resultTags;
+    extractValueTags(items);
+}
+
+const tagValue = ref([]);
+
+function extractValueTags(items) {
+    const resultValueTags = items.flatMap((x) =>
+        Object.keys(x)
+            .filter((k) => /^value\d+$/.test(k))
+            .map((v) => x[v])
+            .filter((v) => v)
+            .sort()
+    );
+    tagValue.value = resultValueTags;
 }
 </script>

 <template>
-    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
-        <VnSearchbar
-            data-key="OrderCatalogList"
-            url="Orders/CatalogFilter"
-            :limit="50"
-            :user-params="catalogParams"
-            :static-params="['orderFk', 'orderBy']"
-            :redirect="false"
-        />
-    </Teleport>
-    <Teleport v-if="stateStore.isHeaderMounted()" to="#actions-append">
-        <div class="row q-gutter-x-sm">
-            <QBtn
-                flat
-                @click.stop="stateStore.toggleRightDrawer()"
-                round
-                dense
-                icon="menu"
-            >
-                <QTooltip bottom anchor="bottom right">
-                    {{ t('globals.collapseMenu') }}
-                </QTooltip>
-            </QBtn>
-        </div>
-    </Teleport>
    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
        <QScrollArea class="fit text-grey-8">
-            <OrderCatalogFilter data-key="OrderCatalogList" :tags="tags" />
+            <OrderCatalogFilter
+                data-key="OrderCatalogList"
+                :tag-value="tagValue"
+                :tags="tags"
+            />
        </QScrollArea>
    </QDrawer>
    <QPage class="column items-center q-pa-md">
--- a/src/pages/Order/OrderLines.vue
+++ b/src/pages/Order/OrderLines.vue
@ -7,19 +7,17 @@ import { useQuasar } from 'quasar';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import FetchData from 'components/FetchData.vue';
 import VnLv from 'components/ui/VnLv.vue';
-import CardList from 'components/ui/CardList.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
+import VnImg from 'components/ui/VnImg.vue';

 import { toCurrency, toDate } from 'src/filters';
-import { useSession } from 'composables/useSession';
 import axios from 'axios';
+import ItemDescriptorProxy from '../Item/Card/ItemDescriptorProxy.vue';

 const route = useRoute();
 const { t } = useI18n();
-const { getTokenMultimedia } = useSession();
 const quasar = useQuasar();
-const token = getTokenMultimedia();
 const orderSummary = ref({
    total: null,
    vat: null,
@ -61,6 +59,56 @@ async function confirmOrder() {
        type: 'positive',
    });
 }
+
+const detailsColumns = ref([
+    {
+        name: 'img',
+        label: '',
+        field: (row) => row?.item?.id,
+    },
+    {
+        name: 'item',
+        label: t('order.summary.item'),
+        field: (row) => row?.item?.id,
+        sortable: true,
+    },
+    {
+        name: 'description',
+        label: t('globals.description'),
+        field: (row) => row?.item?.name,
+    },
+    {
+        name: 'warehouse',
+        label: t('warehouse'),
+        field: (row) => row?.warehouse?.name,
+        sortable: true,
+    },
+    {
+        name: 'shipped',
+        label: t('shipped'),
+        field: (row) => toDate(row?.shipped),
+    },
+    {
+        name: 'quantity',
+        label: t('order.summary.quantity'),
+        field: (row) => row?.quantity,
+    },
+    {
+        name: 'price',
+        label: t('order.summary.price'),
+        field: (row) => toCurrency(row?.price),
+    },
+    {
+        name: 'amount',
+        label: t('order.summary.amount'),
+        field: (row) => toCurrency(row?.quantity * row?.price),
+    },
+    {
+        name: 'actions',
+        label: '',
+        field: (row) => row?.id,
+    },
+]);
 </script>

 <template>
@ -83,30 +131,33 @@ async function confirmOrder() {
        auto-load
    />
    <QPage :key="componentKey" class="column items-center q-pa-md">
-        <div class="vn-card-list">
+        <div class="order-list full-width">
            <div v-if="!orderSummary.total" class="no-result">
                {{ t('globals.noResults') }}
            </div>
-            <QCard v-else class="order-lines-summary q-pa-lg">
-                <p class="header text-right block">
-                    {{ t('summary') }}
-                </p>
-                <VnLv
-                    v-if="orderSummary.vat && orderSummary.total"
-                    :label="t('subtotal')"
-                    :value="toCurrency(orderSummary.total - orderSummary.vat)"
-                />
-                <VnLv
-                    v-if="orderSummary.vat"
-                    :label="t('VAT')"
-                    :value="toCurrency(orderSummary?.vat)"
-                />
-                <VnLv
-                    v-if="orderSummary.total"
-                    :label="t('total')"
-                    :value="toCurrency(orderSummary?.total)"
-                />
-            </QCard>
+
+            <QDrawer side="right" :width="270" show-if-above>
+                <QCard class="order-lines-summary q-pa-lg">
+                    <p class="header text-right block">
+                        {{ t('summary') }}
+                    </p>
+                    <VnLv
+                        v-if="orderSummary.vat && orderSummary.total"
+                        :label="t('subtotal')"
+                        :value="toCurrency(orderSummary.total - orderSummary.vat)"
+                    />
+                    <VnLv
+                        v-if="orderSummary.vat"
+                        :label="t('VAT')"
+                        :value="toCurrency(orderSummary?.vat)"
+                    />
+                    <VnLv
+                        v-if="orderSummary.total"
+                        :label="t('total')"
+                        :value="toCurrency(orderSummary?.total)"
+                    />
+                </QCard>
+            </QDrawer>
            <VnPaginate
                data-key="OrderLines"
                url="OrderRows"
@ -125,74 +176,71 @@ async function confirmOrder() {
                }"
            >
                <template #body="{ rows }">
-                    <div class="catalog-list q-mt-xl">
-                        <CardList
-                            v-for="row in rows"
-                            :key="row.id"
-                            :id="row.id"
-                            :title="row?.item?.name"
-                            class="cursor-inherit"
+                    <div class="q-pa-md">
+                        <QTable
+                            :columns="detailsColumns"
+                            :rows="rows"
+                            flat
+                            class="full-width"
+                            style="text-align: center"
                        >
-                            <template #title>
-                                <div class="flex items-center">
-                                    <div class="image-wrapper q-mr-md">
-                                        <QImg
-                                            :src="`/api/Images/catalog/50x50/${row?.item?.id}/download?access_token=${token}`"
-                                            spinner-color="primary"
-                                            :ratio="1"
-                                            height="50"
-                                            width="50"
-                                            class="image"
-                                        />
-                                    </div>
-                                    <div
-                                        class="title text-primary text-weight-bold text-h5"
+                            <template #header="props">
+                                <QTr class="tr-header" :props="props">
+                                    <QTh
+                                        v-for="col in props.cols"
+                                        :key="col.name"
+                                        :props="props"
+                                        style="text-align: center"
                                    >
-                                        {{ row?.item?.name }}
+                                        {{ t(col.label) }}
+                                    </QTh>
+                                </QTr>
+                            </template>
+                            <template #body-cell-img="{ value }">
+                                <QTd>
+                                    <div class="image-wrapper">
+                                        <VnImg :id="value" class="rounded" />
                                    </div>
-                                    <QChip class="q-chip-color" outline size="sm">
-                                        {{ t('ID') }}: {{ row.id }}
-                                    </QChip>
-                                </div>
+                                </QTd>
                            </template>
-                            <template #list-items>
-                                <div class="q-mb-sm">
-                                    <span class="text-uppercase subname">
-                                        {{ row.item.subName }}
+                            <template #body-cell-item="{ value }">
+                                <QTd class="item">
+                                    <span class="link">
+                                        <QBtn flat>
+                                            {{ value }}
+                                        </QBtn>
+                                        <ItemDescriptorProxy :id="value" />
                                    </span>
-                                    <FetchedTags :item="row.item" :max-length="5" />
-                                </div>
-                                <VnLv :label="t('item')" :value="String(row.item.id)" />
-                                <VnLv
-                                    :label="t('warehouse')"
-                                    :value="row.warehouse.name"
-                                />
-                                <VnLv
-                                    :label="t('shipped')"
-                                    :value="toDate(row.shipped)"
-                                />
-                                <VnLv
-                                    :label="t('quantity')"
-                                    :value="String(row.quantity)"
-                                />
-                                <VnLv
-                                    :label="t('price')"
-                                    :value="toCurrency(row.price)"
-                                />
-                                <VnLv
-                                    :label="t('amount')"
-                                    :value="toCurrency(row.price * row.quantity)"
-                                />
+                                </QTd>
                            </template>
-                            <template #actions v-if="!order?.isConfirmed">
-                                <QBtn
-                                    :label="t('remove')"
-                                    @click.stop="confirmRemove(row)"
-                                    color="primary"
-                                    style="margin-top: 15px"
-                                />
+                            <template #body-cell-description="{ row, value }">
+                                <QTd>
+                                    <div
+                                        class="row column full-width justify-between items-start"
+                                    >
+                                        {{ value }}
+                                        <div v-if="value" class="subName">
+                                            {{ value.toUpperCase() }}
+                                        </div>
+                                    </div>
+                                    <FetchedTags :item="row.item" :max-length="6" />
+                                </QTd>
                            </template>
-                        </CardList>
+
+                            <template #body-cell-actions="{ value }">
+                                <QTd>
+                                    <QIcon
+                                        name="delete"
+                                        color="primary"
+                                        size="sm"
+                                        class="cursor-pointer"
+                                        @click.stop="confirmRemove(value)"
+                                    >
+                                        <QTooltip>{{ t('Remove thermograph') }}</QTooltip>
+                                    </QIcon>
+                                </QTd>
+                            </template>
+                        </QTable>
                    </div>
                </template>
            </VnPaginate>
@ -239,14 +287,7 @@ async function confirmOrder() {
 .image-wrapper {
    height: 50px;
    width: 50px;
-
-    .image {
-        border-radius: 50%;
-    }
-}
-
-.subname {
-    color: var(--vn-label-color);
+    margin-left: 30%;
 }

 .no-result {
@ -255,6 +296,11 @@ async function confirmOrder() {
    color: var(--vn-label-color);
    text-align: center;
 }
+
+.subName {
+    text-transform: uppercase;
+    color: var(--vn-label-color);
+}
 </style>
 <i18n>
 en:
--- a/src/pages/Route/Card/RouteFilter.vue
+++ b/src/pages/Route/Card/RouteFilter.vue
@ -240,4 +240,5 @@ es:
    From: Desde
    To: Hasta
    Served: Servida
+    Days Onward: Días en adelante
 </i18n>
--- a/src/pages/Route/Card/RouteSummary.vue
+++ b/src/pages/Route/Card/RouteSummary.vue
@ -3,14 +3,15 @@ import { computed, onMounted, onUnmounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
-import CardSummary from 'components/ui/CardSummary.vue';
-import VnLv from 'components/ui/VnLv.vue';
 import { QIcon } from 'quasar';
 import { dashIfEmpty, toCurrency, toDate, toHour } from 'src/filters';
+import { openBuscaman } from 'src/utils/buscaman';
+import CardSummary from 'components/ui/CardSummary.vue';
 import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
-import { openBuscaman } from 'src/utils/buscaman';
+import VnLv from 'components/ui/VnLv.vue';
+import VnTitle from 'src/components/common/VnTitle.vue';

 const $props = defineProps({
    id: {
@ -127,8 +128,14 @@ const ticketColumns = ref([
                <span>{{ `${entity?.route.id} - ${entity?.route?.description}` }}</span>
            </template>
            <template #body="{ entity }">
+                <QCard class="vn-max">
+                    <VnTitle
+                        :url="`#/route/${entityId}/basic-data`"
+                        :text="t('globals.pageTitles.basicData')"
+                    />
+                </QCard>
+
                <QCard class="vn-one">
-                    <VnLv :label="t('ID')" :value="entity?.route.id" />
                    <VnLv
                        :label="t('route.summary.date')"
                        :value="toDate(entity?.route.created)"
@ -153,24 +160,6 @@ const ticketColumns = ref([
                        :label="t('route.summary.cost')"
                        :value="toCurrency(entity.route?.cost)"
                    />
-                </QCard>
-                <QCard class="vn-one">
-                    <VnLv
-                        :label="t('route.summary.started')"
-                        :value="toHour(entity?.route.started)"
-                    />
-                    <VnLv
-                        :label="t('route.summary.finished')"
-                        :value="toHour(entity?.route.finished)"
-                    />
-                    <VnLv
-                        :label="t('route.summary.kmStart')"
-                        :value="dashIfEmpty(entity?.route?.kmStart)"
-                    />
-                    <VnLv
-                        :label="t('route.summary.kmEnd')"
-                        :value="dashIfEmpty(entity?.route?.kmEnd)"
-                    />
                    <VnLv
                        :label="t('route.summary.volume')"
                        :value="`${dashIfEmpty(entity?.route?.m3)} / ${dashIfEmpty(
@ -192,19 +181,32 @@ const ticketColumns = ref([
                    />
                </QCard>
                <QCard class="vn-one">
-                    <div class="header">
-                        {{ t('globals.description') }}
-                    </div>
-                    <p>
-                        {{ dashIfEmpty(entity?.route?.description) }}
-                    </p>
+                    <VnLv
+                        :label="t('route.summary.started')"
+                        :value="toHour(entity?.route.started)"
+                    />
+                    <VnLv
+                        :label="t('route.summary.finished')"
+                        :value="toHour(entity?.route.finished)"
+                    />
+                    <VnLv
+                        :label="t('route.summary.kmStart')"
+                        :value="dashIfEmpty(entity?.route?.kmStart)"
+                    />
+                    <VnLv
+                        :label="t('route.summary.kmEnd')"
+                        :value="dashIfEmpty(entity?.route?.kmEnd)"
+                    />
+                    <VnLv
+                        :label="t('globals.description')"
+                        :value="dashIfEmpty(entity?.route?.description)"
+                    />
                </QCard>
-
                <QCard class="vn-max">
-                    <a class="header" :href="`#/route/${entityId}/tickets`">
-                        {{ t('route.summary.tickets') }}
-                        <QIcon name="open_in_new" color="primary" />
-                    </a>
+                    <VnTitle
+                        :url="`#/route/${entityId}/tickets`"
+                        :text="t('route.summary.tickets')"
+                    />
                    <QTable
                        :columns="ticketColumns"
                        :rows="entity?.tickets"
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@ -109,13 +109,7 @@ function downloadPdfs() {
    </RightMenu>
    <div class="column items-center">
        <div class="list">
-            <VnPaginate
-                data-key="CmrList"
-                :url="`Routes/cmrs`"
-                order="cmrFk DESC"
-                limit="null"
-                auto-load
-            >
+            <VnPaginate data-key="CmrList" :url="`Routes/cmrs`" order="cmrFk DESC">
                <template #body="{ rows }">
                    <QTable
                        :columns="columns"
--- a/src/pages/Route/Roadmap/RoadmapSummary.vue
+++ b/src/pages/Route/Roadmap/RoadmapSummary.vue
@ -67,6 +67,7 @@ const filter = {
            },
        },
    ],
+    where: { id: entityId },
 };

 const openAddStopDialog = () => {
@ -84,7 +85,7 @@ const openAddStopDialog = () => {
        <CardSummary
            data-key="RoadmapSummary"
            ref="summary"
-            :url="`Roadmaps/${entityId}`"
+            :url="`Roadmaps`"
            :filter="filter"
        >
            <template #header-left>
--- a/src/pages/Route/RouteAutonomous.vue
+++ b/src/pages/Route/RouteAutonomous.vue
@ -39,7 +39,7 @@ const selectedRows = ref([]);
 const columns = computed(() => [
    {
        name: 'ID',
-        label: t('ID'),
+        label: 'Id',
        field: (row) => row.routeFk,
        sortable: true,
        align: 'left',
@ -117,7 +117,9 @@ const columns = computed(() => [

 const refreshKey = ref(0);

-const total = computed(() => selectedRows.value.reduce((item) => item?.price || 0, 0));
+const total = computed(() => {
+    return selectedRows.value.reduce((sum, item) => sum + item.price, 0);
+});

 const openDmsUploadDialog = async () => {
    dmsDialog.value.rowsToCreateInvoiceIn = selectedRows.value
@ -212,7 +214,6 @@ function navigateToRouteSummary(event, row) {
                data-key="RouteAutonomousList"
                url="AgencyTerms/filter"
                :limit="20"
-                auto-load
            >
                <template #body="{ rows }">
                    <div class="q-pa-md">
@ -306,6 +307,13 @@ function navigateToRouteSummary(event, row) {
        cursor: pointer;
    }
 }
+
+th:last-child,
+td:last-child {
+    background-color: var(--vn-section-color);
+    position: sticky;
+    right: 0;
+}
 </style>
 <i18n>
 es:
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@ -1,40 +1,51 @@
 <script setup>
-import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
-import { computed, onMounted, onUnmounted, ref } from 'vue';
+import { computed, onMounted, ref } from 'vue';
 import { dashIfEmpty, toHour } from 'src/filters';
-import VnSelect from 'components/common/VnSelect.vue';
-import FetchData from 'components/FetchData.vue';
 import { useValidator } from 'composables/useValidator';
+import { useSession } from 'composables/useSession';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useArrayData } from 'composables/useArrayData';
+import { useQuasar } from 'quasar';
+
+import axios from 'axios';
+import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
+import FetchData from 'components/FetchData.vue';
+import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
+import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
+import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
+import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
-import axios from 'axios';
-import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
-import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
-import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
-import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import { useSession } from 'composables/useSession';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
-import { useQuasar } from 'quasar';
-import { useArrayData } from 'composables/useArrayData';
-import RightMenu from 'src/components/common/RightMenu.vue';

-const stateStore = useStateStore();
 const { t } = useI18n();
 const { validate } = useValidator();
+const { viewSummary } = useSummaryDialog();
 const quasar = useQuasar();
 const session = useSession();
-const { viewSummary } = useSummaryDialog();
+const paginate = ref();
 const visibleColumns = ref([]);
 const selectedRows = ref([]);
+const workers = ref([]);
+const agencyList = ref([]);
+const vehicleList = ref([]);
+const allColumnNames = ref([]);
+const confirmationDialog = ref(false);
+const startingDate = ref(null);
+const refreshKey = ref(0);
+
 const columns = computed(() => [
    {
-        name: 'ID',
-        label: t('ID'),
+        name: 'Id',
+        label: t('Id'),
        field: (row) => row.id,
        sortable: true,
        align: 'center',
@ -109,14 +120,12 @@ const columns = computed(() => [
        align: 'right',
    },
 ]);
+
 const arrayData = useArrayData('EntryLatestBuys', {
    url: 'Buys/latestBuysFilter',
    order: ['itemFk DESC'],
 });
-const refreshKey = ref(0);
-const workers = ref([]);
-const agencyList = ref([]);
-const vehicleList = ref([]);
+
 const updateRoute = async (route) => {
    try {
        return await axios.patch(`Routes/${route.id}`, route);
@ -124,9 +133,6 @@ const updateRoute = async (route) => {
        return err;
    }
 };
-const allColumnNames = ref([]);
-const confirmationDialog = ref(false);
-const startingDate = ref(null);

 const cloneRoutes = () => {
    axios.post('Routes/clone', {
@ -135,6 +141,7 @@ const cloneRoutes = () => {
    });
    refreshKey.value++;
    startingDate.value = null;
+    paginate.value.fetch();
 };

 const showRouteReport = () => {
@ -154,15 +161,13 @@ const showRouteReport = () => {
    window.open(url, '_blank');
 };

-const markAsServed = () => {
-    selectedRows.value.forEach((row) => {
-        if (row?.id) {
-            axios.patch(`Routes/${row?.id}`, { isOk: true });
-        }
+function markAsServed() {
+    selectedRows.value.forEach(async (row) => {
+        if (row?.id) await axios.patch(`Routes/${row?.id}`, { isOk: true });
    });
    refreshKey.value++;
    startingDate.value = null;
-};
+}

 const openTicketsDialog = (id) => {
    if (!id) {
@ -179,11 +184,9 @@ const openTicketsDialog = (id) => {
 };

 onMounted(async () => {
-    stateStore.rightDrawer = true;
    allColumnNames.value = columns.value.map((col) => col.name);
    await arrayData.fetch({ append: false });
 });
-onUnmounted(() => (stateStore.rightDrawer = false));
 </script>

 <template>
@ -210,6 +213,10 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                <QBtn flat :label="t('Cancel')" v-close-popup class="text-primary" />
                <QBtn color="primary" v-close-popup @click="cloneRoutes">
                    {{ t('globals.clone') }}
+                    <VnLv
+                        :label="t('route.summary.packages')"
+                        :value="getTotalPackages(entity.tickets)"
+                    />
                </QBtn>
            </QCardActions>
        </QCard>
@ -228,7 +235,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                    class="LeftIcon"
                    :all-columns="allColumnNames"
                    table-code="routesList"
-                    labels-traductions-path="globals"
+                    labels-traductions-path="route.columnLabels"
                    @on-config-saved="visibleColumns = [...$event]"
                />
            </template>
@ -256,7 +263,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                    color="primary"
                    class="q-mr-sm"
                    :disable="!selectedRows?.length"
-                    @click="markAsServed"
+                    @click="markAsServed()"
                >
                    <QTooltip>{{ t('Mark as served') }}</QTooltip>
                </QBtn>
@ -269,7 +276,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                url="Routes/filter"
                :order="['created ASC', 'started ASC', 'id ASC']"
                :limit="20"
-                auto-load
            >
                <template #body="{ rows }">
                    <div class="q-pa-md route-table">
@ -500,7 +506,6 @@ en:
    hourStarted: Started hour
    hourFinished: Finished hour
 es:
-    ID: ID
    Worker: Trabajador
    Agency: Agencia
    Vehicle: Vehículo
@ -521,4 +526,6 @@ es:
    Summary: Resumen
    Route is closed: La ruta está cerrada
    Route is not served: La ruta no está servida
+    hourStarted: Hora de inicio
+    hourFinished: Hora de fin
 </i18n>
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@ -129,7 +129,7 @@ function confirmRemove() {
 }

 function navigateToRoadmapSummary(event, row) {
-    router.push({ name: 'RoadmapSummary', params: { id: row.id } });
+    router.push({ name: 'RoadmapSummary', params: { id: 1 } });
 }
 </script>

@ -193,7 +193,6 @@ function navigateToRoadmapSummary(event, row) {
                url="Roadmaps"
                :limit="20"
                :filter="filter"
-                auto-load
            >
                <template #body="{ rows }">
                    <div class="q-pa-md">
--- a/src/pages/Route/RouteTickets.vue
+++ b/src/pages/Route/RouteTickets.vue
@ -141,7 +141,7 @@ const setOrderedPriority = async () => {
 };

 const sortRoutes = async () => {
-    await axios.get(`Routes/${route.params?.id}/guessPriority/`);
+    await axios.patch(`Routes/${route.params?.id}/guessPriority/`);
    refreshKey.value++;
 };

--- a/src/pages/Worker/Card/WorkerNotificationsManager.vue
+++ b/src/pages/Worker/Card/WorkerNotificationsManager.vue
@ -20,8 +20,8 @@ const { t } = useI18n();
 const quasar = useQuasar();
 const entityId = computed(() => $props.id || route.params.id);
 const URL_KEY = 'NotificationSubscriptions';
-const active = ref();
-const available = ref();
+const active = ref(new Map());
+const available = ref(new Map());

 async function toggleNotification(notification) {
    try {
@ -56,6 +56,7 @@ const swapEntry = (from, to, key) => {
 };

 function setNotifications(data) {
+    console.log('data: ', data);
    active.value = new Map(data.active);
    available.value = new Map(data.available);
 }
--- a/test/cypress/integration/invoiceIn/invoiceInDueDay.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInDueDay.spec.js
@ -22,7 +22,7 @@ describe('InvoiceInDueDay', () => {
        cy.waitForElement('thead');
        cy.get(addBtn).click();

-        cy.saveCard();
+        cy.get('tbody > :nth-child(1)').should('exist');
        cy.get('.q-notification__message').should('have.text', 'Data saved');
    });
 });