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

src/components/VnTable/VnFilter.vue

@@ -40,7 +40,7 @@ const enterEvent = {
 
 const defaultAttrs = {
     filled: !$props.showTitle,
-    class: 'q-px-sm q-pb-xs q-pt-none fit',
+    class: 'q-px-xs q-pb-xs q-pt-none fit',
     dense: true,
 };
 
@@ -101,7 +101,7 @@ const components = {
         component: markRaw(VnSelect),
         event: updateEvent,
         attrs: {
-            class: 'q-px-md q-pb-xs q-pt-none fit',
+            class: 'q-px-sm q-pb-xs q-pt-none fit',
             dense: true,
             filled: !$props.showTitle,
         },
@@ -138,14 +138,6 @@ const showFilter = computed(
 );
 </script>
 <template>
-    <div
-        v-if="showTitle"
-        class="q-pt-sm q-px-sm ellipsis"
-        :class="`text-${column?.align ?? 'left'}`"
-        :style="!showFilter ? { 'min-height': 72 + 'px' } : ''"
-    >
-        {{ column?.label }}
-    </div>
     <div v-if="showFilter" class="full-width" :class="alignRow()">
         <VnTableColumn
             :column="$props.column"

src/components/VnTable/VnTable.vue

@@ -13,6 +13,7 @@ import VnLv from 'components/ui/VnLv.vue';
 import VnTableColumn from 'components/VnTable/VnColumn.vue';
 import VnTableFilter from 'components/VnTable/VnFilter.vue';
 import VnTableChip from 'components/VnTable/VnChip.vue';
+import TableVisibleColumns from 'src/components/VnTable/VnVisibleColumn.vue';
 
 const $props = defineProps({
     columns: {
@@ -67,6 +68,14 @@ const $props = defineProps({
         type: Object,
         default: () => ({ card: false, table: false }),
     },
+    withoutHeader: {
+        type: Boolean,
+        default: false,
+    },
+    tableCode: {
+        type: String,
+        default: null,
+    },
     table: {
         type: Object,
         default: () => ({}),
@@ -119,6 +128,14 @@ watch(
     (val) => setUserParams(val)
 );
 
+const rowClickFunction = computed(() => {
+    if ($props.rowClick) return $props.rowClick;
+    if ($props.redirect) return ({ id }) => redirectFn(id);
+    return () => {};
+});
+
+const isTableMode = computed(() => mode.value == TABLE_MODE);
+
 function setUserParams(watchedParams) {
     if (!watchedParams) return;
 
@@ -126,6 +143,7 @@ function setUserParams(watchedParams) {
     const where = JSON.parse(watchedParams?.filter)?.where;
     watchedParams = { ...watchedParams, ...where };
     delete watchedParams.filter;
+    delete params.value?.filter;
     params.value = { ...params.value, ...watchedParams };
 }
 
@@ -134,7 +152,7 @@ function splitColumns(columns) {
         columns: [],
         chips: [],
         create: [],
-        visible: [],
+        cardVisible: [],
     };
 
     for (const col of columns) {
@@ -142,7 +160,7 @@ function splitColumns(columns) {
         if (col.chip) splittedColumns.value.chips.push(col);
         if (col.isTitle) splittedColumns.value.title = col;
         if (col.create) splittedColumns.value.create.push(col);
-        if (col.cardVisible) splittedColumns.value.visible.push(col);
+        if (col.cardVisible) splittedColumns.value.cardVisible.push(col);
         if ($props.isEditable && col.disable == null) col.disable = false;
         if ($props.useModel) col.columnFilter = { ...col.columnFilter, inWhere: true };
         splittedColumns.value.columns.push(col);
@@ -162,12 +180,6 @@ function splitColumns(columns) {
     }
 }
 
-const rowClickFunction = computed(() => {
-    if ($props.rowClick) return $props.rowClick;
-    if ($props.redirect) return ({ id }) => redirectFn(id);
-    return () => {};
-});
-
 function redirectFn(id) {
     router.push({ path: `/${$props.redirect}/${id}` });
 }
@@ -214,6 +226,7 @@ defineExpose({
                 v-model="params"
                 :disable-submit-event="true"
                 :search-url="searchUrl"
+                :redirect="!!redirect"
             >
                 <template #body>
                     <VnTableFilter
@@ -240,7 +253,7 @@ defineExpose({
             :limit="20"
             ref="CrudModelRef"
             :search-url="searchUrl"
-            :disable-infinite-scroll="mode == TABLE_MODE"
+            :disable-infinite-scroll="isTableMode"
             @save-changes="reload"
             :has-sub-toolbar="$attrs['hasSubToolbar'] ?? isEditable"
         >
@@ -258,11 +271,11 @@ defineExpose({
                     :columns="splittedColumns.columns"
                     :rows="rows"
                     v-model:selected="selected"
-                    :grid="mode != TABLE_MODE"
+                    :grid="!isTableMode"
                     table-header-class="bg-header"
                     card-container-class="grid-three"
                     flat
-                    :style="mode == TABLE_MODE && 'max-height: 90vh'"
+                    :style="isTableMode && 'max-height: 90vh'"
                     virtual-scroll
                     @virtual-scroll="
                         (event) =>
@@ -272,17 +285,15 @@ defineExpose({
                     @row-click="(_, row) => rowClickFunction(row)"
                     @update:selected="emit('update:selected', $event)"
                 >
-                    <template #top-left>
+                    <template #top-left v-if="!$props.withoutHeader">
                         <slot name="top-left"></slot>
                     </template>
                     <template #top-right>
-                        <!-- <QBtn
+                        <TableVisibleColumns
-                        icon="visibility"
+                            v-if="isTableMode"
-                        title="asd"
+                            v-model="splittedColumns.columns"
-                        class="bg-vn-section-color q-mr-md"
+                            :table-code="tableCode ?? route.name"
-                        dense
+                        />
-                        v-if="mode == 'table'"
-                    /> -->
                         <QBtnToggle
                             v-model="mode"
                             toggle-color="primary"
@@ -291,6 +302,7 @@ defineExpose({
                             :options="tableModes"
                         />
                         <QBtn
+                            v-if="$props.rightSearch"
                             icon="filter_alt"
                             title="asd"
                             class="bg-vn-section-color q-ml-md"
@@ -300,11 +312,23 @@ defineExpose({
                     </template>
                     <template #header-cell="{ col }">
                         <QTh
+                            v-if="col.visible ?? true"
                             auto-width
                             style="min-width: 100px"
-                            v-if="$props.columnSearch"
                         >
+                            <div
+                                class="q-pt-sm q-px-sm ellipsis"
+                                :class="`text-${col?.align ?? 'left'}`"
+                                :style="
+                                    $props.columnSearch && col.columnFilter == false
+                                        ? { 'min-height': 72 + 'px' }
+                                        : ''
+                                "
+                            >
+                                {{ col?.label }}
+                            </div>
                             <VnTableFilter
+                                v-if="$props.columnSearch"
                                 :column="col"
                                 :show-title="true"
                                 :data-key="$attrs['data-key']"
@@ -334,6 +358,7 @@ defineExpose({
                             auto-width
                             class="no-margin q-px-xs"
                             :class="getColAlign(col)"
+                            v-if="col.visible ?? true"
                         >
                             <slot :name="`column-${col.name}`" :col="col" :row="row">
                                 <VnTableColumn
@@ -422,7 +447,7 @@ defineExpose({
                                         :class="$props.cardClass"
                                     >
                                         <div
-                                            v-for="col of splittedColumns.visible"
+                                            v-for="col of splittedColumns.cardVisible"
                                             :key="col.name"
                                             class="fields"
                                         >

src/components/VnTable/VnVisibleColumn.vue

@@ -0,0 +1,181 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { ref, computed, onMounted } from 'vue';
+
+import { useState } from 'src/composables/useState';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const columns = defineModel({ type: Object, default: [] });
+const $props = defineProps({
+    tableCode: {
+        type: String,
+        default: '',
+    },
+});
+
+const { notify } = useNotify();
+const { t } = useI18n();
+const state = useState();
+const user = state.getUser();
+const popupProxyRef = ref();
+const initialUserConfigViewData = ref();
+const localColumns = ref([]);
+
+const areAllChecksMarked = computed(() => {
+    return localColumns.value.every((col) => col.visible);
+});
+
+function setUserConfigViewData(data, isLocal) {
+    if (!data) return;
+    // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
+    if (!isLocal) localColumns.value = [];
+    for (let column of columns.value) {
+        const { label, name } = column;
+        column.visible = data[name] ?? true;
+        if (!isLocal) localColumns.value.push({ name, label, visible: column.visible });
+    }
+}
+
+function toggleMarkAll(val) {
+    localColumns.value.forEach((col) => (col.visible = val));
+}
+
+async function getConfig(url, filter) {
+    const response = await axios.get(url, {
+        params: { filter: filter },
+    });
+    return response.data && response.data.length > 0 ? response.data[0] : null;
+}
+
+async function fetchViewConfigData() {
+    try {
+        const defaultFilter = {
+            where: { tableCode: $props.tableCode },
+        };
+
+        const userConfig = await getConfig('UserConfigViews', {
+            where: {
+                ...defaultFilter.where,
+                ...{ userFk: user.id },
+            },
+        });
+
+        if (userConfig) {
+            initialUserConfigViewData.value = userConfig;
+            setUserConfigViewData(userConfig.configuration);
+            return;
+        }
+
+        const defaultConfig = await getConfig('DefaultViewConfigs', defaultFilter);
+        if (defaultConfig) {
+            setUserConfigViewData(defaultConfig.columns);
+            return;
+        }
+    } catch (err) {
+        console.err('Error fetching config view data', err);
+    }
+}
+
+async function saveConfig() {
+    const configuration = {};
+    for (const { name, visible } of localColumns.value)
+        configuration[name] = visible ?? true;
+    setUserConfigViewData(configuration, true);
+    if (!$props.tableCode) return popupProxyRef.value.hide();
+
+    try {
+        const params = {};
+        // Si existe una view config del usuario hacemos un update si no la creamos
+        if (initialUserConfigViewData.value) {
+            params.updates = [
+                {
+                    data: {
+                        configuration,
+                    },
+                    where: {
+                        id: initialUserConfigViewData.value.id,
+                    },
+                },
+            ];
+        } else {
+            params.creates = [
+                {
+                    userFk: user.value.id,
+                    tableCode: $props.tableCode,
+                    tableConfig: $props.tableCode,
+                    configuration,
+                },
+            ];
+        }
+
+        const response = await axios.post('UserConfigViews/crud', params);
+        if (response.data && response.data[0]) {
+            initialUserConfigViewData.value = response.data[0];
+        }
+        notify('globals.dataSaved', 'positive');
+        popupProxyRef.value.hide();
+    } catch (err) {
+        console.error('Error saving user view config', err);
+        notify('errors.writeRequest', 'negative');
+    }
+}
+
+onMounted(async () => {
+    setUserConfigViewData({});
+    await fetchViewConfigData();
+});
+</script>
+<template>
+    <QBtn icon="vn:visible_columns" class="bg-vn-section-color q-mr-md" dense>
+        <QPopupProxy ref="popupProxyRef">
+            <QCard class="column q-pa-md">
+                <QIcon name="info" size="sm" class="info-icon">
+                    <QTooltip>{{ t('Check the columns you want to see') }}</QTooltip>
+                </QIcon>
+                <span class="text-body1 q-mb-sm">{{ t('Visible columns') }}</span>
+                <QCheckbox
+                    :label="t('Tick all')"
+                    :model-value="areAllChecksMarked"
+                    @update:model-value="toggleMarkAll($event)"
+                    class="q-mb-sm"
+                />
+                <div v-if="columns.length > 0" class="checks-layout">
+                    <QCheckbox
+                        v-for="col in localColumns"
+                        :key="col.name"
+                        :label="col.label"
+                        v-model="col.visible"
+                    />
+                </div>
+                <QBtn
+                    class="full-width q-mt-md"
+                    color="primary"
+                    @click="saveConfig()"
+                    :label="t('globals.save')"
+                />
+            </QCard>
+        </QPopupProxy>
+        <QTooltip>{{ t('Visible columns') }}</QTooltip>
+    </QBtn>
+</template>
+
+<style lang="scss" scoped>
+.info-icon {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+}
+
+.checks-layout {
+    display: grid;
+    grid-template-columns: repeat(3, 200px);
+}
+</style>
+
+<i18n>
+    es:
+        Check the columns you want to see: Marca las columnas que quieres ver
+        Visible columns: Columnas visibles
+        Tick all: Marcar todas
+</i18n>

src/components/ui/CardDescriptor.vue

@@ -56,7 +56,12 @@ onBeforeMount(async () => {
         skip: 0,
     });
     store = arrayData.store;
-    entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
+    entity = computed(() => {
+        const data = (Array.isArray(store.data) ? store.data[0] : store.data) ?? {};
+        if (data) emit('onFetch', data);
+        return data;
+    });
+
     // It enables to load data only once if the module is the same as the dataKey
     if (!isSameDataKey.value || !route.params.id) await getData();
     watch(
@@ -85,9 +90,9 @@ function getValueFromPath(path) {
     const keys = path.toString().split('.');
     let current = entity.value;
 
-    for (let i = 0; i < keys.length; i++) {
+    for (const key of keys) {
-        if (current[keys[i]] === undefined) return undefined;
+        if (current[key] === undefined) return undefined;
-        else current = current[keys[i]];
+        else current = current[key];
     }
     return current;
 }

src/components/ui/VnPaginate.vue

@@ -26,6 +26,10 @@ const props = defineProps({
         type: Object,
         default: null,
     },
+    userFilter: {
+        type: Object,
+        default: null,
+    },
     where: {
         type: Object,
         default: null,
@@ -80,6 +84,7 @@ const pagination = ref({
 const arrayData = useArrayData(props.dataKey, {
     url: props.url,
     filter: props.filter,
+    userFilter: props.userFilter,
     where: props.where,
     limit: props.limit,
     order: props.order,

src/i18n/locale/en.yml

@@ -631,69 +631,6 @@ ticket:
         landed: Landed
         warehouse: Warehouse
         agency: Agency
-claim:
-    list:
-        customer: Customer
-        assignedTo: Assigned
-        created: Created
-        state: State
-    rmaList:
-        code: Code
-        records: records
-    card:
-        claimId: Claim ID
-        attendedBy: Attended by
-        created: Created
-        state: State
-        ticketId: Ticket ID
-        customerSummary: Customer summary
-        claimedTicket: Claimed ticket
-        saleTracking: Sale tracking
-        ticketTracking: Ticket tracking
-        commercial: Commercial
-        province: Province
-        zone: Zone
-        customerId: client ID
-    summary:
-        customer: Customer
-        assignedTo: Assigned
-        attendedBy: Attended by
-        created: Created
-        state: State
-        details: Details
-        item: Item
-        landed: Landed
-        quantity: Quantity
-        claimed: Claimed
-        price: Price
-        discount: Discount
-        total: Total
-        actions: Actions
-        responsibility: Responsibility
-        company: Company
-        person: Employee/Customer
-        notes: Notes
-        photos: Photos
-        development: Development
-        reason: Reason
-        result: Result
-        responsible: Responsible
-        worker: Worker
-        redelivery: Redelivery
-        changeState: Change state
-    basicData:
-        customer: Customer
-        assignedTo: Assigned
-        created: Created
-        state: State
-        pickup: Pick up
-        null: No
-        agency: Agency
-        delivery: Delivery
-    photo:
-        fileDescription: 'Claim id {claimId} from client {clientName} id {clientId}'
-        noData: 'There are no images/videos, click here or drag and drop the file'
-        dragDrop: Drag and drop it here
 invoiceOut:
     list:
         ref: Reference

src/i18n/locale/es.yml

@@ -636,69 +636,6 @@ ticket:
         landed: F. entrega
         warehouse: Almacén
         agency: Agencia
-claim:
-    list:
-        customer: Cliente
-        assignedTo: Asignada a
-        created: Creada
-        state: Estado
-    rmaList:
-        code: Código
-        records: registros
-    card:
-        claimId: ID reclamación
-        attendedBy: Atendida por
-        created: Creada
-        state: Estado
-        ticketId: ID ticket
-        customerSummary: Resumen del cliente
-        claimedTicket: Ticket reclamado
-        saleTracking: Líneas preparadas
-        ticketTracking: Estados del ticket
-        commercial: Comercial
-        province: Provincia
-        zone: Zona
-        customerId: ID del cliente
-    summary:
-        customer: Cliente
-        assignedTo: Asignada a
-        attendedBy: Atendida por
-        created: Creada
-        state: Estado
-        details: Detalles
-        item: Artículo
-        landed: Entregado
-        quantity: Cantidad
-        claimed: Reclamado
-        price: Precio
-        discount: Descuento
-        total: Total
-        actions: Acciones
-        responsibility: Responsabilidad
-        company: Empresa
-        person: Comercial/Cliente
-        notes: Observaciones
-        photos: Fotos
-        development: Trazabilidad
-        reason: Motivo
-        result: Consecuencias
-        responsible: Responsable
-        worker: Trabajador
-        redelivery: Devolución
-        changeState: Cambiar estado
-    basicData:
-        customer: Cliente
-        assignedTo: Asignada a
-        created: Creada
-        state: Estado
-        pickup: Recogida
-        null: No
-        agency: Agencia
-        delivery: Reparto
-    photo:
-        fileDescription: 'Reclamacion ID {claimId} del cliente {clientName} id {clientId}'
-        noData: No hay imágenes/videos haz click aquí o arrastra y suelta el archivo
-        dragDrop: Arrástralo y sueltalo aquí
 invoiceOut:
     list:
         ref: Referencia

src/pages/Claim/Card/ClaimAction.vue

@@ -33,8 +33,8 @@ const DEFAULT_MAX_RESPONSABILITY = 5;
 const DEFAULT_MIN_RESPONSABILITY = 1;
 const arrayData = useArrayData('claimData');
 const marker_labels = [
-    { value: DEFAULT_MIN_RESPONSABILITY, label: t('claim.summary.company') },
+    { value: DEFAULT_MIN_RESPONSABILITY, label: t('claim.company') },
-    { value: DEFAULT_MAX_RESPONSABILITY, label: t('claim.summary.person') },
+    { value: DEFAULT_MAX_RESPONSABILITY, label: t('claim.person') },
 ];
 const multiplicatorValue = ref();
 const loading = ref(false);
@@ -209,12 +209,12 @@ async function post(query, params) {
             <QItem class="justify-between">
                 <QItemLabel class="slider-container">
                     <p class="text-primary">
-                        {{ t('claim.summary.actions') }}
+                        {{ t('claim.actions') }}
                     </p>
                     <QSlider
                         class="responsibility { 'background-color:primary': quasar.platform.is.mobile }"
                         v-model="claim.responsibility"
-                        :label-value="t('claim.summary.responsibility')"
+                        :label-value="t('claim.responsibility')"
                         @change="(value) => save({ responsibility: value })"
                         label-always
                         color="primary"

src/pages/Claim/Card/ClaimBasicData.vue

@@ -30,7 +30,7 @@ function setClaimStates(data) {
 }
 
 async function getEnumValues() {
-    optionsList.value = [{ id: null, description: t('claim.basicData.null') }];
+    optionsList.value = [{ id: null, description: t('claim.null') }];
     const { data } = await axios.get(`Applications/get-enum-values`, {
         params: {
             schema: 'vn',
@@ -39,7 +39,7 @@ async function getEnumValues() {
         },
     });
     for (let value of data)
-        optionsList.value.push({ id: value, description: t(`claim.basicData.${value}`) });
+        optionsList.value.push({ id: value, description: t(`claim.${value}`) });
 }
 
 getEnumValues();
@@ -77,17 +77,14 @@ const statesFilter = {
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput
                     v-model="data.client.name"
-                    :label="t('claim.basicData.customer')"
+                    :label="t('claim.customer')"
                     disable
                 />
-                <VnInputDate
+                <VnInputDate v-model="data.created" :label="t('claim.created')" />
-                    v-model="data.created"
-                    :label="t('claim.basicData.created')"
-                />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnSelect
-                    :label="t('claim.basicData.assignedTo')"
+                    :label="t('claim.assignedTo')"
                     v-model="data.workerFk"
                     :options="workersOptions"
                     option-value="id"
@@ -114,7 +111,7 @@ const statesFilter = {
                     option-value="id"
                     option-label="description"
                     emit-value
-                    :label="t('claim.basicData.state')"
+                    :label="t('claim.state')"
                     map-options
                     use-input
                     @filter="(value, update) => filter(value, update, statesFilter)"
@@ -136,7 +133,7 @@ const statesFilter = {
                     option-value="id"
                     option-label="description"
                     emit-value
-                    :label="t('claim.basicData.pickup')"
+                    :label="t('claim.pickup')"
                     map-options
                     use-input
                     :input-debounce="0"

src/pages/Claim/Card/ClaimDescriptor.vue

@@ -2,7 +2,7 @@
 import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { toDate, toPercentage } from 'src/filters';
+import { toDateHourMinSec, toPercentage } from 'src/filters';
 import { useState } from 'src/composables/useState';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
@@ -42,7 +42,7 @@ function stateColor(code) {
 const data = ref(useCardDescription());
 const setData = (entity) => {
     if (!entity) return;
-    data.value = useCardDescription(entity.client.name, entity.id);
+    data.value = useCardDescription(entity?.client?.name, entity.id);
     state.set('ClaimDescriptor', entity);
 };
 onMounted(async () => {
@@ -52,7 +52,6 @@ onMounted(async () => {
 
 <template>
     <CardDescriptor
-        ref="descriptor"
         :url="`Claims/${entityId}`"
         :filter="filter"
         module="Claim"
@@ -64,7 +63,7 @@ onMounted(async () => {
             <ClaimDescriptorMenu :claim="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv v-if="entity.claimState" :label="t('claim.card.state')">
+            <VnLv v-if="entity.claimState" :label="t('claim.state')">
                 <template #value>
                     <QBadge
                         :color="stateColor(entity.claimState.code)"
@@ -75,8 +74,8 @@ onMounted(async () => {
                     </QBadge>
                 </template>
             </VnLv>
-            <VnLv :label="t('claim.card.created')" :value="toDate(entity.created)" />
+            <VnLv :label="t('claim.created')" :value="toDateHourMinSec(entity.created)" />
-            <VnLv :label="t('claim.card.commercial')">
+            <VnLv :label="t('claim.commercial')">
                 <template #value>
                     <VnUserLink
                         :name="entity.client?.salesPersonUser?.name"
@@ -86,17 +85,17 @@ onMounted(async () => {
             </VnLv>
             <VnLv
                 v-if="entity.worker"
-                :label="t('claim.card.attendedBy')"
+                :label="t('claim.attendedBy')"
                 :value="entity.worker.user.name"
             >
                 <template #value>
                     <VnUserLink
-                        :name="entity.worker.user.nickname"
+                        :name="entity.worker.user.name"
                         :worker-id="entity.worker.id"
                     />
                 </template>
             </VnLv>
-            <VnLv :label="t('claim.card.zone')">
+            <VnLv :label="t('claim.zone')">
                 <template #value>
                     <span class="link">
                         {{ entity.ticket?.zone?.name }}
@@ -105,10 +104,10 @@ onMounted(async () => {
                 </template>
             </VnLv>
             <VnLv
-                :label="t('claim.card.province')"
+                :label="t('claim.province')"
                 :value="entity.ticket?.address?.province?.name"
             />
-            <VnLv :label="t('claim.card.ticketId')">
+            <VnLv :label="t('claim.ticketId')">
                 <template #value>
                     <span class="link">
                         {{ entity.ticketFk }}
@@ -130,7 +129,7 @@ onMounted(async () => {
                     color="primary"
                     :to="{ name: 'CustomerCard', params: { id: entity.clientFk } }"
                 >
-                    <QTooltip>{{ t('claim.card.customerSummary') }}</QTooltip>
+                    <QTooltip>{{ t('claim.customerSummary') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     size="md"
@@ -138,7 +137,7 @@ onMounted(async () => {
                     color="primary"
                     :to="{ name: 'TicketCard', params: { id: entity.ticketFk } }"
                 >
-                    <QTooltip>{{ t('claim.card.claimedTicket') }}</QTooltip>
+                    <QTooltip>{{ t('claim.claimedTicket') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     size="md"
@@ -146,7 +145,7 @@ onMounted(async () => {
                     color="primary"
                     :href="salixUrl + 'ticket/' + entity.ticketFk + '/sale-tracking'"
                 >
-                    <QTooltip>{{ t('claim.card.saleTracking') }}</QTooltip>
+                    <QTooltip>{{ t('claim.saleTracking') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     size="md"
@@ -154,7 +153,7 @@ onMounted(async () => {
                     color="primary"
                     :href="salixUrl + 'ticket/' + entity.ticketFk + '/tracking/index'"
                 >
-                    <QTooltip>{{ t('claim.card.ticketTracking') }}</QTooltip>
+                    <QTooltip>{{ t('claim.ticketTracking') }}</QTooltip>
                 </QBtn>
             </QCardActions>
         </template>

src/pages/Claim/Card/ClaimNotes.vue

@@ -9,7 +9,7 @@ const state = useState();
 const user = state.getUser();
 
 const $props = defineProps({
-    id: { type: Number, default: null },
+    id: { type: [Number, String], default: null },
     addNote: { type: Boolean, default: true },
 });
 const claimId = computed(() => $props.id || route.params.id);

src/pages/Claim/Card/ClaimPhoto.vue

@@ -18,7 +18,7 @@ const claimId = computed(() => router.currentRoute.value.params.id);
 
 const claimDms = ref([
     {
-        dmsFk: 1,
+        dmsFk: claimId,
     },
 ]);
 const client = ref({});
@@ -113,7 +113,7 @@ async function create() {
         warehouseId: config.value.warehouseFk,
         companyId: config.value.companyFk,
         dmsTypeId: dmsType.value.id,
-        description: t('claim.photo.fileDescription', {
+        description: t('claim.fileDescription', {
             claimId: claimId.value,
             clientName: client.value.name,
             clientId: client.value.id,
@@ -177,7 +177,7 @@ function onDrag() {
         >
             <QIcon size="xl" name="file_download" />
             <h5>
-                {{ t('claim.photo.dragDrop') }}
+                {{ t('claim.dragDrop') }}
             </h5>
         </div>
         <div
@@ -188,7 +188,7 @@ function onDrag() {
             <QIcon size="xl" name="image"></QIcon>
             <QIcon size="xl" name="movie"></QIcon>
             <h5>
-                {{ t('claim.photo.noData') }}
+                {{ t('claim.noData') }}
             </h5>
         </div>
         <div class="multimediaParent bg-transparent" v-if="claimDms?.length && !dragFile">

src/pages/Claim/Card/ClaimSummary.vue

@@ -1,20 +1,25 @@
 <script setup>
+import axios from 'axios';
 import { onMounted, ref, computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDate, toCurrency } from 'src/filters';
-import CardSummary from 'components/ui/CardSummary.vue';
+import dashIfEmpty from 'src/filters/dashIfEmpty';
-import FetchData from 'components/FetchData.vue';
 import { getUrl } from 'src/composables/getUrl';
 import { useSession } from 'src/composables/useSession';
+
 import VnLv from 'src/components/ui/VnLv.vue';
-import ClaimNotes from 'src/pages/Claim/Card/ClaimNotes.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
-import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
+import FetchData from 'components/FetchData.vue';
+import CardSummary from 'components/ui/CardSummary.vue';
+
+import ClaimSummaryAction from 'src/pages/Claim/Card/ClaimSummaryAction.vue';
+import ClaimNotes from 'src/pages/Claim/Card/ClaimNotes.vue';
+
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
-import axios from 'axios';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
-import dashIfEmpty from 'src/filters/dashIfEmpty';
 
 const route = useRoute();
 const router = useRouter();
@@ -34,6 +39,9 @@ const ClaimStates = ref([]);
 const claimUrl = ref();
 const salixUrl = ref();
 const claimDmsRef = ref();
+const claimDms = ref([]);
+const multimediaDialog = ref();
+const multimediaSlide = ref();
 const claimDmsFilter = ref({
     include: [
         {
@@ -42,34 +50,29 @@ const claimDmsFilter = ref({
     ],
 });
 
-onMounted(async () => {
-    salixUrl.value = await getUrl('');
-    claimUrl.value = salixUrl.value + `claim/${entityId.value}/`;
-});
-
 const detailsColumns = ref([
     {
         name: 'item',
-        label: 'claim.summary.item',
+        label: 'claim.item',
         field: (row) => row.sale.itemFk,
         sortable: true,
     },
     {
         name: 'landed',
-        label: 'claim.summary.landed',
+        label: 'claim.landed',
         field: (row) => row.sale.ticket.landed,
         format: (value) => toDate(value),
         sortable: true,
     },
     {
         name: 'quantity',
-        label: 'claim.summary.quantity',
+        label: 'claim.quantity',
         field: (row) => row.sale.quantity,
         sortable: true,
     },
     {
         name: 'claimed',
-        label: 'claim.summary.claimed',
+        label: 'claim.claimed',
         field: (row) => row.quantity,
         sortable: true,
     },
@@ -80,32 +83,38 @@ const detailsColumns = ref([
     },
     {
         name: 'price',
-        label: 'claim.summary.price',
+        label: 'claim.price',
         field: (row) => row.sale.price,
         sortable: true,
     },
     {
         name: 'discount',
-        label: 'claim.summary.discount',
+        label: 'claim.discount',
         field: (row) => row.sale.discount,
         format: (value) => `${value} %`,
         sortable: true,
     },
     {
         name: 'total',
-        label: 'claim.summary.total',
+        label: 'claim.total',
         field: ({ sale }) =>
             toCurrency(sale.quantity * sale.price * ((100 - sale.discount) / 100)),
         sortable: true,
     },
 ]);
 
+const markerLabels = [
+    { value: 1, label: t('claim.company') },
+    { value: 5, label: t('claim.person') },
+];
+
 const STATE_COLOR = {
     pending: 'warning',
     incomplete: 'info',
     resolved: 'positive',
     canceled: 'negative',
 };
+
 function stateColor(code) {
     return STATE_COLOR[code];
 }
@@ -113,38 +122,40 @@ function stateColor(code) {
 const developmentColumns = ref([
     {
         name: 'claimReason',
-        label: 'claim.summary.reason',
+        label: 'claim.reason',
         field: (row) => row.claimReason.description,
         sortable: true,
     },
     {
         name: 'claimResult',
-        label: 'claim.summary.result',
+        label: 'claim.result',
         field: (row) => row.claimResult.description,
         sortable: true,
     },
     {
         name: 'claimResponsible',
-        label: 'claim.summary.responsible',
+        label: 'claim.responsible',
         field: (row) => row.claimResponsible.description,
         sortable: true,
     },
     {
         name: 'worker',
-        label: 'claim.summary.worker',
+        label: 'claim.worker',
         field: (row) => row.worker?.user.nickname,
         sortable: true,
     },
     {
         name: 'claimRedelivery',
-        label: 'claim.summary.redelivery',
+        label: 'claim.redelivery',
         field: (row) => row.claimRedelivery.description,
         sortable: true,
     },
 ]);
-const claimDms = ref([]);
+
-const multimediaDialog = ref();
+onMounted(async () => {
-const multimediaSlide = ref();
+    salixUrl.value = await getUrl('');
+    claimUrl.value = salixUrl.value + `claim/${entityId.value}/`;
+});
 
 async function getClaimDms() {
     claimDmsFilter.value.where = { claimFk: entityId.value };
@@ -221,16 +232,13 @@ async function changeState(value) {
             </QBtnDropdown>
         </template>
         <template #body="{ entity: { claim, salesClaimed, developments } }">
-            <QCard class="vn-one">
+            <QCard class="vn-one" v-if="$route.name != 'ClaimSummary'">
                 <VnTitle
                     :url="`#/claim/${entityId}/basic-data`"
                     :text="t('globals.pageTitles.basicData')"
                 />
-                <VnLv
+                <VnLv :label="t('claim.created')" :value="toDate(claim.created)" />
-                    :label="t('claim.summary.created')"
+                <VnLv :label="t('claim.state')">
-                    :value="toDate(claim.created)"
-                />
-                <VnLv :label="t('claim.summary.state')">
                     <template #value>
                         <QChip :color="stateColor(claim.claimState.code)" dense>
                             {{ claim.claimState.description }}
@@ -245,7 +253,7 @@ async function changeState(value) {
                         />
                     </template>
                 </VnLv>
-                <VnLv :label="t('claim.summary.attendedBy')">
+                <VnLv :label="t('claim.attendedBy')">
                     <template #value>
                         <VnUserLink
                             :name="claim.worker?.user?.nickname"
@@ -253,7 +261,7 @@ async function changeState(value) {
                         />
                     </template>
                 </VnLv>
-                <VnLv :label="t('claim.summary.customer')">
+                <VnLv :label="t('claim.customer')">
                     <template #value>
                         <span class="link cursor-pointer">
                             {{ claim.client?.name }}
@@ -262,15 +270,12 @@ async function changeState(value) {
                     </template>
                 </VnLv>
                 <VnLv
-                    :label="t('claim.basicData.pickup')"
+                    :label="t('claim.pickup')"
                     :value="`${dashIfEmpty(claim.pickup)}`"
                 />
             </QCard>
-            <QCard class="vn-three">
+            <QCard class="vn-two">
-                <VnTitle
+                <VnTitle :url="`#/claim/${entityId}/notes`" :text="t('claim.notes')" />
-                    :url="`#/claim/${entityId}/notes`"
-                    :text="t('claim.summary.notes')"
-                />
                 <ClaimNotes
                     :id="entityId"
                     :add-note="false"
@@ -278,53 +283,8 @@ async function changeState(value) {
                     order="created ASC"
                 />
             </QCard>
-            <QCard class="vn-two" v-if="salesClaimed.length > 0">
-                <VnTitle
-                    :url="`#/claim/${entityId}/lines`"
-                    :text="t('claim.summary.details')"
-                />
-                <QTable
-                    :columns="detailsColumns"
-                    :rows="salesClaimed"
-                    flat
-                    dense
-                    :rows-per-page-options="[0]"
-                    hide-bottom
-                >
-                    <template #header="props">
-                        <QTr :props="props">
-                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
-                                {{ t(col.label) }}
-                            </QTh>
-                        </QTr>
-                    </template>
-                    <template #body="props">
-                        <QTr :props="props">
-                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
-                                <span v-if="col.name != 'description'">{{
-                                    t(col.value)
-                                }}</span>
-                                <QBtn
-                                    v-if="col.name == 'description'"
-                                    flat
-                                    color="blue"
-                                    >{{ col.value }}</QBtn
-                                >
-                                <ItemDescriptorProxy
-                                    v-if="col.name == 'description'"
-                                    :id="props.row.sale.itemFk"
-                                    :sale-fk="props.row.saleFk"
-                                ></ItemDescriptorProxy>
-                            </QTh>
-                        </QTr>
-                    </template>
-                </QTable>
-            </QCard>
             <QCard class="vn-two" v-if="claimDms.length > 0">
-                <VnTitle
+                <VnTitle :url="`#/claim/${entityId}/photos`" :text="t('claim.photos')" />
-                    :url="`#/claim/${entityId}/photos`"
-                    :text="t('claim.summary.photos')"
-                />
                 <div class="container">
                     <div
                         class="multimedia-container"
@@ -362,11 +322,47 @@ async function changeState(value) {
                     </div>
                 </div>
             </QCard>
+            <QCard class="vn-two" v-if="salesClaimed.length > 0">
+                <VnTitle :url="`#/claim/${entityId}/lines`" :text="t('claim.details')" />
+                <QTable
+                    :columns="detailsColumns"
+                    :rows="salesClaimed"
+                    flat
+                    dense
+                    :rows-per-page-options="[0]"
+                    hide-bottom
+                >
+                    <template #header="props">
+                        <QTr :props="props">
+                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
+                                {{ t(col.label) }}
+                            </QTh>
+                        </QTr>
+                    </template>
+                    <template #body="props">
+                        <QTr :props="props">
+                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
+                                <span v-if="col.name != 'description'">{{
+                                    t(col.value)
+                                }}</span>
+                                <QBtn
+                                    v-if="col.name == 'description'"
+                                    flat
+                                    color="blue"
+                                    >{{ col.value }}</QBtn
+                                >
+                                <ItemDescriptorProxy
+                                    v-if="col.name == 'description'"
+                                    :id="props.row.sale.itemFk"
+                                    :sale-fk="props.row.saleFk"
+                                ></ItemDescriptorProxy>
+                            </QTh>
+                        </QTr>
+                    </template>
+                </QTable>
+            </QCard>
             <QCard class="vn-two" v-if="developments.length > 0">
-                <VnTitle
+                <VnTitle :url="claimUrl + 'development'" :text="t('claim.development')" />
-                    :url="claimUrl + 'development'"
-                    :text="t('claim.summary.development')"
-                />
                 <QTable
                     :columns="developmentColumns"
                     :rows="developments"
@@ -382,27 +378,31 @@ async function changeState(value) {
                             </QTh>
                         </QTr>
                     </template>
+                    <template #body-cell-worker="props">
+                        <QTd :props="props" class="link">
+                            {{ props.value }}
+                            <WorkerDescriptorProxy :id="props.row.worker.id" />
+                        </QTd>
+                    </template>
                 </QTable>
             </QCard>
             <QCard class="vn-max">
-                <VnTitle :url="claimUrl + 'action'" :text="t('claim.summary.actions')" />
+                <VnTitle :url="claimUrl + 'action'" :text="t('claim.actions')" />
                 <div id="slider-container" class="q-px-xl q-py-md">
                     <QSlider
                         v-model="claim.responsibility"
                         label
-                        :label-value="t('claim.summary.responsibility')"
+                        :label-value="t('claim.responsibility')"
                         label-always
                         color="var()"
                         markers
-                        :marker-labels="[
+                        :marker-labels="markerLabels"
-                            { value: 1, label: t('claim.summary.company') },
-                            { value: 5, label: t('claim.summary.person') },
-                        ]"
                         :min="1"
                         :max="5"
                         readonly
                     />
                 </div>
+                <ClaimSummaryAction :id="entityId" />
             </QCard>
             <QDialog
                 v-model="multimediaDialog"

src/pages/Claim/Card/ClaimSummaryAction.vue

@@ -0,0 +1,98 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { toDate, toPercentage } from 'filters/index';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+
+const { t } = useI18n();
+
+const $props = defineProps({
+    id: {
+        type: [Number, String],
+        required: true,
+    },
+});
+
+const columns = [
+    {
+        name: 'itemFk',
+        label: t('Id item'),
+        columnFilter: false,
+        align: 'left',
+    },
+    {
+        name: 'ticketFk',
+        label: t('Ticket'),
+        columnFilter: false,
+        align: 'left',
+    },
+    {
+        name: 'claimDestinationFk',
+        label: t('Destination'),
+        columnFilter: false,
+        align: 'left',
+    },
+    {
+        name: 'landed',
+        label: t('Landed'),
+        format: (row) => toDate(row.landed),
+        align: 'left',
+    },
+    {
+        name: 'quantity',
+        label: t('Quantity'),
+        align: 'left',
+    },
+    {
+        name: 'concept',
+        label: t('Description'),
+        align: 'left',
+    },
+    {
+        name: 'price',
+        label: t('Price'),
+        align: 'left',
+    },
+    {
+        name: 'discount',
+        label: t('Discount'),
+        format: ({ discount }) => toPercentage(discount / 100),
+        align: 'left',
+    },
+    {
+        name: 'total',
+        label: t('Total'),
+        align: 'left',
+    },
+];
+</script>
+<template>
+    <VnTable
+        data-key="ClaimEndsTable"
+        url="ClaimEnds/filter"
+        default-mode="table"
+        :right-search="false"
+        :column-search="false"
+        :disable-option="{ card: true, table: true }"
+        search-url="actions"
+        :filter="{ where: { claimFk: $props.id } }"
+        :columns="columns"
+        :limit="0"
+        :without-header="true"
+        auto-load
+    >
+        <template #column-itemFk="{ row }">
+            <span class="link">
+                {{ row.itemFk }}
+                <ItemDescriptorProxy :id="row.itemFk" />
+            </span>
+        </template>
+        <template #column-ticketFk="{ row }">
+            <span class="link">
+                {{ row.ticketFk }}
+                <TicketDescriptorProxy :id="row.ticketFk" />
+            </span>
+        </template>
+    </VnTable>
+</template>

src/pages/Claim/ClaimFilter.vue

@@ -16,19 +16,12 @@ const props = defineProps({
     },
 });
 
-const workers = ref();
+const states = ref([]);
-const states = ref();
 </script>
 
 <template>
     <FetchData url="ClaimStates" @on-fetch="(data) => (states = data)" auto-load />
-    <FetchData
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -36,156 +29,110 @@ const states = ref();
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QItem class="q-my-sm">
+            <div class="q-pa-sm q-gutter-y-sm">
-                <QItemSection>
+                <VnInput
-                    <VnInput
+                    :label="t('claim.customerId')"
-                        :label="t('Customer ID')"
+                    v-model="params.clientFk"
-                        v-model="params.clientFk"
+                    lazy-rules
-                        lazy-rules
+                    is-outlined
-                        is-outlined
+                >
-                    >
+                    <template #prepend> <QIcon name="badge" size="xs" /></template>
-                        <template #prepend>
+                </VnInput>
-                            <QIcon name="badge" size="xs"></QIcon> </template
+                <VnInput
-                    ></VnInput>
+                    :label="t('Client Name')"
-                </QItemSection>
+                    v-model="params.clientName"
-            </QItem>
+                    lazy-rules
-            <QItem class="q-mb-sm">
+                    is-outlined
-                <QItemSection>
+                />
-                    <VnInput
+                <VnSelect
-                        :label="t('Client Name')"
+                    :label="t('Salesperson')"
-                        v-model="params.clientName"
+                    v-model="params.salesPersonFk"
-                        lazy-rules
+                    @update:model-value="searchFn()"
-                        is-outlined
+                    url="Workers/activeWithInheritedRole"
-                    />
+                    :filter="{ where: { role: 'salesPerson' } }"
-                </QItemSection>
+                    :use-like="false"
-            </QItem>
+                    option-value="id"
-            <QItem class="q-mb-sm">
+                    option-label="name"
-                <QItemSection v-if="!workers">
+                    option-filter="firstName"
-                    <QSkeleton type="QInput" class="full-width" />
+                    dense
-                </QItemSection>
+                    outlined
-                <QItemSection v-if="workers">
+                    rounded
-                    <VnSelect
+                />
-                        :label="t('Salesperson')"
+                <VnSelect
-                        v-model="params.salesPersonFk"
+                    :label="t('claim.attendedBy')"
-                        @update:model-value="searchFn()"
+                    v-model="params.attenderFk"
-                        :options="workers"
+                    @update:model-value="searchFn()"
-                        option-value="id"
+                    url="Workers/activeWithInheritedRole"
-                        option-label="name"
+                    :filter="{ where: { role: 'salesPerson' } }"
-                        emit-value
+                    :use-like="false"
-                        map-options
+                    option-value="id"
-                        use-input
+                    option-label="name"
-                        hide-selected
+                    option-filter="firstName"
-                        dense
+                    dense
-                        outlined
+                    outlined
-                        rounded
+                    rounded
-                        :input-debounce="0"
+                />
-                    />
+                <VnSelect
-                </QItemSection>
+                    :label="t('claim.state')"
-            </QItem>
+                    v-model="params.claimStateFk"
-            <QItem class="q-mb-sm">
+                    @update:model-value="searchFn()"
-                <QItemSection v-if="!workers">
+                    :options="states"
-                    <QSkeleton type="QInput" class="full-width" />
+                    option-value="id"
-                </QItemSection>
+                    option-label="description"
-                <QItemSection v-if="workers">
+                    dense
-                    <VnSelect
+                    outlined
-                        :label="t('Attender')"
+                    rounded
-                        v-model="params.attenderFk"
+                />
-                        @update:model-value="searchFn()"
+                <VnInputDate
-                        :options="workers"
+                    v-model="params.created"
-                        option-value="id"
+                    @update:model-value="searchFn()"
-                        option-label="name"
+                    :label="t('claim.created')"
-                        emit-value
+                    outlined
-                        map-options
+                    rounded
-                        use-input
+                    dense
-                        hide-selected
+                />
-                        dense
+                <VnSelect
-                        outlined
+                    :label="t('Item')"
-                        rounded
+                    v-model="params.itemFk"
-                        :input-debounce="0"
+                    @update:model-value="searchFn()"
-                    />
+                    url="Items/withName"
-                </QItemSection>
+                    option-value="id"
-            </QItem>
+                    option-label="name"
-            <QItem class="q-mb-sm">
+                    sort-by="id DESC"
-                <QItemSection v-if="!workers">
+                    outlined
-                    <QSkeleton type="QInput" class="full-width" />
+                    rounded
-                </QItemSection>
+                    dense
-                <QItemSection v-if="workers">
+                >
-                    <VnSelect
+                    <template #option="scope">
-                        :label="t('Responsible')"
+                        <QItem v-bind="scope.itemProps">
-                        v-model="params.claimResponsibleFk"
+                            <QItemSection>
-                        @update:model-value="searchFn()"
+                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                        :options="workers"
+                                <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
-                        option-value="id"
+                            </QItemSection>
-                        option-label="name"
+                        </QItem>
-                        emit-value
+                    </template>
-                        map-options
+                </VnSelect>
-                        use-input
+                <VnSelect
-                        hide-selected
+                    :label="t('claim.responsible')"
-                        dense
+                    v-model="params.claimResponsibleFk"
-                        outlined
+                    @update:model-value="searchFn()"
-                        rounded
+                    url="Workers/activeWithInheritedRole"
-                        :input-debounce="0"
+                    :filter="{ where: { role: 'salesPerson' } }"
-                    />
+                    :use-like="false"
-                </QItemSection>
+                    option-value="id"
-            </QItem>
+                    option-label="name"
-            <QItem class="q-mb-sm">
+                    option-filter="firstName"
-                <QItemSection v-if="!states">
+                    dense
-                    <QSkeleton type="QInput" class="full-width" />
+                    outlined
-                </QItemSection>
+                    rounded
-                <QItemSection v-if="states">
+                />
-                    <VnSelect
+                <QCheckbox
-                        :label="t('State')"
+                    v-model="params.myTeam"
-                        v-model="params.claimStateFk"
+                    :label="t('params.myTeam')"
-                        @update:model-value="searchFn()"
+                    @update:model-value="searchFn()"
-                        :options="states"
+                    toggle-indeterminate
-                        option-value="id"
+                />
-                        option-label="description"
+            </div>
-                        emit-value
-                        map-options
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <QCheckbox
-                        v-model="params.myTeam"
-                        :label="t('myTeam')"
-                        toggle-indeterminate
-                    />
-                </QItemSection>
-            </QItem>
-            <QSeparator />
-            <QExpansionItem :label="t('More options')" expand-separator>
-                <!-- <QItem>
-                        <QItemSection>
-                            <qSelect
-                                :label="t('Item')"
-                                v-model="params.itemFk"
-                                :options="items"
-                                :loading="loading"
-                                @filter="filterFn"
-                                @virtual-scroll="onScroll"
-                                option-value="id"
-                                option-label="name"
-                                emit-value
-                                map-options
-                            />
-                        </QItemSection>
-                    </QItem> -->
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.created"
-                            :label="t('Created')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-            </QExpansionItem>
         </template>
     </VnFilterPanel>
 </template>
@@ -201,7 +148,8 @@ en:
         claimResponsibleFk: Responsible
         claimStateFk: State
         created: Created
-    myTeam: My team
+        myTeam: My team
+        itemFk: Item
 es:
     params:
         search: Contiene
@@ -212,14 +160,9 @@ es:
         claimResponsibleFk: Responsable
         claimStateFk: Estado
         created: Creada
-    Customer ID: ID cliente
+        myTeam: Mi equipo
+        itemFk: Artículo
     Client Name: Nombre del cliente
     Salesperson: Comercial
-    Attender: Asistente
-    Responsible: Responsable
-    State: Estado
     Item: Artículo
-    Created: Creada
-    More options: Más opciones
-    myTeam: Mi equipo
 </i18n>

src/pages/Claim/ClaimList.vue

@@ -1,38 +1,81 @@
 <script setup>
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
 import { toDate } from 'filters/index';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import ClaimFilter from './ClaimFilter.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import CardList from 'src/components/ui/CardList.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import ClaimSummary from './Card/ClaimSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
-const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('customer.extendedList.tableVisibleColumns.id'),
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.name'),
+        name: 'clientName',
+        isTitle: true,
+    },
+    {
+        align: 'left',
+        label: t('claim.customer'),
+        name: 'clientFk',
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        label: t('claim.attendedBy'),
+        name: 'attendedBy',
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        label: t('claim.created'),
+        name: 'created',
+        format: ({ created }) => toDate(created),
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        label: t('claim.state'),
+        name: 'stateCode',
+        chip: {
+            condition: () => true,
+            color: ({ stateCode }) => STATE_COLOR[stateCode] ?? 'bg-grey',
+        },
+    },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('Client ticket list'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, ClaimSummary),
+            },
+        ],
+    },
+]);
+
 const STATE_COLOR = {
-    pending: 'warning',
+    pending: 'bg-warning',
-    managed: 'info',
+    managed: 'bg-info',
-    resolved: 'positive',
+    resolved: 'bg-positive',
 };
-function getApiUrl() {
-    return new URL(window.location).origin;
-}
-function stateColor(code) {
-    return STATE_COLOR[code];
-}
-function navigate(event, id) {
-    if (event.ctrlKey || event.metaKey)
-        return window.open(`${getApiUrl()}/#/claim/${id}/summary`);
-    router.push({ path: `/claim/${id}` });
-}
 </script>
 
 <template>
@@ -46,78 +89,27 @@ function navigate(event, id) {
             <ClaimFilter data-key="ClaimList" />
         </template>
     </RightMenu>
-    <QPage class="column items-center q-pa-md">
+    <VnTable
-        <div class="vn-card-list">
+        data-key="ClaimList"
-            <VnPaginate
+        url="Claims/filter"
-                data-key="ClaimList"
+        :order="['priority ASC', 'created DESC']"
-                url="Claims/filter"
+        :columns="columns"
-                :order="['priority ASC', 'created DESC']"
+        redirect="claim"
-                auto-load
+        :right-search="false"
-            >
+        auto-load
-                <template #body="{ rows }">
+    >
-                    <CardList
+        <template #column-clientFk="{ row }">
-                        :id="row.id"
+            <span class="link" @click.stop>
-                        :key="row.id"
+                {{ row.clientName }}
-                        :title="row.clientName"
+                <CustomerDescriptorProxy :id="row.clientFk" />
-                        @click="navigate($event, row.id)"
+            </span>
-                        v-for="row of rows"
+        </template>
-                    >
+        <template #column-attendedBy="{ row }">
-                        <template #list-items>
+            <span @click.stop>
-                            <VnLv :label="t('claim.list.customer')">
+                <VnUserLink :name="row.workerName" :worker-id="row.workerFk" />
-                                <template #value>
+            </span>
-                                    <span class="link" @click.stop>
+        </template>
-                                        {{ row.clientName }}
+    </VnTable>
-                                        <CustomerDescriptorProxy :id="row.clientFk" />
-                                    </span>
-                                </template>
-                            </VnLv>
-                            <VnLv :label="t('claim.list.assignedTo')">
-                                <template #value>
-                                    <span @click.stop>
-                                        <VnUserLink
-                                            :name="row.workerName"
-                                            :worker-id="row.workerFk"
-                                        />
-                                    </span>
-                                </template>
-                            </VnLv>
-                            <VnLv
-                                :label="t('claim.list.created')"
-                                :value="toDate(row.created)"
-                            />
-                            <VnLv :label="t('claim.list.state')">
-                                <template #value>
-                                    <QBadge
-                                        text-color="black"
-                                        :color="stateColor(row.stateCode)"
-                                        dense
-                                    >
-                                        {{ row.stateDescription }}
-                                    </QBadge>
-                                </template>
-                            </VnLv>
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('globals.description')"
-                                @click.stop
-                                outline
-                                style="margin-top: 15px"
-                            >
-                                <CustomerDescriptorProxy :id="row.clientFk" />
-                            </QBtn>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, ClaimSummary)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-    </QPage>
 </template>
 
 <i18n>

src/pages/Claim/locale/en.yml

@@ -0,0 +1,46 @@
+claim:
+    customer: Customer
+    code: Code
+    records: records
+    claimId: Claim ID
+    attendedBy: Attended by
+    ticketId: Ticket ID
+    customerSummary: Customer summary
+    claimedTicket: Claimed ticket
+    saleTracking: Sale tracking
+    ticketTracking: Ticket tracking
+    commercial: Commercial
+    province: Province
+    zone: Zone
+    customerId: client ID
+    assignedTo: Assigned
+    created: Created
+    details: Details
+    item: Item
+    landed: Landed
+    quantity: Quantity
+    claimed: Claimed
+    price: Price
+    discount: Discount
+    total: Total
+    actions: Actions
+    responsibility: Responsibility
+    company: Company
+    person: Employee/Customer
+    notes: Notes
+    photos: Photos
+    development: Development
+    reason: Reason
+    result: Result
+    responsible: Responsible
+    worker: Worker
+    redelivery: Redelivery
+    changeState: Change state
+    state: State
+    pickup: Pick up
+    null: No
+    agency: Agency
+    delivery: Delivery
+    fileDescription: 'Claim id {claimId} from client {clientName} id {clientId}'
+    noData: 'There are no images/videos, click here or drag and drop the file'
+    dragDrop: Drag and drop it here

src/pages/Claim/locale/es.yml

@@ -1,2 +1,48 @@
 Search claim: Buscar reclamación
 You can search by claim id or customer name: Puedes buscar por id de la reclamación o nombre del cliente
+claim:
+    customer: Cliente
+    code: Código
+    records: Registros
+    claimId: ID de reclamación
+    attendedBy: Atendido por
+    ticketId: ID de ticket
+    customerSummary: Resumen del cliente
+    claimedTicket: Ticket reclamado
+    saleTracking: Seguimiento de ventas
+    ticketTracking: Seguimiento de tickets
+    commercial: Comercial
+    province: Provincia
+    zone: Zona
+    customerId: ID de cliente
+    assignedTo: Asignado a
+    created: Creado
+    details: Detalles
+    item: Artículo
+    landed: Llegado
+    quantity: Cantidad
+    claimed: Reclamado
+    price: Precio
+    discount: Descuento
+    total: Total
+    actions: Acciones
+    responsibility: Responsabilidad
+    company: Empresa
+    person: Empleado/Cliente
+    notes: Notas
+    photos: Fotos
+    development: Trazabilidad
+    reason: Razón
+    result: Resultado
+    responsible: Responsable
+    worker: Trabajador
+    redelivery: Reentrega
+    changeState: Cambiar estado
+    state: Estado
+    pickup: Recoger
+    null: No
+    agency: Agencia
+    delivery: Entrega
+    fileDescription: 'ID de reclamación {claimId} del cliente {clientName} con ID {clientId}'
+    noData: 'No hay imágenes/videos, haz clic aquí o arrastra y suelta el archivo'
+    dragDrop: Arrastra y suelta aquí

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -32,7 +32,7 @@ const entityId = computed(() => {
 });
 
 const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.name, entity.id));
+const setData = (entity) => (data.value = useCardDescription(entity?.name, entity?.id));
 </script>
 
 <template>

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -147,6 +147,7 @@ function handleLocation(data, location) {
                     :label="t('Electronic invoice')"
                     v-model="data.hasElectronicInvoice"
                 />
+                <QCheckbox :label="t('Daily invoice')" v-model="data.hasDailyInvoice" />
             </VnRow>
         </template>
     </FormModel>
@@ -176,6 +177,7 @@ es:
     onlyLetters: Sólo se pueden usar letras, números y espacios
     whenActivatingIt: Al activarlo, no informar el código del país en el campo nif
     inOrderToInvoice: Para facturar no se consulta este campo, sino el RE de consignatario. Al modificar este campo si no esta marcada la casilla Facturar por consignatario, se propagará automaticamente el cambio a todos lo consignatarios, en caso contrario preguntará al usuario si quiere o no propagar
+    Daily invoice: Facturación diaria
 en:
     onlyLetters: Only letters, numbers and spaces can be used
     whenActivatingIt: When activating it, do not enter the country code in the ID field

src/pages/Entry/Card/EntryDescriptor.vue

@@ -73,7 +73,7 @@ onMounted(async () => {
 
 const data = ref(useCardDescription());
 const setData = (entity) =>
-    (data.value = useCardDescription(entity.supplier.nickname, entity.id));
+    (data.value = useCardDescription(entity.supplier?.nickname, entity.id));
 
 const currentEntry = computed(() => state.get('entry'));
 

src/pages/Order/Card/OrderDescriptor.vue

@@ -60,7 +60,7 @@ const filter = {
 const data = ref(useCardDescription());
 const setData = (entity) => {
     if (!entity) return;
-    data.value = useCardDescription(entity.client.name, entity.id);
+    data.value = useCardDescription(entity?.client?.name, entity?.id);
     state.set('OrderDescriptor', entity);
 };
 
@@ -131,7 +131,7 @@ const total = ref(null);
                     color="primary"
                     :to="{ name: 'CustomerCard', params: { id: entity.clientFk } }"
                 >
-                    <QTooltip>{{ t('claim.card.customerSummary') }}</QTooltip>
+                    <QTooltip>{{ t('claim.customerSummary') }}</QTooltip>
                 </QBtn>
             </QCardActions>
         </template>

src/pages/Order/Card/OrderForm.vue

@@ -1,11 +1,10 @@
 <script setup>
 import { useRoute, useRouter } from 'vue-router';
-import { reactive, ref } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { useState } from 'composables/useState';
 import FormModel from 'components/FormModel.vue';
-import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
@@ -18,29 +17,9 @@ const ORDER_MODEL = 'order';
 
 const router = useRouter();
 const isNew = Boolean(!route.params.id);
-const initialFormState = reactive({
-    clientFk: null,
-    addressFk: null,
-    agencyModeFk: null,
-    landed: null,
-});
 const clientList = ref([]);
 const agencyList = ref([]);
 const addressList = ref([]);
-const clientId = ref(null);
-
-const onClientsFetched = (data) => {
-    clientList.value = data;
-    initialFormState.clientFk = Number(route.query?.clientFk) || null;
-    clientId.value = initialFormState.clientFk;
-
-    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) => {
     try {
@@ -128,28 +107,19 @@ const onClientChange = async (clientId) => {
     }
 };
 
-async function onDataSaved(data) {
+async function onDataSaved({ id }) {
-    await router.push({ path: `/order/${data}/catalog` });
+    await router.push({ path: `/order/${id}/catalog` });
 }
 </script>
 
 <template>
-    <FetchData
-        url="Clients"
-        @on-fetch="(data) => onClientsFetched(data)"
-        :filter="{ fields: ['id', 'name', 'defaultAddressFk'] }"
-        auto-load
-    />
     <VnSubToolbar v-if="isNew" />
     <div class="q-pa-md">
         <FormModel
-            :url="!isNew ? `Orders/${route.params.id}` : null"
+            :url="`Orders/${route.params.id}`"
-            url-create="Orders/new"
             @on-data-saved="onDataSaved"
             :model="ORDER_MODEL"
-            :form-initial-data="isNew ? initialFormState : null"
+            :mapper="orderMapper"
-            :observe-form-changes="!isNew"
-            :mapper="isNew ? orderMapper : null"
             :filter="orderFilter"
             @on-fetch="fetchOrderDetails"
             auto-load
@@ -157,11 +127,15 @@ async function onDataSaved(data) {
             <template #form="{ data }">
                 <VnRow class="row q-gutter-md q-mb-md">
                     <VnSelect
+                        url="Clients"
                         :label="t('order.form.clientFk')"
                         v-model="data.clientFk"
                         :options="clientList"
                         option-value="id"
                         option-label="name"
+                        :filter="{
+                            fields: ['id', 'name', 'defaultAddressFk'],
+                        }"
                         hide-selected
                         @update:model-value="onClientChange"
                     >
@@ -183,7 +157,6 @@ async function onDataSaved(data) {
                         option-label="street"
                         hide-selected
                         :disable="!addressList?.length"
-                        @update:model-value="onAddressChange"
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">

src/pages/Order/Card/OrderSummary.vue

@@ -196,7 +196,7 @@ const detailsColumns = ref([
                                     {{ props.row.quantity }}
                                 </QTd>
                                 <QTd key="price" :props="props">
-                                    {{ props.row.price }}
+                                    {{ toCurrency(props.row.price) }}
                                 </QTd>
                                 <QTd key="amount" :props="props">
                                     {{

src/pages/Order/OrderLines.vue

@@ -1,33 +1,168 @@
 <script setup>
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 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 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 axios from 'axios';
-import ItemDescriptorProxy from '../Item/Card/ItemDescriptorProxy.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import FetchData from 'src/components/FetchData.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import FetchedTags from 'src/components/ui/FetchedTags.vue';
+import { useStateStore } from 'stores/useStateStore';
 
+const stateStore = useStateStore();
 const route = useRoute();
 const { t } = useI18n();
 const quasar = useQuasar();
+const componentKey = ref(0);
+const tableLinesRef = ref();
+const order = ref();
 const orderSummary = ref({
     total: null,
     vat: null,
 });
-const componentKey = ref(0);
-const order = ref(0);
 
-const refresh = () => {
+const lineFilter = ref({
-    componentKey.value += 1;
+    include: [
-};
+        {
+            relation: 'item',
+            scope: {
+                fields: [
+                    'id',
+                    'name',
+                    'subName',
+                    'image',
+                    'tag4',
+                    'value4',
+                    'tag5',
+                    'value5',
+                    'tag6',
+                    'value6',
+                    'tag7',
+                    'value7',
+                    'tag8',
+                    'value8',
+                    'tag9',
+                    'value9',
+                    'tag10',
+                    'value10',
+                ],
+            },
+        },
+        {
+            relation: 'warehouse',
+            scope: {
+                fields: ['id', 'name'],
+            },
+        },
+    ],
+    where: { orderFk: route.params.id },
+});
+
+const columns = computed(() => [
+    {
+        align: 'center',
+        label: t('lines.image'),
+        name: 'image',
+        columnField: {
+            component: VnImg,
+            attrs: (id) => {
+                return {
+                    id,
+                    width: '50px',
+                };
+            },
+        },
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        name: 'id',
+        label: t('lines.item'),
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+        format: (row) => row?.item?.id,
+    },
+    {
+        align: 'left',
+        name: 'itemFk',
+        label: t('globals.description'),
+        isTitle: true,
+        cardVisible: true,
+        component: 'select',
+        attrs: {
+            url: 'Items',
+            fields: ['id', 'name', 'subName'],
+        },
+        columnField: {
+            component: null,
+        },
+        format: (row) => row?.item?.name,
+    },
+    {
+        align: 'left',
+        name: 'warehouseFk',
+        label: t('lines.warehouse'),
+        cardVisible: true,
+        component: 'select',
+        attrs: {
+            url: 'Warehouses',
+            fields: ['id', 'name'],
+        },
+        columnField: {
+            component: null,
+        },
+        format: (row) => row?.warehouse?.name,
+    },
+    {
+        align: 'left',
+        name: 'shipped',
+        label: t('lines.shipped'),
+        cardVisible: true,
+        component: 'date',
+        columnField: {
+            component: null,
+        },
+        format: (row) => toDate(row.shipped),
+    },
+    {
+        align: 'left',
+        name: 'quantity',
+        label: t('lines.quantity'),
+    },
+    {
+        align: 'left',
+        name: 'price',
+        label: t('lines.price'),
+        cardVisible: true,
+        format: (row) => toCurrency(row.price),
+    },
+    {
+        align: 'left',
+        name: 'amount',
+        label: t('lines.amount'),
+        format: (row) => toCurrency(row.amount),
+    },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                action: (row) => confirmRemove(row),
+                isPrimary: true,
+            },
+        ],
+    },
+]);
 
 function confirmRemove(item) {
     quasar.dialog({
@@ -41,6 +176,8 @@ function confirmRemove(item) {
 }
 
 async function remove(item) {
+    console.log('item: ', item);
+    console.log('id: ', route.params.id);
     await axios.post('OrderRows/removes', {
         actualOrderId: route.params.id,
         rows: [item.id],
@@ -49,7 +186,7 @@ async function remove(item) {
         message: t('globals.dataDeleted'),
         type: 'positive',
     });
-    refresh();
+    tableLinesRef.value.reload();
 }
 
 async function confirmOrder() {
@@ -59,56 +196,6 @@ 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>
@@ -130,122 +217,62 @@ const detailsColumns = ref([
         @on-fetch="(data) => (orderSummary.vat = data)"
         auto-load
     />
-    <QPage :key="componentKey" class="column items-center q-pa-md">
+    <QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
+        <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>
+    <QPage :key="componentKey" class="column items-center">
         <div class="order-list full-width">
             <div v-if="!orderSummary.total" class="no-result">
                 {{ t('globals.noResults') }}
             </div>
-
+            <VnTable
-            <QDrawer side="right" :width="270" show-if-above>
+                ref="tableLinesRef"
-                <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"
-                :limit="20"
+                :columns="columns"
+                default-mode="table"
+                :right-search="false"
+                :use-model="true"
                 auto-load
-                :filter="{
+                :user-filter="lineFilter"
-                    include: [
-                        {
-                            relation: 'item',
-                        },
-                        {
-                            relation: 'warehouse',
-                        },
-                    ],
-                    where: { orderFk: route.params.id },
-                }"
             >
-                <template #body="{ rows }">
+                <template #column-image="{ row }">
-                    <div class="q-pa-md">
+                    <div class="image-wrapper">
-                        <QTable
+                        <VnImg :id="parseInt(row?.item?.image)" class="rounded" />
-                            :columns="detailsColumns"
-                            :rows="rows"
-                            flat
-                            class="full-width"
-                            style="text-align: center"
-                        >
-                            <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"
-                                    >
-                                        {{ t(col.label) }}
-                                    </QTh>
-                                </QTr>
-                            </template>
-                            <template #body-cell-img="{ value }">
-                                <QTd>
-                                    <div class="image-wrapper">
-                                        <VnImg :id="value" class="rounded" />
-                                    </div>
-                                </QTd>
-                            </template>
-                            <template #body-cell-item="{ value }">
-                                <QTd class="item">
-                                    <span class="link">
-                                        <QBtn flat>
-                                            {{ value }}
-                                        </QBtn>
-                                        <ItemDescriptorProxy :id="value" />
-                                    </span>
-                                </QTd>
-                            </template>
-                            <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>
-
-                            <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>
+
+                <template #column-itemFk="{ row }">
+                    <div class="row column full-width justify-between items-start">
+                        {{ row?.item?.name }}
+                        <div v-if="row?.item?.subName" class="subName">
+                            {{ row?.item?.subName.toUpperCase() }}
+                        </div>
+                    </div>
+                    <FetchedTags :item="row?.item" :max-length="6" />
+                </template>
+            </VnTable>
         </div>
-        <QPageSticky :offset="[20, 20]" v-if="!order?.isConfirmed">
+        <QPageSticky :offset="[20, 20]" v-if="!order?.isConfirmed" style="z-index: 2">
             <QBtn fab icon="check" color="primary" @click="confirmOrder()" />
             <QTooltip>
                 {{ t('confirm') }}
@@ -253,7 +280,8 @@ const detailsColumns = ref([
         </QPageSticky>
     </QPage>
 </template>
-<style lang="scss">
+
+<style lang="scss" scoped>
 .order-lines-summary {
     .vn-label-value {
         display: flex;
@@ -274,8 +302,13 @@ const detailsColumns = ref([
         }
     }
 }
-</style>
+
-<style lang="scss" scoped>
+.image-wrapper {
+    height: 50px;
+    width: 50px;
+    margin-left: 30%;
+}
+
 .header {
     color: $primary;
     font-weight: bold;
@@ -284,12 +317,6 @@ const detailsColumns = ref([
     display: inline-block;
 }
 
-.image-wrapper {
-    height: 50px;
-    width: 50px;
-    margin-left: 30%;
-}
-
 .no-result {
     font-size: 24px;
     font-weight: bold;
@@ -302,6 +329,7 @@ const detailsColumns = ref([
     color: var(--vn-label-color);
 }
 </style>
+
 <i18n>
 en:
     summary: Summary

src/pages/Order/OrderList.vue

@@ -1,30 +1,135 @@
 <script setup>
+import axios from 'axios';
 import { useI18n } from 'vue-i18n';
-import { onMounted, onUnmounted } from 'vue';
+import { computed, ref } from 'vue';
-import { useRouter } from 'vue-router';
+import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
-import { useStateStore } from 'stores/useStateStore';
-import { toCurrency, toDate } from 'src/filters';
-import CardList from 'components/ui/CardList.vue';
-import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
-import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
-import VnPaginate from 'components/ui/VnPaginate.vue';
-import VnLv from 'components/ui/VnLv.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import OrderFilter from 'pages/Order/Card/OrderFilter.vue';
 import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
-const stateStore = useStateStore();
-const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
+const tableRef = ref();
+const clientList = ref([]);
+const agencyList = ref([]);
+const selectedAddress = ref();
 
-onMounted(() => (stateStore.rightDrawer = true));
+const columns = computed(() => [
-onUnmounted(() => (stateStore.rightDrawer = false));
+    {
+        align: 'left',
+        name: 'id',
+        label: t('module.id'),
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+    },
+    {
+        align: 'left',
+        name: 'clientName',
+        label: t('module.customer'),
+        isTitle: true,
+        cardVisible: true,
+        component: 'select',
+        attrs: {
+            url: 'Clients',
+            fields: ['id', 'name'],
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'name',
+        label: t('module.salesPerson'),
+        component: 'select',
+        attrs: {
+            url: 'Workers/activeWithInheritedRole',
+            fields: ['id', 'name'],
+            where: { role: 'salesPerson' },
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'isConfirmed',
+        label: t('module.isConfirmed'),
+    },
+    {
+        align: 'left',
+        name: 'created',
+        label: t('module.created'),
+        component: 'date',
+        cardVisible: true,
+        format: (row) => toDate(row?.landed),
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'landed',
+        label: t('module.landed'),
+        component: 'date',
+        format: (row) => toDate(row?.landed),
+        columnField: {
+            component: null,
+        },
+        style: 'color="positive"',
+    },
+    {
+        align: 'left',
+        name: 'hour',
+        label: t('module.hour'),
+        format: ({ hourTheoretical, hourEffective }) =>
+            dashIfEmpty(hourTheoretical || hourEffective),
+    },
+    {
+        align: 'left',
+        name: 'agencyName',
+        label: t('module.agency'),
+        component: 'select',
+        cardVisible: true,
+        attrs: {
+            url: 'Agencies',
+            fields: ['id', 'name'],
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'total',
+        label: t('module.total'),
+        format: ({ total }) => toCurrency(total),
+        cardVisible: true,
+    },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('InvoiceOutSummary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, OrderSummary),
+            },
+        ],
+    },
+]);
 
-function navigate(id) {
+async function fetchClientAddress(id, data) {
-    router.push({ path: `/order/${id}` });
+    console.log('data: ', data);
+    const clientData = await axios.get(`Clients/${id}`);
+    selectedAddress.value = clientData.data.defaultAddressFk;
+    data.addressId = selectedAddress.value;
 }
 </script>
 <template>
@@ -33,100 +138,53 @@ function navigate(id) {
         :label="t('Search order')"
         :info="t('You can search orders by reference')"
     />
-    <RightMenu>
+    <VnTable
-        <template #right-panel>
+        ref="tableRef"
-            <OrderFilter data-key="OrderList" />
+        data-key="OrderList"
+        url="Orders/filter"
+        :create="{
+            urlCreate: 'Orders/new',
+            title: 'Create Order',
+            onDataSaved: (url) => {
+                tableRef.redirect(url);
+            },
+            formInitialData: {
+                active: true,
+                addressId: null,
+            },
+        }"
+        :columns="columns"
+        default-mode="table"
+        redirect="order"
+        auto-load
+    >
+        <template #more-create-dialog="{ data }">
+            <VnSelect
+                url="Clients"
+                v-model="data.id"
+                :label="t('module.customer')"
+                :options="clientList"
+                option-value="id"
+                option-label="name"
+                @update:model-value="(id) => fetchClientAddress(id, data)"
+            />
+            <VnSelect
+                url="Clients"
+                v-model="selectedAddress"
+                :label="t('module.address')"
+                :options="selectedAddress"
+                option-value="defaultAddressFk"
+                option-label="street"
+            />
+            <VnInputDate v-model="data.landed" :label="t('module.landed')" />
+            <VnSelect
+                url="Agencies"
+                v-model="data.agencyModeId"
+                :label="t('module.agency')"
+                :options="agencyList"
+                option-value="id"
+                option-label="name"
+            />
         </template>
-    </RightMenu>
+    </VnTable>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                data-key="OrderList"
-                url="Orders/filter"
-                :limit="20"
-                :order="['landed DESC', 'clientFk', 'id DESC']"
-                :user-params="{ showEmpty: false }"
-                :keep-opts="['userParams']"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :key="row.id"
-                        :id="row.id"
-                        :title="`${row?.clientName} (${row?.clientFk})`"
-                        @click="navigate(row.id)"
-                    >
-                        <template #list-items>
-                            <VnLv
-                                :label="t('order.field.salesPersonFk')"
-                                :title-label="t('order.field.salesPersonFk')"
-                            >
-                                <template #value>
-                                    <span class="link" @click.stop>
-                                        {{ row?.name || '-' }}
-                                        <WorkerDescriptorProxy :id="row?.salesPersonFk" />
-                                    </span>
-                                </template>
-                            </VnLv>
-                            <VnLv
-                                :label="t('order.field.clientFk')"
-                                :title-label="t('order.field.clientFk')"
-                            >
-                                <template #value>
-                                    <span class="link" @click.stop>
-                                        {{ row?.clientName || '-' }}
-                                        <CustomerDescriptorProxy :id="row?.clientFk" />
-                                    </span>
-                                </template>
-                            </VnLv>
-                            <VnLv
-                                :label="t('order.field.isConfirmed')"
-                                :value="row?.isConfirmed === 1"
-                            />
-                            <VnLv
-                                :label="t('order.field.created')"
-                                :value="toDate(row?.created)"
-                            />
-                            <VnLv :label="t('order.field.landed')">
-                                <template #value>
-                                    <QBadge text-color="black" color="positive" dense>
-                                        {{ toDate(row?.landed) }}
-                                    </QBadge>
-                                </template>
-                            </VnLv>
-                            <VnLv
-                                :label="t('order.field.hour')"
-                                :value="row.hourTheoretical || row.hourEffective"
-                            />
-                            <VnLv
-                                :label="t('order.field.agency')"
-                                :value="row?.agencyName"
-                            />
-                            <VnLv
-                                :label="t('order.field.total')"
-                                :value="toCurrency(row?.total)"
-                            />
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, OrderSummary)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-        <QPageSticky :offset="[20, 20]">
-            <RouterLink :to="{ name: 'OrderCreate' }">
-                <QBtn fab icon="add" color="primary" />
-                <QTooltip>
-                    {{ t('order.list.newOrder') }}
-                </QTooltip>
-            </RouterLink>
-        </QPageSticky>
-    </QPage>
 </template>

src/pages/Order/locale/en.yml

@@ -0,0 +1,22 @@
+module:
+    id: ID
+    name: Name
+    customer: Client
+    isConfirmed: Confirmed
+    created: Created
+    landed: Landed
+    hour: Hour
+    agency: Agency
+    total: Total
+    salesPerson: Sales Person
+    address: Address
+lines:
+    item: Item
+    warehouse: Warehouse
+    shipped: Shipped
+    quantity: Quantity
+    price: Price
+    amount: Amount
+    image: Image
+params:
+    tagGroups: Tags

src/pages/Order/locale/es.yml

@@ -0,0 +1,22 @@
+module:
+    id: ID
+    name: Nombre
+    customer: Cliente
+    isConfirmed: Confirmado
+    created: Creado
+    landed: F. Entrega
+    hour: Hora
+    agency: Agencia
+    total: Total
+    salesPerson: Comercial
+    address: Dirección
+lines:
+    item: Artículo
+    warehouse: Almacén
+    shipped: Envío
+    quantity: Cantidad
+    price: Precio
+    amount: Importe
+    image: Imagen
+params:
+    tagGroups: Tags

src/pages/Ticket/Card/TicketSale.vue

@@ -515,38 +515,32 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </QBtnGroup>
         </template>
     </VnSubToolbar>
-    <RightMenu>
+    <QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
-        <template #right-panel>
+        <div
-            <div
+            class="q-pa-md q-mb-md q-ma-md color-vn-text"
-                class="q-pa-md q-mb-md q-ma-md color-vn-text"
+            style="border: 2px solid black"
-                style="border: 2px solid black"
+        >
+            <QCardSection class="justify-center text-subtitle1" horizontal>
+                <span class="q-mr-xs color-vn-label"
+                    >{{ t('ticketSale.subtotal') }}:
+                </span>
+                <span>{{ toCurrency(store.data?.totalWithoutVat) }}</span>
+            </QCardSection>
+            <QCardSection class="justify-center text-subtitle1" horizontal>
+                <span class="q-mr-xs color-vn-label"> {{ t('ticketSale.tax') }}: </span>
+                <span>{{
+                    toCurrency(store.data?.totalWithVat - store.data?.totalWithoutVat)
+                }}</span>
+            </QCardSection>
+            <QCardSection
+                class="justify-center text-weight-bold text-subtitle1"
+                horizontal
             >
-                <QCardSection class="justify-center text-subtitle1" horizontal>
+                <span class="q-mr-xs color-vn-label"> {{ t('ticketSale.total') }}: </span>
-                    <span class="q-mr-xs color-vn-label"
+                <span>{{ toCurrency(store.data?.totalWithVat) }}</span>
-                        >{{ t('ticketSale.subtotal') }}:
+            </QCardSection>
-                    </span>
+        </div></QDrawer
-                    <span>{{ toCurrency(store.data?.totalWithoutVat) }}</span>
+    >
-                </QCardSection>
-                <QCardSection class="justify-center text-subtitle1" horizontal>
-                    <span class="q-mr-xs color-vn-label">
-                        {{ t('ticketSale.tax') }}:
-                    </span>
-                    <span>{{
-                        toCurrency(store.data?.totalWithVat - store.data?.totalWithoutVat)
-                    }}</span>
-                </QCardSection>
-                <QCardSection
-                    class="justify-center text-weight-bold text-subtitle1"
-                    horizontal
-                >
-                    <span class="q-mr-xs color-vn-label">
-                        {{ t('ticketSale.total') }}:
-                    </span>
-                    <span>{{ toCurrency(store.data?.totalWithVat) }}</span>
-                </QCardSection>
-            </div>
-        </template>
-    </RightMenu>
     <QTable
         :rows="sales"
         :columns="columns"

src/pages/Worker/Card/WorkerDescriptor.vue

@@ -71,7 +71,7 @@ watch(
 const data = ref(useCardDescription());
 const setData = (entity) => {
     if (!entity) return;
-    data.value = useCardDescription(entity.user.nickname, entity.id);
+    data.value = useCardDescription(entity.user?.nickname, entity.id);
 };
 
 const openChangePasswordForm = () => changePasswordFormDialog.value.show();

src/router/modules/order.js

@@ -37,7 +37,7 @@ export default {
                         title: 'orderCreate',
                         icon: 'add',
                     },
-                    component: () => import('src/pages/Order/Card/OrderForm.vue'),
+                    component: () => import('src/pages/Order/OrderList.vue'),
                 },
             ],
         },

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

@@ -8,7 +8,8 @@ describe('InvoiceInCorrective', () => {
     it('should create a correcting invoice', () => {
         cy.viewport(1280, 720);
         cy.login('developer');
-        cy.visit(`/#/invoice-in/1/summary?limit=10`);
+        cy.visit(`/#/invoice-in/1/summary`);
+        cy.waitForElement('.q-page');
 
         cy.openActionsDescriptor();
 

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

@@ -7,6 +7,7 @@ describe('InvoiceInDescriptor', () => {
         cy.viewport(1280, 720);
         cy.login('developer');
         cy.visit('/#/invoice-in/1/summary');
+        cy.waitForElement('.q-page');
 
         cy.openActionsDescriptor();
         cy.get(firstDescritorOpt).click();