cypress.config.js

@@ -44,7 +44,6 @@ export default defineConfig({
         supportFile: 'test/cypress/support/index.js',
         videosFolder: 'test/cypress/videos',
         downloadsFolder: 'test/cypress/downloads',
-        tmpUploadFolder: 'test/cypress/storage/tmp/dms',
         video: false,
         specPattern: 'test/cypress/integration/**/*.spec.js',
         experimentalRunAllSpecs: true,

package.json

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

src/App.vue

@@ -2,7 +2,6 @@
 import { onMounted } from 'vue';
 import { useQuasar, Dark } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import VnScroll from './components/common/VnScroll.vue';
 
 const quasar = useQuasar();
 const { availableLocales, locale, fallbackLocale } = useI18n();
@@ -39,7 +38,6 @@ quasar.iconMapFn = (iconName) => {
 
 <template>
     <RouterView />
-    <VnScroll/>
 </template>
 
 <style lang="scss">

src/boot/__tests__/axios.spec.js

@@ -67,7 +67,7 @@ describe('Axios boot', () => {
             };
 
             const result = onResponseError(error);
-            await expect(result).rejects.toEqual(expect.objectContaining(error));
+            expect(result).rejects.toEqual(expect.objectContaining(error));
         });
 
         it('should call to the Notify plugin with a message from the response property', async () => {
@@ -83,7 +83,7 @@ describe('Axios boot', () => {
             };
 
             const result = onResponseError(error);
-            await expect(result).rejects.toEqual(expect.objectContaining(error));
+            expect(result).rejects.toEqual(expect.objectContaining(error));
         });
     });
 });

src/boot/vnDate.js

@@ -1,6 +1,4 @@
 import { boot } from 'quasar/wrappers';
-import { date as quasarDate } from 'quasar';
-const { formatDate } = quasarDate;
 
 export default boot(() => {
     Date.vnUTC = () => {
@@ -27,34 +25,4 @@ export default boot(() => {
         const date = new Date(Date.vnUTC());
         return new Date(date.getFullYear(), date.getMonth() + 1, 0);
     };
-
-    Date.getCurrentDateTimeFormatted = (
-        options = {
-            startOfDay: false,
-            endOfDay: true,
-            iso: true,
-            mask: 'DD-MM-YYYY HH:mm',
-        },
-    ) => {
-        const date = Date.vnUTC();
-        if (options.startOfDay) {
-            date.setHours(0, 0, 0);
-        }
-        if (options.endOfDay) {
-            date.setHours(23, 59, 0);
-        }
-        if (options.iso) {
-            return date.toISOString();
-        }
-        return formatDate(date, options.mask);
-    };
-
-    Date.convertToISODateTime = (dateTimeStr) => {
-        const [datePart, timePart] = dateTimeStr.split(' ');
-        const [day, month, year] = datePart.split('-');
-        const [hours, minutes] = timePart.split(':');
-
-        const isoDate = new Date(year, month - 1, day, hours, minutes);
-        return isoDate.toISOString();
-    };
 });

src/components/CreateNewPostcodeForm.vue

@@ -20,6 +20,7 @@ const postcodeFormData = reactive({
     provinceFk: null,
     townFk: null,
 });
+const townFilter = ref({});
 
 const countriesRef = ref(false);
 const provincesOptions = ref([]);
@@ -32,11 +33,11 @@ function onDataSaved(formData) {
     newPostcode.town = town.value.name;
     newPostcode.townFk = town.value.id;
     const provinceObject = provincesOptions.value.find(
-        ({ id }) => id === formData.provinceFk,
+        ({ id }) => id === formData.provinceFk
     );
     newPostcode.province = provinceObject?.name;
     const countryObject = countriesRef.value.opts.find(
-        ({ id }) => id === formData.countryFk,
+        ({ id }) => id === formData.countryFk
     );
     newPostcode.country = countryObject?.name;
     emit('onDataSaved', newPostcode);
@@ -66,11 +67,21 @@ function setTown(newTown, data) {
 }
 async function onCityCreated(newTown, formData) {
     newTown.province = provincesOptions.value.find(
-        (province) => province.id === newTown.provinceFk,
+        (province) => province.id === newTown.provinceFk
     );
     formData.townFk = newTown;
     setTown(newTown, formData);
 }
+
+async function filterTowns(name) {
+    if (name !== '') {
+        townFilter.value.where = {
+            name: {
+                like: `%${name}%`,
+            },
+        };
+    }
+}
 </script>
 
 <template>
@@ -96,6 +107,7 @@ async function onCityCreated(newTown, formData) {
                 <VnSelectDialog
                     :label="t('City')"
                     @update:model-value="(value) => setTown(value, data)"
+                    @filter="filterTowns"
                     :tooltip="t('Create city')"
                     v-model="data.townFk"
                     url="Towns/location"

src/components/CrudModel.vue

@@ -65,7 +65,7 @@ const $props = defineProps({
         default: null,
     },
     beforeSaveFn: {
-        type: [String, Function],
+        type: Function,
         default: null,
     },
     goTo: {
@@ -83,7 +83,7 @@ const isLoading = ref(false);
 const hasChanges = ref(false);
 const originalData = ref();
 const vnPaginateRef = ref();
-const formData = ref();
+const formData = ref([]);
 const saveButtonRef = ref(null);
 const watchChanges = ref();
 const formUrl = computed(() => $props.url);
@@ -298,10 +298,6 @@ watch(formUrl, async () => {
 });
 </script>
 <template>
-    <SkeletonTable
-        v-if="!formData && ($attrs['auto-load'] === '' || $attrs['auto-load'])"
-        :columns="$attrs.columns?.length"
-    />
     <VnPaginate
         :url="url"
         :limit="limit"
@@ -320,6 +316,10 @@ watch(formUrl, async () => {
             ></slot>
         </template>
     </VnPaginate>
+    <SkeletonTable
+        v-if="!formData && $attrs.autoLoad"
+        :columns="$attrs.columns?.length"
+    />
     <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown() && hasSubToolbar">
         <QBtnGroup push style="column-gap: 10px">
             <slot name="moreBeforeActions" />
@@ -332,7 +332,6 @@ watch(formUrl, async () => {
                 :disable="!selected?.length"
                 :title="t('globals.remove')"
                 v-if="$props.defaultRemove"
-                data-cy="crudModelDefaultRemoveBtn"
             />
             <QBtn
                 :label="tMobile('globals.reset')"

src/components/EditPictureForm.vue

@@ -140,7 +140,7 @@ const updatePhotoPreview = (value) => {
             img.onerror = () => {
                 notify(
                     t("This photo provider doesn't allow remote downloads"),
-                    'negative',
+                    'negative'
                 );
             };
         }
@@ -219,7 +219,11 @@ const makeRequest = async () => {
                         color="primary"
                         class="cursor-pointer"
                         @click="rotateLeft()"
-                    />
+                    >
+                        <!-- <QTooltip class="no-pointer-events">
+                            {{ t('Rotate left') }}
+                        </QTooltip> -->
+                    </QIcon>
                     <div>
                         <div ref="photoContainerRef" />
                     </div>
@@ -229,7 +233,11 @@ const makeRequest = async () => {
                         color="primary"
                         class="cursor-pointer"
                         @click="rotateRight()"
-                    />
+                    >
+                        <!-- <QTooltip class="no-pointer-events">
+                            {{ t('Rotate right') }}
+                        </QTooltip> -->
+                    </QIcon>
                 </div>
 
                 <div class="column">
@@ -257,6 +265,7 @@ const makeRequest = async () => {
                                     class="cursor-pointer q-mr-sm"
                                     @click="openInputFile()"
                                 >
+                                    <!-- <QTooltip>{{ t('globals.selectFile') }}</QTooltip> -->
                                 </QIcon>
                                 <QIcon name="info" class="cursor-pointer">
                                     <QTooltip>{{

src/components/EditTableCellValueForm.vue

@@ -8,6 +8,11 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import { QCheckbox } from 'quasar';
 
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const emit = defineEmits(['onDataSaved']);
+
 const $props = defineProps({
     rows: {
         type: Array,
@@ -21,14 +26,10 @@ const $props = defineProps({
         type: String,
         default: '',
     },
-    beforeSave: {
-        type: Function,
-        default: () => {},
-    },
 });
 
 const { t } = useI18n();
-const emit = defineEmits(['onDataSaved']);
+const { notify } = useNotify();
 
 const inputs = {
     input: markRaw(VnInput),
@@ -43,13 +44,24 @@ const selectedField = ref(null);
 const closeButton = ref(null);
 const isLoading = ref(false);
 
+const onDataSaved = () => {
+    notify('globals.dataSaved', 'positive');
+    emit('onDataSaved');
+    closeForm();
+};
+
 const onSubmit = async () => {
     isLoading.value = true;
-    $props.rows.forEach((row) => {
+    const rowsToEdit = $props.rows.map((row) => ({ id: row.id, itemFk: row.itemFk }));
-        row[selectedField.value.name] = newValue.value;
+    const payload = {
-    });
+        field: selectedField.value.field,
-    emit('onDataSaved', $props.rows);
+        newValue: newValue.value,
-    closeForm();
+        lines: rowsToEdit,
+    };
+
+    await axios.post($props.editUrl, payload);
+    onDataSaved();
+    isLoading.value = false;
 };
 
 const closeForm = () => {
@@ -66,24 +78,21 @@ const closeForm = () => {
             <span class="title">{{ t('Edit') }}</span>
             <span class="countLines">{{ ` ${rows.length} ` }}</span>
             <span class="title">{{ t('buy(s)') }}</span>
-            <VnRow class="q-mt-md">
+            <VnRow>
                 <VnSelect
-                    class="editOption"
                     :label="t('Field to edit')"
                     :options="fieldsOptions"
                     hide-selected
                     option-label="label"
                     v-model="selectedField"
-                    data-cy="EditFixedPriceSelectOption"
+                    data-cy="field-to-edit"
-                    @update:model-value="newValue = null"
-                    :class="{ 'is-select': selectedField?.component === 'select' }"
                 />
                 <component
                     :is="inputs[selectedField?.component || 'input']"
                     v-bind="selectedField?.attrs || {}"
                     v-model="newValue"
                     :label="t('Value')"
-                    data-cy="EditFixedPriceValueOption"
+                    data-cy="value-to-edit"
                     style="width: 200px"
                 />
             </VnRow>
@@ -131,15 +140,6 @@ const closeForm = () => {
 }
 </style>
 
-<style lang="scss">
-.editOption .q-field__inner .q-field__control {
-    padding: 0 !important;
-}
-.editOption.is-select .q-field__inner .q-field__control {
-    padding: 0 !important;
-}
-</style>
-
 <i18n>
 es:
     Edit: Editar

src/components/FormModel.vue

@@ -13,15 +13,17 @@ import VnConfirm from './ui/VnConfirm.vue';
 import { tMobile } from 'src/composables/tMobile';
 import { useArrayData } from 'src/composables/useArrayData';
 import { getDifferences, getUpdatedValues } from 'src/filters';
+
 const { push } = useRouter();
 const quasar = useQuasar();
 const state = useState();
 const stateStore = useStateStore();
 const { t } = useI18n();
-const { validate, validations } = useValidator();
+const { validate } = useValidator();
 const { notify } = useNotify();
 const route = useRoute();
 const myForm = ref(null);
+const attrs = useAttrs();
 const $props = defineProps({
     url: {
         type: String,
@@ -98,12 +100,8 @@ const $props = defineProps({
         type: Function,
         default: () => {},
     },
-    preventSubmit: {
-        type: Boolean,
-        default: true,
-    },
 });
-const emit = defineEmits(['onFetch', 'onDataSaved', 'submit']);
+const emit = defineEmits(['onFetch', 'onDataSaved']);
 const modelValue = computed(
     () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
 ).value;
@@ -121,7 +119,7 @@ const defaultButtons = computed(() => ({
         color: 'primary',
         icon: 'save',
         label: 'globals.save',
-        click: async (evt) => submitForm(evt),
+        click: async () => await save(),
         type: 'submit',
     },
     reset: {
@@ -134,13 +132,6 @@ const defaultButtons = computed(() => ({
     ...$props.defaultButtons,
 }));
 
-const submitForm = async (evt) => {
-    const isFormValid = await myForm.value.validate();
-    if (isFormValid) {
-        await save(evt);
-    }
-};
-
 onMounted(async () => {
     nextTick(() => (componentIsRendered.value = true));
 
@@ -236,9 +227,10 @@ async function save() {
         const method = $props.urlCreate ? 'post' : 'patch';
         const url =
             $props.urlCreate || $props.urlUpdate || $props.url || arrayData.store.url;
-        const response = await Promise.resolve(
+        let response;
-            $props.saveFn ? $props.saveFn(body) : axios[method](url, body),
+
-        );
+        if ($props.saveFn) response = await $props.saveFn(body);
+        else response = await axios[method](url, body);
 
         if ($props.urlCreate) notify('globals.dataCreated', 'positive');
 
@@ -304,7 +296,7 @@ function onBeforeSave(formData, originalData) {
     );
 }
 async function onKeyup(evt) {
-    if (evt.key === 'Enter' && !$props.preventSubmit) {
+    if (evt.key === 'Enter' && !('prevent-submit' in attrs)) {
         const input = evt.target;
         if (input.type == 'textarea' && evt.shiftKey) {
             let { selectionStart, selectionEnd } = input;
@@ -315,13 +307,11 @@ async function onKeyup(evt) {
             selectionStart = selectionEnd = selectionStart + 1;
             return;
         }
-        await myForm.value.submit(evt);
+        await save();
     }
 }
 
 defineExpose({
-    submitForm,
-    myForm,
     save,
     isLoading,
     hasChanges,
@@ -333,10 +323,9 @@ defineExpose({
 <template>
     <div class="column items-center full-width">
         <QForm
-            v-on="$attrs"
             ref="myForm"
             v-if="formData"
-            @submit.prevent="save"
+            @submit.prevent
             @keyup.prevent="onKeyup"
             @reset="reset"
             class="q-pa-md"
@@ -350,7 +339,6 @@ defineExpose({
                     name="form"
                     :data="formData"
                     :validate="validate"
-                    :validations="validations()"
                     :filter="filter"
                 />
                 <SkeletonForm v-else />
@@ -410,7 +398,6 @@ defineExpose({
             </QBtnDropdown>
             <QBtn
                 v-else
-                data-cy="saveDefaultBtn"
                 :label="tMobile('globals.save')"
                 color="primary"
                 icon="save"

src/components/FormModelPopup.vue

@@ -41,12 +41,9 @@ const onDataSaved = async (formData, requestResponse) => {
     emit('onDataSaved', formData, requestResponse);
 };
 
-const onClick = async (saveAndContinue = showSaveAndContinueBtn) => {
+const onClick = async (saveAndContinue) => {
-    await formModelRef.value.myForm.validate(true);
     isSaveAndContinue.value = saveAndContinue;
-    if (formModelRef.value) {
+    await formModelRef.value.save();
-        await formModelRef.value.submitForm();
-    }
 };
 
 defineExpose({
@@ -62,23 +59,16 @@ defineExpose({
         ref="formModelRef"
         :observe-form-changes="false"
         :default-actions="false"
-        @submit="onClick"
         v-bind="$attrs"
         @on-data-saved="onDataSaved"
-        :prevent-submit="false"
     >
-        <template #form="{ data, validate, validations }">
+        <template #form="{ data, validate }">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />
             </span>
             <h1 class="title">{{ title }}</h1>
             <p>{{ subtitle }}</p>
-            <slot
+            <slot name="form-inputs" :data="data" :validate="validate" />
-                name="form-inputs"
-                :data="data"
-                :validate="validate"
-                :validations="validations"
-            />
             <div class="q-mt-lg row justify-end">
                 <QBtn
                     :label="t('globals.cancel')"
@@ -97,13 +87,12 @@ defineExpose({
                     :flat="showSaveAndContinueBtn"
                     :label="t('globals.save')"
                     :title="t('globals.save')"
-                    :type="!showSaveAndContinueBtn ? 'submit' : 'button'"
+                    @click="onClick(false)"
                     color="primary"
                     class="q-ml-sm"
                     :disabled="isLoading"
                     :loading="isLoading"
                     data-cy="FormModelPopup_save"
-                    @click="showSaveAndContinueBtn ? onClick(false) : null"
                     z-max
                 />
                 <QBtn
@@ -111,13 +100,12 @@ defineExpose({
                     :label="t('globals.isSaveAndContinue')"
                     :title="t('globals.isSaveAndContinue')"
                     color="primary"
-                    :type="showSaveAndContinueBtn ? 'submit' : 'button'"
                     class="q-ml-sm"
                     :disabled="isLoading"
                     :loading="isLoading"
                     data-cy="FormModelPopup_isSaveAndContinue"
-                    @click="showSaveAndContinueBtn ? onClick(true) : null"
                     z-max
+                    @click="onClick(true)"
                 />
             </div>
         </template>

src/components/LeftMenu.vue

@@ -181,7 +181,7 @@ const searchModule = () => {
 <template>
     <QList padding class="column-max-width">
         <template v-if="$props.source === 'main'">
-            <template v-if="route?.matched[1]?.name === 'Dashboard'">
+            <template v-if="$route?.matched[1]?.name === 'Dashboard'">
                 <QItem class="q-pb-md">
                     <VnInput
                         v-model="search"
@@ -262,7 +262,7 @@ const searchModule = () => {
             </template>
 
             <template v-for="item in items" :key="item.name">
-                <template v-if="item.name === route?.matched[1]?.name">
+                <template v-if="item.name === $route?.matched[1]?.name">
                     <QItem class="header">
                         <QItemSection avatar v-if="item.icon">
                             <QIcon :name="item.icon" />

src/components/NavBar.vue

@@ -69,7 +69,7 @@ const refresh = () => window.location.reload();
                     'no-visible': !stateQuery.isLoading().value,
                 }"
                 size="sm"
-                data-cy="navBar-spinner"
+                data-cy="loading-spinner"
             />
             <QSpace />
             <div id="searchbar" class="searchbar"></div>

src/components/TicketProblems.vue

@@ -1,22 +1,12 @@
 <script setup>
 import { toCurrency } from 'src/filters';
-import { getValueFromPath } from 'src/composables/getValueFromPath';
 
-const { row, visibleProblems = null } = defineProps({
+defineProps({ row: { type: Object, required: true } });
-    row: { type: Object, required: true },
-    visibleProblems: { type: Array },
-});
-
-function showProblem(problem) {
-    const val = getValueFromPath(row, problem);
-    if (!visibleProblems) return val;
-    return !!(visibleProblems?.includes(problem) && val);
-}
 </script>
 <template>
     <span class="q-gutter-x-xs">
         <router-link
-            v-if="showProblem('claim.claimFk')"
+            v-if="row.claim?.claimFk"
             :to="{ name: 'ClaimBasicData', params: { id: row.claim?.claimFk } }"
             class="link"
         >
@@ -28,7 +18,7 @@ function showProblem(problem) {
             </QIcon>
         </router-link>
         <QIcon
-            v-if="showProblem('isDeleted')"
+            v-if="row?.isDeleted"
             color="primary"
             name="vn:deletedTicket"
             size="xs"
@@ -39,7 +29,7 @@ function showProblem(problem) {
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="showProblem('hasRisk')"
+            v-if="row?.hasRisk"
             name="vn:risk"
             :color="row.hasHighRisk ? 'negative' : 'primary'"
             size="xs"
@@ -50,76 +40,51 @@ function showProblem(problem) {
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="showProblem('hasComponentLack')"
+            v-if="row?.hasComponentLack"
             name="vn:components"
             color="primary"
             size="xs"
         >
             <QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
         </QIcon>
-        <QIcon
+        <QIcon v-if="row?.hasItemDelay" color="primary" size="xs" name="vn:hasItemDelay">
-            v-if="showProblem('hasItemDelay')"
-            color="primary"
-            size="xs"
-            name="vn:hasItemDelay"
-        >
             <QTooltip>
                 {{ $t('ticket.summary.hasItemDelay') }}
             </QTooltip>
         </QIcon>
-        <QIcon
+        <QIcon v-if="row?.hasItemLost" color="primary" size="xs" name="vn:hasItemLost">
-            v-if="showProblem('hasItemLost')"
-            color="primary"
-            size="xs"
-            name="vn:hasItemLost"
-        >
             <QTooltip>
                 {{ $t('salesTicketsTable.hasItemLost') }}
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="showProblem('hasItemShortage')"
+            v-if="row?.hasItemShortage"
             name="vn:unavailable"
             color="primary"
             size="xs"
         >
             <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
         </QIcon>
-        <QIcon
+        <QIcon v-if="row?.hasRounding" color="primary" name="sync_problem" size="xs">
-            v-if="showProblem('hasRounding')"
-            color="primary"
-            name="sync_problem"
-            size="xs"
-        >
             <QTooltip>
                 {{ $t('ticketList.rounding') }}
             </QTooltip>
         </QIcon>
         <QIcon
-            v-if="showProblem('hasTicketRequest')"
+            v-if="row?.hasTicketRequest"
             name="vn:buyrequest"
             color="primary"
             size="xs"
         >
             <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
         </QIcon>
-        <QIcon
+        <QIcon v-if="row?.isTaxDataChecked" name="vn:no036" color="primary" size="xs">
-            v-if="showProblem('isTaxDataChecked')"
-            name="vn:no036"
-            color="primary"
-            size="xs"
-        >
             <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
         </QIcon>
-        <QIcon v-if="showProblem('isFreezed')" name="vn:frozen" color="primary" size="xs">
+        <QIcon v-if="row?.isFreezed" name="vn:frozen" color="primary" size="xs">
             <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
         </QIcon>
-        <QIcon
+        <QIcon v-if="row?.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
-            v-if="showProblem('isTooLittle')"
-            name="vn:isTooLittle"
-            color="primary"
-            size="xs"
-        >
             <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
         </QIcon>
     </span>

src/components/VnTable/VnOrder.vue

@@ -16,7 +16,7 @@ const $props = defineProps({
         required: true,
     },
     searchUrl: {
-        type: [String, Boolean],
+        type: String,
         default: 'table',
     },
     vertical: {

src/components/VnTable/VnTable.vue

@@ -33,7 +33,6 @@ import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
 import VnTableFilter from './VnTableFilter.vue';
 import { getColAlign } from 'src/composables/getColAlign';
 import RightMenu from '../common/RightMenu.vue';
-import VnScroll from '../common/VnScroll.vue'
 
 const arrayData = useArrayData(useAttrs()['data-key']);
 const $props = defineProps({
@@ -66,7 +65,7 @@ const $props = defineProps({
         default: null,
     },
     create: {
-        type: [Boolean, Object],
+        type: Object,
         default: null,
     },
     createAsDialog: {
@@ -169,7 +168,6 @@ const params = ref(useFilterParams($attrs['data-key']).params);
 const orders = ref(useFilterParams($attrs['data-key']).orders);
 const app = inject('app');
 const tableHeight = useTableHeight();
-const vnScrollRef = ref(null);
 
 const editingRow = ref(null);
 const editingField = ref(null);
@@ -191,17 +189,6 @@ const tableModes = [
     },
 ];
 
-const onVirtualScroll = ({ to }) => {
-    handleScroll();
-    const virtualScrollContainer = tableRef.value?.$el?.querySelector('.q-table__middle');
-    if (virtualScrollContainer) {
-      virtualScrollContainer.dispatchEvent(new CustomEvent('scroll'));
-      if (vnScrollRef.value) {
-        vnScrollRef.value.updateScrollContainer(virtualScrollContainer);
-      }
-    }
-};
-
 onBeforeMount(() => {
     const urlParams = route.query[$props.searchUrl];
     hasParams.value = urlParams && Object.keys(urlParams).length !== 0;
@@ -242,7 +229,6 @@ watch(
 
 defineExpose({
     create: createForm,
-    showForm,
     reload,
     redirect: redirectFn,
     selected,
@@ -340,13 +326,16 @@ function handleOnDataSaved(_) {
     if (_.onDataSaved) _.onDataSaved({ CrudModelRef: CrudModelRef.value });
     else $props.create.onDataSaved(_);
 }
+
 function handleScroll() {
     if ($props.crudModel.disableInfiniteScroll) return;
+
     const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
     const { scrollHeight, scrollTop, clientHeight } = tMiddle;
     const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
     if (isAtBottom) CrudModelRef.value.vnPaginateRef.paginate();
 }
+
 function handleSelection({ evt, added, rows: selectedRows }, rows) {
     if (evt?.shiftKey && added) {
         const rowIndex = selectedRows[0].$index;
@@ -679,9 +668,9 @@ const rowCtrlClickFunction = computed(() => {
                 ref="tableRef"
                 v-bind="table"
                 :class="[
-                  'vnTable',
+                    'vnTable',
-                  table ? 'selection-cell' : '',
+                    table ? 'selection-cell' : '',
-                  $props.footer ? 'last-row-sticky' : '',
+                    $props.footer ? 'last-row-sticky' : '',
                 ]"
                 wrap-cells
                 :columns="splittedColumns.columns"
@@ -693,7 +682,7 @@ const rowCtrlClickFunction = computed(() => {
                 flat
                 :style="isTableMode && `max-height: ${$props.tableHeight || tableHeight}`"
                 :virtual-scroll="isTableMode"
-                @virtual-scroll="onVirtualScroll"
+                @virtual-scroll="handleScroll"
                 @row-click="(event, row) => handleRowClick(event, row)"
                 @update:selected="emit('update:selected', $event)"
                 @selection="(details) => handleSelection(details, rows)"
@@ -751,7 +740,6 @@ const rowCtrlClickFunction = computed(() => {
                                     withFilters
                                 "
                                 :column="col"
-                                :data-cy="`column-filter-${col.name}`"
                                 :show-title="true"
                                 :data-key="$attrs['data-key']"
                                 v-model="params[columnName(col)]"
@@ -1056,7 +1044,7 @@ const rowCtrlClickFunction = computed(() => {
             :model="$attrs['data-key'] + 'Create'"
             @on-data-saved="(_, res) => createForm.onDataSaved(res)"
         >
-            <template #form-inputs="{ data, validations }">
+            <template #form-inputs="{ data }">
                 <slot name="alter-create" :data="data">
                     <div :style="createComplement?.containerStyle">
                         <div
@@ -1074,7 +1062,6 @@ const rowCtrlClickFunction = computed(() => {
                                 :key="column.name"
                                 :name="`column-create-${column.name}`"
                                 :data="data"
-                                :validations="validations"
                                 :column-name="column.name"
                                 :label="column.label"
                             >
@@ -1098,11 +1085,6 @@ const rowCtrlClickFunction = computed(() => {
             </template>
         </FormModelPopup>
     </QDialog>
-    <VnScroll 
-      ref="vnScrollRef"
-      v-if="isTableMode"
-      :scroll-target="tableRef?.$el?.querySelector('.q-table__middle')"
-    />
 </template>
 <i18n>
 en:

src/components/VnTable/VnTableFilter.vue

@@ -30,7 +30,6 @@ function columnName(col) {
         v-bind="$attrs"
         :search-button="true"
         :disable-submit-event="true"
-        :data-key="$attrs['data-key']"
         :search-url
     >
         <template #body="{ params, orders, searchFn }">

src/components/VnTable/VnVisibleColumn.vue

@@ -58,7 +58,7 @@ async function getConfig(url, filter) {
     const response = await axios.get(url, {
         params: { filter: filter },
     });
-    return response?.data && response?.data?.length > 0 ? response.data[0] : null;
+    return response.data && response.data.length > 0 ? response.data[0] : null;
 }
 
 async function fetchViewConfigData() {

src/components/VnTable/__tests__/VnTable.spec.js

@@ -11,9 +11,6 @@ describe('VnTable', () => {
             propsData: {
                 columns: [],
             },
-            attrs: {
-                'data-key': 'test',
-            },
         });
         vm = wrapper.vm;
 

src/components/__tests__/CrudModel.spec.js

@@ -11,7 +11,13 @@ describe('CrudModel', () => {
     beforeAll(() => {
         wrapper = createWrapper(CrudModel, {
             global: {
-                stubs: ['vnPaginate', 'vue-i18n'],
+                stubs: [
+                    'vnPaginate',
+                    'useState',
+                    'arrayData',
+                    'useStateStore',
+                    'vue-i18n',
+                ],
                 mocks: {
                     validate: vi.fn(),
                 },
@@ -23,7 +29,7 @@ describe('CrudModel', () => {
                 dataKey: 'crudModelKey',
                 model: 'crudModel',
                 url: 'crudModelUrl',
-                saveFn: vi.fn(),
+                saveFn: '',
             },
         });
         wrapper = wrapper.wrapper;
@@ -225,7 +231,7 @@ describe('CrudModel', () => {
             expect(vm.isLoading).toBe(false);
             expect(vm.hasChanges).toBe(false);
 
-            await wrapper.setProps({ saveFn: null });
+            await wrapper.setProps({ saveFn: '' });
         });
 
         it("should use default url if there's not saveFn", async () => {

src/components/__tests__/EditTableCellValueForm.spec.js

@@ -0,0 +1,57 @@
+import { createWrapper } from 'app/test/vitest/helper';
+import { default as axios } from 'axios';
+import EditForm from 'components/EditTableCellValueForm.vue';
+import { vi, afterEach, beforeAll, describe, expect, it } from 'vitest';
+
+const fieldA = 'fieldA';
+const fieldB = 'fieldB';
+
+describe('EditForm', () => {
+    let vm;
+    const mockRows = [
+        { id: 1, itemFk: 101 },
+        { id: 2, itemFk: 102 },
+    ];
+    const mockFieldsOptions = [
+        { label: 'Field A', field: fieldA, component: 'input', attrs: {} },
+        { label: 'Field B', field: fieldB, component: 'date', attrs: {} },
+    ];
+    const editUrl = '/api/edit';
+
+    beforeAll(() => {
+        vi.spyOn(axios, 'post').mockResolvedValue({ status: 200 });
+        vm = createWrapper(EditForm, {
+            props: {
+                rows: mockRows,
+                fieldsOptions: mockFieldsOptions,
+                editUrl,
+            },
+        }).vm;
+    });
+
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    describe('onSubmit()', () => {
+        it('should call axios.post with the correct parameters in the payload', async () => {
+            const selectedField = { field: fieldA, component: 'input', attrs: {} };
+            const newValue = 'Test Value';
+
+            vm.selectedField = selectedField;
+            vm.newValue = newValue;
+
+            await vm.onSubmit();
+
+            const payload = axios.post.mock.calls[0][1];
+
+            expect(axios.post).toHaveBeenCalledWith(editUrl, expect.any(Object));
+            expect(payload.field).toEqual(fieldA);
+            expect(payload.newValue).toEqual(newValue);
+
+            expect(payload.lines).toEqual(expect.arrayContaining(mockRows));
+
+            expect(vm.isLoading).toEqual(false);
+        });
+    });
+});

src/components/__tests__/Leftmenu.spec.js

@@ -170,7 +170,7 @@ describe('LeftMenu as card', () => {
         vm = mount('card').vm;
     });
 
-    it('should get routes for card source', () => {
+    it('should get routes for card source', async () => {
         vm.getRoutes();
     });
 });
@@ -251,6 +251,7 @@ describe('LeftMenu as main', () => {
     });
 
     it('should get routes for main source', () => {
+        vm.props.source = 'main';
         vm.getRoutes();
         expect(navigation.getModules).toHaveBeenCalled();
     });

src/components/__tests__/UserPanel.spec.js

@@ -1,63 +1,65 @@
-import { vi, describe, expect, it, beforeEach, beforeAll, afterEach } from 'vitest';
+import { vi, describe, expect, it, beforeEach, afterEach } from 'vitest';
 import { createWrapper } from 'app/test/vitest/helper';
 import UserPanel from 'src/components/UserPanel.vue';
 import axios from 'axios';
 import { useState } from 'src/composables/useState';
 
+vi.mock('src/utils/quasarLang', () => ({
+  default: vi.fn(),
+}));
+
 describe('UserPanel', () => {
-    let wrapper;
+  let wrapper;
-    let vm;
+  let vm;
-    let state;
+  let state;
 
-    beforeEach(() => {
+  beforeEach(() => {
-        wrapper = createWrapper(UserPanel, {});
+    wrapper = createWrapper(UserPanel, {});
-        state = useState();
+    state = useState();
-        state.setUser({
+    state.setUser({
-            id: 115,
+      id: 115,
-            name: 'itmanagement',
+      name: 'itmanagement',
-            nickname: 'itManagementNick',
+      nickname: 'itManagementNick',
-            lang: 'en',
+      lang: 'en',
-            darkMode: false,
+      darkMode: false,
-            companyFk: 442,
+      companyFk: 442,
-            warehouseFk: 1,
+      warehouseFk: 1,
-        });
-        wrapper = wrapper.wrapper;
-        vm = wrapper.vm;
     });
+    wrapper = wrapper.wrapper;
+    vm = wrapper.vm;
+  });
 
-    afterEach(() => {
+  afterEach(() => {
-        vi.clearAllMocks();
+    vi.clearAllMocks();
-    });
+  });
 
-    it('should fetch warehouses data on mounted', async () => {
+  it('should fetch warehouses data on mounted', async () => {
-        const fetchData = wrapper.findComponent({ name: 'FetchData' });
+    const fetchData = wrapper.findComponent({ name: 'FetchData' });
-        expect(fetchData.props('url')).toBe('Warehouses');
+    expect(fetchData.props('url')).toBe('Warehouses');
-        expect(fetchData.props('autoLoad')).toBe(true);
+    expect(fetchData.props('autoLoad')).toBe(true);
-    });
+  });
 
-    it('should toggle dark mode correctly and update preferences', async () => {
+  it('should toggle dark mode correctly and update preferences', async () => {
-        await vm.saveDarkMode(true);
+    await vm.saveDarkMode(true);
-        expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
+    expect(axios.patch).toHaveBeenCalledWith('/UserConfigs/115', { darkMode: true });
-        expect(vm.user.darkMode).toBe(true);
+    expect(vm.user.darkMode).toBe(true);
-        vm.updatePreferences();
+    await vm.updatePreferences();
-        expect(vm.darkMode).toBe(true);
+    expect(vm.darkMode).toBe(true);
-    });
+  });
 
-    it('should change user language and update preferences', async () => {
+  it('should change user language and update preferences', async () => {
-        const userLanguage = 'es';
+    const userLanguage = 'es';
-        await vm.saveLanguage(userLanguage);
+    await vm.saveLanguage(userLanguage);
-        expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
+    expect(axios.patch).toHaveBeenCalledWith('/VnUsers/115', { lang: userLanguage });
-        expect(vm.user.lang).toBe(userLanguage);
+    expect(vm.user.lang).toBe(userLanguage);
-        vm.updatePreferences();
+    await vm.updatePreferences();
-        expect(vm.locale).toBe(userLanguage);
+    expect(vm.locale).toBe(userLanguage);
-    });
+  });
 
-    it('should update user data', async () => {
+  it('should update user data', async () => {
-        const key = 'name';
+    const key = 'name';
-        const value = 'itboss';
+    const value = 'itboss';
-        await vm.saveUserData(key, value);
+    await vm.saveUserData(key, value);
-        expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', {
+    expect(axios.post).toHaveBeenCalledWith('UserConfigs/setUserConfig', { [key]: value });
-            [key]: value,
+  });
-        });
-    });
 });

src/components/common/VnAccountNumber.vue

@@ -8,8 +8,7 @@ const model = defineModel({ prop: 'modelValue' });
     <VnInput
         v-model="model"
         ref="inputRef"
-        @keydown.tab="$refs.inputRef.vnInputRef.blur()"
+        @keydown.tab="model = useAccountShortToStandard($event.target.value) ?? model"
-        @blur="model = useAccountShortToStandard(model) ?? model"
         @input="model = $event.target.value.replace(/[^\d.]/g, '')"
     />
 </template>

src/components/common/VnColor.vue

@@ -1,6 +1,4 @@
 <script setup>
-import { computed } from 'vue';
-
 const $props = defineProps({
     colors: {
         type: String,
@@ -8,9 +6,9 @@ const $props = defineProps({
     },
 });
 
-const colorArray = computed(() => JSON.parse($props.colors)?.value);
+const colorArray = JSON.parse($props.colors)?.value;
 const maxHeight = 30;
-const colorHeight = maxHeight / colorArray.value?.length;
+const colorHeight = maxHeight / colorArray?.length;
 </script>
 <template>
     <div v-if="colors" class="color-div" :style="{ height: `${maxHeight}px` }">

src/components/common/VnDate.vue

@@ -1,5 +1,5 @@
 <script setup>
-const model = defineModel({ type: [String, Number], default: '' });
+const model = defineModel({ type: [String, Number], required: true });
 </script>
 <template>
     <QDate v-model="model" :today-btn="true" :options="$attrs.options" />

src/components/common/VnDms.vue

@@ -4,7 +4,6 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 
-import useNotify from 'src/composables/useNotify.js';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
@@ -13,7 +12,6 @@ import FormModelPopup from 'components/FormModelPopup.vue';
 
 const route = useRoute();
 const { t } = useI18n();
-const { notify } = useNotify();
 const emit = defineEmits(['onDataSaved']);
 
 const $props = defineProps({
@@ -63,11 +61,8 @@ function onFileChange(files) {
 
 function mapperDms(data) {
     const formData = new FormData();
-    let files = data.files;
+    const { files } = data;
-    if (files) {
+    if (files) formData.append(files?.name, files);
-        files = Array.isArray(files) ? files : [files];
-        files.forEach((file) => formData.append(file?.name, file));
-    }
 
     const dms = {
         hasFile: !!data.hasFile,
@@ -88,16 +83,11 @@ function getUrl() {
 }
 
 async function save() {
-    try {
+    const body = mapperDms(dms.value);
-        const body = mapperDms(dms.value);
+    const response = await axios.post(getUrl(), body[0], body[1]);
-        const response = await axios.post(getUrl(), body[0], body[1]);
+    emit('onDataSaved', body[1].params, response);
-        emit('onDataSaved', body[1].params, response);
+    delete dms.value.files;
-        notify(t('globals.dataSaved'), 'positive');
+    return response;
-        delete dms.value.files;
-        return response;
-    } catch (e) {
-        throw e;
-    }
 }
 
 function defaultData() {

src/components/common/VnDmsList.vue

@@ -13,12 +13,10 @@ import VnDms from 'src/components/common/VnDms.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import { useSession } from 'src/composables/useSession';
-import useNotify from 'src/composables/useNotify.js';
 
 const route = useRoute();
 const quasar = useQuasar();
 const { t } = useI18n();
-const { notify } = useNotify();
 const rows = ref([]);
 const dmsRef = ref();
 const formDialog = ref({});
@@ -90,6 +88,7 @@ const dmsFilter = {
             ],
         },
     },
+    where: { [$props.filter]: route.params.id },
 };
 
 const columns = computed(() => [
@@ -259,16 +258,9 @@ function deleteDms(dmsFk) {
             },
         })
         .onOk(async () => {
-            try {
+            await axios.post(`${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`);
-                await axios.post(
+            const index = rows.value.findIndex((row) => row.id == dmsFk);
-                    `${$props.deleteModel ?? $props.model}/${dmsFk}/removeFile`,
+            rows.value.splice(index, 1);
-                );
-                const index = rows.value.findIndex((row) => row.id == dmsFk);
-                rows.value.splice(index, 1);
-                notify(t('globals.dataDeleted'), 'positive');
-            } catch (e) {
-                throw e;
-            }
         });
 }
 
@@ -306,9 +298,7 @@ defineExpose({
         :data-key="$props.model"
         :url="$props.model"
         :user-filter="dmsFilter"
-        search-url="dmsFilter"
         :order="['dmsFk DESC']"
-        :filter="{ where: { [$props.filter]: route.params.id } }"
         auto-load
         @on-fetch="setData"
     >

src/components/common/VnInputBic.vue

@@ -1,44 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import axios from 'axios';
-
-import VnInput from 'src/components/common/VnInput.vue';
-
-const { t } = useI18n();
-const model = defineModel({ type: [Number, String] });
-const emit = defineEmits(['updateBic']);
-
-const getIbanCountry = (bank) => {
-    return bank.substr(0, 2);
-};
-
-const autofillBic = async (iban) => {
-    if (!iban) return;
-
-    const bankEntityId = parseInt(iban.substr(4, 4));
-    const ibanCountry = getIbanCountry(iban);
-
-    if (ibanCountry != 'ES') return;
-
-    const filter = { where: { id: bankEntityId } };
-    const params = { filter: JSON.stringify(filter) };
-
-    const { data } = await axios.get(`BankEntities`, { params });
-
-    emit('updateBic', data[0]?.id);
-};
-</script>
-<template>
-    <VnInput
-        :label="t('IBAN')"
-        clearable
-        v-model="model"
-        @update:model-value="autofillBic($event)"
-    >
-        <template #append>
-            <QIcon name="info" class="cursor-info">
-                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
-            </QIcon>
-        </template>
-    </VnInput>
-</template>

src/components/common/VnInputDate.vue

@@ -1,6 +1,6 @@
 <script setup>
-import { nextTick, watch, computed, ref, useAttrs } from 'vue';
+import { onMounted, watch, computed, ref, useAttrs } from 'vue';
-import { date, getCssVar } from 'quasar';
+import { date } from 'quasar';
 import VnDate from './VnDate.vue';
 import { useRequired } from 'src/composables/useRequired';
 
@@ -20,18 +20,61 @@ const $props = defineProps({
 });
 
 const vnInputDateRef = ref(null);
-const errColor = getCssVar('negative');
-const textColor = ref('');
 
 const dateFormat = 'DD/MM/YYYY';
 const isPopupOpen = ref();
 const hover = ref();
+const mask = ref();
 
 const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
 
+const formattedDate = computed({
+    get() {
+        if (!model.value) return model.value;
+        return date.formatDate(new Date(model.value), dateFormat);
+    },
+    set(value) {
+        if (value == model.value) return;
+        let newDate;
+        if (value) {
+            // parse input
+            if (value.includes('/') && value.length >= 10) {
+                if (value.at(2) == '/') value = value.split('/').reverse().join('/');
+                value = date.formatDate(
+                    new Date(value).toISOString(),
+                    'YYYY-MM-DDTHH:mm:ss.SSSZ',
+                );
+            }
+            const [year, month, day] = value.split('-').map((e) => parseInt(e));
+            newDate = new Date(year, month - 1, day);
+            if (model.value) {
+                const orgDate =
+                    model.value instanceof Date ? model.value : new Date(model.value);
+
+                newDate.setHours(
+                    orgDate.getHours(),
+                    orgDate.getMinutes(),
+                    orgDate.getSeconds(),
+                    orgDate.getMilliseconds(),
+                );
+            }
+        }
+        if (!isNaN(newDate)) model.value = newDate.toISOString();
+    },
+});
+
 const popupDate = computed(() =>
     model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value,
 );
+onMounted(() => {
+    // fix quasar bug
+    mask.value = '##/##/####';
+});
+watch(
+    () => model.value,
+    (val) => (formattedDate.value = val),
+    { immediate: true },
+);
 
 const styleAttrs = computed(() => {
     return $props.isOutlined
@@ -43,138 +86,28 @@ const styleAttrs = computed(() => {
         : {};
 });
 
-const inputValue = ref('');
-
-const validateAndCleanInput = (value) => {
-    inputValue.value = value.replace(/[^0-9./-]/g, '');
-};
-
 const manageDate = (date) => {
-    inputValue.value = date.split('/').reverse().join('/');
+    formattedDate.value = date;
     isPopupOpen.value = false;
 };
-
-watch(
-    () => model.value,
-    (nVal) => {
-        if (nVal) inputValue.value = date.formatDate(new Date(model.value), dateFormat);
-        else inputValue.value = '';
-    },
-    { immediate: true },
-);
-
-const formatDate = () => {
-    let value = inputValue.value;
-    if (!value || value === model.value) {
-        textColor.value = '';
-        return;
-    }
-    const regex =
-        /^([0]?[1-9]|[12][0-9]|3[01])([./-])([0]?[1-9]|1[0-2])([./-](\d{1,4}))?$/;
-    if (!regex.test(value)) {
-        textColor.value = errColor;
-        return;
-    }
-
-    value = value.replace(/[.-]/g, '/');
-    const parts = value.split('/');
-    if (parts.length < 2) {
-        textColor.value = errColor;
-        return;
-    }
-
-    let [day, month, year] = parts;
-    if (day.length === 1) day = '0' + day;
-    if (month.length === 1) month = '0' + month;
-
-    const currentYear = Date.vnNew().getFullYear();
-    if (!year) year = currentYear;
-    const millennium = currentYear.toString().slice(0, 1);
-
-    switch (year.length) {
-        case 1:
-            year = `${millennium}00${year}`;
-            break;
-        case 2:
-            year = `${millennium}0${year}`;
-            break;
-        case 3:
-            year = `${millennium}${year}`;
-            break;
-        case 4:
-            break;
-    }
-
-    let isoCandidate = `${year}/${month}/${day}`;
-    isoCandidate = date.formatDate(
-        new Date(isoCandidate).toISOString(),
-        'YYYY-MM-DDTHH:mm:ss.SSSZ',
-    );
-    const [isoYear, isoMonth, isoDay] = isoCandidate.split('-').map((e) => parseInt(e));
-    const parsedDate = new Date(isoYear, isoMonth - 1, isoDay);
-
-    const isValidDate =
-        parsedDate instanceof Date &&
-        !isNaN(parsedDate) &&
-        parsedDate.getFullYear() === parseInt(year) &&
-        parsedDate.getMonth() === parseInt(month) - 1 &&
-        parsedDate.getDate() === parseInt(day);
-
-    if (!isValidDate) {
-        textColor.value = errColor;
-        return;
-    }
-
-    if (model.value) {
-        const original =
-            model.value instanceof Date ? model.value : new Date(model.value);
-        parsedDate.setHours(
-            original.getHours(),
-            original.getMinutes(),
-            original.getSeconds(),
-            original.getMilliseconds(),
-        );
-    }
-
-    model.value = parsedDate.toISOString();
-
-    textColor.value = '';
-};
-
-const handleEnter = (event) => {
-    formatDate();
-
-    nextTick(() => {
-        const newEvent = new KeyboardEvent('keydown', {
-            key: 'Enter',
-            code: 'Enter',
-            bubbles: true,
-            cancelable: true,
-        });
-        vnInputDateRef.value?.$el?.dispatchEvent(newEvent);
-    });
-};
 </script>
 
 <template>
     <div @mouseover="hover = true" @mouseleave="hover = false">
         <QInput
             ref="vnInputDateRef"
-            v-model="inputValue"
+            v-model="formattedDate"
             class="vn-input-date"
+            :mask="mask"
             placeholder="dd/mm/aaaa"
             v-bind="{ ...$attrs, ...styleAttrs }"
             :class="{ required: isRequired }"
             :rules="mixinRules"
             :clearable="false"
-            :input-style="{ color: textColor }"
             @click="isPopupOpen = !isPopupOpen"
             @keydown="isPopupOpen = false"
-            @blur="formatDate"
-            @keydown.enter.prevent="handleEnter"
             hide-bottom-space
             :data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'"
-            @update:model-value="validateAndCleanInput"
         >
             <template #append>
                 <QIcon
@@ -183,12 +116,11 @@ const handleEnter = (event) => {
                     v-if="
                         ($attrs.clearable == undefined || $attrs.clearable) &&
                         hover &&
-                        inputValue &&
+                        model &&
                         !$attrs.disable
                     "
                     @click="
                         vnInputDateRef.focus();
-                        inputValue = null;
                         model = null;
                         isPopupOpen = false;
                     "

src/components/common/VnInputDateTime.vue

@@ -1,79 +0,0 @@
-<script setup>
-import { computed, useAttrs } from 'vue';
-import { date } from 'quasar';
-import VnDate from './VnDate.vue';
-import VnTime from './VnTime.vue';
-
-const $attrs = useAttrs();
-const model = defineModel({ type: [Date, String] });
-
-const $props = defineProps({
-    isOutlined: {
-        type: Boolean,
-        default: false,
-    },
-    showEvent: {
-        type: Boolean,
-        default: true,
-    },
-});
-const styleAttrs = computed(() => {
-    return $props.isOutlined
-        ? {
-              dense: true,
-              outlined: true,
-              rounded: true,
-          }
-        : {};
-});
-const mask = 'DD-MM-YYYY HH:mm';
-const selectedDate = computed({
-    get() {
-        if (!model.value) return JSON.stringify(new Date(model.value));
-        return date.formatDate(new Date(model.value), mask);
-    },
-    set(value) {
-        model.value = Date.convertToISODateTime(value);
-    },
-});
-const manageDate = (date) => {
-    selectedDate.value = date;
-};
-</script>
-
-<template>
-    <div @mouseover="hover = true" @mouseleave="hover = false">
-        <QInput
-            ref="vnInputDateRef"
-            v-model="selectedDate"
-            class="vn-input-date"
-            placeholder="dd/mm/aaaa HH:mm"
-            v-bind="{ ...$attrs, ...styleAttrs }"
-            :clearable="false"
-            @click="isPopupOpen = !isPopupOpen"
-            @keydown="isPopupOpen = false"
-            hide-bottom-space
-            @update:model-value="manageDate"
-            :data-cy="$attrs.dataCy ?? $attrs.label + '_inputDateTime'"
-        >
-            <template #prepend>
-                <QIcon name="today" size="xs">
-                    <QPopupProxy cover transition-show="scale" transition-hide="scale">
-                        <VnDate :mask="mask" v-model="selectedDate" />
-                    </QPopupProxy>
-                </QIcon>
-            </template>
-            <template #append>
-                <QIcon name="access_time" size="xs">
-                    <QPopupProxy cover transition-show="scale" transition-hide="scale">
-                        <VnTime format24h :mask="mask" v-model="selectedDate" />
-                    </QPopupProxy>
-                </QIcon>
-            </template>
-        </QInput>
-    </div>
-</template>
-<i18n>
-    es:
-        Open date: Abrir fecha
-</i18n>

src/components/common/VnJsonValue.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { watch } from 'vue';
-import { toDateHourMinSec } from 'src/filters';
+import { toDateString } from 'src/filters';
 
 const props = defineProps({
     value: { type: [String, Number, Boolean, Object], default: undefined },
@@ -40,7 +40,7 @@ const updateValue = () => {
                 break;
             case 'object':
                 if (props.value instanceof Date) {
-                    t = toDateHourMinSec(props.value);
+                    t = toDateString(props.value);
                 } else {
                     t = props.value.toString();
                 }

src/components/common/VnLog.vue

@@ -68,6 +68,7 @@ const filter = {
             },
         },
     ],
+    where: { and: [{ originFk: route.params.id }] },
 };
 
 const paginate = ref();
@@ -266,6 +267,13 @@ onMounted(() => {
 onUnmounted(() => {
     stateStore.rightDrawer = false;
 });
+
+watch(
+    () => router.currentRoute.value.params.id,
+    () => {
+        applyFilter();
+    },
+);
 </script>
 <template>
     <VnPaginate
@@ -273,7 +281,6 @@ onUnmounted(() => {
         :data-key
         :url="dataKey + 's'"
         :user-filter="filter"
-        :filter="{ where: { and: [{ originFk: route.params.id }] } }"
         :skeleton="false"
         auto-load
         @on-fetch="setLogTree"

src/components/common/VnLogFilter.vue

@@ -39,7 +39,7 @@ const checkboxOptions = ref([
     { name: 'select', label: 'Accesses', selected: false },
 ]);
 const columns = computed(() => [
-    { name: 'changedModelValue', orderBy: 'id' },
+    { name: 'changedModelValue' },
     { name: 'changedModel' },
     { name: 'userType', orderBy: false },
     { name: 'userFk' },

src/components/common/VnScroll.vue

@@ -1,100 +0,0 @@
-<script setup>
-import { ref, onMounted, onUnmounted, watch, nextTick } from 'vue';
-
-const props = defineProps({
-    scrollTarget: { type: [String, Object], default: 'window' }
-});
-
-const scrollPosition = ref(0);
-const showButton = ref(false);
-let scrollContainer = null;
-
-const onScroll = () => {
-    if (!scrollContainer) return;
-    scrollPosition.value = 
-        typeof props.scrollTarget === 'object' 
-            ? scrollContainer.scrollTop 
-            : window.scrollY;
-};
-
-watch(scrollPosition, (newValue) => {
-    showButton.value = newValue > 0;
-});
-
-const scrollToTop = () => {
-    if (scrollContainer) {
-        scrollContainer.scrollTo({ top: 0, behavior: 'smooth' });
-    }
-};
-
-const updateScrollContainer = (container) => {
-  if (container) {
-    if (scrollContainer) {
-      scrollContainer.removeEventListener('scroll', onScroll);
-    }
-    scrollContainer = container;
-    scrollContainer.addEventListener('scroll', onScroll);
-    onScroll();
-  }
-};
-
-defineExpose({
-  updateScrollContainer
-});
-
-const initScrollContainer = async () => {
-    await nextTick();
-
-    if (typeof props.scrollTarget === 'object') {
-        scrollContainer = props.scrollTarget;
-    } else {
-        scrollContainer = window;
-    }
-
-    if (!scrollContainer) return
-        scrollContainer.addEventListener('scroll', onScroll);    
-};
-
-
-onMounted(() => {
-    initScrollContainer();
-});
-
-onUnmounted(() => {
-    if (scrollContainer) {
-        scrollContainer.removeEventListener('scroll', onScroll);
-        scrollContainer = null;
-    }
-});
-</script>
-
-<template>
-    <QIcon
-        v-if="showButton"
-        color="primary"
-        name="keyboard_arrow_up"
-        class="scroll-to-top"
-        @click="scrollToTop"
-    >
-        <QTooltip>{{ $t('globals.scrollToTop') }}</QTooltip>
-    </QIcon>
-</template>
-
-<style scoped>
-.scroll-to-top {
-  position: fixed;
-  top: 70px;
-  font-size: 65px;
-  left: 50%;
-  transform: translateX(-50%);
-  z-index: 1000;
-  transition: transform 0.2s ease-in-out;
-}
-
-.scroll-to-top:hover {
-  transform: translateX(-50%) scale(1.2);
-  cursor: pointer;
-  filter: brightness(0.8);
-}
-</style>
-

src/components/common/VnSelect.vue

@@ -54,10 +54,6 @@ const $props = defineProps({
         type: [Array],
         default: () => [],
     },
-    filterFn: {
-        type: Function,
-        default: null,
-    },
     exprBuilder: {
         type: Function,
         default: null,
@@ -66,12 +62,16 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    defaultFilter: {
+        type: Boolean,
+        default: true,
+    },
     fields: {
         type: Array,
         default: null,
     },
     include: {
-        type: [Object, Array, String],
+        type: [Object, Array],
         default: null,
     },
     where: {
@@ -79,7 +79,7 @@ const $props = defineProps({
         default: null,
     },
     sortBy: {
-        type: [String, Array],
+        type: String,
         default: null,
     },
     limit: {
@@ -152,22 +152,10 @@ const value = computed({
     },
 });
 
-const arrayDataKey =
-    $props.dataKey ??
-    ($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
-
-const arrayData = useArrayData(arrayDataKey, {
-    url: $props.url,
-    searchUrl: false,
-    mapKey: $attrs['map-key'],
-});
-
 const computedSortBy = computed(() => {
     return $props.sortBy || $props.optionLabel + ' ASC';
 });
 
-const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
-
 watch(options, (newValue) => {
     setOptions(newValue);
 });
@@ -186,7 +174,16 @@ onMounted(() => {
     if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
 });
 
-const someIsLoading = computed(() => isLoading.value || !!arrayData?.isLoading?.value);
+const arrayDataKey =
+    $props.dataKey ??
+    ($props.url?.length > 0 ? $props.url : ($attrs.name ?? $attrs.label));
+
+const arrayData = useArrayData(arrayDataKey, {
+    url: $props.url,
+    searchUrl: false,
+    mapKey: $attrs['map-key'],
+});
+
 function findKeyInOptions() {
     if (!$props.options) return;
     return filter($props.modelValue, $props.options)?.length;
@@ -255,41 +252,43 @@ async function fetchFilter(val) {
 }
 
 async function filterHandler(val, update) {
+    if (isLoading.value) return update();
+    if (!val && lastVal.value === val) {
+        lastVal.value = val;
+        return update();
+    }
+    lastVal.value = val;
     let newOptions;
 
-    if ($props.filterFn) update($props.filterFn(val));
+    if (!$props.defaultFilter) return update();
-    else if (!val && lastVal.value === val) update();
+    if (
-    else {
+        $props.url &&
-        const makeRequest =
+        ($props.limit || (!$props.limit && Object.keys(myOptions.value).length === 0))
-            ($props.url && $props.limit) ||
+    ) {
-            (!$props.limit && Object.keys(myOptions.value).length === 0);
+        newOptions = await fetchFilter(val);
-        newOptions = makeRequest
+    } else newOptions = filter(val, myOptionsOriginal.value);
-            ? await fetchFilter(val)
+    update(
-            : filter(val, myOptionsOriginal.value);
+        () => {
+            if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
+                newOptions.unshift(noOneOpt.value);
 
-        update(
+            myOptions.value = newOptions;
-            () => {
+        },
-                if ($props.noOne && noOneText.toLowerCase().includes(val.toLowerCase()))
+        (ref) => {
-                    newOptions.unshift(noOneOpt.value);
+            if (val !== '' && ref.options.length > 0) {
-
+                ref.setOptionIndex(-1);
-                myOptions.value = newOptions;
+                ref.moveOptionSelection(1, true);
-            },
+            }
-            (ref) => {
+        },
-                if (val !== '' && ref.options.length > 0) {
+    );
-                    ref.setOptionIndex(-1);
-                    ref.moveOptionSelection(1, true);
-                }
-            },
-        );
-    }
-
-    lastVal.value = val;
 }
 
 function nullishToTrue(value) {
     return value ?? true;
 }
 
+const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
+
 async function onScroll({ to, direction, from, index }) {
     const lastIndex = myOptions.value.length - 1;
 
@@ -367,8 +366,7 @@ function getCaption(opt) {
         virtual-scroll-slice-size="options.length"
         hide-bottom-space
         :input-debounce="useURL ? '300' : '0'"
-        :loading="someIsLoading"
+        :loading="isLoading"
-        :disable="someIsLoading"
         @virtual-scroll="onScroll"
         @keydown="handleKeyDown"
         :data-cy="$attrs.dataCy ?? $attrs.label + '_select'"
@@ -376,7 +374,7 @@ function getCaption(opt) {
     >
         <template #append>
             <QIcon
-                v-show="isClearable && value != null && value !== ''"
+                v-show="isClearable && value"
                 name="close"
                 @click="
                     () => {
@@ -391,7 +389,7 @@ function getCaption(opt) {
         <template v-for="(_, slotName) in $slots" #[slotName]="slotData" :key="slotName">
             <div v-if="slotName == 'append'">
                 <QIcon
-                    v-show="isClearable && value != null && value !== ''"
+                    v-show="isClearable && value"
                     name="close"
                     @click.stop="
                         () => {
@@ -416,7 +414,7 @@ function getCaption(opt) {
                     <QItemLabel>
                         {{ opt[optionLabel] }}
                     </QItemLabel>
-                    <QItemLabel caption v-if="getCaption(opt) !== false">
+                    <QItemLabel caption v-if="getCaption(opt)">
                         {{ `#${getCaption(opt)}` }}
                     </QItemLabel>
                 </QItemSection>

src/components/common/VnSmsDialog.vue

@@ -232,7 +232,7 @@ fr:
     pt: Portugais
 pt:
     Send SMS: Enviar SMS
-    CustomerDefaultLanguage: Este cliente utiliza o {locale} como seu idioma padrão
+    CustomerDefaultLanguage: Este cliente utiliza o <strong>{locale}</strong> como seu idioma padrão
     Language: Linguagem
     Phone: Móvel
     Subject: Assunto

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

@@ -12,9 +12,7 @@ describe('VnDiscount', () => {
                 price: 100,
                 quantity: 2,
                 discount: 10,
-                mana: 10,
+            }
-                promise: vi.fn(),
-            },
         }).vm;
     });
 

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

@@ -41,12 +41,10 @@ describe('VnDms', () => {
         companyFk: 2,
         dmsTypeFk: 3,
         description: 'This is a test description',
-        files: [
+        files: {
-            {
+            name: 'example.txt',
-                name: 'example.txt',
+            content: new Blob(['file content'], { type: 'text/plain' }),
-                content: new Blob(['file content'], { type: 'text/plain' }),
+        },
-            },
-        ],
     };
 
     const expectedBody = {
@@ -85,7 +83,7 @@ describe('VnDms', () => {
         it('should map DMS data correctly and add file to FormData', () => {
             const [formData, params] = vm.mapperDms(data);
 
-            expect([formData.get('example.txt')]).toStrictEqual(data.files);
+            expect(formData.get('example.txt')).toBe(data.files);
             expect(expectedBody).toEqual(params.params);
         });
 

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

@@ -2,6 +2,7 @@ import { createWrapper } from 'app/test/vitest/helper';
 import { vi, describe, expect, it } from 'vitest';
 import VnInput from 'src/components/common/VnInput.vue';
 
+
 describe('VnInput', () => {
     let vm;
     let wrapper;
@@ -11,27 +12,25 @@ describe('VnInput', () => {
         wrapper = createWrapper(VnInput, {
             props: {
                 modelValue: value,                
-                isOutlined,
+                isOutlined,  emptyToNull,  insertable,
-                emptyToNull,
+                maxlength: 101
-                insertable,
-                maxlength: 101,
             },
             attrs: {
                 label: 'test',
                 required: true,
                 maxlength: 101,
                 maxLength: 10,
-                'max-length': 20,
+                'max-length':20
             },
         });
         wrapper = wrapper.wrapper;
         vm = wrapper.vm;
         input = wrapper.find('[data-cy="test_input"]');
-    }
+    };
 
     describe('value', () => {
         it('should emit update:modelValue when value changes', async () => {
-            generateWrapper('12345', false, false, true);
+            generateWrapper('12345', false, false, true)
             await input.setValue('123');
             expect(wrapper.emitted('update:modelValue')).toBeTruthy();
             expect(wrapper.emitted('update:modelValue')[0]).toEqual(['123']);
@@ -63,6 +62,7 @@ describe('VnInput', () => {
             expect(wrapper.emitted('update:modelValue')).toBeUndefined();
             const spyhandler = vi.spyOn(vm, 'handleInsertMode');
             expect(spyhandler).not.toHaveBeenCalled();
+            
         });
         
         /*
@@ -71,12 +71,12 @@ describe('VnInput', () => {
         it.skip('handleKeydown respects insertable behavior', async () => {
             const expectedValue = '12345';
             generateWrapper('1234', false, false, true);
-            vm.focus();
+            vm.focus()
             await input.trigger('keydown', { key: '5' });
             await vm.$nextTick();
             expect(wrapper.emitted('update:modelValue')).toBeTruthy();
-            expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue]);
+            expect(wrapper.emitted('update:modelValue')[0]).toEqual([expectedValue ]);
-            expect(vm.value).toBe(expectedValue);
+            expect(vm.value).toBe( expectedValue);
         });
     });
 

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

@@ -5,71 +5,52 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 let vm;
 let wrapper;
 
-function generateWrapper(outlined = false, required = false) {
+function generateWrapper(date, outlined, required) {
     wrapper = createWrapper(VnInputDate, {
         props: {
-            modelValue: '2000-12-31T23:00:00.000Z',
+            modelValue: date,
-            'onUpdate:modelValue': (e) => wrapper.setProps({ modelValue: e }),
         },
         attrs: {
             isOutlined: outlined,
-            required: required,
+            required: required
         },
     });
     wrapper = wrapper.wrapper;
     vm = wrapper.vm;
-}
+};
 
 describe('VnInputDate', () => {
+
     describe('formattedDate', () => {     
-        it('validateAndCleanInput should remove non-numeric characters', async () => {
+        it('formats a valid date correctly', async () => {
-            generateWrapper();
+            generateWrapper('2023-12-25', false, false);
-            vm.validateAndCleanInput('10a/1s2/2dd0a23');
             await vm.$nextTick();
-            expect(vm.inputValue).toBe('10/12/2023');
+            expect(vm.formattedDate).toBe('25/12/2023');
         });
 
-        it('manageDate should reverse the date', async () => {
+        it('updates the model value when a new date is set', async () => {
-            generateWrapper();
-            vm.manageDate('10/12/2023');
-            await vm.$nextTick();
-            expect(vm.inputValue).toBe('2023/12/10');
-        });
-
-        it('formatDate should format the date correctly when a valid date is entered with full year', async () => {
             const input = wrapper.find('input');
-            await input.setValue('25.12/2002');
+            await input.setValue('31/12/2023');
-            await vm.$nextTick();
+            expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
-            await vm.formatDate();
+            expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
-            expect(vm.model).toBe('2002-12-24T23:00:00.000Z');
         });
 
-        it('should format the date correctly when a valid date is entered with short year', async () => {
+        it('should not update the model value when an invalid date is set', async () => {
             const input = wrapper.find('input');
-            await input.setValue('31.12-23');
+            await input.setValue('invalid-date');
-            await vm.$nextTick();
+            expect(wrapper.emitted()['update:modelValue'][0][0]).toBe('2023-12-31T00:00:00.000Z');
-            await vm.formatDate();
-            expect(vm.model).toBe('2023-12-30T23:00:00.000Z');
-        });
-
-        it('should format the date correctly when a valid date is entered without year', async () => {
-            const input = wrapper.find('input');
-            await input.setValue('12.03');
-            await vm.$nextTick();
-            await vm.formatDate();
-            expect(vm.model).toBe('2001-03-11T23:00:00.000Z');
         }); 
     });
 
     describe('styleAttrs', () => {
         it('should return empty styleAttrs when isOutlined is false', async () => {
-            generateWrapper();
+            generateWrapper('2023-12-25', false, false);
             await vm.$nextTick();
             expect(vm.styleAttrs).toEqual({}); 
         });
 
         it('should set styleAttrs when isOutlined is true', async () => {        
-            generateWrapper(true, false);
+            generateWrapper('2023-12-25', true, false);
             await vm.$nextTick();
             expect(vm.styleAttrs.outlined).toBe(true);
         });
@@ -77,13 +58,13 @@ describe('VnInputDate', () => {
 
     describe('required', () => {
         it('should not applies required class when isRequired is false', async () => {
-            generateWrapper();
+            generateWrapper('2023-12-25', false, false);
             await vm.$nextTick();
             expect(wrapper.find('.vn-input-date').classes()).not.toContain('required');
         });
         
         it('should applies required class when isRequired is true', async () => {
-            generateWrapper(false, true);
+            generateWrapper('2023-12-25', false, true);
             await vm.$nextTick();
             expect(wrapper.find('.vn-input-date').classes()).toContain('required');
         });

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

@@ -1,81 +0,0 @@
-import { createWrapper } from 'app/test/vitest/helper.js';
-import { describe, it, expect, beforeAll } from 'vitest';
-import VnInputDateTime from 'components/common/VnInputDateTime.vue';
-import vnDateBoot from 'src/boot/vnDate';
-
-let vm;
-let wrapper;
-
-beforeAll(() => {
-    // Initialize the vnDate boot
-    vnDateBoot();
-});
-function generateWrapper(date, outlined, showEvent) {
-    wrapper = createWrapper(VnInputDateTime, {
-        props: {
-            modelValue: date,
-            isOutlined: outlined,
-            showEvent: showEvent,
-        },
-    });
-    wrapper = wrapper.wrapper;
-    vm = wrapper.vm;
-}
-
-describe('VnInputDateTime', () => {
-    describe('selectedDate', () => {
-        it('formats a valid datetime correctly', async () => {
-            generateWrapper('2023-12-25T10:30:00', false, true);
-            await vm.$nextTick();
-            expect(vm.selectedDate).toBe('25-12-2023 10:30');
-        });
-
-        it('handles null date value', async () => {
-            generateWrapper(null, false, true);
-            await vm.$nextTick();
-            expect(vm.selectedDate).not.toBe(null);
-        });
-
-        it('updates the model value when a new datetime is set', async () => {
-            vm.selectedDate = '31-12-2023 15:45';
-            await vm.$nextTick();
-            expect(wrapper.emitted()['update:modelValue']).toBeTruthy();
-        });
-    });
-
-    describe('styleAttrs', () => {
-        it('should return empty styleAttrs when isOutlined is false', async () => {
-            generateWrapper('2023-12-25T10:30:00', false, true);
-            await vm.$nextTick();
-            expect(vm.styleAttrs).toEqual({});
-        });
-
-        it('should set styleAttrs when isOutlined is true', async () => {
-            generateWrapper('2023-12-25T10:30:00', true, true);
-            await vm.$nextTick();
-            expect(vm.styleAttrs).toEqual({
-                dense: true,
-                outlined: true,
-                rounded: true,
-            });
-        });
-    });
-
-    describe('component rendering', () => {
-        it('should render date and time icons', async () => {
-            generateWrapper('2023-12-25T10:30:00', false, true);
-            await vm.$nextTick();
-            const icons = wrapper.findAllComponents({ name: 'QIcon' });
-            expect(icons.length).toBe(2);
-            expect(icons[0].props('name')).toBe('today');
-            expect(icons[1].props('name')).toBe('access_time');
-        });
-
-        it('should render popup proxies for date and time', async () => {
-            generateWrapper('2023-12-25T10:30:00', false, true);
-            await vm.$nextTick();
-            const popups = wrapper.findAllComponents({ name: 'QPopupProxy' });
-            expect(popups.length).toBe(2);
-        });
-    });
-});

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

@@ -65,7 +65,7 @@ describe('VnJsonValue', () => {
         const date = new Date('2023-01-01');
         const wrapper = buildComponent({ value: date });
         const span = wrapper.find('span');
-        expect(span.text()).toBe('01/01/2023, 01:00:00');
+        expect(span.text()).toBe('2023-01-01');
         expect(span.classes()).toContain('json-object');
     });
 

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

@@ -90,10 +90,8 @@ describe('VnLog', () => {
 
         vm = createWrapper(VnLog, {
             global: {
-                stubs: ['FetchData', 'vue-i18n'],
+                stubs: [],
-                mocks: {
+                mocks: {},
-                    fetch: vi.fn(),
-                },
             },
             propsData: {
                 model: 'Claim',

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

@@ -26,7 +26,7 @@ describe('VnNotes', () => {
     ) {
         vi.spyOn(axios, 'get').mockResolvedValue({ data: [] });
         wrapper = createWrapper(VnNotes, {
-            propsData: { ...defaultOptions, ...options },
+            propsData: options,
         });
         wrapper = wrapper.wrapper;
         vm = wrapper.vm;

src/components/ui/EntityDescriptor.vue

@@ -58,8 +58,7 @@ async function getData() {
     store.filter = $props.filter ?? {};
     isLoading.value = true;
     try {
-        await arrayData.fetch({ append: false, updateRouter: false });
+        const { data } = await arrayData.fetch({ append: false, updateRouter: false });
-        const { data } = store;
         state.set($props.dataKey, data);
         emit('onFetch', data);
     } finally {

src/components/ui/VnConfirm.vue

@@ -89,26 +89,24 @@ function cancel() {
                 <slot name="customHTML"></slot>
             </QCardSection>
             <QCardActions align="right">
-                <slot name="actions" :actions="{ confirm, cancel }">
+                <QBtn
-                    <QBtn
+                    :label="t('globals.cancel')"
-                        :label="t('globals.cancel')"
+                    color="primary"
-                        color="primary"
+                    :disable="isLoading"
-                        :disable="isLoading"
+                    flat
-                        flat
+                    @click="cancel()"
-                        @click="cancel()"
+                    data-cy="VnConfirm_cancel"
-                        data-cy="VnConfirm_cancel"
+                />
-                    />
+                <QBtn
-                    <QBtn
+                    :label="t('globals.confirm')"
-                        :label="t('globals.confirm')"
+                    :title="t('globals.confirm')"
-                        :title="t('globals.confirm')"
+                    color="primary"
-                        color="primary"
+                    :loading="isLoading"
-                        :loading="isLoading"
+                    @click="confirm()"
-                        @click="confirm()"
+                    unelevated
-                        unelevated
+                    autofocus
-                        autofocus
+                    data-cy="VnConfirm_confirm"
-                        data-cy="VnConfirm_confirm"
+                />
-                    />
-                </slot>
             </QCardActions>
         </QCard>
     </QDialog>

src/components/ui/VnDescriptor.vue

@@ -6,7 +6,6 @@ import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useRoute, useRouter } from 'vue-router';
 import { useClipboard } from 'src/composables/useClipboard';
 import VnMoreOptions from './VnMoreOptions.vue';
-import { getValueFromPath } from 'src/composables/getValueFromPath';
 
 const entity = defineModel({ type: Object, default: null });
 const $props = defineProps({
@@ -57,6 +56,18 @@ const routeName = computed(() => {
     return `${routeName}Summary`;
 });
 
+function getValueFromPath(path) {
+    if (!path) return;
+    const keys = path.toString().split('.');
+    let current = entity.value;
+
+    for (const key of keys) {
+        if (current[key] === undefined) return undefined;
+        else current = current[key];
+    }
+    return current;
+}
+
 function copyIdText(id) {
     copyText(id, {
         component: {
@@ -159,10 +170,10 @@ const toModule = computed(() => {
                         <div class="title">
                             <span
                                 v-if="title"
-                                :title="getValueFromPath(entity, title)"
+                                :title="getValueFromPath(title)"
                                 :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_title`"
                             >
-                                {{ getValueFromPath(entity, title) ?? title }}
+                                {{ getValueFromPath(title) ?? title }}
                             </span>
                             <slot v-else name="description" :entity="entity">
                                 <span
@@ -178,7 +189,7 @@ const toModule = computed(() => {
                             class="subtitle"
                             :data-cy="`${$attrs['data-cy'] ?? 'vnDescriptor'}_subtitle`"
                         >
-                            #{{ getValueFromPath(entity, subtitle) ?? entity.id }}
+                            #{{ getValueFromPath(subtitle) ?? entity.id }}
                         </QItemLabel>
                         <QBtn
                             round

src/components/ui/VnFilterPanel.vue

@@ -212,7 +212,6 @@ const getLocale = (label) => {
         color="primary"
         style="position: fixed; z-index: 1; right: 0; bottom: 0"
         icon="search"
-        data-cy="vnFilterPanel_search"
         @click="search()"
     >
         <QTooltip bottom anchor="bottom right">
@@ -230,7 +229,6 @@ const getLocale = (label) => {
                 <QItemSection top side>
                     <QBtn
                         @click="clearFilters"
-                        data-cy="clearFilters"
                         color="primary"
                         dense
                         flat
@@ -294,7 +292,6 @@ const getLocale = (label) => {
         </QList>
     </QForm>
     <QInnerLoading
-        data-cy="filterPanel-spinner"
         :label="t('globals.pleaseWait')"
         :showing="isLoading"
         color="primary"

src/components/ui/VnLv.vue

@@ -6,7 +6,6 @@ import { computed } from 'vue';
 
 const $props = defineProps({
     label: { type: String, default: null },
-    tooltip: { type: String, default: null },
     value: {
         type: [String, Boolean, Number],
         default: null,
@@ -41,10 +40,7 @@ const val = computed(() => $props.value);
         <template v-else>
             <div v-if="label || $slots.label" class="label">
                 <slot name="label">
-                    <QTooltip v-if="tooltip">{{ tooltip }}</QTooltip>
+                    <span style="color: var(--vn-label-color)">{{ label }}</span>
-                    <span style="color: var(--vn-label-color)">
-                        {{ label }}
-                    </span>
                 </slot>
             </div>
             <div class="value" v-if="value || $slots.value">

src/components/ui/VnPaginate.vue

@@ -2,9 +2,7 @@
 import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
-import { useAttrs } from 'vue';
 
-const attrs = useAttrs();
 const { t } = useI18n();
 
 const props = defineProps({
@@ -69,7 +67,7 @@ const props = defineProps({
         default: null,
     },
     searchUrl: {
-        type: [String, Boolean],
+        type: String,
         default: null,
     },
     disableInfiniteScroll: {
@@ -77,7 +75,7 @@ const props = defineProps({
         default: false,
     },
     mapKey: {
-        type: [String, Boolean],
+        type: String,
         default: '',
     },
     keyData: {
@@ -222,7 +220,7 @@ defineExpose({
 </script>
 
 <template>
-    <div class="full-width" v-bind="attrs">
+    <div class="full-width">
         <div
             v-if="!store.data && !store.data?.length && !isLoading"
             class="info-row q-pa-md text-center"

src/components/ui/VnSearchbar.vue

@@ -46,7 +46,7 @@ const props = defineProps({
         default: null,
     },
     order: {
-        type: [String, Array],
+        type: String,
         default: '',
     },
     limit: {

src/components/ui/VnUsesMana.vue

@@ -0,0 +1,60 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+const { t } = useI18n();
+const props = defineProps({
+    usesMana: {
+        type: Boolean,
+        required: true,
+    },
+    manaCode: {
+        type: String,
+        required: true,
+    },
+    manaVal: {
+        type: String,
+        default: 'mana',
+    },
+    manaLabel: {
+        type: String,
+        default: 'Promotion mana',
+    },
+    manaClaimVal: {
+        type: String,
+        default: 'manaClaim',
+    },
+    claimLabel: {
+        type: String,
+        default: 'Claim mana',
+    },
+});
+
+const manaCode = ref(props.manaCode);
+</script>
+
+<template>
+    <div class="column q-gutter-y-sm q-mt-sm">
+        <QRadio
+            v-model="manaCode"
+            dense
+            :val="manaVal"
+            :label="t(manaLabel)"
+            :dark="true"
+            class="q-mb-sm"
+        />
+        <QRadio
+            v-model="manaCode"
+            dense
+            :val="manaClaimVal"
+            :label="t(claimLabel)"
+            :dark="true"
+            class="q-mb-sm"
+        />
+    </div>
+</template>
+<i18n>
+    es:
+        Promotion mana: Maná promoción
+        Claim mana: Maná reclamación
+</i18n>

src/components/ui/__tests__/CardSummary.spec.js

@@ -23,15 +23,10 @@ describe('CardSummary', () => {
 
     beforeEach(() => {
         wrapper = createWrapper(CardSummary, {
-            global: {
-                mocks: {
-                    validate: vi.fn(),
-                },
-            },
             propsData: {
                 dataKey: 'cardSummaryKey',
                 url: 'cardSummaryUrl',
-                filter: { key: 'cardFilter' },
+                filter: 'cardFilter',
             },
         });
         vm = wrapper.vm;
@@ -55,7 +50,7 @@ describe('CardSummary', () => {
 
     it('should set correct props to the store', () => {
         expect(vm.store.url).toEqual('cardSummaryUrl');
-        expect(vm.store.filter).toEqual({ key: 'cardFilter' });
+        expect(vm.store.filter).toEqual('cardFilter');
     });
 
     it('should respond to prop changes and refetch data', async () => {

src/components/ui/__tests__/VnSearchbar.spec.js

@@ -7,7 +7,7 @@ describe('VnSearchbar', () => {
     let wrapper;
     let applyFilterSpy;
     const searchText = 'Bolas de madera';
-    const userParams = { staticKey: 'staticValue' };
+    const userParams = {staticKey: 'staticValue'};
 
     beforeEach(async () => {
         wrapper = createWrapper(VnSearchbar, {
@@ -23,9 +23,8 @@ describe('VnSearchbar', () => {
 
         vm.searchText = searchText;
         vm.arrayData.store.userParams = userParams;
-        applyFilterSpy = vi
+        applyFilterSpy = vi.spyOn(vm.arrayData, 'applyFilter').mockImplementation(() => {});
-            .spyOn(vm.arrayData, 'applyFilter')
+        
-            .mockImplementation(() => {});
     });
 
     afterEach(() => {
@@ -33,9 +32,7 @@ describe('VnSearchbar', () => {
     });
 
     it('search resets pagination and applies filter', async () => {
-        const resetPaginationSpy = vi
+        const resetPaginationSpy = vi.spyOn(vm.arrayData, 'resetPagination').mockImplementation(() => {});
-            .spyOn(vm.arrayData, 'resetPagination')
-            .mockImplementation(() => {});
         await vm.search();
 
         expect(resetPaginationSpy).toHaveBeenCalled();
@@ -51,7 +48,7 @@ describe('VnSearchbar', () => {
 
         expect(applyFilterSpy).toHaveBeenCalledWith({
             params: { staticKey: 'staticValue', search: searchText },
-            filter: { skip: 0 },
+            filter: {skip: 0},
         });
     });
 

src/components/ui/__tests__/VnSms.spec.js

@@ -1,4 +1,5 @@
 import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
+import axios from 'axios';
 import { createWrapper } from 'app/test/vitest/helper';
 import VnSms from 'src/components/ui/VnSms.vue';
 
@@ -11,9 +12,6 @@ describe('VnSms', () => {
                 stubs: ['VnPaginate'],
                 mocks: {},
             },
-            propsData: {
-                url: 'SmsUrl',
-            },
         }).vm;
     });
 

src/composables/__tests__/useArrayData.spec.js

@@ -4,8 +4,6 @@ import { useArrayData } from 'composables/useArrayData';
 import { useRouter } from 'vue-router';
 import * as vueRouter from 'vue-router';
 import { setActivePinia, createPinia } from 'pinia';
-import { defineComponent, h } from 'vue';
-import { mount } from '@vue/test-utils';
 
 describe('useArrayData', () => {
     const filter = '{"limit":20,"skip":0}';
@@ -45,7 +43,7 @@ describe('useArrayData', () => {
     it('should fetch and replace url with new params', async () => {
         vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: [] });
 
-        const arrayData = mountArrayData('ArrayData', {
+        const arrayData = useArrayData('ArrayData', {
             url: 'mockUrl',
             searchUrl: 'params',
         });
@@ -74,7 +72,7 @@ describe('useArrayData', () => {
             data: [{ id: 1 }],
         });
 
-        const arrayData = mountArrayData('ArrayData', {
+        const arrayData = useArrayData('ArrayData', {
             url: 'mockUrl',
             navigate: {},
         });
@@ -96,7 +94,7 @@ describe('useArrayData', () => {
             ],
         });
 
-        const arrayData = mountArrayData('ArrayData', {
+        const arrayData = useArrayData('ArrayData', {
             url: 'mockUrl',
             oneRecord: true,
         });
@@ -109,17 +107,3 @@ describe('useArrayData', () => {
         });
     });
 });
-
-function mountArrayData(...args) {
-    let arrayData;
-
-    const TestComponent = defineComponent({
-        setup() {
-            arrayData = useArrayData(...args);
-            return () => h('div');
-        },
-    });
-
-    const asd = mount(TestComponent);
-    return arrayData;
-}

src/composables/__tests__/useSession.spec.js

@@ -64,84 +64,88 @@ describe('session', () => {
         });
     });
 
-    describe('login', () => {
+    describe(
-        const expectedUser = {
+        'login',
-            id: 999,
+        () => {
-            name: `T'Challa`,
+            const expectedUser = {
-            nickname: 'Black Panther',
+                id: 999,
-            lang: 'en',
+                name: `T'Challa`,
-            userConfig: {
+                nickname: 'Black Panther',
-                darkMode: false,
+                lang: 'en',
-            },
+                userConfig: {
-            worker: { department: { departmentFk: 155 } },
+                    darkMode: false,
-        };
-        const rolesData = [
-            {
-                role: {
-                    name: 'salesPerson',
                 },
-            },
+                worker: { department: { departmentFk: 155 } },
-            {
+            };
-                role: {
+            const rolesData = [
-                    name: 'admin',
+                {
+                    role: {
+                        name: 'salesPerson',
+                    },
                 },
-            },
+                {
-        ];
+                    role: {
-        beforeEach(() => {
+                        name: 'admin',
-            vi.spyOn(axios, 'get').mockImplementation((url) => {
+                    },
-                if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
+                },
-                return Promise.resolve({
+            ];
-                    data: { roles: rolesData, user: expectedUser },
+            beforeEach(() => {
+                vi.spyOn(axios, 'get').mockImplementation((url) => {
+                    if (url === 'VnUsers/acls') return Promise.resolve({ data: [] });
+                    return Promise.resolve({
+                        data: { roles: rolesData, user: expectedUser },
+                    });
                 });
             });
-        });
 
-        it('should fetch the user roles and then set token in the sessionStorage', async () => {
+            it('should fetch the user roles and then set token in the sessionStorage', async () => {
-            const expectedRoles = ['salesPerson', 'admin'];
+                const expectedRoles = ['salesPerson', 'admin'];
-            const expectedToken = 'mySessionToken';
+                const expectedToken = 'mySessionToken';
-            const expectedTokenMultimedia = 'mySessionTokenMultimedia';
+                const expectedTokenMultimedia = 'mySessionTokenMultimedia';
-            const keepLogin = false;
+                const keepLogin = false;
 
-            await session.login({
+                await session.login({
-                token: expectedToken,
+                    token: expectedToken,
-                tokenMultimedia: expectedTokenMultimedia,
+                    tokenMultimedia: expectedTokenMultimedia,
-                keepLogin,
+                    keepLogin,
+                });
+
+                const roles = state.getRoles();
+                const localToken = localStorage.getItem('token');
+                const sessionToken = sessionStorage.getItem('token');
+
+                expect(roles.value).toEqual(expectedRoles);
+                expect(localToken).toBeNull();
+                expect(sessionToken).toEqual(expectedToken);
+
+                await session.destroy(); // this clears token and user for any other test
             });
 
-            const roles = state.getRoles();
+            it('should fetch the user roles and then set token in the localStorage', async () => {
-            const localToken = localStorage.getItem('token');
+                const expectedRoles = ['salesPerson', 'admin'];
-            const sessionToken = sessionStorage.getItem('token');
+                const expectedToken = 'myLocalToken';
+                const expectedTokenMultimedia = 'myLocalTokenMultimedia';
+                const keepLogin = true;
 
-            expect(roles.value).toEqual(expectedRoles);
+                await session.login({
-            expect(localToken).toBeNull();
+                    token: expectedToken,
-            expect(sessionToken).toEqual(expectedToken);
+                    tokenMultimedia: expectedTokenMultimedia,
+                    keepLogin,
+                });
 
-            await session.destroy(); // this clears token and user for any other test
+                const roles = state.getRoles();
-        });
+                const localToken = localStorage.getItem('token');
+                const sessionToken = sessionStorage.getItem('token');
 
-        it('should fetch the user roles and then set token in the localStorage', async () => {
+                expect(roles.value).toEqual(expectedRoles);
-            const expectedRoles = ['salesPerson', 'admin'];
+                expect(localToken).toEqual(expectedToken);
-            const expectedToken = 'myLocalToken';
+                expect(sessionToken).toBeNull();
-            const expectedTokenMultimedia = 'myLocalTokenMultimedia';
-            const keepLogin = true;
 
-            await session.login({
+                await session.destroy(); // this clears token and user for any other test
-                token: expectedToken,
-                tokenMultimedia: expectedTokenMultimedia,
-                keepLogin,
             });
-
+        },
-            const roles = state.getRoles();
+        {},
-            const localToken = localStorage.getItem('token');
+    );
-            const sessionToken = sessionStorage.getItem('token');
-
-            expect(roles.value).toEqual(expectedRoles);
-            expect(localToken).toEqual(expectedToken);
-            expect(sessionToken).toBeNull();
-
-            await session.destroy(); // this clears token and user for any other test
-        });
-    });
 
     describe('RenewToken', () => {
         const expectedToken = 'myToken';

src/composables/getValueFromPath.js

@@ -1,11 +0,0 @@
-export function getValueFromPath(root, path) {
-    if (!root || !path) return;
-    const keys = path.toString().split('.');
-    let current = root;
-
-    for (const key of keys) {
-        if (current[key] === undefined) return undefined;
-        else current = current[key];
-    }
-    return current;
-}

src/composables/updateMinPriceBeforeSave.js

@@ -1,51 +0,0 @@
-import axios from 'axios';
-
-export async function beforeSave(data, getChanges, modelOrigin) {
-    try {
-        const changes = data.updates;
-        if (!changes) return data;
-        const patchPromises = [];
-
-        for (const change of changes) {
-            let patchData = {};
-
-            if ('hasMinPrice' in change.data) {
-                patchData.hasMinPrice = change.data?.hasMinPrice;
-                delete change.data.hasMinPrice;
-            }
-            if ('minPrice' in change.data) {
-                patchData.minPrice = change.data?.minPrice;
-                delete change.data.minPrice;
-            }
-
-            if (Object.keys(patchData).length > 0) {
-                const promise = axios
-                    .get(`${modelOrigin}/findOne`, {
-                        params: {
-                            filter: {
-                                fields: ['itemFk'],
-                                where: { id: change.where.id },
-                            },
-                        },
-                    })
-                    .then((row) => {
-                        return axios.patch(`Items/${row.data.itemFk}`, patchData);
-                    })
-                    .catch((error) => {
-                        console.error('Error processing change: ', change, error);
-                    });
-
-                patchPromises.push(promise);
-            }
-        }
-
-        await Promise.all(patchPromises);
-
-        data.updates = changes.filter((change) => Object.keys(change.data).length > 0);
-
-        return data;
-    } catch (error) {
-        console.error('Error in beforeSave:', error);
-        throw error;
-    }
-}

src/composables/useArrayData.js

@@ -1,4 +1,4 @@
-import { onMounted, computed, ref } from 'vue';
+import { onMounted, computed } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import axios from 'axios';
 import { useArrayDataStore } from 'stores/useArrayDataStore';
@@ -346,7 +346,7 @@ export function useArrayData(key, userOptions) {
     }
 
     const totalRows = computed(() => (store.data && store.data.length) || 0);
-    const isLoading = ref(store.isLoading || false);
+    const isLoading = computed(() => store.isLoading || false);
 
     return {
         fetch,

src/css/quasar.variables.scss

@@ -18,7 +18,6 @@ $positive: #c8e484;
 $negative: #fb5252;
 $info: #84d0e2;
 $warning: #f4b974;
-$neutral: #b0b0b0;
 // Pendiente de cuadrar con la base de datos
 $success: $positive;
 $alert: $negative;
@@ -52,6 +51,3 @@ $width-xl: 1600px;
 .bg-alert {
     background-color: $negative;
 }
-.bg-neutral {
-    background-color: $neutral;
-}

src/i18n/locale/en.yml

@@ -6,7 +6,6 @@ globals:
     quantity: Quantity
     entity: Entity
     preview: Preview
-    scrollToTop: Go up
     user: User
     details: Details
     collapseMenu: Collapse lateral menu
@@ -20,7 +19,6 @@ globals:
     logOut: Log out
     date: Date
     dataSaved: Data saved
-    openDetail: Open detail
     dataDeleted: Data deleted
     delete: Delete
     search: Search
@@ -162,9 +160,6 @@ globals:
     department: Department
     noData: No data available
     vehicle: Vehicle
-    selectDocumentId: Select document id
-    document: Document
-    import: Import from existing
     pageTitles:
         logIn: Login
         addressEdit: Update address
@@ -346,7 +341,6 @@ globals:
         parking: Parking
         vehicleList: Vehicles
         vehicle: Vehicle
-        entryPreAccount: Pre-account
     unsavedPopup:
         title: Unsaved changes will be lost
         subtitle: Are you sure exit without saving?
@@ -883,11 +877,6 @@ components:
         active: Is active
         floramondo: Is floramondo
         showBadDates: Show future items
-        name: Nombre
-        rate2: Grouping price
-        rate3: Packing price
-        minPrice: Min. Price
-        itemFk: Item id
     userPanel:
         copyToken: Token copied to clipboard
         settings: Settings

src/i18n/locale/es.yml

@@ -6,7 +6,6 @@ globals:
     quantity: Cantidad
     entity: Entidad
     preview: Vista previa
-    scrollToTop: Ir arriba
     user: Usuario
     details: Detalles
     collapseMenu: Contraer menú lateral
@@ -21,11 +20,10 @@ globals:
     date: Fecha
     dataSaved: Datos guardados
     dataDeleted: Datos eliminados
-    dataCreated: Datos creados
-    openDetail: Ver detalle
     delete: Eliminar
     search: Buscar
     changes: Cambios
+    dataCreated: Datos creados
     add: Añadir
     create: Crear
     edit: Modificar
@@ -166,9 +164,6 @@ globals:
     noData: Datos no disponibles
     department: Departamento
     vehicle: Vehículo
-    selectDocumentId: Seleccione el id de gestión documental
-    document: Documento
-    import: Importar desde existente
     pageTitles:
         logIn: Inicio de sesión
         addressEdit: Modificar consignatario
@@ -349,7 +344,6 @@ globals:
         parking: Parking
         vehicleList: Vehículos
         vehicle: Vehículo
-        entryPreAccount: Precontabilizar
     unsavedPopup:
         title: Los cambios que no haya guardado se perderán
         subtitle: ¿Seguro que quiere salir sin guardar?
@@ -967,11 +961,6 @@ components:
         to: Hasta
         floramondo: Floramondo
         showBadDates: Ver items a futuro
-        name: Nombre
-        rate2: Precio grouping
-        rate3: Precio packing
-        minPrice: Precio mínimo
-        itemFk: Id item
     userPanel:
         copyToken: Token copiado al portapapeles
         settings: Configuración

src/pages/Claim/Card/ClaimDescriptor.vue

@@ -28,8 +28,14 @@ const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 
-function stateColor(entity) {
+const STATE_COLOR = {
-    return entity?.claimState?.classColor;
+    pending: 'warning',
+    incomplete: 'info',
+    resolved: 'positive',
+    canceled: 'negative',
+};
+function stateColor(code) {
+    return STATE_COLOR[code];
 }
 
 onMounted(async () => {
@@ -51,8 +57,9 @@ onMounted(async () => {
             <VnLv v-if="entity.claimState" :label="t('claim.state')">
                 <template #value>
                     <QBadge
-                        :color="stateColor(entity)"
+                        :color="stateColor(entity.claimState.code)"
-                        style="color: var(--vn-black-text-color)"
+                        text-color="black"
+                        dense
                     >
                         {{ entity.claimState.description }}
                     </QBadge>

src/pages/Claim/Card/ClaimLines.vue

@@ -123,8 +123,8 @@ async function fetchMana() {
 
 async function updateDiscount({ saleFk, discount, canceller }) {
     const body = { salesIds: [saleFk], newDiscount: discount };
-    const ticketFk = claim.value.ticketFk;
+    const claimId = claim.value.ticketFk;
-    const query = `Tickets/${ticketFk}/updateDiscount`;
+    const query = `Tickets/${claimId}/updateDiscount`;
 
     await axios.post(query, body, {
         signal: canceller.signal,

src/pages/Claim/Card/ClaimPhoto.vue

@@ -23,7 +23,7 @@ const claimDms = ref([
 ]);
 const client = ref({});
 const inputFile = ref();
-const files = ref([]);
+const files = ref({});
 const spinnerRef = ref();
 const claimDmsRef = ref();
 const dmsType = ref({});
@@ -255,8 +255,9 @@ function onDrag() {
                 icon="add"
                 color="primary"
             >
-                <QFile
+                <QInput
                     ref="inputFile"
+                    type="file"
                     style="display: none"
                     multiple
                     v-model="files"

src/pages/Claim/Card/ClaimSummary.vue

@@ -108,9 +108,15 @@ const markerLabels = [
     { value: 5, label: t('claim.person') },
 ];
 
+const STATE_COLOR = {
+    pending: 'warning',
+    incomplete: 'info',
+    resolved: 'positive',
+    canceled: 'negative',
+};
+
 function stateColor(code) {
-    const claimState = claimStates.value.find((state) => state.code === code);
+    return STATE_COLOR[code];
-    return claimState?.classColor;
 }
 
 const developmentColumns = ref([
@@ -182,7 +188,7 @@ function claimUrl(section) {
 <template>
     <FetchData
         url="ClaimStates"
-        :filter="{ fields: ['id', 'description', 'code', 'classColor'] }"
+        :filter="{ fields: ['id', 'description'] }"
         @on-fetch="(data) => (claimStates = data)"
         auto-load
     />
@@ -340,18 +346,17 @@ function claimUrl(section) {
                     <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 v-if="col.name != 'description'">{{
-                                    <span class="link">{{
+                                    t(col.value)
-                                        dashIfEmpty(col.field(props.row))
+                                }}</span>
-                                    }}</span>
+                                <span class="link" v-if="col.name === 'description'">{{
-                                    <ItemDescriptorProxy
+                                    t(col.value)
-                                        :id="props.row.sale.itemFk"
+                                }}</span>
-                                        :sale-fk="props.row.saleFk"
+                                <ItemDescriptorProxy
-                                    />
+                                    v-if="col.name == 'description'"
-                                </template>
+                                    :id="props.row.sale.itemFk"
-                                <template v-else>
+                                    :sale-fk="props.row.saleFk"
-                                    {{ dashIfEmpty(col.field(props.row)) }}
+                                ></ItemDescriptorProxy>
-                                </template>
                             </QTd>
                         </QTr>
                     </template>

src/pages/Claim/Card/__tests__/ClaimLines.spec.js

@@ -52,7 +52,7 @@ describe('ClaimLines', () => {
                 expectedData,
                 {
                     signal: canceller.signal,
-                },
+                }
             );
         });
     });
@@ -69,7 +69,7 @@ describe('ClaimLines', () => {
                 expect.objectContaining({
                     message: 'Discount updated',
                     type: 'positive',
-                }),
+                })
             );
         });
     });

src/pages/Claim/Card/__tests__/ClaimLinesImport.spec.js

@@ -14,9 +14,6 @@ describe('ClaimLinesImport', () => {
                     fetch: vi.fn(),
                 },
             },
-            propsData: {
-                ticketId: 1,
-            },
         }).vm;
     });
 
@@ -43,7 +40,7 @@ describe('ClaimLinesImport', () => {
                 expect.objectContaining({
                     message: 'Lines added to claim',
                     type: 'positive',
-                }),
+                })
             );
             expect(vm.canceller).toEqual(null);
         });

src/pages/Claim/Card/__tests__/ClaimPhoto.spec.js

@@ -41,10 +41,10 @@ describe('ClaimPhoto', () => {
             await vm.deleteDms({ index: 0 });
 
             expect(axios.post).toHaveBeenCalledWith(
-                `ClaimDms/${claimMock.claimDms[0].dmsFk}/removeFile`,
+                `ClaimDms/${claimMock.claimDms[0].dmsFk}/removeFile`
             );
             expect(vm.quasar.notify).toHaveBeenCalledWith(
-                expect.objectContaining({ type: 'positive' }),
+                expect.objectContaining({ type: 'positive' })
             );
         });
     });
@@ -63,7 +63,7 @@ describe('ClaimPhoto', () => {
                         data: { index: 1 },
                         promise: vm.deleteDms,
                     },
-                }),
+                })
             );
         });
     });
@@ -102,10 +102,10 @@ describe('ClaimPhoto', () => {
                 new FormData(),
                 expect.objectContaining({
                     params: expect.objectContaining({ hasFile: false }),
-                }),
+                })
             );
             expect(vm.quasar.notify).toHaveBeenCalledWith(
-                expect.objectContaining({ type: 'positive' }),
+                expect.objectContaining({ type: 'positive' })
             );
 
             expect(vm.claimDmsRef.fetch).toHaveBeenCalledOnce();

src/pages/Claim/ClaimList.vue

@@ -101,10 +101,7 @@ const columns = computed(() => [
         name: 'stateCode',
         chip: {
             condition: () => true,
-            color: ({ stateCode }) => {
+            color: ({ stateCode }) => STATE_COLOR[stateCode] ?? 'bg-grey',
-                const state = states.value?.find(({ code }) => code === stateCode);
-                return `bg-${state.classColor}`;
-            },
         },
         columnFilter: {
             name: 'claimStateFk',
@@ -134,6 +131,12 @@ const columns = computed(() => [
         ],
     },
 ]);
+
+const STATE_COLOR = {
+    pending: 'bg-warning',
+    loses: 'bg-negative',
+    resolved: 'bg-positive',
+};
 </script>
 
 <template>

src/pages/Customer/Card/CustomerBalance.vue

@@ -131,7 +131,6 @@ const columns = computed(() => [
         name: 'isConciliate',
         label: t('Conciliated'),
         cardVisible: true,
-        component: 'checkbox',
     },
     {
         align: 'left',

src/pages/Customer/Card/CustomerBillingData.vue

@@ -9,7 +9,6 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CreateBankEntityForm from 'src/components/CreateBankEntityForm.vue';
-import VnInputBic from 'src/components/common/VnInputBic.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -18,7 +17,7 @@ const bankEntitiesRef = ref(null);
 
 const filter = {
     fields: ['id', 'bic', 'name'],
-    order: 'bic ASC',
+    order: 'bic ASC'
 };
 
 const getBankEntities = (data, formData) => {
@@ -44,11 +43,13 @@ const getBankEntities = (data, formData) => {
             </VnRow>
 
             <VnRow>
-                <VnInputBic
+                <VnInput :label="t('IBAN')" clearable v-model="data.iban">
-                    :label="t('IBAN')"
+                    <template #append>
-                    v-model="data.iban"
+                        <QIcon name="info" class="cursor-info">
-                    @update-bic="(bankEntityFk) => (data.bankEntityFk = bankEntityFk)"
+                            <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
-                />
+                        </QIcon>
+                    </template>
+                </VnInput>
                 <VnSelectDialog
                     :label="t('Swift / BIC')"
                     ref="bankEntitiesRef"

src/pages/Customer/Card/CustomerConsumption.vue

@@ -18,7 +18,7 @@ import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
-const arrayData = useArrayData('Customer');
+const arrayData = useArrayData('Client');
 const { t } = useI18n();
 const route = useRoute();
 const campaignList = ref();
@@ -260,7 +260,7 @@ const updateDateParams = (value, params) => {
                     :label="t('globals.campaign')"
                     :filled="true"
                     class="q-px-sm q-pt-none fit"
-                    :option-label="(opt) => t(opt.code ?? '')"
+                    :option-label="(opt) => t(opt.code)"
                     :fields="['id', 'code', 'dated', 'scopeDays']"
                     @update:model-value="(data) => updateDateParams(data, params)"
                     dense

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -39,7 +39,7 @@ const route = useRoute();
 const { t } = useI18n();
 
 const entityId = computed(() => {
-    return Number($props.id || route.params.id);
+    return $props.id || route.params.id;
 });
 
 const data = ref(useCardDescription());

src/pages/Customer/Card/CustomerDescriptorProxy.vue

@@ -11,7 +11,7 @@ const $props = defineProps({
 </script>
 
 <template>
-    <QPopupProxy data-cy="CustomerDescriptor">
+    <QPopupProxy>
         <CustomerDescriptor v-if="$props.id" :id="$props.id" :summary="CustomerSummary" />
     </QPopupProxy>
 </template>

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -79,14 +79,14 @@ async function acceptPropagate({ isEqualizated }) {
         observe-form-changes
         @on-data-saved="checkEtChanges"
     >
-        <template #form="{ data, validate, validations }">
+        <template #form="{ data, validate }">
             <VnRow>
                 <VnInput
                     :label="t('Social name')"
                     :required="true"
                     :rules="validate('client.socialName')"
                     clearable
-                    :uppercase="true"
+                    uppercase="true"
                     v-model="data.socialName"
                 >
                     <template #append>
@@ -112,7 +112,6 @@ async function acceptPropagate({ isEqualizated }) {
                     v-model="data.sageTaxTypeFk"
                     data-cy="sageTaxTypeFk"
                     :required="data.isTaxDataChecked"
-                    :rules="[(val) => validations.required(data.isTaxDataChecked, val)]"
                 />
                 <VnSelect
                     :label="t('Sage transaction type')"
@@ -123,9 +122,6 @@ async function acceptPropagate({ isEqualizated }) {
                     data-cy="sageTransactionTypeFk"
                     v-model="data.sageTransactionTypeFk"
                     :required="data.isTaxDataChecked"
-                    :rules="[
-                        (val) => validations.required(data.sageTransactionTypeFk, val),
-                    ]"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">

src/pages/Customer/Card/CustomerSamples.vue

@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 
 import { QBtn, useQuasar } from 'quasar';
+
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
 import VnTable from 'src/components/VnTable/VnTable.vue';
@@ -33,7 +34,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        format: (row) => row?.type?.description,
+        format: (row) => row.type.description,
         label: t('Description'),
         name: 'description',
     },
@@ -73,11 +74,12 @@ const tableRef = ref();
 <template>
     <VnTable
         ref="tableRef"
-        data-key="CustomerSamples"
+        data-key="ClientSamples"
         auto-load
-        :user-filter="filter"
+        :filter="filter"
         url="ClientSamples"
         :columns="columns"
+        :pagination="{ rowsPerPage: 12 }"
         :disable-option="{ card: true }"
         :right-search="false"
         :rows="rows"

src/pages/Customer/Card/CustomerSummary.vue

@@ -25,7 +25,7 @@ const $props = defineProps({
     },
 });
 
-const entityId = computed(() => Number($props.id || route.params.id));
+const entityId = computed(() => $props.id || route.params.id);
 const customer = computed(() => summary.value.entity);
 const summary = ref();
 const defaulterAmount = computed(() => customer.value.defaulters[0]?.amount);
@@ -181,11 +181,11 @@ const sumRisk = ({ clientRisks }) => {
             <QCard class="vn-one">
                 <VnTitle
                     :url="`#/customer/${entityId}/billing-data`"
-                    :text="t('customer.summary.payMethodFk')"
+                    :text="t('customer.summary.billingData')"
                 />
                 <VnLv
                     :label="t('customer.summary.payMethod')"
-                    :value="entity.payMethod?.name"
+                    :value="entity.payMethod.name"
                 />
                 <VnLv :label="t('customer.summary.bankAccount')" :value="entity.iban" />
                 <VnLv :label="t('customer.summary.dueDay')" :value="entity.dueDay" />
@@ -208,8 +208,7 @@ const sumRisk = ({ clientRisks }) => {
                     :text="t('customer.summary.consignee')"
                 />
                 <VnLv
-                    :tooltip="t('customer.summary.addressName')"
+                    :label="t('customer.summary.addressName')"
-                    :label="t('customer.summary.addressNameAbbr')"
                     :value="entity.defaultAddress.nickname"
                 />
                 <VnLv
@@ -253,8 +252,7 @@ const sumRisk = ({ clientRisks }) => {
                 />
                 <VnLv
                     v-if="entity.claimsRatio"
-                    :tooltip="t('customer.summary.priceIncreasingRate')"
+                    :label="t('customer.summary.priceIncreasingRate')"
-                    :label="t('customer.summary.priceIncreasingRateAbbr')"
                     :value="toPercentage(priceIncreasingRate)"
                 />
                 <VnLv
@@ -263,8 +261,7 @@ const sumRisk = ({ clientRisks }) => {
                 />
                 <VnLv
                     v-if="entity.claimsRatio"
-                    :label="t('customer.summary.claimRateAbbr')"
+                    :label="t('customer.summary.claimRate')"
-                    :tooltip="t('customer.summary.claimRate')"
                     :value="toPercentage(claimRate)"
                 />
             </QCard>
@@ -292,7 +289,7 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv
                     v-if="entity.creditInsurance"
                     :label="t('customer.summary.securedCredit')"
-                    :value="`${toCurrency(entity.creditInsurance)} (${entity.classifications[0]?.insurances[0]?.grade || ''})`"
+                    :value="toCurrency(entity.creditInsurance)"
                     :info="t('customer.summary.securedCreditInfo')"
                 />
 
@@ -321,9 +318,8 @@ const sumRisk = ({ clientRisks }) => {
                 />
 
                 <VnLv
-                    :label="t('customer.summary.recommendCreditAbbr')"
+                    :label="t('customer.summary.recommendCredit')"
-                    :tooltip="t('customer.summary.recommendCredit')"
+                    :value="entity.recommendedCredit"
-                    :value="toCurrency(entity.recommendedCredit)"
                 />
             </QCard>
             <QCard class="vn-max">

src/pages/Customer/CustomerFilter.vue

@@ -72,7 +72,7 @@ const exprBuilder = (param, value) => {
                         option-value="id"
                         option-label="name"
                         url="Departments"
-                        :no-one="true"
+                        no-one="true"
                     />
                 </QItemSection>
             </QItem>

src/pages/Customer/CustomerList.vue

@@ -111,11 +111,14 @@ const columns = computed(() => [
             component: 'number',
         },
         columnField: {
-            component: markRaw(VnLinkPhone),
+            component: null,
-            attrs: ({ model }) => {
+            after: {
-                return {
+                component: markRaw(VnLinkPhone),
-                    'phone-number': model,
+                attrs: ({ model }) => {
-                };
+                    return {
+                        'phone-number': model,
+                    };
+                },
             },
         },
     },

src/pages/Customer/Payments/__tests__/CustomerPayments.spec.js

@@ -32,7 +32,7 @@ describe('CustomerPayments', () => {
                 expect.objectContaining({
                     message: 'Payment confirmed',
                     type: 'positive',
-                }),
+                })
             );
         });
     });

src/pages/Customer/components/CustomerSamplesCreate.vue

@@ -41,6 +41,7 @@ const sampleType = ref({ hasPreview: false });
 const initialData = reactive({});
 const entityId = computed(() => route.params.id);
 const customer = computed(() => useArrayData('Customer').store?.data);
+const filterEmailUsers = { where: { userFk: user.value.id } };
 const filterClientsAddresses = {
     include: [
         { relation: 'province', scope: { fields: ['name'] } },
@@ -72,7 +73,7 @@ onBeforeMount(async () => {
 
 const setEmailUser = (data) => {
     optionsEmailUsers.value = data;
-    initialData.replyTo = data[0]?.notificationEmail;
+    initialData.replyTo = data[0]?.email;
 };
 
 const setClientsAddresses = (data) => {
@@ -181,12 +182,10 @@ const toCustomerSamples = () => {
 
 <template>
     <FetchData
-        :filter="{
+        :filter="filterEmailUsers"
-            where: { id: customer.departmentFk },
-        }"
         @on-fetch="setEmailUser"
         auto-load
-        url="Departments"
+        url="EmailUsers"
     />
     <FetchData
         :filter="filterClientsAddresses"

src/pages/Customer/locale/en.yml

@@ -42,17 +42,14 @@ customer:
         hasCoreVnl: Has core VNL
         hasB2BVnl: Has B2B VNL
         addressName: Address name
-        addressNameAbbr: A. Name
         addressCity: City
         username: Username
         webAccess: Web access
         totalGreuge: Total greuge
         mana: Mana
         priceIncreasingRate: Price increasing rate
-        priceIncreasingRateAbbr: Price inc. rate
         averageInvoiced: Average invoiced
         claimRate: Claming rate
-        claimRateAbbr: Claim. rate
         payMethodFk: Billing data
         risk: Risk
         maximumRisk: Solunion's maximum risk
@@ -71,7 +68,6 @@ customer:
         descriptorInfo: Invoices minus payments plus orders not yet
         rating: Rating
         recommendCredit: Recommended credit
-        recommendCreditAbbr: Rec. credit
         goToLines: Go to lines
     basicData:
         socialName: Fiscal name

src/pages/Customer/locale/es.yml

@@ -42,17 +42,14 @@ customer:
         hasCoreVnl: Recibido core VNL
         hasB2BVnl: Recibido B2B VNL
         addressName: Nombre de la dirección
-        addressNameAbbr: N. Dirección
         addressCity: Ciudad
         username: Usuario
         webAccess: Acceso web
         totalGreuge: Greuge total
         mana: Maná
         priceIncreasingRate: Ratio de incremento de precio
-        priceIncreasingRateAbbr: R. Inc. Precio
         averageInvoiced: Facturación media
         claimRate: Ratio de reclamaciones
-        claimRateAbbr: R. Reclamaciones
         maximumRisk: Riesgo máximo asumido por Solunion
         payMethodFk: Forma de pago
         risk: Riesgo
@@ -71,7 +68,6 @@ customer:
         descriptorInfo: Facturas menos recibos mas pedidos sin facturar
         rating: Clasificación
         recommendCredit: Crédito recomendado
-        recommendCreditAbbr: Cr. Recomendado
         goToLines: Ir a líneas
     basicData:
         socialName: Nombre fiscal

src/pages/Entry/Card/EntryBuys.vue

@@ -19,7 +19,6 @@ import { checkEntryLock } from 'src/composables/checkEntryLock';
 import VnRow from 'src/components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
-import { beforeSave } from 'src/composables/updateMinPriceBeforeSave';
 
 const $props = defineProps({
     id: {
@@ -416,6 +415,56 @@ function getAmountStyle(row) {
     return { color: 'var(--vn-label-color)' };
 }
 
+async function beforeSave(data, getChanges) {
+    try {
+        const changes = data.updates;
+        if (!changes) return data;
+        const patchPromises = [];
+
+        for (const change of changes) {
+            let patchData = {};
+
+            if ('hasMinPrice' in change.data) {
+                patchData.hasMinPrice = change.data?.hasMinPrice;
+                delete change.data.hasMinPrice;
+            }
+            if ('minPrice' in change.data) {
+                patchData.minPrice = change.data?.minPrice;
+                delete change.data.minPrice;
+            }
+
+            if (Object.keys(patchData).length > 0) {
+                const promise = axios
+                    .get('Buys/findOne', {
+                        params: {
+                            filter: {
+                                fields: ['itemFk'],
+                                where: { id: change.where.id },
+                            },
+                        },
+                    })
+                    .then((buy) => {
+                        return axios.patch(`Items/${buy.data.itemFk}`, patchData);
+                    })
+                    .catch((error) => {
+                        console.error('Error processing change: ', change, error);
+                    });
+
+                patchPromises.push(promise);
+            }
+        }
+
+        await Promise.all(patchPromises);
+
+        data.updates = changes.filter((change) => Object.keys(change.data).length > 0);
+
+        return data;
+    } catch (error) {
+        console.error('Error in beforeSave:', error);
+        throw error;
+    }
+}
+
 function invertQuantitySign(rows, sign) {
     for (const row of rows) {
         if (sign > 0) row.quantity = Math.abs(row.quantity);
@@ -648,7 +697,7 @@ onMounted(() => {
         :right-search="false"
         :row-click="false"
         :columns="columns"
-        :beforeSaveFn="(data, getChanges) => beforeSave(data, getChanges, 'Buys')"
+        :beforeSaveFn="beforeSave"
         class="buyList"
         :table-height="$props.tableHeight ?? '84vh'"
         auto-load
@@ -738,7 +787,7 @@ onMounted(() => {
             <span data-cy="footer-amount">{{ footer?.amount }} / </span>
             <span style="color: var(--q-positive)">{{ footer?.checkedAmount }}</span>
         </template>
-        <template #column-create-itemFk="{ data, validations }">
+        <template #column-create-itemFk="{ data }">
             <VnSelect
                 url="Items/search"
                 v-model="data.itemFk"
@@ -752,8 +801,7 @@ onMounted(() => {
                         await setBuyUltimate(value, data);
                     }
                 "
-                required
+                :required="true"
-                :rules="[(val) => validations.required(true, val)]"
                 data-cy="itemFk-create-popup"
                 sort-by="nickname DESC"
             >

src/pages/Entry/EntryPreAccount.vue

@@ -1,477 +0,0 @@
-<script setup>
-import { ref, computed, markRaw, useTemplateRef, onBeforeMount, watch } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { toDate, toCurrency } from 'src/filters';
-import { useArrayData } from 'src/composables/useArrayData';
-import VnTable from 'src/components/VnTable/VnTable.vue';
-import FetchData from 'src/components/FetchData.vue';
-import VnSelectSupplier from 'src/components/common/VnSelectSupplier.vue';
-import EntryDescriptorProxy from './Card/EntryDescriptorProxy.vue';
-import SupplierDescriptorProxy from '../Supplier/Card/SupplierDescriptorProxy.vue';
-import VnInputNumber from 'src/components/common/VnInputNumber.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import axios from 'axios';
-import useNotify from 'src/composables/useNotify';
-import VnConfirm from 'src/components/ui/VnConfirm.vue';
-import VnDms from 'src/components/common/VnDms.vue';
-import { useState } from 'src/composables/useState';
-import { useQuasar } from 'quasar';
-import InvoiceInDescriptorProxy from '../InvoiceIn/Card/InvoiceInDescriptorProxy.vue';
-import { useStateStore } from 'src/stores/useStateStore';
-import { downloadFile } from 'src/composables/downloadFile';
-
-const { t } = useI18n();
-const quasar = useQuasar();
-const { notify } = useNotify();
-const user = useState().getUser();
-const stateStore = useStateStore();
-const updateDialog = ref();
-const uploadDialog = ref();
-let maxDays;
-let defaultDays;
-const dataKey = 'entryPreaccountingFilter';
-const url = 'Entries/preAccountingFilter';
-const arrayData = useArrayData(dataKey);
-const daysAgo = ref();
-const isBooked = ref();
-const dmsData = ref();
-const table = useTemplateRef('table');
-const companies = ref([]);
-const countries = ref([]);
-const entryTypes = ref([]);
-const supplierFiscalTypes = ref([]);
-const warehouses = ref([]);
-const defaultDmsDescription = ref();
-const dmsTypeId = ref();
-const selectedRows = ref([]);
-const totalAmount = ref();
-const totalSelectedAmount = computed(() => {
-    if (!selectedRows.value.length) return 0;
-    return selectedRows.value.reduce((acc, entry) => acc + entry.amount, 0);
-});
-let supplierRef;
-let dmsFk;
-const columns = computed(() => [
-    {
-        name: 'id',
-        label: t('entry.preAccount.id'),
-        isId: true,
-        chip: {
-            condition: () => true,
-        },
-    },
-    {
-        name: 'invoiceNumber',
-        label: t('entry.preAccount.invoiceNumber'),
-    },
-    {
-        name: 'company',
-        label: t('globals.company'),
-        columnFilter: {
-            component: 'select',
-            name: 'companyFk',
-            optionLabel: 'code',
-            options: companies.value,
-        },
-    },
-    {
-        name: 'warehouse',
-        label: t('globals.warehouse'),
-        columnFilter: {
-            component: 'select',
-            name: 'warehouseInFk',
-            options: warehouses.value,
-        },
-    },
-    {
-        name: 'gestDocFk',
-        label: t('entry.preAccount.gestDocFk'),
-    },
-    {
-        name: 'dmsType',
-        label: t('entry.preAccount.dmsType'),
-        columnFilter: {
-            component: 'select',
-            label: null,
-            name: 'dmsTypeFk',
-            url: 'DmsTypes',
-            fields: ['id', 'name'],
-        },
-    },
-    {
-        name: 'reference',
-        label: t('entry.preAccount.reference'),
-    },
-    {
-        name: 'shipped',
-        label: t('entry.preAccount.shipped'),
-        format: ({ shipped }, dashIfEmpty) => dashIfEmpty(toDate(shipped)),
-        columnFilter: {
-            component: 'date',
-            name: 'shipped',
-        },
-    },
-    {
-        name: 'landed',
-        label: t('entry.preAccount.landed'),
-        format: ({ landed }, dashIfEmpty) => dashIfEmpty(toDate(landed)),
-        columnFilter: {
-            component: 'date',
-            name: 'landed',
-        },
-    },
-    {
-        name: 'invoiceInFk',
-        label: t('entry.preAccount.invoiceInFk'),
-    },
-    {
-        name: 'supplier',
-        label: t('globals.supplier'),
-        format: (row) => row.supplier,
-        columnFilter: {
-            component: markRaw(VnSelectSupplier),
-            label: null,
-            name: 'supplierFk',
-            class: 'fit',
-        },
-    },
-    {
-        name: 'country',
-        label: t('globals.country'),
-        columnFilter: {
-            component: 'select',
-            name: 'countryFk',
-            options: countries.value,
-        },
-    },
-    {
-        name: 'description',
-        label: t('entry.preAccount.entryType'),
-        columnFilter: {
-            component: 'select',
-            label: null,
-            name: 'typeFk',
-            options: entryTypes.value,
-            optionLabel: 'description',
-            optionValue: 'code',
-        },
-    },
-    {
-        name: 'payDem',
-        label: t('entry.preAccount.payDem'),
-        columnFilter: {
-            component: 'number',
-            name: 'payDem',
-        },
-    },
-    {
-        name: 'fiscalCode',
-        label: t('entry.preAccount.fiscalCode'),
-        format: ({ fiscalCode }) => t(fiscalCode),
-        columnFilter: {
-            component: 'select',
-            name: 'fiscalCode',
-            options: supplierFiscalTypes.value,
-            optionLabel: 'locale',
-            optionValue: 'code',
-            sortBy: 'code',
-        },
-    },
-    {
-        name: 'amount',
-        label: t('globals.amount'),
-        format: ({ amount }) => toCurrency(amount),
-        columnFilter: {
-            component: 'number',
-            name: 'amount',
-        },
-    },
-    {
-        name: 'isAgricultural',
-        label: t('entry.preAccount.isAgricultural'),
-        component: 'checkbox',
-        isEditable: false,
-    },
-    {
-        name: 'isBooked',
-        label: t('entry.preAccount.isBooked'),
-        component: 'checkbox',
-    },
-    {
-        name: 'isReceived',
-        label: t('entry.preAccount.isReceived'),
-        component: 'checkbox',
-        isEditable: false,
-    },
-]);
-
-onBeforeMount(async () => {
-    const { data } = await axios.get('EntryConfigs/findOne', {
-        params: { filter: JSON.stringify({ fields: ['maxDays', 'defaultDays'] }) },
-    });
-    maxDays = data.maxDays;
-    defaultDays = data.defaultDays;
-    daysAgo.value = arrayData.store.userParams.daysAgo || defaultDays;
-    isBooked.value = arrayData.store.userParams.isBooked || false;
-    stateStore.leftDrawer = false;
-});
-
-watch(selectedRows, (nVal, oVal) => {
-    const lastRow = nVal.at(-1);
-    if (lastRow?.isBooked) selectedRows.value.pop();
-    if (nVal.length > oVal.length && lastRow.invoiceInFk)
-        quasar.dialog({
-            component: VnConfirm,
-            componentProps: { title: t('entry.preAccount.hasInvoice') },
-        });
-});
-
-function filterByDaysAgo(val) {
-    if (!val) val = defaultDays;
-    else if (val > maxDays) val = maxDays;
-    daysAgo.value = val;
-    arrayData.store.userParams.daysAgo = daysAgo.value;
-    table.value.reload();
-}
-
-async function preAccount() {
-    const entries = selectedRows.value;
-    const { companyFk, isAgricultural, landed } = entries.at(0);
-    try {
-        dmsFk = entries.find(({ gestDocFk }) => gestDocFk)?.gestDocFk;
-        if (isAgricultural) {
-            const year = new Date(landed).getFullYear();
-            supplierRef = (
-                await axios.get('InvoiceIns/getMaxRef', { params: { companyFk, year } })
-            ).data;
-            return createInvoice();
-        } else if (dmsFk) {
-            supplierRef = (
-                await axios.get(`Dms/${dmsFk}`, {
-                    params: { filter: JSON.stringify({ fields: ['reference'] }) },
-                })
-            ).data?.reference;
-            updateDialog.value.show();
-        } else {
-            uploadFile();
-        }
-    } catch (e) {
-        throw e;
-    }
-}
-
-async function updateFile() {
-    await axios.post(`Dms/${dmsFk}/updateFile`, { dmsTypeId: dmsTypeId.value });
-    await createInvoice();
-}
-
-async function uploadFile() {
-    const firstSelectedEntry = selectedRows.value.at(0);
-    const { supplier, companyFk, invoiceNumber } = firstSelectedEntry;
-    dmsData.value = {
-        dmsTypeFk: dmsTypeId.value,
-        warehouseFk: user.value.warehouseFk,
-        companyFk: companyFk,
-        description: supplier + defaultDmsDescription.value + invoiceNumber,
-        hasFile: false,
-    };
-    uploadDialog.value.show();
-}
-
-async function afterUploadFile({ reference }, res) {
-    supplierRef = reference;
-    dmsFk = res.data[0].id;
-    await createInvoice();
-}
-
-async function createInvoice() {
-    try {
-        await axios.post(`Entries/addInvoiceIn`, {
-            ids: selectedRows.value.map((entry) => entry.id),
-            supplierRef,
-            dmsFk,
-        });
-        notify(t('entry.preAccount.success'), 'positive');
-    } catch (e) {
-        throw e;
-    } finally {
-        supplierRef = null;
-        dmsFk = undefined;
-        selectedRows.value.length = 0;
-        table.value.reload();
-    }
-}
-</script>
-<template>
-    <FetchData
-        url="Countries"
-        :filter="{ fields: ['id', 'name'] }"
-        @on-fetch="(data) => (countries = data)"
-        auto-load
-    />
-    <FetchData
-        url="Companies"
-        :filter="{ fields: ['id', 'code'] }"
-        @on-fetch="(data) => (companies = data)"
-        auto-load
-    />
-    <FetchData
-        url="Warehouses"
-        :filter="{ fields: ['id', 'name'] }"
-        @on-fetch="(data) => (warehouses = data)"
-        auto-load
-    />
-    <FetchData
-        url="EntryTypes"
-        :filter="{ fields: ['code', 'description'] }"
-        @on-fetch="(data) => (entryTypes = data)"
-        auto-load
-    />
-    <FetchData
-        url="supplierFiscalTypes"
-        :filter="{ fields: ['code'] }"
-        @on-fetch="
-            (data) =>
-                (supplierFiscalTypes = data.map((x) => ({ locale: t(x.code), ...x })))
-        "
-        auto-load
-    />
-    <FetchData
-        url="InvoiceInConfigs/findOne"
-        :filter="{ fields: ['defaultDmsDescription'] }"
-        @on-fetch="(data) => (defaultDmsDescription = data?.defaultDmsDescription)"
-        auto-load
-    />
-    <FetchData
-        url="DmsTypes/findOne"
-        :filter="{ fields: ['id'] }"
-        :where="{ code: 'invoiceIn' }"
-        @on-fetch="(data) => (dmsTypeId = data?.id)"
-        auto-load
-    />
-    <VnSearchbar
-        :data-key
-        :url
-        :label="t('entry.preAccount.search')"
-        :info="t('entry.preAccount.searchInfo')"
-        :search-remove-params="false"
-    />
-    <VnTable
-        v-model:selected="selectedRows"
-        :data-key
-        :columns
-        :url
-        :search-url="dataKey"
-        ref="table"
-        :disable-option="{ card: true }"
-        redirect="Entry"
-        :order="['landed DESC']"
-        :right-search="false"
-        :user-params="{ daysAgo, isBooked }"
-        :row-click="false"
-        :table="{ selection: 'multiple' }"
-        :limit="0"
-        :footer="true"
-        @on-fetch="
-            (data) => (totalAmount = data?.reduce((acc, entry) => acc + entry.amount, 0))
-        "
-        auto-load
-    >
-        <template #top-left>
-            <QBtn
-                data-cy="preAccount_btn"
-                icon="account_balance"
-                color="primary"
-                class="q-mr-sm"
-                :disable="!selectedRows.length"
-                @click="preAccount"
-            >
-                <QTooltip>{{ t('entry.preAccount.btn') }}</QTooltip>
-            </QBtn>
-            <VnInputNumber
-                v-model="daysAgo"
-                :label="$t('globals.daysAgo')"
-                dense
-                :step="1"
-                :decimal-places="0"
-                @update:model-value="filterByDaysAgo"
-                debounce="500"
-                :title="t('entry.preAccount.daysAgo')"
-            />
-        </template>
-        <template #column-id="{ row }">
-            <span class="link" @click.stop>
-                {{ row.id }}
-                <EntryDescriptorProxy :id="row.id" />
-            </span>
-        </template>
-        <template #column-company="{ row }">
-            <QBadge :color="row.color ?? 'transparent'" :label="row.company" />
-        </template>
-        <template #column-gestDocFk="{ row }">
-            <span class="link" @click.stop="downloadFile(row.gestDocFk)">
-                {{ row.gestDocFk }}
-            </span>
-        </template>
-        <template #column-supplier="{ row }">
-            <span class="link" @click.stop>
-                {{ row.supplier }}
-                <SupplierDescriptorProxy :id="row.supplierFk" />
-            </span>
-        </template>
-        <template #column-invoiceInFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row.invoiceInFk }}
-                <InvoiceInDescriptorProxy :id="row.invoiceInFk" />
-            </span>
-        </template>
-        <template #column-footer-amount>
-            <div v-text="toCurrency(totalSelectedAmount)" />
-            <div v-text="toCurrency(totalAmount)" />
-        </template>
-    </VnTable>
-    <VnConfirm
-        ref="updateDialog"
-        :title="t('entry.preAccount.dialog.title')"
-        :message="t('entry.preAccount.dialog.message')"
-    >
-        <template #actions>
-            <QBtn
-                data-cy="updateFileYes"
-                :label="t('globals.yes')"
-                color="primary"
-                @click="updateFile"
-                autofocus
-                v-close-popup
-            />
-            <QBtn
-                data-cy="updateFileNo"
-                :label="t('globals.no')"
-                color="primary"
-                flat
-                @click="uploadFile"
-                v-close-popup
-            />
-            <QBtn :label="t('globals.cancel')" color="primary" flat v-close-popup />
-        </template>
-    </VnConfirm>
-    <QDialog ref="uploadDialog">
-        <VnDms
-            model="dms"
-            :form-initial-data="dmsData"
-            url="Dms/uploadFile"
-            @on-data-saved="afterUploadFile"
-        />
-    </QDialog>
-</template>
-<i18n>
-en:
-    IntraCommunity: Intra-community
-    NonCommunity: Non-community
-    CanaryIslands: Canary Islands
-es:
-    IntraCommunity: Intracomunitaria
-    NonCommunity: Extracomunitaria
-    CanaryIsland: Islas Canarias
-    National: Nacional
-</i18n>

src/pages/Entry/__tests__/EntryPreAccount.spec.js

@@ -1,63 +0,0 @@
-import { vi, describe, expect, it, beforeAll, afterEach } from 'vitest';
-import { createWrapper } from 'app/test/vitest/helper';
-import EntryPreAccount from '../EntryPreAccount.vue';
-import axios from 'axios';
-
-describe('EntryPreAccount', () => {
-    let wrapper;
-    let vm;
-
-    beforeAll(() => {
-        vi.spyOn(axios, 'get').mockImplementation((url) => {
-            if (url == 'EntryConfigs/findOne')
-                return { data: { maxDays: 90, defaultDays: 30 } };
-            return { data: [] };
-        });
-        wrapper = createWrapper(EntryPreAccount);
-        vm = wrapper.vm;
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    describe('filterByDaysAgo()', () => {
-        it('should set daysAgo to defaultDays if no value is provided', () => {
-            vm.filterByDaysAgo();
-            expect(vm.daysAgo).toBe(vm.defaultDays);
-            expect(vm.arrayData.store.userParams.daysAgo).toBe(vm.defaultDays);
-        });
-
-        it('should set daysAgo to maxDays if the value exceeds maxDays', () => {
-            vm.filterByDaysAgo(500);
-            expect(vm.daysAgo).toBe(vm.maxDays);
-            expect(vm.arrayData.store.userParams.daysAgo).toBe(vm.maxDays);
-        });
-
-        it('should set daysAgo to the provided value if it is valid', () => {
-            vm.filterByDaysAgo(30);
-            expect(vm.daysAgo).toBe(30);
-            expect(vm.arrayData.store.userParams.daysAgo).toBe(30);
-        });
-    });
-
-    describe('Dialog behavior when adding a new row', () => {
-        it('should open the dialog if the new row has invoiceInFk', async () => {
-            const dialogSpy = vi.spyOn(vm.quasar, 'dialog');
-            const selectedRows = [{ id: 1, invoiceInFk: 123 }];
-            vm.selectedRows = selectedRows;
-            await vm.$nextTick();
-            expect(dialogSpy).toHaveBeenCalledWith({
-                component: vm.VnConfirm,
-                componentProps: { title: vm.t('entry.preAccount.hasInvoice') },
-            });
-        });
-
-        it('should not open the dialog if the new row does not have invoiceInFk', async () => {
-            const dialogSpy = vi.spyOn(vm.quasar, 'dialog');
-            vm.selectedRows = [{ id: 1, invoiceInFk: null }];
-            await vm.$nextTick();
-            expect(dialogSpy).not.toHaveBeenCalled();
-        });
-    });
-});

src/pages/Entry/locale/en.yml

@@ -118,33 +118,6 @@ entry:
     searchInfo: You can search by entry reference
     descriptorMenu:
         showEntryReport: Show entry report
-    preAccount:
-        gestDocFk: Gestdoc
-        dmsType: Gestdoc type
-        invoiceNumber: Entry ref.
-        reference: Gestdoc ref.
-        shipped: Shipped
-        landed: Landed
-        id: Entry
-        invoiceInFk: Invoice in
-        supplierFk: Supplier
-        country: Country
-        description: Entry type
-        payDem: Payment term
-        isBooked: B
-        isReceived: R
-        entryType: Entry type
-        isAgricultural: Agricultural
-        fiscalCode: Account type
-        daysAgo: Max 365 days
-        search: Search
-        searchInfo: You can search by supplier name or nickname
-        btn: Pre-account
-        hasInvoice: This entry has already an invoice in
-        success: It has been successfully pre-accounted
-        dialog:
-            title: Pre-account entries
-            message: Do you want the invoice to inherit the entry document?
 entryFilter:
     params:
         isExcludedFromAvailable: Excluded from available

src/pages/Entry/locale/es.yml

@@ -69,33 +69,6 @@ entry:
         observationType: Tipo de observación
     search: Buscar entradas
     searchInfo: Puedes buscar por referencia de entrada
-    preAccount:
-        gestDocFk: Gestdoc
-        dmsType: Tipo gestdoc
-        invoiceNumber: Ref. Entrada
-        reference: Ref. GestDoc
-        shipped: F. envío
-        landed: F. llegada
-        id: Entrada
-        invoiceInFk: Recibida
-        supplierFk: Proveedor
-        country: País
-        description: Tipo de Entrada
-        payDem: Plazo de pago
-        isBooked: C
-        isReceived: R
-        entryType: Tipo de entrada
-        isAgricultural: Agricultural
-        fiscalCode: Tipo de cuenta
-        daysAgo: Máximo 365 días
-        search: Buscar
-        searchInfo: Puedes buscar por nombre o alias de proveedor
-        btn: Precontabilizar
-        hasInvoice: Esta entrada ya tiene una f. recibida
-        success: Se ha precontabilizado correctamente
-        dialog:
-            title: Precontabilizar entradas
-            message: ¿Desea que la factura herede el documento de la entrada?
     params:
         entryFk: Entrada
         observationTypeFk: Tipo de observación

src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue

@@ -5,7 +5,7 @@ import InvoiceInSummary from './InvoiceInSummary.vue';
 const $props = defineProps({
     id: {
         type: Number,
-        default: null,
+        required: true,
     },
 });
 </script>

src/pages/InvoiceOut/InvoiceOutGlobalForm.vue

@@ -164,7 +164,6 @@ onMounted(async () => {
             unelevated
             filled
             dense
-            data-cy="formSubmitBtn"
         />
         <QBtn
             v-else
@@ -175,7 +174,6 @@ onMounted(async () => {
             filled
             dense
             @click="getStatus = 'stopping'"
-            data-cy="formStopBtn"
         />
     </QForm>
 </template>

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -79,30 +79,6 @@ const columns = computed(() => [
             inWhere: true,
         },
     },
-    {
-        align: 'left',
-        name: 'issued',
-        label: t('invoiceOut.summary.issued'),
-        component: 'date',
-        format: (row) => toDate(row.issued),
-        columnField: { component: null },
-    },
-    {
-        align: 'left',
-        name: 'created',
-        label: t('globals.created'),
-        component: 'date',
-        columnField: { component: null },
-        format: (row) => toDate(row.created),
-    },
-    {
-        align: 'left',
-        name: 'dued',
-        label: t('invoiceOut.summary.expirationDate'),
-        component: 'date',
-        columnField: { component: null },
-        format: (row) => toDate(row.dued),
-    },
     {
         align: 'left',
         name: 'clientFk',
@@ -156,6 +132,22 @@ const columns = computed(() => [
         cardVisible: true,
         format: (row) => toCurrency(row.amount),
     },
+    {
+        align: 'left',
+        name: 'created',
+        label: t('globals.created'),
+        component: 'date',
+        columnField: { component: null },
+        format: (row) => toDate(row.created),
+    },
+    {
+        align: 'left',
+        name: 'dued',
+        label: t('invoiceOut.summary.dued'),
+        component: 'date',
+        columnField: { component: null },
+        format: (row) => toDate(row.dued),
+    },
     {
         align: 'left',
         name: 'customsAgentFk',

src/pages/Item/Card/ItemTags.vue

@@ -89,6 +89,7 @@ const insertTag = (rows) => {
                 :default-remove="false"
                 :user-filter="{
                     fields: ['id', 'itemFk', 'tagFk', 'value', 'priority'],
+                    where: { itemFk: route.params.id },
                     include: {
                         relation: 'tag',
                         scope: {
@@ -96,7 +97,6 @@ const insertTag = (rows) => {
                         },
                     },
                 }"
-                :filter="{ where: { itemFk: route.params.id } }"
                 order="priority"
                 auto-load
                 @on-fetch="onItemTagsFetched"

src/pages/Item/ItemFixedPrice.vue

@@ -1,386 +1,574 @@
 <script setup>
-import { onMounted, ref, onUnmounted, computed, watch } from 'vue';
+import { onMounted, ref, onUnmounted, nextTick, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
-import { useState } from 'src/composables/useState';
-
-import { beforeSave } from 'src/composables/updateMinPriceBeforeSave';
-
-import FetchedTags from 'components/ui/FetchedTags.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import EditFixedPriceForm from 'src/pages/Item/components/EditFixedPriceForm.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import EditTableCellValueForm from 'src/components/EditTableCellValueForm.vue';
+import ItemFixedPriceFilter from './ItemFixedPriceFilter.vue';
+import { useQuasar } from 'quasar';
+import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue';
+import { tMobile } from 'src/composables/tMobile';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+import FetchData from 'src/components/FetchData.vue';
+import { useStateStore } from 'stores/useStateStore';
+import { toDate } from 'src/filters';
+import { useVnConfirm } from 'composables/useVnConfirm';
+import { useState } from 'src/composables/useState';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+import { isLower, isBigger } from 'src/filters/date.js';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
-import VnColor from 'src/components/common/VnColor.vue';
+import { QCheckbox } from 'quasar';
-
-import { toDate } from 'src/filters';
-import { isLower, isBigger } from 'src/filters/date.js';
-import ItemFixedPriceFilter from './ItemFixedPriceFilter.vue';
-import ItemDescriptorProxy from './Card/ItemDescriptorProxy.vue';
-import { toCurrency } from 'src/filters';
 
+const quasar = useQuasar();
 const stateStore = useStateStore();
 const { t } = useI18n();
-const tableRef = ref();
+const { openConfirmationModal } = useVnConfirm();
-const editFixedPriceForm = ref(null);
-const selectedRows = ref([]);
-const hasSelectedRows = computed(() => selectedRows.value.length > 0);
-const isToClone = ref(false);
-const dateColor = 'var(--vn-label-text-color)';
 const state = useState();
-const user = state.getUser().fn();
+const { notify } = useNotify();
-const warehouse = computed(() => user.warehouseFk);
+const tableRef = ref();
+const editTableCellDialogRef = ref(null);
+const user = state.getUser();
+const fixedPrices = ref([]);
+const warehousesOptions = ref([]);
+const hasSelectedRows = computed(() => rowsSelected.value.length > 0);
+const rowsSelected = ref([]);
+const itemFixedPriceFilterRef = ref();
+
 onMounted(async () => {
     stateStore.rightDrawer = true;
 });
 onUnmounted(() => (stateStore.rightDrawer = false));
 
+const defaultColumnAttrs = {
+    align: 'left',
+    sortable: true,
+};
 const columns = computed(() => [
     {
-        name: 'itemFk',
         label: t('item.fixedPrice.itemFk'),
-        labelAbbreviation: 'Id',
+        name: 'itemFk',
-        toolTip: t('item.fixedPrice.itemFk'),
+        ...defaultColumnAttrs,
-        component: 'input',
+        isId: true,
+        columnField: {
+            component: 'input',
+            type: 'number',
+        },
+        columnClass: 'shrink',
+    },
+    {
+        label: t('globals.name'),
+        name: 'name',
+        ...defaultColumnAttrs,
+        create: true,
         columnFilter: {
+            component: 'select',
             attrs: {
-                component: 'select',
                 url: 'Items',
                 fields: ['id', 'name', 'subName'],
                 optionLabel: 'name',
-                optionValue: 'id',
+                optionValue: 'name',
                 uppercase: false,
             },
-            inWhere: true,
         },
-        width: '55px',
-        isEditable: false,
-    },
-    {
-        labelAbbreviation: '',
-        name: 'hex',
-        columnSearch: false,
-        isEditable: false,
-        width: '9px',
-        component: 'select',
-        attrs: {
-            url: 'Inks',
-            fields: ['id', 'name'],
-        },
-    },
-    {
-        align: 'left',
-        label: t('globals.name'),
-        name: 'name',
-        create: true,
-        component: 'input',
-        isEditable: false,
     },
     {
         label: t('item.fixedPrice.groupingPrice'),
-        labelAbbreviation: 'P. Group',
-        toolTip: t('item.fixedPrice.groupingPrice'),
         name: 'rate2',
-        component: 'number',
+        ...defaultColumnAttrs,
-        create: true,
+        component: 'input',
-        createOrder: 3,
+        type: 'number',
-        createAttrs: {
-            required: true,
-        },
-        width: '50px',
-        format: (row) => toCurrency(row.rate2),
     },
     {
         label: t('item.fixedPrice.packingPrice'),
-        labelAbbreviation: 'P. Pack',
-        toolTip: t('item.fixedPrice.packingPrice'),
         name: 'rate3',
-        component: 'number',
+        ...defaultColumnAttrs,
-        create: true,
+        component: 'input',
-        createOrder: 4,
+        type: 'number',
-        createAttrs: {
-            required: true,
-        },
-        width: '50px',
-        format: (row) => toCurrency(row.rate3),
-    },
-    {
-        name: 'hasMinPrice',
-        label: t('item.fixedPrice.hasMinPrice'),
-        labelAbbreviation: t('item.fixedPrice.MP'),
-        toolTip: t('item.fixedPrice.hasMinPrice'),
-        label: t('item.fixedPrice.hasMinPrice'),
-        component: 'checkbox',
-        attrs: {
-            toggleIndeterminate: false,
-        },
-        width: '50px',
     },
+
     {
         label: t('item.fixedPrice.minPrice'),
-        labelAbbreviation: 'Min.P',
-        toolTip: t('item.fixedPrice.minPrice'),
         name: 'minPrice',
-        component: 'number',
+        ...defaultColumnAttrs,
-        width: '50px',
+        component: 'input',
-        style: (row) => {
+        type: 'number',
-            if (!row?.hasMinPrice) return { color: 'var(--vn-label-color)' };
-        },
-        format: (row) => toCurrency(row.minPrice),
     },
     {
         label: t('item.fixedPrice.started'),
+        field: 'started',
         name: 'started',
-        component: 'date',
+        format: ({ started }) => toDate(started),
+        ...defaultColumnAttrs,
+        columnField: {
+            component: 'date',
+            class: 'shrink',
+        },
         columnFilter: {
             component: 'date',
         },
-        createAttrs: {
+        columnClass: 'expand',
-            required: true,
-        },
-        create: true,
-        createOrder: 5,
-        width: '65px',
     },
     {
         label: t('item.fixedPrice.ended'),
         name: 'ended',
-        component: 'date',
+        ...defaultColumnAttrs,
+        columnField: {
+            component: 'date',
+            class: 'shrink',
+        },
         columnFilter: {
             component: 'date',
         },
-        createAttrs: {
+        columnClass: 'expand',
-            required: true,
+        format: (row) => toDate(row.ended),
-        },
-        create: true,
-        createOrder: 6,
-        width: '65px',
     },
+
     {
-        align: 'center',
         label: t('globals.warehouse'),
         name: 'warehouseFk',
+        ...defaultColumnAttrs,
+        columnClass: 'shrink',
         component: 'select',
-        attrs: {
+        options: warehousesOptions,
-            url: 'Warehouses',
+        columnFilter: {
-            fields: ['id', 'name'],
+            name: 'warehouseFk',
-            optionLabel: 'name',
+            inWhere: true,
-            optionValue: 'id',
+            component: 'select',
+            attrs: {
+                options: warehousesOptions,
+                'option-label': 'name',
+                'option-value': 'id',
+            },
         },
-        create: true,
-        format: (row, dashIfEmpty) => dashIfEmpty(row.warehouseName),
-        width: '80px',
     },
     {
         align: 'right',
         name: 'tableActions',
         actions: [
             {
-                title: t('globals.clone'),
+                title: t('delete'),
-                icon: 'vn:clone',
+                icon: 'delete',
-                action: (row) => openCloneFixedPriceForm(row),
+                action: (row) => confirmRemove(row),
                 isPrimary: true,
             },
         ],
     },
 ]);
 
-const openEditFixedPriceForm = () => {
+const editTableFieldsOptions = [
-    editFixedPriceForm.value.show();
+    {
+        field: 'rate2',
+        label: t('item.fixedPrice.groupingPrice'),
+        component: 'input',
+        attrs: {
+            type: 'number',
+        },
+    },
+    {
+        field: 'rate3',
+        label: t('item.fixedPrice.packingPrice'),
+        component: 'input',
+        attrs: {
+            type: 'number',
+        },
+    },
+    {
+        field: 'minPrice',
+        label: t('item.fixedPrice.minPrice'),
+        component: 'input',
+        attrs: {
+            type: 'number',
+        },
+    },
+    {
+        field: 'started',
+        label: t('item.fixedPrice.started'),
+        component: 'date',
+    },
+    {
+        field: 'ended',
+        label: t('item.fixedPrice.ended'),
+        component: 'date',
+    },
+    {
+        field: 'warehouseFk',
+        label: t('globals.warehouse'),
+        component: 'select',
+        attrs: {
+            options: [],
+            'option-label': 'name',
+            'option-value': 'id',
+        },
+    },
+];
+const getRowUpdateInputEvents = (props, resetMinPrice, inputType = 'text') => {
+    return inputType === 'text'
+        ? {
+              'keyup.enter': () => upsertPrice(props, resetMinPrice),
+              blur: () => upsertPrice(props, resetMinPrice),
+          }
+        : { 'update:modelValue': () => upsertPrice(props, resetMinPrice) };
 };
 
-const openCloneFixedPriceForm = (row) => {
+const updateMinPrice = async (value, props) => {
-    tableRef.value.showForm = true;
+    props.row.hasMinPrice = value;
-    isToClone.value = true;
+    await upsertPrice({
-    tableRef.value.create.title = t('Clone fixed price');
+        row: props.row,
-    tableRef.value.create.formInitialData = (({
+        col: { field: 'hasMinPrice' },
-        itemFk,
+        rowIndex: props.rowIndex,
-        rate2,
+    });
-        rate3,
-        started,
-        ended,
-        warehouseFk,
-    }) => ({
-        itemFk,
-        rate2,
-        rate3,
-        started,
-        ended,
-        warehouseFk,
-    }))(JSON.parse(JSON.stringify(row)));
 };
 
+const validations = ({ row }) => {
+    const requiredFields = [
+        'itemFk',
+        'started',
+        'ended',
+        'rate2',
+        'rate3',
+        'warehouseFk',
+    ];
+    const isValid = requiredFields.every(
+        (field) => row[field] !== null && row[field] !== undefined
+    );
+    return isValid;
+};
+const upsertPrice = async (props, resetMinPrice = false) => {
+    const isValid = validations({ ...props });
+    if (!isValid) {
+        return;
+    }
+    const { row } = props;
+    const changes = tableRef.value.CrudModelRef.getChanges();
+    if (changes?.updates?.length > 0) {
+        if (resetMinPrice) row.hasMinPrice = 0;
+    }
+    if (!changes.updates && !changes.creates) return;
+    const data = await upsertFixedPrice(row);
+    Object.assign(tableRef.value.CrudModelRef.formData[props.rowIndex], data);
+    notify(t('globals.dataSaved'), 'positive');
+    tableRef.value.reload();
+};
+
+async function upsertFixedPrice(row) {
+    const { data } = await axios.patch('FixedPrices/upsertFixedPrice', row);
+    data.hasMinPrice = data.hasMinPrice ? 1 : 0;
+    return data;
+}
+
+function checkLastVisibleRow() {
+    let lastVisibleRow = null;
+
+    getTableRows().forEach((row, index) => {
+        const rect = row.getBoundingClientRect();
+        if (rect.top >= 0 && rect.bottom <= window.innerHeight) {
+            lastVisibleRow = index;
+        }
+    });
+
+    return lastVisibleRow;
+}
+
+const addRow = (original = null) => {
+    let copy = null;
+    const today = Date.vnNew();
+    const millisecsInDay = 86400000;
+    const daysInWeek = 7;
+    const nextWeek = new Date(today.getTime() + daysInWeek * millisecsInDay);
+
+    copy = {
+        id: 0,
+        started: today,
+        ended: nextWeek,
+        hasMinPrice: 0,
+        $index: 0,
+    };
+    return { original, copy };
+};
+
+const getTableRows = () =>
+    document.getElementsByClassName('q-table')[0].querySelectorAll('tr.cursor-pointer');
+
+function highlightNewRow({ $index: index }) {
+    const row = getTableRows()[index];
+    if (row) {
+        row.classList.add('highlight');
+        setTimeout(() => {
+            row.classList.remove('highlight');
+        }, 3000);
+    }
+}
+const openEditTableCellDialog = () => {
+    editTableCellDialogRef.value.show();
+};
+
+const onEditCellDataSaved = async () => {
+    rowsSelected.value = [];
+    tableRef.value.reload();
+};
+
+const removeFuturePrice = async () => {
+    rowsSelected.value.forEach(({ id }) => {
+        const rowIndex = fixedPrices.value.findIndex(({ id }) => id === id);
+        removePrice(id, rowIndex);
+    });
+};
+
+function confirmRemove(item, isFuture) {
+    const promise = async () =>
+        isFuture ? removeFuturePrice(item.id) : removePrice(item.id);
+    quasar.dialog({
+        component: VnConfirm,
+        componentProps: {
+            title: t('globals.rowWillBeRemoved'),
+            message: t('globals.confirmDeletion'),
+            promise,
+        },
+    });
+}
+
+const removePrice = async (id) => {
+    await axios.delete(`FixedPrices/${id}`);
+    notify(t('globals.dataSaved'), 'positive');
+    tableRef.value.reload({});
+};
 const dateStyle = (date) =>
     date
         ? {
-              color: 'var(--vn-black-text-color)',
+              'bg-color': 'warning',
+              'is-outlined': true,
           }
-        : { color: dateColor, 'background-color': 'transparent' };
+        : {};
 
-const onDataSaved = () => {
+function handleOnDataSave({ CrudModelRef }) {
-    tableRef.value.CrudModelRef.saveChanges();
+    const { original, copy } = addRow(CrudModelRef.formData[checkLastVisibleRow()]);
-    selectedRows.value = [];
+    if (original) {
-};
+        CrudModelRef.formData.splice(original?.$index ?? 0, 0, copy);
-
+    } else {
-onMounted(() => {
+        CrudModelRef.insert(copy);
-    if (tableRef.value) {
-        tableRef.value.showForm = false;
     }
-});
+    nextTick(() => {
-
+        highlightNewRow(original ?? { $index: 0 });
-watch(
+    });
-    () => tableRef.value?.showForm,
+}
-    (newVal) => {
-        if (!newVal) {
-            tableRef.value.create.title = '';
-            tableRef.value.create.formInitialData = { warehouseFk: warehouse };
-            if (tableRef.value) {
-                isToClone.value = false;
-                tableRef.value.create.title = t('Create fixed price');
-            }
-        }
-    },
-);
 </script>
 
 <template>
+    <FetchData
+        @on-fetch="(data) => (warehousesOptions = data)"
+        auto-load
+        url="Warehouses"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+    />
     <RightMenu>
         <template #right-panel>
-            <ItemFixedPriceFilter data-key="ItemFixedPrices" />
+            <ItemFixedPriceFilter
+                data-key="ItemFixedPrices"
+                ref="itemFixedPriceFilterRef"
+            />
         </template>
     </RightMenu>
-    <VnSubToolbar />
+    <VnSubToolbar>
-    <Teleport to="#st-data" v-if="stateStore?.isSubToolbarShown()">
+        <template #st-actions>
-        <QBtnGroup push style="column-gap: 10px">
             <QBtn
                 :disable="!hasSelectedRows"
-                @click="openEditFixedPriceForm()"
+                @click="openEditTableCellDialog()"
                 color="primary"
                 icon="edit"
-                flat
-                :label="t('globals.edit')"
-                data-cy="FixedPriceToolbarEditBtn"
             >
                 <QTooltip>
                     {{ t('Edit fixed price(s)') }}
                 </QTooltip>
             </QBtn>
-        </QBtnGroup>
+            <QBtn
-    </Teleport>
+                :disable="!hasSelectedRows"
+                :label="tMobile('globals.remove')"
+                color="primary"
+                icon="delete"
+                flat
+                @click="(row) => confirmRemove(row, true)"
+                :title="t('globals.remove')"
+            />
+        </template>
+    </VnSubToolbar>
     <VnTable
-        ref="tableRef"
+        :default-remove="false"
+        :default-reset="false"
+        :default-save="false"
         data-key="ItemFixedPrices"
         url="FixedPrices/filter"
-        :order="'name DESC'"
+        :order="['name DESC', 'itemFk DESC']"
         save-url="FixedPrices/crud"
+        ref="tableRef"
+        dense
+        :filter="{
+            where: {
+                warehouseFk: user.warehouseFk,
+            },
+        }"
         :columns="columns"
+        default-mode="table"
+        auto-load
         :is-editable="true"
         :right-search="false"
         :table="{
             'row-key': 'id',
             selection: 'multiple',
         }"
-        v-model:selected="selectedRows"
+        v-model:selected="rowsSelected"
+        :create-as-dialog="false"
         :create="{
-            urlCreate: 'FixedPrices',
+            onDataSaved: handleOnDataSave,
-            title: t('Create fixed price'),
-            formInitialData: { warehouseFk: warehouse },
-            onDataSaved: () => tableRef.reload(),
-            showSaveAndContinueBtn: true,
         }"
         :disable-option="{ card: true }"
-        auto-load
+        :has-sub-toolbar="false"
-        :beforeSaveFn="(data, getChanges) => beforeSave(data, getChanges, 'FixedPrices')"
     >
-        <template #column-hex="{ row }">
+        <template #header-selection="scope">
-            <VnColor :colors="row?.hexJson" style="height: 100%; min-width: 2000px" />
+            <QCheckbox v-model="scope.selected" />
+        </template>
+        <template #body-selection="scope">
+            {{ scope }}
+            <QCheckbox flat v-model="scope.selected" />
+        </template>
+
+        <template #column-itemFk="props">
+            <VnSelect
+                style="max-width: 100px"
+                url="Items/withName"
+                hide-selected
+                option-label="id"
+                option-value="id"
+                v-model="props.row.itemFk"
+                v-on="getRowUpdateInputEvents(props, true, 'select')"
+            >
+                <template #option="scope">
+                    <QItem v-bind="scope.itemProps">
+                        <QItemSection>
+                            <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                            <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </template>
+            </VnSelect>
         </template>
         <template #column-name="{ row }">
             <span class="link">
                 {{ row.name }}
-                <ItemDescriptorProxy :id="row.itemFk" />
             </span>
             <span class="subName">{{ row.subName }}</span>
-            <FetchedTags :item="row" :columns="6" />
+            <ItemDescriptorProxy :id="row.itemFk" />
+            <FetchedTags :item="row" :columns="3" />
         </template>
-        <template #column-started="{ row }">
+        <template #column-rate2="props">
-            <div class="editable-text q-pb-xxs">
+            <QTd class="col">
-                <QBadge class="badge" :style="dateStyle(isLower(row?.ended))">
+                <VnInput
-                    {{ toDate(row?.started) }}
+                    type="currency"
-                </QBadge>
+                    style="width: 75px"
-            </div>
+                    v-model.number="props.row.rate2"
+                    v-on="getRowUpdateInputEvents(props)"
+                >
+                    <template #append>€</template>
+                </VnInput>
+            </QTd>
         </template>
-        <template #column-ended="{ row }">
+        <template #column-rate3="props">
-            <div class="editable-text q-pb-xxs">
+            <QTd class="col">
-                <QBadge class="badge" :style="dateStyle(isBigger(row?.ended))">
+                <VnInput
-                    {{ toDate(row?.ended) }}
+                    style="width: 75px"
-                </QBadge>
+                    type="currency"
-            </div>
+                    v-model.number="props.row.rate3"
+                    v-on="getRowUpdateInputEvents(props)"
+                >
+                    <template #append>€</template>
+                </VnInput>
+            </QTd>
         </template>
-        <template #column-create-name="{ data }">
+        <template #column-minPrice="props">
-            <VnSelect
+            <QTd class="col">
-                url="Items/search"
+                <div class="row" style="align-items: center">
-                v-model="data.itemFk"
+                    <QCheckbox
-                :label="t('item.fixedPrice.itemName')"
+                        :model-value="props.row.hasMinPrice"
-                :fields="['id', 'name']"
+                        @update:model-value="updateMinPrice($event, props)"
-                :filter-options="['id', 'name']"
+                        :false-value="0"
-                option-label="name"
+                        :true-value="1"
-                option-value="id"
+                        :toggle-indeterminate="false"
-                :required="true"
+                    />
-                sort-by="name ASC"
+                    <VnInput
-                data-cy="FixedPriceCreateNameSelect"
+                        class="col"
+                        type="currency"
+                        mask="###.##"
+                        :disable="props.row.hasMinPrice === 0"
+                        v-model.number="props.row.minPrice"
+                        v-on="getRowUpdateInputEvents(props)"
+                    >
+                        <template #append>€</template>
+                    </VnInput>
+                </div>
+            </QTd>
+        </template>
+        <template #column-started="props">
+            <VnInputDate
+                class="vnInputDate"
+                :show-event="true"
+                v-model="props.row.started"
+                v-on="getRowUpdateInputEvents(props, false, 'date')"
+                v-bind="dateStyle(isBigger(props.row.started))"
+            />
+        </template>
+        <template #column-ended="props">
+            <VnInputDate
+                class="vnInputDate"
+                :show-event="true"
+                v-model="props.row.ended"
+                v-on="getRowUpdateInputEvents(props, false, 'date')"
+                v-bind="dateStyle(isLower(props.row.ended))"
+            />
+        </template>
+        <template #column-warehouseFk="props">
+            <QTd class="col">
+                <VnSelect
+                    style="max-width: 150px"
+                    :options="warehousesOptions"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                    v-model="props.row.warehouseFk"
+                    v-on="getRowUpdateInputEvents(props, false, 'select')"
+                />
+            </QTd>
+        </template>
+        <template #column-deleteAction="{ row, rowIndex }">
+            <QIcon
+                name="delete"
+                size="sm"
+                class="cursor-pointer fill-icon-on-hover"
+                color="primary"
+                @click.stop="
+                    openConfirmationModal(
+                        t('globals.rowWillBeRemoved'),
+                        t('Do you want to clone this item?'),
+                        () => removePrice(row.id, rowIndex)
+                    )
+                "
             >
-                <template #option="scope">
+                <QTooltip class="text-no-wrap">
-                    <QItem v-bind="scope.itemProps">
+                    {{ t('globals.delete') }}
-                        <QItemSection>
+                </QTooltip>
-                            <QItemLabel>
+            </QIcon>
-                                {{ scope.opt.name }}
-                            </QItemLabel>
-                            <QItemLabel caption> #{{ scope.opt.id }} </QItemLabel>
-                        </QItemSection>
-                    </QItem>
-                </template>
-            </VnSelect>
-        </template>
-        <template #column-create-warehouseFk="{ data }">
-            <VnSelect
-                :label="t('globals.warehouse')"
-                url="Warehouses"
-                v-model="data.warehouseFk"
-                :fields="['id', 'name']"
-                option-label="name"
-                option-value="id"
-                hide-selected
-                :required="true"
-                sort-by="name ASC"
-                data-cy="FixedPriceCreateWarehouseSelect"
-            >
-                <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
-                        <QItemSection>
-                            <QItemLabel>
-                                {{ scope.opt.name }}
-                            </QItemLabel>
-                            <QItemLabel caption> #{{ scope.opt.id }} </QItemLabel>
-                        </QItemSection>
-                    </QItem>
-                </template>
-            </VnSelect>
         </template>
     </VnTable>
-    <QDialog ref="editFixedPriceForm">
+
-        <EditFixedPriceForm
+    <QDialog ref="editTableCellDialogRef">
+        <EditTableCellValueForm
             edit-url="FixedPrices/editFixedPrice"
-            :rows="selectedRows"
+            :rows="rowsSelected"
-            :fields-options="
+            :fields-options="editTableFieldsOptions"
-                columns.filter(
+            @on-data-saved="onEditCellDataSaved()"
-                    ({ isEditable, component, name }) =>
-                        isEditable !== false && component && name !== 'itemFk',
-                )
-            "
-            :beforeSave="beforeSave"
-            @on-data-saved="onDataSaved"
         />
     </QDialog>
 </template>
@@ -435,17 +623,8 @@ tbody tr.highlight .q-td {
     color: var(--vn-label-color);
 }
 </style>
-
-<style lang="scss" scoped>
-.badge {
-    background-color: $warning;
-}
-</style>
-
 <i18n>
 es:
     Add fixed price: Añadir precio fijado
     Edit fixed price(s): Editar precio(s) fijado(s)
-    Create fixed price: Crear precio fijado
-    Clone fixed price: Clonar precio fijado
 </i18n>

src/pages/Item/ItemFixedPriceFilter.vue

@@ -29,7 +29,6 @@ const props = defineProps({
                         dense
                         filled
                         use-input
-                        :use-like="false"
                         @update:model-value="searchFn()"
                         sort-by="nickname ASC"
                     />
@@ -51,19 +50,21 @@ const props = defineProps({
                     />
                 </QItemSection>
             </QItem>
-            <QItem>
+            <QItem class="q-my-md">
                 <QItemSection>
                     <VnInputDate
-                        v-model="params.started"
                         :label="t('params.started')"
+                        v-model="params.started"
                         filled
                         @update:model-value="searchFn()"
                     />
                 </QItemSection>
+            </QItem>
+            <QItem class="q-my-md">
                 <QItemSection>
                     <VnInputDate
-                        v-model="params.ended"
                         :label="t('params.ended')"
+                        v-model="params.ended"
                         filled
                         @update:model-value="searchFn()"
                     />

src/pages/Item/components/ItemProposal.vue

@@ -6,12 +6,10 @@ import { toCurrency } from 'filters/index';
 import VnStockValueDisplay from 'src/components/ui/VnStockValueDisplay.vue';
 import VnTable from 'src/components/VnTable/VnTable.vue';
 import axios from 'axios';
-import { displayResults } from 'src/pages/Ticket/Negative/composables/notifyResults';
+import notifyResults from 'src/utils/notifyResults';
 import FetchData from 'components/FetchData.vue';
-import { useState } from 'src/composables/useState';
 
 const MATCH = 'match';
-const { notifyResults } = displayResults();
 
 const { t } = useI18n();
 const $props = defineProps({
@@ -20,20 +18,14 @@ const $props = defineProps({
         required: true,
         default: () => {},
     },
-    filter: {
-        type: Object,
-        required: true,
-        default: () => {},
-    },
     replaceAction: {
         type: Boolean,
-        required: true,
+        required: false,
         default: false,
     },
-
     sales: {
         type: Array,
-        required: true,
+        required: false,
         default: () => [],
     },
 });
@@ -44,8 +36,6 @@ const proposalTableRef = ref(null);
 const sale = computed(() => $props.sales[0]);
 const saleFk = computed(() => sale.value.saleFk);
 const filter = computed(() => ({
-    where: $props.filter,
-
     itemFk: $props.itemLack.itemFk,
     sales: saleFk.value,
 }));
@@ -238,15 +228,11 @@ async function handleTicketConfig(data) {
         url="TicketConfigs"
         :filter="{ fields: ['lackAlertPrice'] }"
         @on-fetch="handleTicketConfig"
-    ></FetchData>
+        auto-load
-    <QInnerLoading
-        :showing="isLoading"
-        :label="t && t('globals.pleaseWait')"
-        color="primary"
     />
 
     <VnTable
-        v-if="!isLoading"
+        v-if="ticketConfig"
         auto-load
         data-cy="proposalTable"
         ref="proposalTableRef"

src/pages/Item/components/ItemProposalProxy.vue

@@ -1,17 +1,13 @@
 <script setup>
 import ItemProposal from './ItemProposal.vue';
 import { useDialogPluginComponent } from 'quasar';
+
 const $props = defineProps({
     itemLack: {
         type: Object,
         required: true,
         default: () => {},
     },
-    filter: {
-        type: Object,
-        required: true,
-        default: () => {},
-    },
     replaceAction: {
         type: Boolean,
         required: false,
@@ -35,7 +31,7 @@ defineExpose({ show: () => dialogRef.value.show(), hide: () => dialogRef.value.h
     <QDialog ref="dialogRef" transition-show="scale" transition-hide="scale">
         <QCard class="dialog-width">
             <QCardSection class="row items-center q-pb-none">
-                <span class="text-h6 text-grey">{{ $t('itemProposal') }}</span>
+                <span class="text-h6 text-grey">{{ $t('Item proposal') }}</span>
                 <QSpace />
                 <QBtn icon="close" flat round dense v-close-popup />
             </QCardSection>

src/pages/Item/components/__tests__/EditFixedPriceForm.spec.js

@@ -1,46 +0,0 @@
-import { describe, it, expect, beforeEach, vi, afterEach } from 'vitest';
-import { createWrapper } from 'app/test/vitest/helper';
-import EditFixedPriceForm from 'src/pages/Item/components/EditFixedPriceForm.vue';
-
-describe('EditFixedPriceForm.vue', () => {
-    let wrapper;
-    let vm;
-
-    const mockRows = [
-        { id: 1, itemFk: 101 },
-        { id: 2, itemFk: 102 },
-    ];
-
-    const mockFieldsOptions = [
-        {
-            name: 'price',
-            label: 'Price',
-            component: 'input',
-            attrs: { type: 'number' },
-        },
-    ];
-
-    beforeEach(() => {
-        wrapper = createWrapper(EditFixedPriceForm, {
-            props: {
-                rows: JSON.parse(JSON.stringify(mockRows)),
-                fieldsOptions: mockFieldsOptions,
-            },
-        });
-        wrapper = wrapper.wrapper;
-        vm = wrapper.vm;
-    });
-
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
-
-    it('should emit "onDataSaved" with updated rows on submit', async () => {
-        vm.selectedField = mockFieldsOptions[0];
-        vm.newValue = 199.99;
-
-        await vm.onSubmit();
-
-        expect(wrapper.emitted('onDataSaved')).toBeTruthy();
-    });
-});