Merge branch '8944-FixedPriceChanges' of https://gitea.verdnatura.es/verdnatura/salix-front into 8944-FixedPriceChanges

src/components/CrudModel.vue

@@ -347,8 +347,8 @@ watch(formUrl, async () => {
             <QBtnDropdown
                 v-if="$props.goTo && $props.defaultSave"
                 @click="onSubmitAndGo"
-                :label="tMobile('globals.saveAndContinue')"
-                :title="t('globals.saveAndContinue')"
+                :label="tMobile('globals.saveAndContinue') + ' ' + t('globals.' + $props.goTo.split('/').pop())"
+                :title="t('globals.saveAndContinue') + ' ' + t('globals.' + $props.goTo.split('/').pop())"
                 :disable="!hasChanges"
                 color="primary"
                 icon="save"
@@ -397,4 +397,4 @@ watch(formUrl, async () => {
         :label="t && t('globals.pleaseWait')"
         color="primary"
     />
-</template>
+</template>

src/components/FormModel.vue

@@ -380,8 +380,8 @@ defineExpose({
                 data-cy="saveAndContinueDefaultBtn"
                 v-if="$props.goTo"
                 @click="saveAndGo"
-                :label="tMobile('globals.saveAndContinue')"
-                :title="t('globals.saveAndContinue')"
+                :label="tMobile('globals.saveAndContinue') + ' ' + t('globals.' + $props.goTo.split('/').pop())"
+                :title="t('globals.saveAndContinue') + ' ' + t('globals.' + $props.goTo.split('/').pop())"
                 :disable="!hasChanges"
                 color="primary"
                 icon="save"

src/components/VnTable/VnTable.vue

@@ -34,7 +34,8 @@ import VnTableFilter from './VnTableFilter.vue';
 import { getColAlign } from 'src/composables/getColAlign';
 import RightMenu from '../common/RightMenu.vue';
 import VnScroll from '../common/VnScroll.vue';
-import VnMultiCheck from '../common/VnMultiCheck.vue';
+import VnCheckboxMenu from '../common/VnCheckboxMenu.vue';
+import VnCheckbox from '../common/VnCheckbox.vue';
 
 const arrayData = useArrayData(useAttrs()['data-key']);
 const $props = defineProps({
@@ -332,6 +333,7 @@ function stopEventPropagation(event) {
 
 function reload(params) {
     selected.value = [];
+    selectAll.value = false;
     CrudModelRef.value.reload(params);
 }
 
@@ -644,21 +646,15 @@ const rowCtrlClickFunction = computed(() => {
         };
     return () => {};
 });
-const handleMultiCheck = (value) => {
-    if (value) {
+const handleHeaderSelection = (evt, data) => {
+    if (evt === 'updateSelected' && selectAll.value) {
         selected.value = tableRef.value.rows;
-    } else {
-        selected.value = [];
-    }
-    emit('update:selected', selected.value);
-};
-
-const handleSelectedAll = (data) => {
-    if (data) {
+    } else if (evt === 'selectAll') {
         selected.value = data;
     } else {
         selected.value = [];
     }
+
     emit('update:selected', selected.value);
 };
 </script>
@@ -686,7 +682,13 @@ const handleSelectedAll = (data) => {
         :class="$attrs['class'] ?? 'q-px-md'"
         :limit="$attrs['limit'] ?? 100"
         ref="CrudModelRef"
-        @on-fetch="(...args) => emit('onFetch', ...args)"
+        @on-fetch="
+            (...args) => {
+                selectAll = false;
+                selected = [];
+                emit('onFetch', ...args);
+            }
+        "
         :search-url="searchUrl"
         :disable-infinite-scroll="isTableMode"
         :before-save-fn="removeTextValue"
@@ -724,14 +726,23 @@ const handleSelectedAll = (data) => {
                 :data-cy
             >
                 <template #header-selection>
-                    <VnMultiCheck
-                        :searchUrl="searchUrl"
-                        :expand="$props.multiCheck.expand"
-                        v-model="selectAll"
-                        :url="$attrs['url']"
-                        @update:selected="handleMultiCheck"
-                        @select:all="handleSelectedAll"
-                    ></VnMultiCheck>
+                    <div class="flex items-center no-wrap" style="display: flex">
+                        <VnCheckbox
+                            v-model="selectAll"
+                            @click="handleHeaderSelection('updateSelected', $event)"
+                        />
+
+                        <VnCheckboxMenu
+                            v-if="selectAll && $props.multiCheck.expand"
+                            :searchUrl="searchUrl"
+                            v-model="selectAll"
+                            :url="$attrs['url']"
+                            @update:selected="
+                                handleHeaderSelection('updateSelected', $event)
+                            "
+                            @select:all="handleHeaderSelection('selectAll', $event)"
+                        />
+                    </div>
                 </template>
 
                 <template #top-left v-if="!$props.withoutHeader">

src/components/common/VnCheckboxMenu.vue

@@ -0,0 +1,104 @@
+<script setup>
+import { ref } from 'vue';
+import VnCheckbox from './VnCheckbox.vue';
+import axios from 'axios';
+import { toRaw } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+const route = useRoute();
+const { t } = useI18n();
+const model = defineModel({ type: [Boolean] });
+const props = defineProps({
+    url: {
+        type: String,
+        required: true,
+    },
+    searchUrl: {
+        type: [String, Boolean],
+        default: 'table',
+    },
+});
+const menuRef = ref(null);
+const errorMessage = ref(null);
+const rows = ref(0);
+const onClick = async () => {
+    errorMessage.value = null;
+
+    const { filter } = JSON.parse(route.query[props.searchUrl]);
+    filter.limit = 0;
+    const params = {
+        params: { filter: JSON.stringify(filter) },
+    };
+    try {
+        const { data } = axios.get(props.url, params);
+        rows.value = data;
+    } catch (error) {
+        const response = error.response;
+        if (response.data.error.name === 'UserError') {
+            errorMessage.value = t('tooManyResults');
+        } else {
+            errorMessage.value = response.data.error.message;
+        }
+    }
+};
+defineEmits(['update:selected', 'select:all']);
+</script>
+
+<template>
+    <QIcon
+        style="margin-left: -10px"
+        data-cy="btnMultiCheck"
+        name="expand_more"
+        @click="onClick"
+        class="cursor-pointer"
+        color="primary"
+        size="xs"
+    >
+        <QMenu
+            fit
+            anchor="bottom start"
+            self="top left"
+            ref="menuRef"
+            data-cy="menuMultiCheck"
+        >
+            <QList separator>
+                <QItem
+                    data-cy="selectAll"
+                    v-ripple
+                    clickable
+                    @click="
+                        $refs.menuRef.hide();
+                        $emit('select:all', toRaw(rows));
+                    "
+                >
+                    <QItemSection>
+                        <QItemLabel>
+                            <span v-text="t('Select all')" />
+                        </QItemLabel>
+                        <QItemLabel overline caption>
+                            <span
+                                v-if="errorMessage"
+                                class="text-negative"
+                                v-text="errorMessage"
+                            />
+                            <span
+                                v-else
+                                v-text="t('records', { rows: rows.length ?? 0 })"
+                            />
+                        </QItemLabel>
+                    </QItemSection>
+                </QItem>
+                <slot name="more-options"></slot>
+            </QList>
+        </QMenu>
+    </QIcon>
+</template>
+<i18n lang="yml">
+en:
+    tooManyResults: Too many results. Please narrow down your search.
+    records: '{rows} records'
+es:
+    Select all: Seleccionar todo
+    tooManyResults: Demasiados registros. Restringe la búsqueda.
+    records: '{rows} registros'
+</i18n>

src/components/common/VnMultiCheck.vue

@@ -1,80 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import VnCheckbox from './VnCheckbox.vue';
-import axios from 'axios';
-import { toRaw } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-const route = useRoute();
-const { t } = useI18n();
-const model = defineModel({ type: [Boolean] });
-const props = defineProps({
-    expand: {
-        type: Boolean,
-        default: false,
-    },
-    url: {
-        type: String,
-        default: null,
-        required: true,
-    },
-    searchUrl: {
-        type: [String, Boolean],
-        default: 'table',
-    },
-});
-const value = ref(false);
-const rows = ref(0);
-const onClick = () => {
-    if (value.value) {
-        const { filter } = JSON.parse(route.query[props.searchUrl]);
-        filter.limit = 0;
-        const params = {
-            params: { filter: JSON.stringify(filter) },
-        };
-        axios
-            .get(props.url, params)
-            .then(({ data }) => {
-                rows.value = data;
-            })
-            .catch(console.error);
-    }
-};
-defineEmits(['update:selected', 'select:all']);
-</script>
-
-<template>
-    <div style="display: flex">
-        <VnCheckbox v-model="value" @click="$emit('update:selected', value)" />
-        <QBtn
-            v-if="value && $props.expand"
-            flat
-            dense
-            icon="expand_more"
-            @click="onClick"
-        >
-            <QMenu anchor="bottom right" self="top right">
-                <QList>
-                    <QItem v-ripple clickable @click="$emit('select:all', toRaw(rows))">
-                        {{ t('Select all', { rows: rows.length }) }}
-                    </QItem>
-                    <slot name="more-options"></slot>
-                </QList>
-            </QMenu>
-        </QBtn>
-    </div>
-</template>
-<i18n lang="yml">
-en:
-    Select all: 'Select all ({rows})'
-fr:
-    Select all: 'Sélectionner tout ({rows})'
-es:
-    Select all: 'Seleccionar todo ({rows})'
-de:
-    Select all: 'Alle auswählen ({rows})'
-it:
-    Select all: 'Seleziona tutto ({rows})'
-pt:
-    Select all: 'Selecionar tudo ({rows})'
-</i18n>

src/components/common/VnSelect.vue

@@ -161,7 +161,7 @@ const arrayData = useArrayData(arrayDataKey, {
     searchUrl: false,
     mapKey: $attrs['map-key'],
 });
-
+const isMenuOpened = ref(false);
 const computedSortBy = computed(() => {
     return $props.sortBy || $props.optionLabel + ' ASC';
 });
@@ -186,7 +186,9 @@ onMounted(() => {
     if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
 });
 
-const someIsLoading = computed(() => isLoading.value || !!arrayData?.isLoading?.value);
+const someIsLoading = computed(
+    () => (isLoading.value || !!arrayData?.isLoading?.value) && !isMenuOpened.value,
+);
 function findKeyInOptions() {
     if (!$props.options) return;
     return filter($props.modelValue, $props.options)?.length;
@@ -369,6 +371,8 @@ function getCaption(opt) {
         :input-debounce="useURL ? '300' : '0'"
         :loading="someIsLoading"
         @virtual-scroll="onScroll"
+        @popup-hide="isMenuOpened = false"
+        @popup-show="isMenuOpened = true"
         @keydown="handleKeyDown"
         :data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
         :data-url="url"

src/components/ui/CatalogItem.vue

@@ -132,8 +132,7 @@ const card = toRef(props, 'item');
     display: flex;
     flex-direction: column;
     gap: 4px;
-    white-space: nowrap;
-    width: 192px;
+
     p {
         margin-bottom: 0;
     }

src/components/ui/VnNotes.vue

@@ -1,10 +1,11 @@
 <script setup>
 import axios from 'axios';
-import { ref, reactive, useAttrs, computed } from 'vue';
-import { onBeforeRouteLeave } from 'vue-router';
+import { ref, reactive, useAttrs, computed, onMounted, nextTick, } from 'vue';
+import { onBeforeRouteLeave , useRouter, useRoute} from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-
+import { useStateStore } from 'stores/useStateStore';
+import { tMobile } from 'src/composables/tMobile';
 import { toDateHourMin } from 'src/filters';
 
 import VnPaginate from 'components/ui/VnPaginate.vue';
@@ -33,10 +34,15 @@ const $props = defineProps({
     addNote: { type: Boolean, default: false },
     selectType: { type: Boolean, default: false },
     justInput: { type: Boolean, default: false },
+    goTo: { type: String, default: '', },
 });
 
 const { t } = useI18n();
 const quasar = useQuasar();
+const stateStore = useStateStore();
+const router = useRouter();
+const route = useRoute();
+const componentIsRendered = ref(false);
 const newNote = reactive({ text: null, observationTypeFk: null });
 const observationTypes = ref([]);
 const vnPaginateRef = ref();
@@ -45,6 +51,7 @@ const defaultObservationType = computed(() =>
     observationTypes.value.find(ot => ot.code === 'salesPerson')?.id
 );
 
+let savedNote = false;
 let originalText;
 
 function handleClick(e) {
@@ -68,6 +75,7 @@ async function insert() {
     };
     await axios.post($props.url, newBody);
     await vnPaginateRef.value.fetch();
+    savedNote = true;
 }
 
 function confirmAndUpdate() {
@@ -129,8 +137,29 @@ const handleObservationTypes = (data) => {
     }
 };
 
+
+onMounted(() => {
+  nextTick(() => (componentIsRendered.value = true));
+});
+
+async function saveAndGo() {
+    savedNote = false;
+    await insert();
+    await savedNote;
+    router.push({ path: $props.goTo });
+}
 </script>
 <template>
+    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && componentIsRendered && $props.goTo && !route.path.includes('summary')">
+      <QBtn
+        :label="tMobile('globals.saveAndContinue') + ' ' + t('globals.' + $props.goTo.split('/').pop())"
+        :title="t('globals.saveAndContinue') + ' ' + t('globals.' + $props.goTo.split('/').pop())"
+        color="primary"
+        icon="save"
+        @click="saveAndGo"
+        data-cy="saveContinueNoteButton"
+      />
+  </Teleport>
     <FetchData
         v-if="selectType"
         url="ObservationTypes"
@@ -176,7 +205,7 @@ const handleObservationTypes = (data) => {
                     :required="'required' in originalAttrs"
                     clearable
                 >
-                    <template #append>
+                    <template #append v-if="!$props.goTo">
                         <QBtn
                             :title="t('Save (Enter)')"
                             icon="save"

src/components/ui/VnPaginate.vue

@@ -146,14 +146,14 @@ const addFilter = async (filter, params) => {
 };
 
 async function fetch(params) {
-    useArrayData(props.dataKey, params);
+    arrayData.setOptions(params);
     arrayData.resetPagination();
     await arrayData.fetch({ append: false });
     return emitStoreData();
 }
 
 async function update(params) {
-    useArrayData(props.dataKey, params);
+    arrayData.setOptions(params);
     const { limit, skip } = store;
     store.limit = limit + skip;
     store.skip = 0;

src/composables/useArrayData.js

@@ -19,7 +19,7 @@ export function useArrayData(key, userOptions) {
     let canceller = null;
 
     onMounted(() => {
-        setOptions();
+        setOptions(userOptions ?? {});
         reset(['skip']);
 
         const query = route.query;
@@ -39,9 +39,10 @@ export function useArrayData(key, userOptions) {
         setCurrentFilter();
     });
 
-    if (key && userOptions) setOptions();
+    if (userOptions) setOptions(userOptions);
 
-    function setOptions() {
+    function setOptions(params) {
+        if (!params) return;
         const allowedOptions = [
             'url',
             'filter',
@@ -57,14 +58,14 @@ export function useArrayData(key, userOptions) {
             'mapKey',
             'oneRecord',
         ];
-        if (typeof userOptions === 'object') {
-            for (const option in userOptions) {
-                const isEmpty = userOptions[option] == null || userOptions[option] === '';
+        if (typeof params === 'object') {
+            for (const option in params) {
+                const isEmpty = params[option] == null || params[option] === '';
                 if (isEmpty || !allowedOptions.includes(option)) continue;
 
                 if (Object.hasOwn(store, option)) {
-                    const defaultOpts = userOptions[option];
-                    store[option] = userOptions.keepOpts?.includes(option)
+                    const defaultOpts = params[option];
+                    store[option] = params.keepOpts?.includes(option)
                         ? Object.assign(defaultOpts, store[option])
                         : defaultOpts;
                     if (option === 'userParams') store.defaultParams = store[option];
@@ -367,5 +368,6 @@ export function useArrayData(key, userOptions) {
         deleteOption,
         reset,
         resetPagination,
+        setOptions,
     };
 }

src/filters/index.js

@@ -6,6 +6,7 @@ import toDateHourMinSec from './toDateHourMinSec';
 import toRelativeDate from './toRelativeDate';
 import toCurrency from './toCurrency';
 import toPercentage from './toPercentage';
+import toNumber from './toNumber';
 import toLowerCamel from './toLowerCamel';
 import dashIfEmpty from './dashIfEmpty';
 import dateRange from './dateRange';
@@ -34,6 +35,7 @@ export {
     toRelativeDate,
     toCurrency,
     toPercentage,
+    toNumber,
     dashIfEmpty,
     dateRange,
     getParamWhere,

src/filters/toNumber.js

@@ -0,0 +1,8 @@
+export default function (value, fractionSize = 2) {
+    if (isNaN(value)) return value;
+    return new Intl.NumberFormat('es-ES', {
+        style: 'decimal',
+        minimumFractionDigits: 0,
+        maximumFractionDigits: fractionSize,
+    }).format(value);
+}

src/i18n/locale/en.yml

@@ -24,13 +24,14 @@ globals:
     dataDeleted: Data deleted
     delete: Delete
     search: Search
+    lines: Lines
     changes: Changes
     dataCreated: Data created
     add: Add
     create: Create
     edit: Edit
     save: Save
-    saveAndContinue: Save and continue
+    saveAndContinue: Save and go to
     remove: Remove
     reset: Reset
     close: Close
@@ -107,6 +108,8 @@ globals:
     from: From
     to: To
     notes: Notes
+    photos: Photos
+    due-day: Due day
     refresh: Refresh
     item: Item
     ticket: Ticket
@@ -122,6 +125,7 @@ globals:
     producer: Producer
     origin: Origin
     state: State
+    total: Total
     subtotal: Subtotal
     visible: Visible
     price: Price
@@ -347,6 +351,7 @@ globals:
         vehicleList: Vehicles
         vehicle: Vehicle
         entryPreAccount: Pre-account
+        management: Worker management
     unsavedPopup:
         title: Unsaved changes will be lost
         subtitle: Are you sure exit without saving?
@@ -395,6 +400,7 @@ errors:
     updateUserConfig: Error updating user config
     tokenConfig: Error fetching token config
     writeRequest: The requested operation could not be completed
+    claimBeginningQuantity: Cannot import a line with a claimed quantity of 0
 login:
     title: Login
     username: Username

src/i18n/locale/es.yml

@@ -25,12 +25,13 @@ globals:
     openDetail: Ver detalle
     delete: Eliminar
     search: Buscar
+    lines: Lineas
     changes: Cambios
     add: Añadir
     create: Crear
     edit: Modificar
     save: Guardar
-    saveAndContinue: Guardar y continuar
+    saveAndContinue: Guardar e ir a
     remove: Eliminar
     reset: Restaurar
     close: Cerrar
@@ -111,6 +112,8 @@ globals:
     from: Desde
     to: Hasta
     notes: Notas
+    photos: Fotos
+    due-day: Vencimiento
     refresh: Actualizar
     item: Artículo
     ticket: Ticket
@@ -126,6 +129,7 @@ globals:
     producer: Productor
     origin: Origen
     state: Estado
+    total: Total
     subtotal: Subtotal
     visible: Visible
     price: Precio
@@ -350,6 +354,7 @@ globals:
         vehicleList: Vehículos
         vehicle: Vehículo
         entryPreAccount: Precontabilizar
+        management: Gestión de trabajadores
     unsavedPopup:
         title: Los cambios que no haya guardado se perderán
         subtitle: ¿Seguro que quiere salir sin guardar?
@@ -391,6 +396,7 @@ errors:
     updateUserConfig: Error al actualizar la configuración de usuario
     tokenConfig: Error al obtener configuración de token
     writeRequest: No se pudo completar la operación solicitada
+    claimBeginningQuantity: No se puede importar una linea sin una cantidad reclamada
 login:
     title: Inicio de sesión
     username: Nombre de usuario

src/pages/Claim/Card/ClaimAction.vue

@@ -13,8 +13,10 @@ import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import { useArrayData } from 'composables/useArrayData';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import useNotify from 'src/composables/useNotify.js';
 
 const { t } = useI18n();
+const { notify } = useNotify();
 const quasar = useQuasar();
 const route = useRoute();
 const claim = ref(null);
@@ -176,12 +178,17 @@ async function save(data) {
 }
 
 async function importToNewRefundTicket() {
-    await post(`ClaimBeginnings/${claimId}/importToNewRefundTicket`);
-    await claimActionsForm.value.reload();
-    quasar.notify({
-        message: t('globals.dataSaved'),
-        type: 'positive',
-    });
+    try{
+        await post(`ClaimBeginnings/${claimId}/importToNewRefundTicket`);
+        await claimActionsForm.value.reload();
+        quasar.notify({
+            message: t('globals.dataSaved'),
+            type: 'positive',
+        });
+    } catch (error) {
+        const errorMessage = error.response?.data?.error?.message;
+        notify( t(errorMessage), 'negative' );
+    }
 }
 
 async function post(query, params) {

src/pages/Claim/Card/ClaimBasicData.vue

@@ -33,6 +33,7 @@ function onBeforeSave(formData, originalData) {
     <FetchData url="ClaimStates" @on-fetch="setClaimStates" auto-load />
     <FormModel
         model="Claim"
+        :go-to="`/claim/${route.params.id}/notes`"
         :url-update="`Claims/updateClaim/${route.params.id}`"
         :mapper="onBeforeSave"
         auto-load

src/pages/Claim/Card/ClaimLines.vue

@@ -78,6 +78,8 @@ const columns = computed(() => [
         label: t('Quantity'),
         field: ({ sale }) => sale.quantity,
         sortable: true,
+        style: 'padding-right: 2%;',
+        headerStyle: 'padding-right: 2%;'
     },
     {
         name: 'claimed',
@@ -110,6 +112,8 @@ const columns = computed(() => [
         field: ({ sale }) => totalRow(sale),
         format: (value) => toCurrency(value),
         sortable: true,
+        style: 'padding-right: 2%;',
+        headerStyle: 'padding-right: 2%;'
     },
 ]);
 
@@ -152,12 +156,33 @@ function showImportDialog() {
         .onOk(() => claimLinesForm.value.reload());
 }
 
-async function saveWhenHasChanges() {
-    if (claimLinesForm.value.getChanges().updates) {
-        await claimLinesForm.value.onSubmit();
-        onFetch(claimLinesForm.value.formData);
+function fillClaimedQuantities() {
+    const formData = claimLinesForm.value.formData;
+    let hasChanges = false;
+
+    const selectedRows = formData.filter(row => selected.value.includes(row));
+
+    for (const row of selectedRows) {
+        if (row.quantity === 0 || row.quantity === null) {
+            row.quantity = row.sale.quantity;
+            hasChanges = true;
+        }
+    }
+
+    if (hasChanges) {
+    quasar.notify({
+        message: t('Quantities filled automatically'),
+        type: 'positive',
+    });
+    } else {
+        quasar.notify({
+            message: t('No quantities to fill'),
+            type: 'info',
+        });
     }
 }
+
+
 </script>
 <template>
     <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
@@ -185,15 +210,16 @@ async function saveWhenHasChanges() {
         auto-load
     />
     <div class="q-pa-md">
+        
         <CrudModel
-            data-key="ClaimLines"
+            data-key="claimLines"
             ref="claimLinesForm"
+            :go-to="`photos`"
             :url="`Claims/${route.params.id}/lines`"
             save-url="ClaimBeginnings/crud"
             :user-filter="linesFilter"
             @on-fetch="onFetch"
             v-model:selected="selected"
-            :default-save="false"
             :default-reset="false"
             auto-load
             :limit="0"
@@ -214,8 +240,7 @@ async function saveWhenHasChanges() {
                                 v-model.number="row.quantity"
                                 type="number"
                                 dense
-                                @keyup.enter="saveWhenHasChanges()"
-                                @blur="saveWhenHasChanges()"
+                               
                             />
                         </QTd>
                     </template>
@@ -272,10 +297,7 @@ async function saveWhenHasChanges() {
                                                         type="number"
                                                         dense
                                                         autofocus
-                                                        @keyup.enter="
-                                                            saveWhenHasChanges()
-                                                        "
-                                                        @blur="saveWhenHasChanges()"
+                                               
                                                     />
                                                 </QItemLabel>
                                             </template>
@@ -313,6 +335,18 @@ async function saveWhenHasChanges() {
                     </template>
                 </QTable>
             </template>
+            <template #moreBeforeActions>
+                <QBtn
+                    color="primary"
+                    text-color="white"
+                    :unelevated="true"
+                    :label="t('Rellenar cantidades')"
+                    :title="t('Rellenar cantidades')"
+                    icon="auto_fix_high"
+                    :disabled="!selected.length"
+                    @click="fillClaimedQuantities"
+                />
+            </template>
         </CrudModel>
     </div>
 
@@ -358,6 +392,8 @@ es:
     Delete claimed sales: Eliminar ventas reclamadas
     Discount updated: Descuento actualizado
     Claimed quantity: Cantidad reclamada
+    Quantities filled automatically: Cantidades rellenadas automáticamente
+    No quantities to fill: No hay cantidades para rellenar
     You are about to remove {count} rows: '
         Vas a eliminar <strong>{count}</strong> línea |
         Vas a eliminar <strong>{count}</strong> líneas'

src/pages/Claim/Card/ClaimNotes.vue

@@ -35,9 +35,11 @@ const body = {
     workerFk: user.value.id,
 };
 </script>
+    
 <template>
     <VnNotes
         url="claimObservations"
+        :go-to="`/claim/${route.params.id}/lines`"
         :add-note="$props.addNote"
         :user-filter="claimFilter"
         :filter="{ where: { claimFk: claimId } }"

src/pages/Claim/Card/ClaimSummary.vue

@@ -54,7 +54,7 @@ const detailsColumns = ref([
     {
         name: 'item',
         label: 'claim.item',
-        field: (row) => row.sale.itemFk,
+        field: (row) => dashIfEmpty(row.sale.itemFk),
         sortable: true,
     },
     {
@@ -67,13 +67,13 @@ const detailsColumns = ref([
     {
         name: 'quantity',
         label: 'claim.quantity',
-        field: (row) => row.sale.quantity,
+        field: (row) => dashIfEmpty(row.sale.quantity),
         sortable: true,
     },
     {
         name: 'claimed',
         label: 'claim.claimed',
-        field: (row) => row.quantity,
+        field: (row) => dashIfEmpty(row.quantity),
         sortable: true,
     },
     {
@@ -84,7 +84,7 @@ const detailsColumns = ref([
     {
         name: 'price',
         label: 'claim.price',
-        field: (row) => row.sale.price,
+        field: (row) => dashIfEmpty(row.sale.price),
         sortable: true,
     },
     {
@@ -337,23 +337,16 @@ function claimUrl(section) {
                             </QTh>
                         </QTr>
                     </template>
-                    <template #body="props">
-                        <QTr :props="props">
-                            <QTd v-for="col in props.cols" :key="col.name" :props="props">
-                                <template v-if="col.name === 'description'">
-                                    <span class="link">{{
-                                        dashIfEmpty(col.field(props.row))
-                                    }}</span>
-                                    <ItemDescriptorProxy
-                                        :id="props.row.sale.itemFk"
-                                        :sale-fk="props.row.saleFk"
-                                    />
-                                </template>
-                                <template v-else>
-                                    {{ dashIfEmpty(col.field(props.row)) }}
-                                </template>
-                            </QTd>
-                        </QTr>
+                    <template #body-cell-description="props">
+                        <QTd :props="props">
+                            <span class="link">
+                                {{ props.value }}
+                            </span>
+                            <ItemDescriptorProxy
+                                :id="props.row.sale.itemFk"
+                                :sale-fk="props.row.saleFk"
+                            />
+                        </QTd>
                     </template>
                 </QTable>
             </QCard>

src/pages/Customer/Card/CustomerCreditContracts.vue

@@ -2,12 +2,13 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-
+import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
 import { useQuasar } from 'quasar';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import ModalCloseContract from 'src/pages/Customer/components/ModalCloseContract.vue';
-import { toDate } from 'src/filters';
+import CustomerCreditContractsCreate from '../components/CustomerCreditContractsCreate.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -16,6 +17,7 @@ const quasar = useQuasar();
 
 const vnPaginateRef = ref(null);
 const showQPageSticky = ref(true);
+const showForm = ref();
 
 const filter = {
     order: 'finished ASC, started DESC',
@@ -36,25 +38,21 @@ const fetch = (data) => {
     data.forEach((element) => {
         if (!element.finished) {
             showQPageSticky.value = false;
-            return;
         }
     });
 };
 
-const toCustomerCreditContractsCreate = () => {
-    router.push({ name: 'CustomerCreditContractsCreate' });
-};
-
 const openDialog = (item) => {
     quasar.dialog({
         component: ModalCloseContract,
         componentProps: {
             id: item.id,
-            promise: updateData,
+            promise: async () => {
+                await updateData();
+                showQPageSticky.value = true;
+            },
         },
     });
-    updateData();
-    showQPageSticky.value = true;
 };
 
 const openViewCredit = (credit) => {
@@ -66,14 +64,14 @@ const openViewCredit = (credit) => {
     });
 };
 
-const updateData = () => {
-    vnPaginateRef.value?.fetch();
+const updateData = async () => {
+    await vnPaginateRef.value?.fetch();
 };
 </script>
 
 <template>
-    <div class="full-width flex justify-center">
-        <QCard class="card-width q-pa-lg">
+    <section class="row justify-center">
+        <QCard class="q-pa-lg" style="width: 70%">
             <VnPaginate
                 :user-filter="filter"
                 @on-fetch="fetch"
@@ -84,100 +82,84 @@ const updateData = () => {
                 url="CreditClassifications"
             >
                 <template #body="{ rows }">
-                    <div v-if="rows.length">
+                    <div v-if="rows.length" class="q-gutter-y-md">
                         <QCard
                             v-for="(item, index) in rows"
                             :key="index"
-                            :class="{
-                                'customer-card': true,
-                                'q-mb-md': index < rows.length - 1,
-                                'is-active': !item.finished,
-                            }"
+                            :class="{ disabled: item.finished }"
                         >
                             <QCardSection
-                                class="full-width flex justify-between q-py-none"
+                                class="full-width"
+                                :class="{ 'row justify-between': $q.screen.gt.md }"
                             >
-                                <div class="width-state flex">
-                                    <div
-                                        class="flex items-center cursor-pointer q-mr-md"
-                                        v-if="!item.finished"
+                                <div class="width-state row no-wrap">
+                                    <QIcon
+                                        :style="{
+                                            visibility: item.finished
+                                                ? 'hidden'
+                                                : 'visible',
+                                        }"
+                                        @click.stop="openDialog(item)"
+                                        color="primary"
+                                        name="lock"
+                                        data-cy="closeBtn"
+                                        size="md"
+                                        class="fill-icon q-px-md"
                                     >
-                                        <QIcon
-                                            @click.stop="openDialog(item)"
-                                            color="primary"
-                                            name="lock"
-                                            size="md"
-                                            class="fill-icon"
-                                        >
-                                            <QTooltip>{{ t('Close contract') }}</QTooltip>
-                                        </QIcon>
-                                    </div>
+                                        <QTooltip>{{ t('Close contract') }}</QTooltip>
+                                    </QIcon>
 
-                                    <div>
-                                        <div class="flex q-mb-xs">
-                                            <div class="q-mr-sm color-vn-label">
-                                                {{ t('Since') }}:
-                                            </div>
-                                            <div class="text-weight-bold">
-                                                {{ toDate(item.started) }}
-                                            </div>
-                                        </div>
-                                        <div class="flex">
-                                            <div class="q-mr-sm color-vn-label">
-                                                {{ t('To') }}:
-                                            </div>
-                                            <div class="text-weight-bold">
-                                                {{ toDate(item.finished) }}
-                                            </div>
-                                        </div>
+                                    <div class="column">
+                                        <VnLv
+                                            :label="t('Since')"
+                                            :value="toDate(item.started)"
+                                        />
+                                        <VnLv
+                                            :label="t('To')"
+                                            :value="toDate(item.finished)"
+                                        />
                                     </div>
                                 </div>
 
                                 <QSeparator vertical />
 
-                                <div class="width-data flex">
+                                <div class="column width-data">
                                     <div
-                                        class="full-width flex justify-between items-center"
+                                        class="column"
                                         v-if="item?.insurances.length"
+                                        v-for="insurance in item.insurances"
+                                        :key="insurance.id"
                                     >
-                                        <div class="flex">
-                                            <div class="color-vn-label q-mr-xs">
-                                                {{ t('Credit') }}:
-                                            </div>
-                                            <div class="text-weight-bold">
-                                                {{ item.insurances[0].credit }}
-                                            </div>
-                                        </div>
-                                        <div class="flex">
-                                            <div class="color-vn-label q-mr-xs">
-                                                {{ t('Grade') }}:
-                                            </div>
-                                            <div class="text-weight-bold">
-                                                {{ item.insurances[0].grade || '-' }}
-                                            </div>
-                                        </div>
-                                        <div class="flex">
-                                            <div class="color-vn-label q-mr-xs">
-                                                {{ t('Date') }}:
-                                            </div>
-                                            <div class="text-weight-bold">
-                                                {{ toDate(item.insurances[0].created) }}
-                                            </div>
-                                        </div>
-                                        <div class="flex items-center cursor-pointer">
-                                            <QIcon
-                                                @click.stop="openViewCredit(item)"
-                                                color="primary"
-                                                name="preview"
-                                                size="md"
-                                            >
-                                                <QTooltip>{{
-                                                    t('View credits')
-                                                }}</QTooltip>
-                                            </QIcon>
+                                        <div
+                                            :class="{
+                                                'row q-gutter-x-md': $q.screen.gt.sm,
+                                            }"
+                                            class="q-mb-sm"
+                                        >
+                                            <VnLv
+                                                :label="t('Credit')"
+                                                :value="toCurrency(insurance.credit)"
+                                            />
+                                            <VnLv
+                                                :label="t('Grade')"
+                                                :value="dashIfEmpty(insurance.grade)"
+                                            />
+                                            <VnLv
+                                                :label="t('Date')"
+                                                :value="toDate(insurance.created)"
+                                            />
                                         </div>
                                     </div>
                                 </div>
+                                <QBtn
+                                    @click.stop="openViewCredit(item)"
+                                    icon="preview"
+                                    size="md"
+                                    :title="t('View credits')"
+                                    data-cy="viewBtn"
+                                    color="primary"
+                                    flat
+                                />
                             </QCardSection>
                         </QCard>
                     </div>
@@ -187,11 +169,12 @@ const updateData = () => {
                 </template>
             </VnPaginate>
         </QCard>
-    </div>
+    </section>
 
     <QPageSticky :offset="[18, 18]" v-if="showQPageSticky">
         <QBtn
-            @click.stop="toCustomerCreditContractsCreate()"
+            data-cy="createBtn"
+            @click.stop="showForm = !showForm"
             color="primary"
             fab
             icon="add"
@@ -201,24 +184,25 @@ const updateData = () => {
             {{ t('New contract') }}
         </QTooltip>
     </QPageSticky>
+
+    <QDialog v-model="showForm">
+        <CustomerCreditContractsCreate @on-data-saved="updateData()" />
+    </QDialog>
 </template>
 
 <style lang="scss" scoped>
-.customer-card {
-    border: 2px solid var(--vn-light-gray);
-    border-radius: 10px;
-    padding: 10px;
-    display: flex;
-    justify-content: space-between;
-}
-.is-active {
-    background-color: var(--vn-light-gray);
-}
 .width-state {
     width: 30%;
 }
 .width-data {
-    width: 65%;
+    width: 50%;
+}
+::v-deep(.label) {
+    margin-right: 5px;
+}
+::v-deep(.label)::after {
+    content: ':';
+    color: var(--vn-label-color);
 }
 </style>
 

src/pages/Customer/Card/CustomerCreditContractsInsurance.vue

@@ -0,0 +1,93 @@
+<script setup>
+import { computed, onBeforeMount, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import { toCurrency, toDate } from 'src/filters';
+
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import axios from 'axios';
+
+const { t } = useI18n();
+const route = useRoute();
+const create = ref(null);
+const tableRef = ref();
+const columns = computed(() => [
+    {
+        align: 'left',
+        field: 'created',
+        format: ({ created }) => toDate(created),
+        label: t('Created'),
+        name: 'created',
+        create: true,
+        columnCreate: {
+            component: 'date',
+        },
+    },
+    {
+        align: 'left',
+        field: 'grade',
+        label: t('Grade'),
+        name: 'grade',
+        create: true,
+    },
+    {
+        align: 'left',
+        format: ({ credit }) => toCurrency(credit),
+        label: t('Credit'),
+        name: 'credit',
+        create: true,
+    },
+]);
+
+onBeforeMount(async () => {
+    const query = `CreditClassifications/findOne?filter=${encodeURIComponent(
+        JSON.stringify({
+            fields: ['finished'],
+            where: { id: route.params.creditId },
+        }),
+    )}`;
+    const { data } = await axios(query);
+    create.value = data.finished
+        ? false
+        : {
+              urlCreate: 'CreditInsurances',
+              title: t('Create Insurance'),
+              onDataSaved: () => tableRef.value.reload(),
+              formInitialData: {
+                  created: Date.vnNew(),
+                  creditClassificationFk: route.params.creditId,
+              },
+          };
+});
+</script>
+
+<template>
+    <VnTable
+        v-if="create != null"
+        url="CreditInsurances"
+        ref="tableRef"
+        data-key="creditInsurances"
+        :filter="{
+            where: {
+                creditClassificationFk: `${route.params.creditId}`,
+            },
+            order: 'created DESC',
+        }"
+        :columns="columns"
+        :right-search="false"
+        :is-editable="false"
+        :use-model="true"
+        :column-search="false"
+        :disable-option="{ card: true }"
+        :create
+        auto-load
+    />
+</template>
+
+<i18n>
+es:
+    Created: Fecha creación
+    Grade: Grade
+    Credit: Crédito
+</i18n>

src/pages/Customer/Notifications/CustomerNotifications.vue

@@ -26,6 +26,7 @@ const columns = computed(() => [
                 url: 'Clients',
                 fields: ['id', 'socialName'],
                 optionLabel: 'socialName',
+                optionValue: 'socialName',
             },
         },
         columnClass: 'expand',
@@ -37,8 +38,11 @@ const columns = computed(() => [
         name: 'city',
         columnFilter: {
             component: 'select',
+            inWhere: true,
             attrs: {
                 url: 'Towns',
+                optionValue: 'name',
+                optionLabel: 'name',
             },
         },
         cardVisible: true,
@@ -89,13 +93,12 @@ const columns = computed(() => [
             <CustomerNotificationsCampaignConsumption
                 :selected-rows="selected.length > 0"
                 :clients="selected"
-                :promise="refreshData"
             />
         </template>
     </VnSubToolbar>
     <VnTable
         :data-key="dataKey"
-        url="Clients/filter"
+        url="Clients/extendedListFilter"
         :table="{
             'row-key': 'id',
             selection: 'multiple',

src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue

@@ -142,13 +142,13 @@ onMounted(async () => {
             valentinesDay: Valentine's Day
             mothersDay: Mother's Day
             allSaints: All Saints' Day
-        Campaign consumption: Campaign consumption ({rows})
+        Campaign consumption: Campaign consumption - {rows} records
     es:
         params:
             valentinesDay: Día de San Valentín
             mothersDay: Día de la Madre
             allSaints: Día de Todos los Santos
-        Campaign consumption: Consumo campaña ({rows})
+        Campaign consumption: Consumo campaña - {rows} registros
         Campaign: Campaña
         From: Desde
         To: Hasta

src/pages/Customer/components/CustomerCreditContractsCreate.vue

@@ -3,44 +3,29 @@ import { reactive, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 
-import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
+import FormModelPopup from 'src/components/FormModelPopup.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const routeId = computed(() => route.params.id);
-const router = useRouter();
 
 const initialData = reactive({
     started: Date.vnNew(),
     clientFk: routeId.value,
 });
-
-const toCustomerCreditContracts = () => {
-    router.push({ name: 'CustomerCreditContracts' });
-};
 </script>
 
 <template>
-    <FormModel
+    <FormModelPopup
+        v-on="$attrs"
         :form-initial-data="initialData"
         :observe-form-changes="false"
         url-create="creditClassifications/createWithInsurance"
-        @on-data-saved="toCustomerCreditContracts()"
     >
-        <template #moreActions>
-            <QBtn
-                :label="t('globals.cancel')"
-                @click="toCustomerCreditContracts"
-                color="primary"
-                flat
-                icon="close"
-            />
-        </template>
-
-        <template #form="{ data }">
+        <template #form-inputs="{ data }">
             <VnRow>
                 <div class="col">
                     <VnInput
@@ -63,7 +48,7 @@ const toCustomerCreditContracts = () => {
                 </div>
             </VnRow>
         </template>
-    </FormModel>
+    </FormModelPopup>
 </template>
 
 <i18n>

src/pages/Customer/components/CustomerCreditContractsInsurance.vue

@@ -1,63 +0,0 @@
-<script setup>
-import { computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-
-import { toCurrency, toDate } from 'src/filters';
-
-import VnTable from 'src/components/VnTable/VnTable.vue';
-
-const { t } = useI18n();
-const route = useRoute();
-
-const filter = {
-    where: {
-        creditClassificationFk: `${route.params.creditId}`,
-    },
-    limit: 20,
-};
-const columns = computed(() => [
-    {
-        align: 'left',
-        field: 'created',
-        format: ({ created }) => toDate(created),
-        label: t('Created'),
-        name: 'created',
-    },
-    {
-        align: 'left',
-        field: 'grade',
-        label: t('Grade'),
-        name: 'grade',
-    },
-    {
-        align: 'left',
-        format: ({ credit }) => toCurrency(credit),
-        label: t('Credit'),
-        name: 'credit',
-    },
-]);
-</script>
-
-<template>
-    <VnTable
-        url="CreditInsurances"
-        ref="tableRef"
-        data-key="creditInsurances"
-        :filter="filter"
-        :columns="columns"
-        :right-search="false"
-        :is-editable="false"
-        :use-model="true"
-        :column-search="false"
-        :disable-option="{ card: true }"
-        auto-load
-    ></VnTable>
-</template>
-
-<i18n>
-es:
-    Created: Fecha creación
-    Grade: Grade
-    Credit: Crédito
-</i18n>

src/pages/Customer/components/CustomerFileManagementActions.vue

@@ -1,9 +1,9 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-
 import { useQuasar } from 'quasar';
 
+import { usePrintService } from 'composables/usePrintService';
 import { downloadFile } from 'src/composables/downloadFile';
 
 import CustomerFileManagementDelete from 'src/pages/Customer/components/CustomerFileManagementDelete.vue';
@@ -12,7 +12,7 @@ const { t } = useI18n();
 const quasar = useQuasar();
 const route = useRoute();
 const router = useRouter();
-
+const { openReport } = usePrintService();
 const $props = defineProps({
     id: {
         type: Number,
@@ -24,7 +24,7 @@ const $props = defineProps({
     },
 });
 
-const setDownloadFile = () => downloadFile($props.id);
+const setDownloadFile = () => openReport(`dms/${$props.id}/downloadFile`, {}, '_blank');
 
 const toCustomerFileManagementEdit = () => {
     router.push({

src/pages/Customer/components/CustomerSummaryTable.vue

@@ -15,7 +15,7 @@ import InvoiceOutDescriptorProxy from 'pages/InvoiceOut/Card/InvoiceOutDescripto
 import RouteDescriptorProxy from 'src/pages/Route/Card/RouteDescriptorProxy.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
-
+import { getItemPackagingType } from '../composables/getItemPackagingType.js';
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
@@ -161,23 +161,6 @@ const setShippedColor = (date) => {
 };
 const rowClick = ({ id }) =>
     window.open(router.resolve({ params: { id }, name: 'TicketSummary' }).href, '_blank');
-
-const getItemPackagingType = (ticketSales) => {
-    if (!ticketSales?.length) return '-';
-
-    const packagingTypes = ticketSales.reduce((types, sale) => {
-        const { itemPackingTypeFk } = sale.item;
-        if (
-            !types.includes(itemPackingTypeFk) &&
-            (itemPackingTypeFk === 'H' || itemPackingTypeFk === 'V')
-        ) {
-            types.push(itemPackingTypeFk);
-        }
-        return types;
-    }, []);
-
-    return dashIfEmpty(packagingTypes.join(', ') || '-');
-};
 </script>
 
 <template>

src/pages/Customer/composables/__tests__/getItemPackagingType.spec.js

@@ -0,0 +1,36 @@
+import { describe, it, expect } from 'vitest';
+import { getItemPackagingType } from '../getItemPackagingType';
+
+describe('getItemPackagingType', () => {
+    it('should return "-" if ticketSales is null or undefined', () => {
+        expect(getItemPackagingType(null)).toBe('-');
+        expect(getItemPackagingType(undefined)).toBe('-');
+    });
+
+    it('should return "-" if ticketSales does not have a length property', () => {
+        const ticketSales = { someKey: 'someValue' }; // No tiene propiedad length
+        expect(getItemPackagingType(ticketSales)).toBe('-');
+    });
+
+    it('should return unique packaging types as a comma-separated string', () => {
+        const ticketSales = [
+            { item: { itemPackingTypeFk: 'H' } },
+            { item: { itemPackingTypeFk: 'V' } },
+            { item: { itemPackingTypeFk: 'H' } },
+        ];
+        expect(getItemPackagingType(ticketSales)).toBe('H, V');
+    });
+    it('should return unique packaging types as a comma-separated string', () => {
+        const ticketSales = [
+            { item: { itemPackingTypeFk: 'H' } },
+            { item: { itemPackingTypeFk: 'V' } },
+            { item: { itemPackingTypeFk: 'H' } },
+            { item: { itemPackingTypeFk: 'A' } },
+        ];
+        expect(getItemPackagingType(ticketSales)).toBe('H, V, A');
+    });
+
+    it('should return "-" if ticketSales is an empty array', () => {
+        expect(getItemPackagingType([])).toBe('-');
+    });
+});

src/pages/Customer/composables/getItemPackagingType.js

@@ -0,0 +1,11 @@
+import { dashIfEmpty } from 'src/filters';
+
+export function getItemPackagingType(ticketSales) {
+    if (!ticketSales?.length) return '-';
+
+    const packagingTypes = Array.from(
+        new Set(ticketSales.map(({ item: { itemPackingTypeFk } }) => itemPackingTypeFk)),
+    );
+
+    return dashIfEmpty(packagingTypes.join(', '));
+}

src/pages/Supplier/Card/SupplierConsumption.vue

@@ -1,22 +1,20 @@
 <script setup>
-import { useRoute } from 'vue-router';
 import { computed, onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
 import { useQuasar } from 'quasar';
-import FetchedTags from 'components/ui/FetchedTags.vue';
-import SendEmailDialog from 'components/common/SendEmailDialog.vue';
-import SupplierConsumptionFilter from './SupplierConsumptionFilter.vue';
-import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-
-import { dateRange, toDate } from 'src/filters';
-import { dashIfEmpty } from 'src/filters';
-import { usePrintService } from 'composables/usePrintService';
-import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
+import { dateRange, toCurrency, toNumber, toDateHourMin } from 'src/filters';
+import { usePrintService } from 'composables/usePrintService';
+import useNotify from 'src/composables/useNotify';
 import { useStateStore } from 'stores/useStateStore';
 import { useState } from 'src/composables/useState';
 import { useArrayData } from 'composables/useArrayData';
+import SendEmailDialog from 'components/common/SendEmailDialog.vue';
+import SupplierConsumptionFilter from './SupplierConsumptionFilter.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 
 const state = useState();
 const stateStore = useStateStore();
@@ -31,7 +29,86 @@ const arrayData = useArrayData('SupplierConsumption', {
     order: ['itemTypeFk', 'itemName', 'itemSize'],
     userFilter: { where: { supplierFk: route.params.id } },
 });
+const headerColumns = computed(() => [
+    {
+        name: 'id',
+        label: t('globals.entry'),
+        align: 'left',
+        field: 'id',
+        sortable: true,
+    },
+    {
+        name: 'invoiceNumber',
+        label: t('globals.params.supplierRef'),
+        align: 'left',
+        field: 'invoiceNumber',
+        sortable: true,
+    },
+    {
+        name: 'shipped',
+        label: t('globals.shipped'),
+        align: 'center',
+        field: 'shipped',
+        format: toDateHourMin,
+        sortable: true,
+    },
+    {
+        name: 'quantity',
+        label: t('item.list.stems'),
+        align: 'center',
+        field: 'quantity',
+        format: (value) => toNumber(value),
+        sortable: true,
+    },
+    {
+        name: 'total',
+        label: t('globals.total'),
+        align: 'center',
+        field: 'total',
+        format: (value) => toCurrency(value),
+        sortable: true,
+    },
+]);
 
+const columns = computed(() => [
+    {
+        name: 'itemName',
+        label: t('globals.item'),
+        align: 'left',
+        field: 'itemName',
+        sortable: true,
+    },
+    {
+        name: 'subName',
+        align: 'left',
+        field: 'subName',
+        sortable: true,
+    },
+    {
+        name: 'quantity',
+        label: t('globals.quantity'),
+        align: 'right',
+        field: 'quantity',
+        format: (value) => toNumber(value),
+        sortable: true,
+    },
+    {
+        name: 'price',
+        label: t('globals.price'),
+        align: 'right',
+        field: 'price',
+        format: (value) => toCurrency(value),
+        sortable: true,
+    },
+    {
+        name: 'total',
+        label: t('globals.total'),
+        align: 'right',
+        field: 'total',
+        format: (value) => toCurrency(value),
+        sortable: true,
+    },
+]);
 const store = arrayData.store;
 
 onUnmounted(() => state.unset('SupplierConsumption'));
@@ -40,13 +117,11 @@ const dateRanges = computed(() => {
     return { from, to };
 });
 
-const reportParams = computed(() => {
-    return {
-        recipientId: Number(route.params.id),
-        to: dateRange(dateRanges.value.to)[1],
-        from: dateRange(dateRanges.value.from)[1],
-    };
-});
+const reportParams = computed(() => ({
+    recipientId: Number(route.params.id),
+    from: dateRange(dateRanges.value.from)[0].toISOString(),
+    to: dateRange(dateRanges.value.to)[1].toISOString(),
+}));
 
 async function getSupplierConsumptionData() {
     await arrayData.fetch({ append: false });
@@ -102,33 +177,34 @@ const sendCampaignMetricsEmail = ({ address }) => {
 };
 
 const totalEntryPrice = (rows) => {
-    let totalPrice = 0;
-    let totalQuantity = 0;
-    if (!rows) return totalPrice;
-    for (const row of rows) {
-        let total = 0;
-        let quantity = 0;
-
-        if (row.buys) {
-            for (const buy of row.buys) {
-                total = total + buy.total;
-                quantity = quantity + buy.quantity;
+    if (!rows) return [];
+    totalRows.value = rows.reduce(
+        (acc, row) => {
+            if (Array.isArray(row.buys)) {
+                const { total, quantity } = row.buys.reduce(
+                    (buyAcc, buy) => {
+                        buyAcc.total += buy.total || 0;
+                        buyAcc.quantity += buy.quantity || 0;
+                        return buyAcc;
+                    },
+                    { total: 0, quantity: 0 },
+                );
+                row.total = total;
+                row.quantity = quantity;
+                acc.totalPrice += total;
+                acc.totalQuantity += quantity;
             }
-        }
-
-        row.total = total;
-        row.quantity = quantity;
-        totalPrice = totalPrice + total;
-        totalQuantity = totalQuantity + quantity;
-    }
-    totalRows.value = { totalPrice, totalQuantity };
+            return acc;
+        },
+        { totalPrice: 0, totalQuantity: 0 },
+    );
     return rows;
 };
-
 onMounted(async () => {
     stateStore.rightDrawer = true;
     await getSupplierConsumptionData();
 });
+const expanded = ref([]);
 </script>
 
 <template>
@@ -162,14 +238,14 @@ onMounted(async () => {
             <div>
                 {{ t('Total entries') }}:
                 <QChip :dense="$q.screen.lt.sm" text-color="white">
-                    {{ totalRows.totalPrice }} €
+                    {{ toCurrency(totalRows.totalPrice) }}
                 </QChip>
             </div>
             <QSeparator dark vertical />
             <div>
                 {{ t('Total stems entries') }}:
                 <QChip :dense="$q.screen.lt.sm" text-color="white">
-                    {{ totalRows.totalQuantity }}
+                    {{ toNumber(totalRows.totalQuantity) }}
                 </QChip>
             </div>
         </div>
@@ -179,59 +255,111 @@ onMounted(async () => {
             <SupplierConsumptionFilter data-key="SupplierConsumption" />
         </template>
     </RightMenu>
-    <QTable
-        :rows="rows"
-        row-key="id"
-        hide-header
-        class="full-width q-mt-md"
-        :no-data-label="t('No results')"
-    >
-        <template #body="{ row }">
-            <QTr>
-                <QTd no-hover>
-                    <span class="label">{{ t('supplier.consumption.entry') }}: </span>
-                    <span>{{ row.id }}</span>
-                </QTd>
-                <QTd no-hover>
-                    <span class="label">{{ t('globals.date') }}: </span>
-                    <span>{{ toDate(row.shipped) }}</span></QTd
+    <QCard class="full-width q-pa-md">
+        <QTable
+            flat
+            bordered
+            :rows="rows"
+            :columns="headerColumns"
+            row-key="id"
+            v-model:expanded="expanded"
+            :grid="$q.screen.lt.md"
+        >
+            <template #header="props">
+                <QTr :props="props">
+                    <QTh auto-width />
+
+                    <QTh v-for="col in props.cols" :key="col.name" :props="props">
+                        <span v-text="col.label" class="tr-header" />
+                    </QTh>
+                </QTr>
+            </template>
+
+            <template #body="props">
+                <QTr
+                    :props="props"
+                    :key="`movement_${props.row.id}`"
+                    class="bg-vn-page cursor-pointer"
+                    @click="props.expand = !props.expand"
                 >
-                <QTd colspan="6" no-hover>
-                    <span class="label">{{ t('globals.reference') }}: </span>
-                    <span>{{ row.invoiceNumber }}</span>
-                </QTd>
-            </QTr>
-            <QTr v-for="(buy, index) in row.buys" :key="index">
-                <QTd no-hover>
-                    <QBtn flat class="link" dense no-caps>{{ buy.itemName }}</QBtn>
-                    <ItemDescriptorProxy :id="buy.itemFk" />
-                </QTd>
+                    <QTd auto-width>
+                        <QIcon
+                            :class="props.expand ? '' : 'rotate-270'"
+                            name="expand_circle_down"
+                            size="md"
+                            :color="props.expand ? 'primary' : 'white'"
+                        />
+                    </QTd>
 
-                <QTd no-hover>
-                    <span>{{ buy.subName }}</span>
-                    <FetchedTags :item="buy" />
-                </QTd>
-                <QTd no-hover> {{ dashIfEmpty(buy.quantity) }}</QTd>
-                <QTd no-hover> {{ dashIfEmpty(buy.price) }}</QTd>
-                <QTd colspan="2" no-hover> {{ dashIfEmpty(buy.total) }}</QTd>
-            </QTr>
-            <QTr>
-                <QTd colspan="5" no-hover>
-                    <span class="label">{{ t('Total entry') }}: </span>
-                    <span>{{ row.total }} €</span>
-                </QTd>
-                <QTd no-hover>
-                    <span class="label">{{ t('Total stems') }}: </span>
-                    <span>{{ row.quantity }}</span>
-                </QTd>
-            </QTr>
-        </template>
-    </QTable>
+                    <QTd v-for="col in props.cols" :key="col.name" :props="props">
+                        <span @click.stop class="link" v-if="col.name === 'id'">
+                            {{ col.value }}
+                            <EntryDescriptorProxy :id="col.value" />
+                        </span>
+
+                        <span v-else v-text="col.value" />
+                    </QTd>
+                </QTr>
+
+                <QTr
+                    v-show="props.expand"
+                    :props="props"
+                    :key="`expedition_${props.row.id}`"
+                >
+                    <QTd colspan="12" style="padding: 1px 0">
+                        <QTable
+                            color="secondary"
+                            card-class="bg-vn-page text-white "
+                            style-class="height: 30px"
+                            table-header-class="text-white"
+                            :rows="props.row.buys"
+                            :columns="columns"
+                            row-key="id"
+                            virtual-scroll
+                            v-model:expanded="expanded"
+                        >
+                            <template #header="props">
+                                <QTr :props="props">
+                                    <QTh
+                                        v-for="col in props.cols"
+                                        :key="col.name"
+                                        :props="props"
+                                    >
+                                        <span v-text="col.label" class="tr-header" />
+                                    </QTh>
+                                </QTr>
+                            </template>
+                            <template #body="props">
+                                <QTr :props="props" :key="`m_${props.row.id}`">
+                                    <QTd
+                                        v-for="col in props.cols"
+                                        :key="col.name"
+                                        :title="col.label"
+                                        :props="props"
+                                    >
+                                        <span
+                                            @click.stop
+                                            class="link"
+                                            v-if="col.name === 'itemName'"
+                                        >
+                                            {{ col.value }}
+                                            <ItemDescriptorProxy :id="props.row.itemFk" />
+                                        </span>
+                                        <span v-else v-text="col.value" />
+                                    </QTd>
+                                </QTr>
+                            </template>
+                        </QTable>
+                    </QTd>
+                </QTr>
+            </template>
+        </QTable>
+    </QCard>
 </template>
-
 <style scoped lang="scss">
-.label {
-    color: var(--vn-label-color);
+.q-table thead tr,
+.q-table tbody td {
+    height: 30px;
 }
 </style>
 

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

@@ -8,7 +8,6 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-import VnInputTime from 'components/common/VnInputTime.vue';
 
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
@@ -59,11 +58,25 @@ const zoneWhere = computed(() => {
 });
 
 async function getLanded(params) {
-    getDate(`Agencies/getLanded`, params);
+    const data = await getDate(`Agencies/getLanded`, params);
+    formData.value.landed = data.landed;
+    const shippedDate = new Date(params.shipped);
+    const landedDate = new Date(data.hour);
+    shippedDate.setHours(
+        landedDate.getHours(),
+        landedDate.getMinutes(),
+        landedDate.getSeconds(),
+    );
+    formData.value.shipped = shippedDate.toISOString();
 }
 
 async function getShipped(params) {
-    getDate(`Agencies/getShipped`, params);
+    const data = await getDate(`Agencies/getShipped`, params);
+    formData.value.landed = params.landed;
+    const [hours, minutes, seconds] = data.hour.split(':').map(Number);
+    let shippedDate = new Date(data.shipped);
+    shippedDate.setHours(hours, minutes, seconds);
+    formData.value.shipped = shippedDate.toISOString();
 }
 
 async function getDate(query, params) {
@@ -75,15 +88,8 @@ async function getDate(query, params) {
     if (!data) return notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
 
     formData.value.zoneFk = data.zoneFk;
-    formData.value.landed = data.landed;
-    const shippedDate = new Date(params.shipped);
-    const landedDate = new Date(data.hour);
-    shippedDate.setHours(
-        landedDate.getHours(),
-        landedDate.getMinutes(),
-        landedDate.getSeconds(),
-    );
-    formData.value.shipped = shippedDate.toISOString();
+
+    return data;
 }
 
 const onChangeZone = async (zoneId) => {
@@ -273,8 +279,6 @@ async function getZone(options) {
             <VnSelect
                 :label="t('ticketList.client')"
                 v-model="clientId"
-                option-value="id"
-                option-label="name"
                 url="Clients"
                 :fields="['id', 'name']"
                 sort-by="id"
@@ -294,7 +298,7 @@ async function getZone(options) {
                 </template>
             </VnSelect>
             <VnSelect
-                :label="t('ticketList.warehouse')"
+                :label="t('basicData.warehouse')"
                 v-model="warehouseId"
                 option-value="id"
                 option-label="name"
@@ -302,23 +306,38 @@ async function getZone(options) {
                 hide-selected
                 map-options
                 :required="true"
-                :rules="validate('ticketList.warehouse')"
+                :rules="validate('basicData.warehouse')"
             />
         </VnRow>
         <VnRow class="row q-gutter-md q-mb-md no-wrap">
             <VnSelect
                 :label="t('basicData.address')"
                 v-model="addressId"
-                option-value="id"
                 option-label="nickname"
                 :options="addresses"
                 hide-selected
                 map-options
                 :required="true"
+                :sort-by="['isActive DESC']"
                 :rules="validate('basicData.address')"
             >
                 <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
+                    <QItem
+                        v-bind="scope.itemProps"
+                        :class="{ disabled: !scope.opt.isActive }"
+                    >
+                        <QItemSection style="min-width: min-content" avatar>
+                            <QIcon
+                                v-if="
+                                    scope.opt.isActive &&
+                                    formData.client.defaultAddressFk === scope.opt.id
+                                "
+                                size="sm"
+                                color="grey"
+                                name="star"
+                                class="fill-icon"
+                            />
+                        </QItemSection>
                         <QItemSection>
                             <QItemLabel
                                 :class="{
@@ -344,6 +363,9 @@ async function getZone(options) {
                                     {{ scope.opt?.agencyMode?.name }}</span
                                 >
                             </QItemLabel>
+                            <QItemLabel caption>
+                                {{ `#${scope.opt?.id}` }}
+                            </QItemLabel>
                         </QItemSection>
                     </QItem>
                 </template>
@@ -425,14 +447,6 @@ async function getZone(options) {
                 :rules="validate('ticketList.shipped')"
                 @update:model-value="setShipped"
             />
-            <VnInputTime
-                :label="t('basicData.shippedHour')"
-                v-model="formData.shipped"
-                :required="true"
-                :rules="validate('basicData.shippedHour')"
-                disabled
-                @update:model-value="setShipped"
-            />
             <VnInputDate
                 :label="t('basicData.landed')"
                 v-model="formData.landed"

src/pages/Ticket/Card/TicketFilter.js

@@ -20,6 +20,7 @@ export default {
                     'isFreezed',
                     'isTaxDataChecked',
                     'hasElectronicInvoice',
+                    'defaultAddressFk',
                     'credit',
                 ],
                 include: [

src/pages/Ticket/Negative/TicketLackFilter.vue

@@ -137,8 +137,6 @@ const setUserParams = (params) => {
                                 ($event) => onCategoryChange($event, searchFn)
                             "
                             :options="categoriesOptions"
-                            option-value="id"
-                            option-label="name"
                             hide-selected
                             dense
                             filled
@@ -152,10 +150,7 @@ const setUserParams = (params) => {
                         <VnSelect
                             :label="t('negative.type')"
                             v-model="params.typeFk"
-                            @update:model-value="searchFn()"
                             :options="itemTypesOptions"
-                            option-value="id"
-                            option-label="name"
                             hide-selected
                             dense
                             filled

src/pages/Ticket/TicketAdvance.vue

@@ -121,7 +121,7 @@ const ticketColumns = computed(() => [
         format: (row, dashIfEmpty) => dashIfEmpty(row.lines),
     },
     {
-        align: 'left',
+        align: 'right',
         label: t('advanceTickets.import'),
         name: 'totalWithVat',
         hidden: true,
@@ -172,6 +172,15 @@ const ticketColumns = computed(() => [
         headerClass: 'horizontal-separator',
         name: 'futureLiters',
     },
+    {
+        label: t('advanceTickets.preparation'),
+        name: 'futurePreparation',
+        field: 'futurePreparation',
+        align: 'left',
+        sortable: true,
+        headerClass: 'horizontal-separator',
+        columnFilter: false,
+    },
     {
         align: 'left',
         label: t('advanceTickets.futureZone'),
@@ -196,15 +205,17 @@ const ticketColumns = computed(() => [
         label: t('advanceTickets.notMovableLines'),
         headerClass: 'horizontal-separator',
         name: 'notMovableLines',
+        class: 'shrink',
     },
     {
         align: 'left',
         label: t('advanceTickets.futureLines'),
         headerClass: 'horizontal-separator',
         name: 'futureLines',
+        class: 'shrink',
     },
     {
-        align: 'left',
+        align: 'right',
         label: t('advanceTickets.futureImport'),
         name: 'futureTotalWithVat',
         hidden: true,
@@ -399,8 +410,10 @@ watch(
         destinationElRef.value.classList.add('text-uppercase', 'color-vn-label');
         originElRef.value.classList.add('text-uppercase', 'color-vn-label');
 
-        destinationElRef.value.setAttribute('colspan', '10');
-        originElRef.value.setAttribute('colspan', '10');
+        originElRef.value.classList.add('advance-icon');
+
+        destinationElRef.value.setAttribute('colspan', '9');
+        originElRef.value.setAttribute('colspan', '11');
 
         destinationElRef.value.textContent = `${t(
             'advanceTickets.destination',

src/pages/Ticket/TicketAdvanceFilter.vue

@@ -68,7 +68,7 @@ onMounted(async () => await getItemPackingTypes());
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params, searchFn }">
+        <template #body="{ params }">
             <QItem class="q-my-sm">
                 <QItemSection>
                     <VnInputDate
@@ -96,12 +96,10 @@ onMounted(async () => await getItemPackingTypes());
                         option-value="code"
                         option-label="description"
                         :info="t('iptInfo')"
-                        @update:model-value="searchFn()"
                         dense
                         filled
                         :use-like="false"
-                    >
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -113,12 +111,10 @@ onMounted(async () => await getItemPackingTypes());
                         option-value="code"
                         option-label="description"
                         :info="t('iptInfo')"
-                        @update:model-value="searchFn()"
                         dense
                         filled
                         :use-like="false"
-                    >
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -137,7 +133,6 @@ onMounted(async () => await getItemPackingTypes());
                         :label="t('params.isFullMovable')"
                         v-model="params.isFullMovable"
                         toggle-indeterminate
-                        @update:model-value="searchFn()"
                         dense
                     />
                 </QItemSection>
@@ -160,13 +155,9 @@ onMounted(async () => await getItemPackingTypes());
                         :label="t('params.warehouseFk')"
                         v-model="params.warehouseFk"
                         :options="warehousesOptions"
-                        option-value="id"
-                        option-label="name"
-                        @update:model-value="searchFn()"
                         dense
                         filled
-                    >
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -175,7 +166,6 @@ onMounted(async () => await getItemPackingTypes());
                         toggle-indeterminate
                         :label="t('params.onlyWithDestination')"
                         v-model="params.onlyWithDestination"
-                        @update:model-value="searchFn()"
                         dense
                     />
                 </QItemSection>

src/pages/Ticket/TicketFilter.vue

@@ -60,7 +60,7 @@ const groupedStates = ref([]);
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params, searchFn }">
+        <template #body="{ params }">
             <QItem>
                 <QItemSection>
                     <VnInput v-model="params.clientFk" :label="t('Customer ID')" filled />
@@ -108,10 +108,7 @@ const groupedStates = ref([]);
                     <VnSelect
                         :label="t('State')"
                         v-model="params.stateFk"
-                        @update:model-value="searchFn()"
                         :options="states"
-                        option-value="id"
-                        option-label="name"
                         emit-value
                         map-options
                         use-input
@@ -128,7 +125,6 @@ const groupedStates = ref([]);
                     <VnSelect
                         :label="t('params.groupedStates')"
                         v-model="params.groupedStates"
-                        @update:model-value="searchFn()"
                         :options="groupedStates"
                         option-label="code"
                         emit-value
@@ -163,7 +159,6 @@ const groupedStates = ref([]);
                 <QItemSection>
                     <QCheckbox
                         v-model="params.myTeam"
-                        @update:model-value="searchFn()"
                         :label="t('My team')"
                         toggle-indeterminate
                     />
@@ -171,7 +166,6 @@ const groupedStates = ref([]);
                 <QItemSection>
                     <QCheckbox
                         v-model="params.pending"
-                        @update:model-value="searchFn()"
                         :label="t('Pending')"
                         toggle-indeterminate
                     />
@@ -181,7 +175,6 @@ const groupedStates = ref([]);
                 <QItemSection>
                     <QCheckbox
                         v-model="params.hasInvoice"
-                        @update:model-value="searchFn()"
                         :label="t('Invoiced')"
                         toggle-indeterminate
                     />
@@ -189,7 +182,6 @@ const groupedStates = ref([]);
                 <QItemSection>
                     <QCheckbox
                         v-model="params.hasRoute"
-                        @update:model-value="searchFn()"
                         :label="t('Routed')"
                         toggle-indeterminate
                     />
@@ -203,10 +195,7 @@ const groupedStates = ref([]);
                     <VnSelect
                         :label="t('Province')"
                         v-model="params.provinceFk"
-                        @update:model-value="searchFn()"
                         :options="provinces"
-                        option-value="id"
-                        option-label="name"
                         emit-value
                         map-options
                         use-input
@@ -223,7 +212,6 @@ const groupedStates = ref([]);
                     <VnSelect
                         :label="t('Agency')"
                         v-model="params.agencyModeFk"
-                        @update:model-value="searchFn()"
                         :options="agencies"
                         emit-value
                         map-options
@@ -241,10 +229,7 @@ const groupedStates = ref([]);
                     <VnSelect
                         :label="t('Warehouse')"
                         v-model="params.warehouseFk"
-                        @update:model-value="searchFn()"
                         :options="warehouses"
-                        option-value="id"
-                        option-label="name"
                         emit-value
                         map-options
                         use-input

src/pages/Ticket/TicketFuture.vue

@@ -85,6 +85,7 @@ const ticketColumns = computed(() => [
         label: t('advanceTickets.liters'),
         name: 'liters',
         align: 'left',
+        class: 'shrink',
         headerClass: 'horizontal-separator',
     },
     {
@@ -177,7 +178,12 @@ watch(
         if (!$el) return;
         const head = $el.querySelector('thead');
         const firstRow = $el.querySelector('thead > tr');
-
+        const headSelectionCol = $el.querySelector(
+            'thead tr.bg-header th.q-table--col-auto-width',
+        );
+        if (headSelectionCol) {
+            headSelectionCol.classList.add('horizontal-separator');
+        }
         const newRow = document.createElement('tr');
         destinationElRef.value = document.createElement('th');
         originElRef.value = document.createElement('th');
@@ -185,9 +191,10 @@ watch(
         newRow.classList.add('bg-header');
         destinationElRef.value.classList.add('text-uppercase', 'color-vn-label');
         originElRef.value.classList.add('text-uppercase', 'color-vn-label');
+        originElRef.value.classList.add('advance-icon');
 
-        destinationElRef.value.setAttribute('colspan', '7');
-        originElRef.value.setAttribute('colspan', '9');
+        destinationElRef.value.setAttribute('colspan', '9');
+        originElRef.value.setAttribute('colspan', '7');
 
         originElRef.value.textContent = `${t('advanceTickets.origin')}`;
         destinationElRef.value.textContent = `${t('advanceTickets.destination')}`;
@@ -371,4 +378,12 @@ watch(
 :deep(.horizontal-bottom-separator) {
     border-bottom: 4px solid white !important;
 }
+:deep(th.advance-icon::after) {
+    content: '>>';
+    font-size: larger;
+    position: absolute;
+    text-align: center;
+    float: 0;
+    left: 0;
+}
 </style>

src/pages/Ticket/TicketFutureFilter.vue

@@ -70,7 +70,7 @@ onMounted(async () => {
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params, searchFn }">
+        <template #body="{ params }">
             <QItem class="q-my-sm">
                 <QItemSection>
                     <VnInputDate
@@ -116,11 +116,9 @@ onMounted(async () => {
                         option-value="code"
                         option-label="description"
                         :info="t('iptInfo')"
-                        @update:model-value="searchFn()"
                         dense
                         filled
-                    >
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -132,11 +130,9 @@ onMounted(async () => {
                         option-value="code"
                         option-label="description"
                         :info="t('iptInfo')"
-                        @update:model-value="searchFn()"
                         dense
                         filled
-                    >
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -145,13 +141,9 @@ onMounted(async () => {
                         :label="t('params.state')"
                         v-model="params.state"
                         :options="stateOptions"
-                        option-value="id"
-                        option-label="name"
-                        @update:model-value="searchFn()"
                         dense
                         filled
-                    >
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
             <QItem>
@@ -160,13 +152,9 @@ onMounted(async () => {
                         :label="t('params.futureState')"
                         v-model="params.futureState"
                         :options="stateOptions"
-                        option-value="id"
-                        option-label="name"
-                        @update:model-value="searchFn()"
                         dense
                         filled
-                    >
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
 
@@ -176,7 +164,6 @@ onMounted(async () => {
                         :label="t('params.problems')"
                         v-model="params.problems"
                         :toggle-indeterminate="false"
-                        @update:model-value="searchFn()"
                     />
                 </QItemSection>
             </QItem>
@@ -186,13 +173,9 @@ onMounted(async () => {
                         :label="t('params.warehouseFk')"
                         v-model="params.warehouseFk"
                         :options="warehousesOptions"
-                        option-value="id"
-                        option-label="name"
-                        @update:model-value="searchFn()"
                         dense
                         filled
-                    >
-                    </VnSelect>
+                    />
                 </QItemSection>
             </QItem>
         </template>

src/pages/Ticket/TicketList.vue

@@ -582,7 +582,7 @@ function setReference(data) {
                             hide-selected
                             required
                             @update:model-value="() => onClientSelected(data)"
-                            :sort-by="'id ASC'"
+                            :sort-by="['id ASC']"
                         >
                             <template #option="scope">
                                 <QItem v-bind="scope.itemProps">
@@ -608,7 +608,7 @@ function setReference(data) {
                             map-options
                             required
                             :disable="!data.clientId"
-                            :sort-by="'isActive DESC'"
+                            :sort-by="['isActive DESC']"
                             @update:model-value="() => fetchAvailableAgencies(data)"
                         >
                             <template #option="scope">

src/pages/Ticket/locale/en.yml

@@ -120,6 +120,7 @@ basicData:
     difference: Difference
     total: Total
     price: Price
+    warehouse: Warehouse
     newPrice: New price
     chargeDifference: Charge difference to
     withoutNegatives: Create without negatives

src/pages/Ticket/locale/es.yml

@@ -47,6 +47,7 @@ basicData:
     difference: Diferencia
     total: Total
     price: Precio
+    warehouse: Almacén
     newPrice: Nuevo precio
     chargeDifference: Cargar diferencia a
     withoutNegatives: Crear sin negativos

src/pages/Travel/Card/TravelFilter.js

@@ -13,6 +13,8 @@ export default {
         'daysInForward',
         'availabled',
         'awbFk',
+        'isDelivered',
+        'isReceived',
     ],
     include: [
         {

src/pages/Travel/ExtraCommunity.vue

@@ -182,6 +182,7 @@ const columns = computed(() => [
         align: 'left',
         showValue: false,
         sortable: true,
+        style: 'max-width: 200px;',
     },
     {
         label: t('globals.packages'),
@@ -206,6 +207,7 @@ const columns = computed(() => [
         align: 'left',
         showValue: false,
         sortable: true,
+        style: 'max-width: 75px;',
     },
     {
         label: t('extraCommunity.physicKg'),

src/pages/Worker/Card/WorkerTimeControl.vue

@@ -280,7 +280,7 @@ const fetchWeekData = async () => {
         week: selectedWeekNumber.value,
     };
     try {
-        const [{ data: mailData }, { data: countData }] = await Promise.allS([
+        const [{ data: mailData }, { data: countData }] = await Promise.all([
             axios.get(`Workers/${route.params.id}/mail`, {
                 params: { filter: { where } },
             }),
@@ -292,8 +292,9 @@ const fetchWeekData = async () => {
         state.value = mail?.state;
         reason.value = mail?.reason;
         canResend.value = !!countData.count;
-    } catch {
+    } catch (error) {
         state.value = null;
+        if (error?.status != 403) throw error;
     }
 };
 
@@ -407,7 +408,7 @@ const isUnsatisfied = async (reason) => {
 
 const resendEmail = async () => {
     const params = {
-        recipient: worker.value[0]?.user?.emailUser?.email,
+        recipient: worker.value?.user?.emailUser?.email,
         week: selectedWeekNumber.value,
         year: selectedDateYear.value,
         workerId: Number(route.params.id),

src/pages/Worker/WorkerFilter.vue

@@ -33,14 +33,6 @@ const getLocale = (label) => {
             </div>
         </template>
         <template #body="{ params }">
-            <QItem>
-                <QItemSection>
-                    <VnInput :label="t('FI')" v-model="params.fi" filled
-                        ><template #prepend>
-                            <QIcon name="badge" size="xs"></QIcon> </template
-                    ></VnInput>
-                </QItemSection>
-            </QItem>
             <QItem>
                 <QItemSection>
                     <VnInput :label="t('First Name')" v-model="params.firstName" filled />
@@ -112,7 +104,6 @@ es:
         lastName: Apellidos
         userName: Usuario
         extension: Extensión
-    FI: NIF
     First Name: Nombre
     Last Name: Apellidos
     User Name: Usuario

src/pages/Worker/WorkerManagement.vue

@@ -0,0 +1,118 @@
+<script setup>
+import { computed, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import { useAcl } from 'src/composables/useAcl';
+
+import VnTable from 'components/VnTable/VnTable.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import WorkerSummary from './Card/WorkerSummary.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import WorkerManagementFilter from './WorkerManagementFilter.vue';
+
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+const dataKey = 'ManagementList';
+
+const columns = computed(() => [
+    {
+        align: 'left',
+        label: t('tableColumns.firstName'),
+        name: 'firstName',
+        isTitle: true,
+        columnFilter: {
+            name: 'firstName',
+        },
+    },
+    {
+        align: 'left',
+        label: t('tableColumns.lastName'),
+        name: 'lastName',
+        columnFilter: {
+            name: 'lastName',
+        },
+    },
+    {
+        align: 'left',
+        label: t('management.NIF'),
+        name: 'fi',
+        columnFilter: {
+            name: 'fi',
+        },
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        label: t('tableColumns.email'),
+        name: 'email',
+        columnFilter: {
+            name: 'email',
+        },
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        label: t('management.ssn'),
+        labelAbbreviation: t('management.ssn'),
+        toolTip: t('management.completeSsn'),
+        name: 'SSN',
+        columnFilter: {
+            name: 'SSN',
+        },
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        name: 'departmentFk',
+        label: t('tableColumns.department'),
+        columnFilter: {
+            component: 'select',
+            name: 'departmentFk',
+            attrs: {
+                url: 'Departments',
+            },
+        },
+        cardVisible: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(row.department),
+    },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('globals.pageTitles.summary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row?.id, WorkerSummary),
+                isPrimary: true,
+            },
+        ],
+    },
+]);
+
+onMounted(() => {
+    const canAccess = useAcl().hasAcl('Worker', 'management', 'WRITE');
+});
+</script>
+<template>
+    <VnSearchbar
+        :data-key
+        url="Workers/filter"
+        :label="t('management.search')"
+        :info="t('management.searchInfo')"
+    />
+    <RightMenu>
+        <template #right-panel>
+            <WorkerManagementFilter :data-key />
+        </template>
+    </RightMenu>
+    <VnTable
+        ref="tableRef"
+        url="Workers/filter"
+        :columns="columns"
+        :data-key
+        :right-search="false"
+        order="id DESC"
+    />
+</template>

src/pages/Worker/WorkerManagementFilter.vue

@@ -0,0 +1,99 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import FetchData from 'components/FetchData.vue';
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+
+const { t, te } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const departments = ref();
+
+const getLocale = (label) => {
+    const globalLocale = `globals.params.${label}`;
+    return te(globalLocale) ? t(globalLocale) : t(`management.${label}`);
+};
+</script>
+
+<template>
+    <FetchData url="Departments" @on-fetch="(data) => (departments = data)" auto-load />
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ getLocale(tag.label) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params }">
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('tableColumns.firstName')"
+                        v-model="params.firstName"
+                        filled
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('tableColumns.lastName')"
+                        v-model="params.lastName"
+                        filled
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('management.NIF')"
+                        v-model="params.fi"
+                        filled
+                        data-cy="worker-filter-fi"
+                    >
+                        <template #prepend>
+                            <QIcon name="badge" size="xs" />
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('tableColumns.email')"
+                        v-model="params.email"
+                        filled
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput :label="t('management.ssn')" v-model="params.SSN" filled />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelect
+                        :label="t('tableColumns.department')"
+                        v-model="params.departmentFk"
+                        :options="departments"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        dense
+                        filled
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>

src/pages/Worker/locale/en.yml

@@ -13,3 +13,11 @@ tableColumns:
     SSN: SSN
     extension: Extension
 queue: Queue
+management:
+    search: Search worker
+    searchInfo: You can search by NIF, NSS or worker name
+    NIF: NIF
+    ssn: SSN
+    completeSsn: National Insurance Number
+    firstName: First Name
+    lastName: Last Name

src/pages/Worker/locale/es.yml

@@ -16,3 +16,11 @@ tableColumns:
     SSN: NSS
     extension: Extensión
 queue: Cola
+management:
+    search: Buscar trabajador
+    searchInfo: Puedes buscar por NIF, NSS o nombre del trabajador
+    NIF: NIF
+    ssn: Núm. SS
+    completeSsn: Número de Seguridad Social
+    firstName: Nombre
+    lastName: Apellidos

src/pages/Zone/ZoneDeliveryPanel.vue

@@ -89,7 +89,7 @@ watch(
                 v-model="formData.geoFk"
                 url="Postcodes/location"
                 :fields="['geoFk', 'code', 'townFk', 'countryFk']"
-                :sort-by="'code ASC'"
+                :sort-by="['code ASC']"
                 option-value="geoFk"
                 option-label="code"
                 :filter-options="['code']"

src/router/modules/claim.js

@@ -8,9 +8,9 @@ const claimCard = {
     meta: {
         menu: [
             'ClaimBasicData',
+            'ClaimNotes',
             'ClaimLines',
             'ClaimPhotos',
-            'ClaimNotes',
             'ClaimDevelopment',
             'ClaimAction',
             'ClaimLog',
@@ -36,6 +36,15 @@ const claimCard = {
             },
             component: () => import('src/pages/Claim/Card/ClaimBasicData.vue'),
         },
+        {
+            path: 'notes',
+            name: 'ClaimNotes',
+            meta: {
+                title: 'notes',
+                icon: 'draft',
+            },
+            component: () => import('src/pages/Claim/Card/ClaimNotes.vue'),
+        },
         {
             path: 'lines',
             name: 'ClaimLines',
@@ -54,15 +63,6 @@ const claimCard = {
             },
             component: () => import('src/pages/Claim/Card/ClaimPhoto.vue'),
         },
-        {
-            path: 'notes',
-            name: 'ClaimNotes',
-            meta: {
-                title: 'notes',
-                icon: 'draft',
-            },
-            component: () => import('src/pages/Claim/Card/ClaimNotes.vue'),
-        },
         {
             path: 'development',
             name: 'ClaimDevelopment',

src/router/modules/customer.js

@@ -225,7 +225,7 @@ const customerCard = {
                             name: 'CustomerCreditContractsInsurance',
                             component: () =>
                                 import(
-                                    'src/pages/Customer/components/CustomerCreditContractsInsurance.vue'
+                                    'src/pages/Customer/Card/CustomerCreditContractsInsurance.vue'
                                 ),
                         },
                     ],

src/router/modules/worker.js

@@ -239,7 +239,7 @@ export default {
         icon: 'vn:worker',
         moduleName: 'Worker',
         keyBinding: 'w',
-        menu: ['WorkerList', 'WorkerDepartment'],
+        menu: ['WorkerList', 'WorkerDepartment', 'WorkerManagement'],
     },
     component: RouterView,
     redirect: { name: 'WorkerMain' },
@@ -283,6 +283,22 @@ export default {
                         departmentCard,
                     ],
                 },
+                {
+                    path: 'management',
+                    name: 'WorkerManagement',
+                    meta: {
+                        title: 'management',
+                        icon: 'view_list',
+                        acls: [
+                            {
+                                model: 'Worker',
+                                props: 'isRoleAdvanced',
+                                accessType: 'READ',
+                            },
+                        ],
+                    },
+                    component: () => import('src/pages/Worker/WorkerManagement.vue'),
+                },
             ],
         },
     ],

test/cypress/integration/claim/claimLines.spec.js

@@ -0,0 +1,25 @@
+/// <reference types="cypress" />
+describe('ClaimLines', () => {
+    const claimId = 1;
+
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/claim/${claimId}/lines`);
+    });
+
+    it('should add new line', () => {
+        cy.get('.q-page-sticky > div > .q-btn').click();
+        cy.get('.q-card > .q-table__container > .q-table__middle > .q-table > thead > tr > .q-table--col-auto-width > .q-checkbox > .q-checkbox__inner > .q-checkbox__bg').click();
+        cy.get('.q-card__actions > .q-btn--unelevated').click();
+        cy.get('.q-notification__message').should('have.text', 'Lines added to claim');
+    })
+
+    it('should autofill claimed quantity if 0 or null', () => {
+        cy.get('thead > tr > .q-table--col-auto-width > .q-checkbox > .q-checkbox__inner > .q-checkbox__bg').click();
+        cy.get('.q-btn--unelevated').click();
+        cy.checkNotification('Quantities filled automatically');
+        cy.get('.q-btn--unelevated').click();
+        cy.checkNotification('No quantities to fill');
+    })
+});

test/cypress/integration/claim/claimNotes.spec.js

@@ -1,5 +1,4 @@
 describe('ClaimNotes', () => {
-    const saveBtn = '.q-field__append > .q-btn > .q-btn__content > .q-icon';
     const firstNote = '.q-infinite-scroll :nth-child(1) > .q-card__section--vert';
     beforeEach(() => {
         cy.login('developer');
@@ -11,9 +10,9 @@ describe('ClaimNotes', () => {
         cy.get('.q-textarea')
             .should('be.visible')
             .should('not.be.disabled')
-            .type(message);
+            .type(message, "{{enter}}");
 
-        cy.get(saveBtn).click();
+        cy.dataCy("saveContinueNoteButton").click();
         cy.get(firstNote).should('have.text', message);
     });
 });

test/cypress/integration/customer/credit-management/clientCreditContracts.spec.js

@@ -7,7 +7,28 @@ describe('Client credit contracts', () => {
             timeout: 5000,
         });
     });
-    it('Should load layout', () => {
-        cy.get('.q-page').should('be.visible');
+    it('Should add a new contract and an additional credit', () => {
+        cy.dataCy('createBtn').click();
+        cy.dataCy('Credit_input').type(123);
+        cy.dataCy('Grade_input').type(9);
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('Data created');
+        cy.dataCy('createBtn').should('not.exist');
+    });
+
+    it('Should add an additional credit', () => {
+        cy.dataCy('viewBtn').eq(0).click();
+        cy.get('.q-page-sticky > div').click();
+        cy.dataCy('Credit_input').type(321);
+        cy.dataCy('Grade_input').type(89);
+        cy.dataCy('FormModelPopup_save').click();
+        cy.checkNotification('Data created');
+    });
+
+    it('Should close a contract', () => {
+        cy.dataCy('closeBtn').eq(0).click();
+        cy.get('.q-btn--unelevated').click();
+        cy.checkNotification('Data saved');
+        cy.dataCy('createBtn').should('exist');
     });
 });

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

@@ -23,7 +23,7 @@ describe('InvoiceOut list', () => {
         cy.dataCy('InvoiceOutDownloadPdfBtn').click();
     });
 
-    it('should download all pdfs', () => {
+    it.skip('should download all pdfs', () => {
         cy.get(columnCheckbox).click();
         cy.dataCy('InvoiceOutDownloadPdfBtn').click();
     });
@@ -31,7 +31,7 @@ describe('InvoiceOut list', () => {
     it('should open the invoice descriptor from table icon', () => {
         cy.get(firstSummaryIcon).click();
         cy.get('.cardSummary').should('be.visible');
-        cy.get('.summaryHeader > div').should('include.text', 'V10100001');
+        cy.get('.summaryHeader > div').should('include.text', 'A1111111');
     });
 
     it('should open the client descriptor', () => {

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

@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('OrderCatalog', () => {
+describe.skip('OrderCatalog', () => {
     beforeEach(() => {
         cy.login('developer');
         cy.viewport(1920, 1080);

test/cypress/integration/ticket/ticketList.spec.js

@@ -2,6 +2,7 @@
 describe('TicketList', () => {
     beforeEach(() => {
         cy.login('developer');
+        cy.viewport(1920, 1080);
         cy.visit('/#/ticket/list', false);
     });
 
@@ -76,8 +77,8 @@ describe('TicketList', () => {
             });
         }).as('ticket');
 
-        cy.get('[data-cy="Warehouse_select"]').type('Warehouse One');
-        cy.get('.q-menu .q-item').contains('Warehouse One').click();
+        cy.selectOption('[data-cy="Warehouse_select"]', 'Warehouse One');
+        cy.searchBtnFilterPanel();
         cy.wait('@ticket').then((interception) => {
             const data = interception.response.body[0];
             expect(data.hasComponentLack).to.equal(1);

test/cypress/integration/worker/workerManagement.spec.js

@@ -0,0 +1,23 @@
+describe('WorkerManagement', () => {
+    const nif = '12091201A';
+    const searchButton = '.q-scrollarea__content > .q-btn--standard > .q-btn__content';
+    const url = '/#/worker/management';
+
+    it('should not enter the section', () => {
+        cy.login('salesPerson');
+        cy.visit(url);
+        cy.url().should('include', '/dashboard');
+    });
+
+    it('should enter the section and filter by NIF, then open the worker summary popup', () => {
+        cy.login('hr');
+        cy.visit(url);
+        cy.dataCy('worker-filter-fi').type(nif);
+        cy.get(searchButton).click();
+        cy.dataCy('tableAction-0').click();
+        cy.get('.summaryHeader').should('exist');
+        cy.get('.summaryHeader').should('be.visible');
+        cy.get('.summaryBody').should('exist');
+        cy.get('.summaryBody').should('be.visible');
+    });
+});