Merge branch 'dev' into feature/UpcomingDeliveries

CHANGELOG.md

@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 -   (Worker) => Se crea la sección Taquilla
+-   (General) => Se mantiene el filtro lateral en cualquier parte de la seccíon.
 
 ### Fixed
 

quasar.config.js

@@ -29,7 +29,7 @@ module.exports = configure(function (/* ctx */) {
         // app boot file (/src/boot)
         // --> boot files are part of "main.js"
         // https://v2.quasar.dev/quasar-cli/boot-files
-        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar.defaults'],
+        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar', 'quasar.defaults'],
 
         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
         css: ['app.scss'],

src/components/CreateBankEntityForm.vue

@@ -8,12 +8,7 @@ import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
 
-const props = defineProps({
+defineProps({ showEntityField: { type: Boolean, default: true } });
-    showEntityField: {
-        type: Boolean,
-        default: true,
-    },
-});
 
 const emit = defineEmits(['onDataSaved']);
 const { t } = useI18n();
@@ -26,7 +21,7 @@ const bankEntityFormData = reactive({
 });
 
 const countriesFilter = {
-    fields: ['id', 'country', 'code'],
+    fields: ['id', 'name', 'code'],
 };
 
 const countriesOptions = ref([]);
@@ -79,7 +74,7 @@ onMounted(async () => {
                         v-model="data.countryFk"
                         :options="countriesOptions"
                         option-value="id"
-                        option-label="country"
+                        option-label="name"
                         hide-selected
                         :required="true"
                         :rules="validate('bankEntity.countryFk')"

src/components/CreateNewPostcodeForm.vue

@@ -127,13 +127,14 @@ const onProvinceCreated = async ({ name }, formData) => {
                         <CreateNewProvinceForm
                             @on-data-saved="onProvinceCreated($event, data)"
                         />
-                    </template>
+                    </template> </VnSelectDialog
-                </VnSelectDialog>
+            ></VnRow>
-                <VnSelect
+            <VnRow class="row q-gutter-md q-mb-xl"
+                ><VnSelect
                     :label="t('Country')"
                     :options="countriesOptions"
                     hide-selected
-                    option-label="country"
+                    option-label="name"
                     option-value="id"
                     v-model="data.countryFk"
                     :rules="validate('postcode.countryFk')"

src/components/FormModelPopup.vue

@@ -6,7 +6,7 @@ import FormModel from 'components/FormModel.vue';
 
 const emit = defineEmits(['onDataSaved']);
 
-const $props = defineProps({
+defineProps({
     title: {
         type: String,
         default: '',

src/components/FormPopup.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 
 const emit = defineEmits(['onSubmit']);
 
-const $props = defineProps({
+defineProps({
     title: {
         type: String,
         default: '',

src/components/UserPanel.vue

@@ -178,6 +178,8 @@ function copyUserToken() {
                     :options="warehousesData"
                     option-label="name"
                     option-value="id"
+                    input-debounce="0"
+                    hide-selected
                 />
                 <VnSelect
                     :label="t('components.userPanel.localBank')"
@@ -185,6 +187,8 @@ function copyUserToken() {
                     :options="accountBankData"
                     option-label="bank"
                     option-value="id"
+                    input-debounce="0"
+                    hide-selected
                 >
                     <template #option="{ itemProps, opt }">
                         <QItem v-bind="itemProps">
@@ -201,10 +205,11 @@ function copyUserToken() {
                 <VnSelect
                     :label="t('components.userPanel.localCompany')"
                     hide-selected
-                    v-model="user.companyFk"
+                    v-model="user.localCompanyFk"
                     :options="companiesData"
                     option-label="code"
                     option-value="id"
+                    input-debounce="0"
                 />
                 <VnSelect
                     :label="t('components.userPanel.userWarehouse')"
@@ -213,6 +218,7 @@ function copyUserToken() {
                     :options="warehousesData"
                     option-label="name"
                     option-value="id"
+                    input-debounce="0"
                 />
             </VnRow>
             <VnRow>
@@ -224,6 +230,8 @@ function copyUserToken() {
                     option-label="code"
                     option-value="id"
                     style="flex: 0"
+                    dense
+                    input-debounce="0"
                 />
             </VnRow>
         </div>

src/components/common/RightMenu.vue

@@ -0,0 +1,55 @@
+<script setup>
+import { ref, onMounted, useSlots } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useStateStore } from 'stores/useStateStore';
+
+const slots = useSlots();
+const hasContent = ref(false);
+const rightPanel = ref(null);
+
+onMounted(() => {
+    rightPanel.value = document.querySelector('#right-panel');
+    if (rightPanel.value.childNodes.length) hasContent.value = true;
+
+    // Check if there's content to display
+    const observer = new MutationObserver(() => {
+        hasContent.value = rightPanel.value.childNodes.length;
+    });
+
+    if (rightPanel.value)
+        observer.observe(rightPanel.value, {
+            subtree: true,
+            childList: true,
+            attributes: true,
+        });
+
+    if (!slots['right-panel'] && !hasContent.value) stateStore.rightDrawer = false;
+});
+
+const { t } = useI18n();
+const stateStore = useStateStore();
+</script>
+<template>
+    <Teleport to="#actions-append">
+        <div class="row q-gutter-x-sm">
+            <QBtn
+                v-if="hasContent || $slots['right-panel']"
+                flat
+                @click="stateStore.toggleRightDrawer()"
+                round
+                dense
+                icon="menu"
+            >
+                <QTooltip bottom anchor="bottom right">
+                    {{ t('globals.collapseMenu') }}
+                </QTooltip>
+            </QBtn>
+        </div>
+    </Teleport>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <div id="right-panel"></div>
+            <slot v-if="!hasContent" name="right-panel" />
+        </QScrollArea>
+    </QDrawer>
+</template>

src/components/common/SendEmailDialog.vue

@@ -29,10 +29,12 @@ async function confirm() {
     const response = { address: address.value };
     if (props.promise) {
         isLoading.value = true;
-        const { address: _address, ...restData } = props.data;
 
         try {
-            Object.assign(response, restData);
+            const dataCopy = JSON.parse(JSON.stringify({ ...props.data }));
+            delete dataCopy.address;
+
+            Object.assign(response, dataCopy);
             await props.promise(response);
         } finally {
             isLoading.value = false;

src/components/common/VnCard.vue

@@ -1,13 +1,13 @@
 <script setup>
 import { onBeforeMount, computed, watchEffect } from 'vue';
 import { useRoute, onBeforeRouteUpdate } from 'vue-router';
-import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import useCardSize from 'src/composables/useCardSize';
 import VnSubToolbar from '../ui/VnSubToolbar.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import LeftMenu from 'components/LeftMenu.vue';
+import RightMenu from 'components/common/RightMenu.vue';
 
 const props = defineProps({
     dataKey: { type: String, required: true },
@@ -15,13 +15,13 @@ const props = defineProps({
     customUrl: { type: String, default: undefined },
     filter: { type: Object, default: () => {} },
     descriptor: { type: Object, required: true },
-    searchbarDataKey: { type: String, default: undefined },
+    filterPanel: { type: Object, default: undefined },
-    searchbarUrl: { type: String, default: undefined },
+    searchDataKey: { type: String, default: undefined },
+    searchUrl: { type: String, default: undefined },
     searchbarLabel: { type: String, default: '' },
     searchbarInfo: { type: String, default: '' },
 });
 
-const { t } = useI18n();
 const stateStore = useStateStore();
 const route = useRoute();
 const url = computed(() => {
@@ -54,17 +54,18 @@ watchEffect(() => {
 });
 </script>
 <template>
-    <Teleport
+    <template v-if="stateStore.isHeaderMounted()">
-        to="#searchbar"
+        <Teleport to="#searchbar" v-if="props.searchDataKey">
-        v-if="stateStore.isHeaderMounted() && props.searchbarDataKey"
+            <slot name="searchbar">
-    >
                 <VnSearchbar
-            :data-key="props.searchbarDataKey"
+                    :data-key="props.searchDataKey"
-            :url="props.searchbarUrl"
+                    :url="props.searchUrl"
-            :label="t(props.searchbarLabel)"
+                    :label="props.searchbarLabel"
-            :info="t(props.searchbarInfo)"
+                    :info="props.searchbarInfo"
                 />
+            </slot>
         </Teleport>
+        <slot v-else name="searchbar" />
         <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
             <QScrollArea class="fit">
                 <component :is="descriptor" />
@@ -72,6 +73,12 @@ watchEffect(() => {
                 <LeftMenu source="card" />
             </QScrollArea>
         </QDrawer>
+        <RightMenu>
+            <template #right-panel v-if="props.filterPanel">
+                <component :is="props.filterPanel" :data-key="props.searchDataKey" />
+            </template>
+        </RightMenu>
+    </template>
     <QPageContainer>
         <QPage>
             <VnSubToolbar />

src/components/common/VnInput.vue

@@ -37,14 +37,6 @@ const styleAttrs = computed(() => {
         : {};
 });
 
-const onEnterPress = () => {
-    emit('keyup.enter');
-};
-
-const handleValue = (val = null) => {
-    value.value = val;
-};
-
 const focus = () => {
     vnInputRef.value.focus();
 };
@@ -73,7 +65,7 @@ const inputRules = [
             v-bind="{ ...$attrs, ...styleAttrs }"
             :type="$attrs.type"
             :class="{ required: $attrs.required }"
-            @keyup.enter="onEnterPress()"
+            @keyup.enter="emit('keyup.enter')"
             :clearable="false"
             :rules="inputRules"
             :lazy-rules="true"
@@ -84,12 +76,12 @@ const inputRules = [
             </template>
             
             <template #append>
-                <slot name="append" v-if="$slots.append" />
+                <slot name="append" v-if="$slots.append && !$attrs.disabled" />
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="hover && value"
+                    v-if="$slots.append && hover && value && !$attrs.disabled"
-                    @click="handleValue(null)"
+                    @click="value = null"
                 ></QIcon>
             </template>
         </QInput>

src/components/ui/CardSummary.vue

@@ -142,6 +142,9 @@ const showRedirectToSummaryIcon = computed(() => {
             box-shadow: none;
 
             .vn-label-value {
+                &.negative > .value span {
+                    color: $alert;
+                }
                 display: flex;
                 flex-direction: row;
                 margin-top: 2px;

src/components/ui/VnFilterPanel.vue

@@ -4,7 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useArrayData } from 'composables/useArrayData';
 import { useRoute } from 'vue-router';
 import toDate from 'filters/toDate';
-
+import useRedirect from 'src/composables/useRedirect';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 
 const { t } = useI18n();
@@ -56,6 +56,7 @@ const arrayData = useArrayData(props.dataKey, {
 const route = useRoute();
 const store = arrayData.store;
 const userParams = ref({});
+const { navigate } = useRedirect();
 
 onMounted(() => {
     if (props.params) userParams.value = JSON.parse(JSON.stringify(props.params));
@@ -92,6 +93,7 @@ async function search() {
 
     isLoading.value = false;
     emit('search');
+    navigate(store.data, {});
 }
 
 async function reload() {
@@ -102,6 +104,7 @@ async function reload() {
     if (!props.showAll && !params.length) store.data = [];
     isLoading.value = false;
     emit('refresh');
+    navigate(store.data, {});
 }
 
 async function clearFilters() {

src/components/ui/VnLinkPhone.vue

@@ -1,21 +1,16 @@
 <script setup>
-import { useI18n } from 'vue-i18n';
+defineProps({ phoneNumber: { type: [String, Number], default: null } });
-const props = defineProps({
-    phoneNumber: { type: [String, Number], default: null },
-});
-const { t } = useI18n();
 </script>
 <template>
     <QBtn
-        v-if="props.phoneNumber"
+        v-if="phoneNumber"
         flat
         round
         icon="phone"
         size="sm"
         color="primary"
         padding="none"
-        :href="`sip:${props.phoneNumber}`"
+        :href="`sip:${phoneNumber}`"
         @click.stop
     />
 </template>
-<style scoped></style>

src/components/ui/VnPaginate.vue

@@ -42,6 +42,10 @@ const props = defineProps({
         type: Object,
         default: null,
     },
+    keepOpts: {
+        type: Array,
+        default: () => [],
+    },
     offset: {
         type: Number,
         default: 0,
@@ -76,6 +80,7 @@ const arrayData = useArrayData(props.dataKey, {
     order: props.order,
     userParams: props.userParams,
     exprBuilder: props.exprBuilder,
+    keepOpts: props.keepOpts,
 });
 const store = arrayData.store;
 

src/components/ui/VnSearchbar.vue

@@ -1,11 +1,13 @@
 <script setup>
 import { onMounted, ref } from 'vue';
-import { useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
 import { useArrayData } from 'composables/useArrayData';
 import VnInput from 'src/components/common/VnInput.vue';
+import useRedirect from 'src/composables/useRedirect';
+import { useI18n } from 'vue-i18n';
 
 const quasar = useQuasar();
+const { t } = useI18n();
 
 const props = defineProps({
     dataKey: {
@@ -65,10 +67,10 @@ const props = defineProps({
     },
 });
 
-const router = useRouter();
 const arrayData = useArrayData(props.dataKey, { ...props });
 const { store } = arrayData;
 const searchText = ref('');
+const { navigate } = useRedirect();
 
 onMounted(() => {
     const params = store.userParams;
@@ -91,28 +93,10 @@ async function search() {
 
     if (!props.redirect) return;
 
-    const { matched: matches } = router.currentRoute.value;
+    navigate(store.data, {
-    const { path } = matches.at(-1);
+        customRouteRedirectName: props.customRouteRedirectName,
-    const [, moduleName] = path.split('/');
+        searchText: searchText.value,
-
-    if (!store.data.length || store.data.length > 1)
-        return router.push({ path: `/${moduleName}/list` });
-
-    const targetId = store.data[0].id;
-
-    if (props.customRouteRedirectName && targetId)
-        return router.push({
-            name: props.customRouteRedirectName,
-            params: { id: targetId },
     });
-
-    let targetUrl;
-
-    if (path.endsWith('/list')) targetUrl = path.replace('/list', `/${targetId}/summary`);
-    if (path.endsWith('-list')) targetUrl = path.replace('-list', `/${targetId}/summary`);
-    else if (path.includes(':id')) targetUrl = path.replace(':id', targetId);
-
-    await router.push({ path: targetUrl });
 }
 </script>
 
@@ -121,7 +105,7 @@ async function search() {
         <VnInput
             id="searchbar"
             v-model="searchText"
-            :placeholder="props.label"
+            :placeholder="t(props.label)"
             dense
             standout
             autofocus
@@ -140,7 +124,7 @@ async function search() {
                     name="info"
                     class="cursor-info"
                 >
-                    <QTooltip>{{ props.info }}</QTooltip>
+                    <QTooltip>{{ t(props.info) }}</QTooltip>
                 </QIcon>
             </template>
         </VnInput>

src/components/ui/VnTree.vue

@@ -90,7 +90,7 @@ const onNodeCreated = async () => {
     await fetchNodeLeaves(creationNodeSelectedId.value);
 };
 
-onMounted(async (n) => {
+onMounted(async () => {
     const tree = [...state.get('Tree'), 1];
     const lastStateTree = state.get('TreeState');
     if (tree) {

src/composables/useArrayData.js

@@ -47,7 +47,10 @@ export function useArrayData(key, userOptions) {
                 if (isEmpty || !allowedOptions.includes(option)) continue;
 
                 if (Object.prototype.hasOwnProperty.call(store, option)) {
-                    store[option] = userOptions[option];
+                    const defaultOpts = userOptions[option];
+                    store[option] = userOptions.keepOpts?.includes(option)
+                        ? Object.assign(defaultOpts, store[option])
+                        : defaultOpts;
                 }
             }
         }

src/composables/useRedirect.js

@@ -0,0 +1,25 @@
+import { useRouter } from 'vue-router';
+
+export default function useRedirect() {
+    const router = useRouter();
+
+    const navigate = (data, { customRouteRedirectName, searchText }) => {
+        if (customRouteRedirectName)
+            return router.push({
+                name: customRouteRedirectName,
+                params: { id: searchText },
+            });
+
+        const { matched: matches } = router.currentRoute.value;
+        const { path } = matches.at(-1);
+
+        const to =
+            data.length === 1
+                ? path.replace(/\/(list|:id)|-list/, `/${data[0].id}`)
+                : path.replace(/:id.*/, '');
+
+        router.push({ path: to });
+    };
+
+    return { navigate };
+}

src/composables/useState.js

@@ -20,28 +20,12 @@ const headerMounted = ref(false);
 export function useState() {
     function getUser() {
         return computed(() => {
-            return {
+            return user.value;
-                id: user.value.id,
-                name: user.value.name,
-                nickname: user.value.nickname,
-                lang: user.value.lang,
-                darkMode: user.value.darkMode,
-                companyFk: user.value.companyFk,
-                warehouseFk: user.value.warehouseFk,
-            };
         });
     }
 
     function setUser(data) {
-        user.value = {
+        user.value = data;
-            id: data.id,
-            name: data.name,
-            nickname: data.nickname,
-            lang: data.lang,
-            darkMode: data.darkMode,
-            companyFk: data.companyFk,
-            warehouseFk: data.warehouseFk,
-        };
     }
 
     function getRoles() {

src/i18n/locale/en.yml

@@ -32,6 +32,7 @@ globals:
     confirm: Confirm
     assign: Assign
     back: Back
+    downloadPdf: Download PDF
     yes: 'Yes'
     no: 'No'
     noChanges: No changes to save
@@ -271,6 +272,7 @@ customer:
         tableVisibleColumns:
             id: Identifier
             name: Name
+            socialName: Social name
             fi: Tax number
             salesPersonFk: Salesperson
             credit: Credit
@@ -1236,16 +1238,10 @@ item/itemType:
         itemType: Item type
         basicData: Basic data
         summary: Summary
-zone:
-    pageTitles:
-        zones: Zone
-        zonesList: Zones
-        deliveryList: Delivery days
-        upcomingList: Upcoming deliveries
 monitor:
     pageTitles:
-        monitors: Monitores
+        monitors: Monitors
-        list: Listado
+        list: List
 components:
     topbar: {}
     itemsFilterPanel:

src/i18n/locale/es.yml

@@ -59,6 +59,7 @@ globals:
     amount: Importe
     packages: Bultos
     download: Descargar
+    downloadPdf: Descargar PDF
     selectRows: 'Seleccionar las { numberRows } filas(s)'
     allRows: 'Todo { numberRows } filas(s)'
     markAll: Marcar todo
@@ -269,6 +270,7 @@ customer:
         tableVisibleColumns:
             id: Identificador
             name: Nombre
+            socialName: Razón social
             fi: NIF / CIF
             salesPersonFk: Comercial
             credit: Crédito

src/pages/Agency/Card/AgencyCard.vue

@@ -1,34 +1,14 @@
 <script setup>
-import { onMounted, watch } from 'vue';
-import { useRoute } from 'vue-router';
-import { useArrayData } from 'src/composables/useArrayData';
-
 import AgencyDescriptor from 'pages/Agency/Card/AgencyDescriptor.vue';
 import VnCard from 'components/common/VnCard.vue';
-
-const route = useRoute();
-const arrayData = useArrayData('Agency', {
-    url: `Agencies/${route.params.id}`,
-});
-const { store } = arrayData;
-onMounted(async () => await arrayData.fetch({ append: false }));
-watch(
-    () => route.params.id,
-    async (newId) => {
-        if (newId) {
-            store.url = `Agencies/${newId}`;
-            await arrayData.fetch({ append: false });
-        }
-    }
-);
 </script>
 <template>
     <VnCard
         data-key="Agency"
         base-url="Agencies"
         :descriptor="AgencyDescriptor"
-        searchbar-data-key="AgencyList"
+        search-data-key="AgencyList"
-        searchbar-url="Agencies"
+        search-url="Agencies"
         searchbar-label="agency.searchBar.label"
         searchbar-info="agency.searchBar.info"
     />

src/pages/Agency/Card/AgencyDescriptor.vue

@@ -15,8 +15,8 @@ const props = defineProps({
 });
 
 const { t } = useI18n();
-const { params } = useRoute();
+const route = useRoute();
-const entityId = computed(() => props.id || params.id);
+const entityId = computed(() => props.id || route.params.id);
 const { store } = useArrayData('Parking');
 const card = computed(() => store.data);
 </script>

src/pages/Agency/Card/AgencySummary.vue

@@ -3,26 +3,13 @@ import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
-import FetchData from 'src/components/FetchData.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 
-const $props = defineProps({
+const $props = defineProps({ id: { type: Number, default: 0 } });
-    id: {
-        type: Number,
-        default: 0,
-    },
-});
-const { params } = useRoute();
 const { t } = useI18n();
-const entityId = computed(() => $props.id || params.id);
+const entityId = computed(() => $props.id || useRoute().params.id);
-
-const filter = {
-    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
-    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
-};
 </script>
 
 <template>

src/pages/Claim/Card/ClaimAction.vue

@@ -201,30 +201,7 @@ async function post(query, params) {
         auto-load
         @on-fetch="(data) => (destinationTypes = data)"
     />
-    <template v-if="stateStore.isHeaderMounted()">
+    <Teleport to="#right-panel" v-if="stateStore.isHeaderMounted() && claim">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
-    <QDrawer
-        v-model="stateStore.rightDrawer"
-        side="right"
-        :width="300"
-        show-if-above
-        v-if="claim"
-    >
         <QCard class="totalClaim q-my-md q-pa-sm no-box-shadow">
             {{ `${t('Total claimed')}: ${toCurrency(totalClaimed)}` }}
         </QCard>
@@ -274,7 +251,7 @@ async function post(query, params) {
                 v-model="multiplicatorValue"
             />
         </QCard>
-    </QDrawer>
+    </Teleport>
     <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()"> </Teleport>
     <CrudModel
         v-if="claim"

src/pages/Claim/Card/ClaimCard.vue

@@ -1,14 +1,16 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import ClaimDescriptor from './ClaimDescriptor.vue';
+import ClaimFilter from '../ClaimFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="Claim"
         base-url="Claims"
         :descriptor="ClaimDescriptor"
-        searchbar-data-key="ClaimList"
+        :filter-panel="ClaimFilter"
-        searchbar-url="Claims/filter"
+        search-data-key="ClaimList"
+        search-url="Claims/filter"
         searchbar-label="Search claim"
         searchbar-info="You can search by claim id or customer name"
     />

src/pages/Claim/ClaimList.vue

@@ -12,7 +12,6 @@ import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorP
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import ClaimSummary from './Card/ClaimSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { getUrl } from 'src/composables/getUrl';
 
 const stateStore = useStateStore();
 const router = useRouter();

src/pages/Customer/Card/CustomerAddress.vue

@@ -202,9 +202,9 @@ const toCustomerAddressEdit = (addressId) => {
 
                     <div v-if="item.observations.length">
                         <div
-                            :key="index"
+                            :key="obIndex"
                             class="flex q-mb-sm"
-                            v-for="(observation, index) in item.observations"
+                            v-for="(observation, obIndex) in item.observations"
                         >
                             <div class="text-weight-bold q-mr-sm">
                                 {{ observation.observationType.description }}:

src/pages/Customer/Card/CustomerBalance.vue

@@ -11,6 +11,7 @@ import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
 import { useValidator } from 'src/composables/useValidator';
 import { usePrintService } from 'src/composables/usePrintService';
+import { useSession } from 'src/composables/useSession';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import FetchData from 'components/FetchData.vue';
@@ -19,6 +20,9 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import CustomerNewPayment from 'src/pages/Customer/components/CustomerNewPayment.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
+const session = useSession();
+
+const tokenMultimedia = session.getTokenMultimedia();
 
 const { sendEmail } = usePrintService();
 const { t } = useI18n();
@@ -188,6 +192,11 @@ const saveFieldValue = async (row) => {
 const sendEmailAction = () => {
     sendEmail(`Suppliers/${route.params.id}/campaign-metrics-email`);
 };
+
+const showBalancePdf = (balance) => {
+    const url = `api/InvoiceOuts/${balance.id}/download?access_token=${tokenMultimedia}`;
+    window.open(url, '_blank');
+};
 </script>
 
 <template>
@@ -257,17 +266,28 @@ const sendEmailAction = () => {
                     <QTd align="center">
                         <QIcon
                             @click.stop="showDialog = true"
-                            class="q-ml-md"
+                            class="q-ml-md fill-icon"
                             color="primary"
                             name="outgoing_mail"
                             size="sm"
-                            style="font-variation-settings: 'FILL' 1"
                             v-if="row.isCompensation"
                         >
                             <QTooltip>
                                 {{ t('Send compensation') }}
                             </QTooltip>
                         </QIcon>
+                        <QIcon
+                            @click="showBalancePdf(row)"
+                            class="q-ml-md fill-icon"
+                            color="primary"
+                            name="cloud_download"
+                            size="sm"
+                            v-if="row.hasPdf"
+                        >
+                            <QTooltip>
+                                {{ t('globals.downloadPdf') }}
+                            </QTooltip>
+                        </QIcon>
 
                         <QDialog v-model="showDialog">
                             <QCard class="q-pa-sm">

src/pages/Customer/Card/CustomerCard.vue

@@ -1,14 +1,16 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import CustomerDescriptor from './CustomerDescriptor.vue';
+import CustomerFilter from '../CustomerFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="Client"
         base-url="Clients"
         :descriptor="CustomerDescriptor"
-        searchbar-data-key="CustomerList"
+        :filter-panel="CustomerFilter"
-        searchbar-url="Clients/filter"
+        search-data-key="CustomerList"
+        search-url="Clients/filter"
         searchbar-label="Search customer"
         searchbar-info="You can search by customer id or name"
     />

src/pages/Customer/Card/CustomerCreditContracts.vue

@@ -105,7 +105,7 @@ const updateData = () => {
                                             color="primary"
                                             name="lock"
                                             size="md"
-                                            style="font-variation-settings: 'FILL' 1"
+                                            class="fill-icon"
                                         >
                                             <QTooltip>{{ t('Close contract') }}</QTooltip>
                                         </QIcon>

src/pages/Customer/Card/CustomerFiscalData.vue

@@ -102,22 +102,24 @@ function handleLocation(data, location) {
                 </VnLocation>
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QCheckbox :label="t('Active')" v-model="data.isActive" />
                 <QCheckbox :label="t('Frozen')" v-model="data.isFreezed" />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QCheckbox :label="t('Has to invoice')" v-model="data.hasToInvoice" />
+                <div>
                     <QCheckbox :label="t('Vies')" v-model="data.isVies" />
                     <QIcon name="info" class="cursor-info q-ml-sm" size="sm">
                         <QTooltip>
                             {{ t('whenActivatingIt') }}
                         </QTooltip>
                     </QIcon>
+                </div>
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QCheckbox :label="t('Notify by email')" v-model="data.isToBeMailed" />
                 <QCheckbox
                     :label="t('Invoice by address')"
@@ -125,17 +127,22 @@ function handleLocation(data, location) {
                 />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
-                <QCheckbox :label="t('Is equalizated')" v-model="data.isEqualizated" />
+                <div>
+                    <QCheckbox
+                        :label="t('Is equalizated')"
+                        v-model="data.isEqualizated"
+                    />
                     <QIcon class="cursor-info q-ml-sm" name="info" size="sm">
                         <QTooltip>
                             {{ t('inOrderToInvoice') }}
                         </QTooltip>
                     </QIcon>
+                </div>
                 <QCheckbox :label="t('Verified data')" v-model="data.isTaxDataChecked" />
             </VnRow>
 
-            <VnRow class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QCheckbox
                     :label="t('Incoterms authorization')"
                     v-model="data.hasIncoterms"

src/pages/Customer/Card/CustomerGreuges.vue

@@ -1,20 +1,17 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
-
 import { QBtn } from 'quasar';
-
+import { useStateStore } from 'src/stores/useStateStore';
 import { toCurrency } from 'src/filters';
 import { toDateTimeFormat } from 'src/filters/date';
-
 import FetchData from 'components/FetchData.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const router = useRouter();
+const stateStore = computed(() => useStateStore());
-
 const rows = ref([]);
 const totalAmount = ref(0);
 
@@ -105,28 +102,40 @@ const columns = computed(() => [
 
 const setRows = (data) => {
     rows.value = data;
-    totalAmount.value = data.reduce((accumulator, currentValue) => {
+    totalAmount.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
-        return accumulator + currentValue.amount;
-    }, 0);
-};
-
-const toCustomerGreugeCreate = () => {
-    router.push({ name: 'CustomerGreugeCreate' });
 };
 </script>
 
 <template>
     <FetchData :filter="filter" @on-fetch="setRows" auto-load url="greuges" />
-
+    <template v-if="stateStore.isHeaderMounted()">
-    <div class="full-width flex justify-center">
+        <Teleport to="#actions-append">
-        <QPage class="card-width q-pa-lg">
+            <div class="row q-gutter-x-sm">
-            <QCard class="full-width q-pa-sm" v-if="totalAmount">
+                <QBtn
-                <h6 class="flex justify-end q-my-lg q-pr-lg">
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="300" show-if-above>
+        <QCard class="full-width q-pa-sm">
+            <h6 class="flex justify-end q-my-lg q-pr-lg" v-if="totalAmount">
                 <span class="color-vn-label q-mr-md">{{ t('Total') }}:</span>
                 {{ toCurrency(totalAmount) }}
             </h6>
+            <QSkeleton v-else type="QInput" square />
         </QCard>
-
+    </QDrawer>
+    <div class="full-width flex justify-center">
+        <QPage class="card-width q-pa-lg">
             <QCard class="q-pa-sm q-mt-md">
                 <QTable
                     :columns="columns"
@@ -164,7 +173,7 @@ const toCustomerGreugeCreate = () => {
     </div>
 
     <QPageSticky :offset="[18, 18]">
-        <QBtn @click.stop="toCustomerGreugeCreate()" color="primary" fab icon="add" />
+        <QBtn color="primary" fab icon="add" :to="{ name: 'CustomerGreugeCreate' }" />
         <QTooltip>
             {{ t('New greuge') }}
         </QTooltip>

src/pages/Customer/Card/CustomerWebAccess.vue

@@ -11,7 +11,6 @@ import useNotify from 'src/composables/useNotify';
 import { useStateStore } from 'stores/useStateStore';
 
 import FetchData from 'components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerChangePassword from 'src/pages/Customer/components/CustomerChangePassword.vue';
 

src/pages/Customer/Card/CustomerWebPayment.vue

@@ -7,7 +7,6 @@ import axios from 'axios';
 
 import { toCurrency, toDateHourMinSec } from 'src/filters';
 
-import FetchData from 'components/FetchData.vue';
 import CustomerCloseIconTooltip from '../components/CustomerCloseIconTooltip.vue';
 import CustomerCheckIconTooltip from '../components/CustomerCheckIconTooltip.vue';
 

src/pages/Customer/Defaulter/CustomerDefaulter.vue

@@ -3,10 +3,10 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import { QBtn, QCheckbox, useQuasar } from 'quasar';
+import { useStateStore } from 'stores/useStateStore';
 
-import { toCurrency, toDate } from 'filters/index';
+import { toCurrency, toDate, dateRange } from 'filters/index';
-
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import FetchData from 'components/FetchData.vue';
 import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
 import CustomerBalanceDueTotal from './CustomerBalanceDueTotal.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
@@ -14,13 +14,14 @@ import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.v
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import CustomerDefaulterAddObservation from './CustomerDefaulterAddObservation.vue';
+const stateStore = useStateStore();
 
-const { t } = useI18n();
+const { t, locale } = useI18n();
 const quasar = useQuasar();
+const dataRef = ref(null);
 
 const balanceDueTotal = ref(0);
 const selected = ref([]);
-const rows = ref([]);
 
 const tableColumnComponents = {
     client: {
@@ -167,39 +168,61 @@ const columns = computed(() => [
     },
 ]);
 
-const setRows = (data) => {
-    rows.value = data;
-    balanceDueTotal.value = data.reduce((accumulator, currentValue) => {
-        return accumulator + (currentValue['amount'] || 0);
-    }, 0);
-};
-
 const viewAddObservation = (rowsSelected) => {
     quasar.dialog({
         component: CustomerDefaulterAddObservation,
         componentProps: {
             clients: rowsSelected,
-            promise: refreshData,
+            promise: async () => await dataRef.value.fetch(),
         },
     });
 };
 
-const refreshData = () => {
+const onFetch = (data) => {
-    setRows();
+    for (const element of data) element.isWorker = element.businessTypeFk === 'worker';
+
+    balanceDueTotal.value = data.reduce((acc, { amount = 0 }) => acc + amount, 0);
 };
 
-const onFetch = (data) => {
+function exprBuilder(param, value) {
-    for (const element of data) {
+    switch (param) {
-        element.isWorker = element.businessTypeFk === 'worker';
+        case 'clientFk':
+            return { [`d.${param}`]: value?.id };
+        case 'creditInsurance':
+        case 'amount':
+        case 'workerFk':
+        case 'countryFk':
+        case 'payMethod':
+        case 'salesPersonFk':
+            return { [`d.${param}`]: value };
+        case 'date':
+            return { 'd.created': { between: dateRange(value) } };
+        case 'defaulterSinced':
+            return { 'd.defaulterSinced': { between: dateRange(value) } };
+    }
 }
-    rows.value = data;
-};
 </script>
 
 <template>
-    <FetchData :filter="filter" @on-fetch="onFetch" auto-load url="Defaulters/filter" />
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
 
-    <QDrawer side="right" :width="256" show-if-above>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <CustomerNotificationsFilter data-key="CustomerDefaulter" />
         </QScrollArea>
@@ -214,12 +237,25 @@ const onFetch = (data) => {
                     icon="vn:notes"
                     :disabled="!selected.length"
                     @click.stop="viewAddObservation(selected)"
-                />
+                >
+                    <QTooltip>{{ t('Add observation') }}</QTooltip>
+                </QBtn>
             </div>
         </template>
     </VnSubToolbar>
 
     <QPage class="column items-center q-pa-md">
+        <VnPaginate
+            ref="dataRef"
+            @on-fetch="onFetch"
+            data-key="CustomerDefaulter"
+            :filter="filter"
+            :expr-builder="exprBuilder"
+            auto-load
+            url="Defaulters/filter"
+        >
+            <template #body="{ rows }">
+                <div class="q-pa-md">
                     <QTable
                         :columns="columns"
                         :rows="rows"
@@ -233,9 +269,15 @@ const onFetch = (data) => {
                                 <QTh>
                                     <QCheckbox v-model="props.selected" />
                                 </QTh>
-                    <QTh v-for="col in props.cols" :key="col.name" :props="props">
+                                <QTh
+                                    v-for="col in props.cols"
+                                    :key="col.name"
+                                    :props="props"
+                                >
                                     {{ t(col.label) }}
-                        <QTooltip v-if="col.tooltip">{{ col.tooltip }}</QTooltip>
+                                    <QTooltip v-if="col.tooltip">{{
+                                        col.tooltip
+                                    }}</QTooltip>
                                 </QTh>
                             </QTr>
                         </template>
@@ -244,17 +286,33 @@ const onFetch = (data) => {
                             <QTd :props="props">
                                 <QTr :props="props" class="cursor-pointer">
                                     <component
-                            :is="tableColumnComponents[props.col.name].component"
+                                        :is="
+                                            tableColumnComponents[props.col.name]
+                                                .component
+                                        "
                                         class="col-content"
-                            v-bind="tableColumnComponents[props.col.name].props(props)"
+                                        v-bind="
-                            @click="tableColumnComponents[props.col.name].event(props)"
+                                            tableColumnComponents[props.col.name].props(
+                                                props
+                                            )
+                                        "
+                                        @click="
+                                            tableColumnComponents[props.col.name].event(
+                                                props
+                                            )
+                                        "
                                     >
                                         <template v-if="props.col.name !== 'isWorker'">
-                                <div v-if="props.col.name === 'lastObservation'">
+                                            <div
+                                                v-if="
+                                                    props.col.name === 'lastObservation'
+                                                "
+                                            >
                                                 <VnInput
                                                     type="textarea"
                                                     v-model="props.value"
                                                     autogrow
+                                                    :disable="true"
                                                 />
                                             </div>
                                             <div v-else>{{ props.value }}</div>
@@ -277,6 +335,9 @@ const onFetch = (data) => {
                             </QTd>
                         </template>
                     </QTable>
+                </div>
+            </template>
+        </VnPaginate>
     </QPage>
 </template>
 
@@ -289,6 +350,7 @@ const onFetch = (data) => {
 
 <i18n>
 es:
+    Add observation:  Añadir observación
     Client: Cliente
     Is worker: Es trabajador
     Salesperson: Comercial

src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue

@@ -57,7 +57,7 @@ const authors = ref();
                         hide-selected
                         map-options
                         option-label="name"
-                        option-value="clientTypeFk"
+                        option-value="id"
                         outlined
                         rounded
                         use-input
@@ -162,7 +162,7 @@ const authors = ref();
 
             <QItem class="q-mb-sm">
                 <QItemSection>
-                    <VnInput
+                    <VnInputDate
                         :label="t('L. O. Date')"
                         clearable
                         is-outlined

src/pages/Customer/ExtendedList/CustomerExtendedList.vue

@@ -10,7 +10,7 @@ import CustomerExtendedListActions from './CustomerExtendedListActions.vue';
 import CustomerExtendedListFilter from './CustomerExtendedListFilter.vue';
 import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import { useArrayData } from 'composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters';
@@ -37,8 +37,6 @@ onMounted(() => {
     allColumnNames.value = filteredColumns.map((col) => col.name);
 });
 
-const rows = computed(() => arrayData.value.store.data);
-
 const selectedCustomerId = ref(0);
 const selectedSalesPersonId = ref(0);
 const allColumnNames = ref([]);
@@ -70,6 +68,11 @@ const tableColumnComponents = {
         props: () => {},
         event: () => {},
     },
+    socialName: {
+        component: 'span',
+        props: () => {},
+        event: () => {},
+    },
     fi: {
         component: 'span',
         props: () => {},
@@ -283,6 +286,12 @@ const columns = computed(() => [
         label: t('customer.extendedList.tableVisibleColumns.name'),
         name: 'name',
     },
+    {
+        align: 'left',
+        field: 'socialName',
+        label: t('customer.extendedList.tableVisibleColumns.socialName'),
+        name: 'socialName',
+    },
     {
         align: 'left',
         field: 'fi',
@@ -485,6 +494,23 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
 </script>
 
 <template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#actions-append">
+            <div class="row q-gutter-x-sm">
+                <QBtn
+                    flat
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport></template
+    >
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <CustomerExtendedListFilter
@@ -495,7 +521,7 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
         </QScrollArea>
     </QDrawer>
     <VnSubToolbar>
-        <template #st-actions>
+        <template #st-data>
             <TableVisibleColumns
                 :all-columns="allColumnNames"
                 table-code="clientsDetail"
@@ -508,6 +534,13 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
     </VnSubToolbar>
 
     <QPage class="column items-center q-pa-md">
+        <VnPaginate
+            data-key="CustomerExtendedList"
+            url="Clients/extendedListFilter"
+            auto-load
+        >
+            <template #body="{ rows }">
+                <div class="q-pa-md">
                     <QTable
                         :columns="columns"
                         :rows="rows"
@@ -521,13 +554,32 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
                                 {{ value }}
                             </QTd>
                         </template>
+                        <template #body-cell-customerStatus="props">
+                            <QTd @click="stopEventPropagation($event, props.col)">
+                                <component
+                                    :is="tableColumnComponents[props.col.name].component"
+                                    class="col-content"
+                                    v-bind="
+                                        tableColumnComponents[props.col.name].props(props)
+                                    "
+                                    @click="
+                                        tableColumnComponents[props.col.name].event(props)
+                                    "
+                                >
+                                </component>
+                            </QTd>
+                        </template>
                         <template #body-cell-id="props">
                             <QTd @click="stopEventPropagation($event, props.col)">
                                 <component
                                     :is="tableColumnComponents[props.col.name].component"
                                     class="col-content"
-                        v-bind="tableColumnComponents[props.col.name].props(props)"
+                                    v-bind="
-                        @click="tableColumnComponents[props.col.name].event(props)"
+                                        tableColumnComponents[props.col.name].props(props)
+                                    "
+                                    @click="
+                                        tableColumnComponents[props.col.name].event(props)
+                                    "
                                 >
                                     <CustomerDescriptorProxy :id="props.row.id" />
                                     {{ props.row.id }}
@@ -540,10 +592,16 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
                                     v-if="props.row.salesPerson"
                                     class="col-content"
                                     :is="tableColumnComponents[props.col.name].component"
-                        v-bind="tableColumnComponents[props.col.name].props(props)"
+                                    v-bind="
-                        @click="tableColumnComponents[props.col.name].event(props)"
+                                        tableColumnComponents[props.col.name].props(props)
+                                    "
+                                    @click="
+                                        tableColumnComponents[props.col.name].event(props)
+                                    "
                                 >
-                        <WorkerDescriptorProxy :id="props.row.salesPersonFk" />
+                                    <WorkerDescriptorProxy
+                                        :id="props.row.salesPersonFk"
+                                    />
                                     {{ props.row.salesPerson }}
                                 </component>
                                 <span class="col-content" v-else>-</span>
@@ -554,12 +612,19 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
                                 <component
                                     :is="tableColumnComponents[props.col.name].component"
                                     class="col-content"
-                        v-bind="tableColumnComponents[props.col.name].props(props)"
+                                    v-bind="
-                        @click="tableColumnComponents[props.col.name].event(props)"
+                                        tableColumnComponents[props.col.name].props(props)
+                                    "
+                                    @click="
+                                        tableColumnComponents[props.col.name].event(props)
+                                    "
                                 />
                             </QTd>
                         </template>
                     </QTable>
+                </div>
+            </template>
+        </VnPaginate>
     </QPage>
 </template>
 

src/pages/Customer/Notifications/CustomerNotifications.vue

@@ -1,17 +1,16 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-
 import { QBtn } from 'quasar';
-
-import FetchData from 'components/FetchData.vue';
 import CustomerNotificationsFilter from './CustomerNotificationsFilter.vue';
 import CustomerDescriptorProxy from '../Card/CustomerDescriptorProxy.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import { useStateStore } from 'stores/useStateStore';
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import CustomerNotificationsCampaignConsumption from './CustomerNotificationsCampaignConsumption.vue';
 
+const stateStore = useStateStore();
 const { t } = useI18n();
-
-const rows = ref([]);
 const selected = ref([]);
 const selectedCustomerId = ref(0);
 
@@ -82,22 +81,42 @@ const selectCustomerId = (id) => {
 </script>
 
 <template>
-    <FetchData
+    <template v-if="stateStore.isHeaderMounted()">
-        :filter="filter"
+        <Teleport to="#actions-append">
-        @on-fetch="(data) => (rows = data)"
+            <div class="row q-gutter-x-sm">
-        auto-load
+                <QBtn
-        url="Clients"
+                    flat
-    />
+                    @click="stateStore.toggleRightDrawer()"
+                    round
+                    dense
+                    icon="menu"
+                >
+                    <QTooltip bottom anchor="bottom right">
+                        {{ t('globals.collapseMenu') }}
+                    </QTooltip>
+                </QBtn>
+            </div>
+        </Teleport>
+    </template>
 
-    <QDrawer side="right" :width="256" show-if-above>
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <CustomerNotificationsFilter data-key="CustomerNotifications" />
         </QScrollArea>
     </QDrawer>
-
+    <VnSubToolbar class="justify-end">
-    <VnSubToolbar />
+        <template #st-data>
-
+            <CustomerNotificationsCampaignConsumption
+                :selected-rows="selected.length > 0"
+                :clients="selected"
+                :promise="refreshData"
+            />
+        </template>
+    </VnSubToolbar>
     <QPage class="column items-center q-pa-md">
+        <VnPaginate data-key="CustomerNotifications" url="Clients" auto-load>
+            <template #body="{ rows }">
+                <div class="q-pa-md">
                     <QTable
                         :columns="columns"
                         :rows="rows"
@@ -110,18 +129,34 @@ const selectCustomerId = (id) => {
                             <QTd :props="props">
                                 <QTr :props="props" class="cursor-pointer">
                                     <component
-                            :is="tableColumnComponents[props.col.name].component"
+                                        :is="
+                                            tableColumnComponents[props.col.name]
+                                                .component
+                                        "
                                         class="col-content"
-                            v-bind="tableColumnComponents[props.col.name].props(props)"
+                                        v-bind="
-                            @click="tableColumnComponents[props.col.name].event(props)"
+                                            tableColumnComponents[props.col.name].props(
+                                                props
+                                            )
+                                        "
+                                        @click="
+                                            tableColumnComponents[props.col.name].event(
+                                                props
+                                            )
+                                        "
                                     >
                                         {{ props.value }}
-                            <CustomerDescriptorProxy :id="selectedCustomerId" />
+                                        <CustomerDescriptorProxy
+                                            :id="selectedCustomerId"
+                                        />
                                     </component>
                                 </QTr>
                             </QTd>
                         </template>
                     </QTable>
+                </div>
+            </template>
+        </VnPaginate>
     </QPage>
 </template>
 
@@ -140,4 +175,5 @@ es:
     Phone: Teléfono
     City: Población
     Email: Email
+    Campaign consumption: Consumo campaña
 </i18n>

src/pages/Customer/Notifications/CustomerNotificationsCampaignConsumption.vue

@@ -0,0 +1,152 @@
+<script setup>
+import { ref, toRefs } from 'vue';
+import { useI18n } from 'vue-i18n';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify';
+import { useValidator } from 'src/composables/useValidator';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import FetchData from 'src/components/FetchData.vue';
+import { watch } from 'vue';
+import { onMounted } from 'vue';
+const $props = defineProps({
+    clients: {
+        type: Array,
+        required: true,
+    },
+    promise: {
+        type: Function,
+        required: true,
+    },
+    selectedRows: {
+        type: Boolean,
+    },
+});
+
+const { selectedRows } = toRefs($props);
+const { notify } = useNotify();
+const { t } = useI18n();
+const validationsStore = useValidator();
+const campaignParams = ref(null);
+const campaignsOptions = ref(null);
+const moreFields = ref([]);
+const popupProxyRef = ref(null);
+const upcomingOptions = ref(null);
+const campaignChange = ({ name }) => {
+    const campaign = campaignsOptions.value.find((c) => c.code === name);
+    handleDates(campaign);
+};
+const handleDates = (campaign) => {
+    const from = new Date(campaign.dated);
+    from.setDate(from.getDate() - campaign.scopeDays);
+    campaignParams.value = {
+        code: campaign.code,
+        from: from,
+        to: campaign.dated,
+    };
+};
+watch(selectedRows, () => {
+    handleDates(upcomingOptions.value);
+});
+const onSubmit = async () => {
+    try {
+        const data = {
+            clients: $props.clients.map((item) => item.id),
+            from: campaignParams.value.from,
+            to: campaignParams.value.to,
+        };
+        const params = JSON.stringify(data);
+        await axios.post('ClientConsumptionQueues', { params });
+
+        notify('globals.dataSaved', 'positive');
+        popupProxyRef.value.hide();
+    } catch (error) {
+        notify(error.message, 'negative');
+    }
+};
+
+onMounted(async () => {
+    const { models } = validationsStore;
+    const properties = models.Item?.properties || {};
+    const _moreFields = ['valentinesDay', 'mothersDay', 'allSaints'];
+
+    _moreFields.forEach((field) => {
+        let prop = properties[field];
+        const label = t(`params.${field}`);
+        moreFields.value.push({
+            name: field,
+            label,
+            type: prop ? prop.type : null,
+        });
+    });
+});
+</script>
+
+<template>
+    <FetchData
+        url="Campaigns/latest"
+        @on-fetch="(data) => (campaignsOptions = data)"
+        :filter="{ fields: ['id', 'code', 'dated'], order: 'code ASC', limit: 30 }"
+        auto-load
+    />
+    <FetchData
+        url="Campaigns/upcoming"
+        @on-fetch="(data) => (upcomingOptions = data)"
+        auto-load
+    />
+    <QBtn color="primary" icon="show_chart" :disable="!selectedRows">
+        <QPopupProxy ref="popupProxyRef">
+            <QCard class="column q-pa-md">
+                <span class="text-body1 q-mb-sm">{{ t('Campaign consumption') }}</span>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnSelect
+                        :options="moreFields"
+                        option-value="code"
+                        option-label="label"
+                        v-model="campaignParams.code"
+                        :label="t('Campaign')"
+                        @update:model-value="campaignChange"
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInputDate v-model="campaignParams.from" :label="t('From')" />
+                    <VnInputDate v-model="campaignParams.to" :label="t('To')" />
+                </VnRow>
+                <div class="q-mt-lg row justify-end">
+                    <QBtn
+                        :label="t('globals.cancel')"
+                        color="primary"
+                        flat
+                        class="q-mr-md"
+                        v-close-popup
+                    />
+                    <QBtn
+                        :label="t('globals.save')"
+                        type="submit"
+                        color="primary"
+                        @click="onSubmit()"
+                    />
+                </div>
+            </QCard>
+        </QPopupProxy>
+        <QTooltip>{{ t('Campaign consumption') }}</QTooltip>
+    </QBtn>
+</template>
+
+<i18n>
+    en:
+        params:
+            valentinesDay: Valentine's Day
+            mothersDay: Mother's Day
+            allSaints: All Saints' Day
+    es:
+        params:
+            valentinesDay: Día de San Valentín
+            mothersDay: Día de la Madre
+            allSaints: Día de Todos los Santos
+        Campaign consumption: Consumo campaña
+        Campaign: Campaña
+        From: Desde
+        To: Hasta
+</i18n>

src/pages/Customer/Payments/CustomerPayments.vue

@@ -110,13 +110,7 @@ function stateColor(row) {
             </div>
         </Teleport>
     </template>
-    <QDrawer
+    <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        v-model="stateStore.rightDrawer"
-        side="right"
-        :width="256"
-        show-if-above
-        :breakpoint="1600"
-    >
         <QScrollArea class="fit text-grey-8">
             <CustomerPaymentsFilter data-key="CustomerTransactions" />
         </QScrollArea>

src/pages/Customer/components/CustomerAddressCreate.vue

@@ -11,7 +11,6 @@ import VnRow from 'components/ui/VnRow.vue';
 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 CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
 
 const { t } = useI18n();

src/pages/Customer/components/CustomerAddressEdit.vue

@@ -11,7 +11,6 @@ import VnRow from 'components/ui/VnRow.vue';
 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 CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import CustomsNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
 
 const { t } = useI18n();

src/pages/Customer/components/CustomerNewCustomsAgent.vue

@@ -1,5 +1,4 @@
 <script setup>
-import { reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import VnRow from 'components/ui/VnRow.vue';

src/pages/Entry/Card/EntryCard.vue

@@ -1,14 +1,16 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import EntryDescriptor from './EntryDescriptor.vue';
+import EntryFilter from '../EntryFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="Entry"
         base-url="Entries"
         :descriptor="EntryDescriptor"
-        searchbar-data-key="EntryList"
+        :filter-panel="EntryFilter"
-        searchbar-url="Entries/filter"
+        search-data-key="EntryList"
+        search-url="Entries/filter"
         searchbar-label="Search entries"
         searchbar-info="You can search by entry reference"
     />

src/pages/Entry/Card/EntrySummary.vue

@@ -6,7 +6,6 @@ import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
-import VnTitle from 'src/components/common/VnTitle.vue';
 
 import { toDate, toCurrency } from 'src/filters';
 import { getUrl } from 'src/composables/getUrl';

src/pages/Entry/EntryLatestBuys.vue

@@ -12,6 +12,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
 import ItemDescriptorProxy from '../Item/Card/ItemDescriptorProxy.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { toDate, toCurrency } from 'src/filters';
@@ -636,18 +637,18 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         auto-load
         @on-fetch="(data) => (intrastatOptions = data)"
     />
-    <QToolbar class="justify-end">
+    <VnSubToolbar>
-        <div id="st-data">
+        <template #st-data>
             <TableVisibleColumns
                 :all-columns="allColumnNames"
                 table-code="latestBuys"
                 labels-traductions-path="entry.latestBuys"
                 @on-config-saved="visibleColumns = ['picture', ...$event]"
             />
-        </div>
+        </template>
         <QSpace />
         <div id="st-actions"></div>
-    </QToolbar>
+    </VnSubToolbar>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <EntryLatestBuysFilter data-key="EntryLatestBuys" />

src/pages/InvoiceIn/Card/InvoiceInBasicData.vue

@@ -3,14 +3,13 @@ import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
+import axios from 'axios';
 import { useArrayData } from 'src/composables/useArrayData';
 import { downloadFile } from 'src/composables/downloadFile';
-
 import FormModel from 'components/FormModel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import FetchData from 'src/components/FetchData.vue';
-
+import VnRow from 'src/components/ui/VnRow.vue';
-import axios from 'axios';
 
 const quasar = useQuasar();
 const route = useRoute();
@@ -181,7 +180,7 @@ async function upsert() {
         :auto-load="true"
     >
         <template #form="{ data }">
-            <div class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('supplierFk')"
                     v-model="data.supplierFk"
@@ -208,8 +207,8 @@ async function upsert() {
                     :label="t('Supplier ref')"
                     v-model="data.supplierRef"
                 />
-            </div>
+            </VnRow>
-            <div class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QInput
                     :label="t('Expedition date')"
                     v-model="data.issued"
@@ -264,8 +263,8 @@ async function upsert() {
                         </QIcon>
                     </template>
                 </QInput>
-            </div>
+            </VnRow>
-            <div class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QInput
                     :label="t('Undeductible VAT')"
                     v-model="data.deductibleExpenseFk"
@@ -318,8 +317,8 @@ async function upsert() {
                         </QBtn>
                     </template>
                 </QInput>
-            </div>
+            </VnRow>
-            <div class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <QInput
                     :label="t('Entry date')"
                     v-model="data.bookEntried"
@@ -378,8 +377,8 @@ async function upsert() {
                         </QIcon>
                     </template>
                 </QInput>
-            </div>
+            </VnRow>
-            <div class="row q-gutter-md q-mb-md">
+            <VnRow>
                 <VnSelect
                     :label="t('Currency')"
                     v-model="data.currencyFk"
@@ -395,13 +394,8 @@ async function upsert() {
                     option-value="id"
                     option-label="code"
                 />
-            </div>
+            </VnRow>
-            <div class="row q-gutter-md q-mb-md">
+            <QCheckbox :label="t('invoiceIn.summary.booked')" v-model="data.isBooked" />
-                <QCheckbox
-                    :label="t('invoiceIn.summary.booked')"
-                    v-model="data.isBooked"
-                />
-            </div>
         </template>
     </FormModel>
     <QDialog ref="editDmsRef">

src/pages/InvoiceIn/Card/InvoiceInCard.vue

@@ -1,6 +1,7 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import InvoiceInDescriptor from './InvoiceInDescriptor.vue';
+import InvoiceInFilter from '../InvoiceInFilter.vue';
 
 const filter = {
     include: [
@@ -25,8 +26,9 @@ const filter = {
         base-url="InvoiceIns"
         :filter="filter"
         :descriptor="InvoiceInDescriptor"
-        searchbar-data-key="InvoiceInList"
+        :filter-panel="InvoiceInFilter"
-        searchbar-url="InvoiceIns/filter"
+        search-data-key="InvoiceInList"
+        search-url="InvoiceIns/filter"
         searchbar-label="Search invoice"
         searchbar-info="You can search by invoice reference"
     />

src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue

@@ -90,7 +90,7 @@ function getTotal(type) {
         url="Countries"
         auto-load
         @on-fetch="(data) => (countries = data)"
-        sort-by="country"
+        sort-by="name"
     />
     <FetchData
         url="Intrastats"

src/pages/InvoiceOut/Card/InvoiceOutCard.vue

@@ -1,14 +1,16 @@
 <script setup>
 import InvoiceOutDescriptor from './InvoiceOutDescriptor.vue';
 import VnCard from 'components/common/VnCard.vue';
+import InvoiceOutFilter from '../InvoiceOutFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="InvoiceOut"
         base-url="InvoiceOuts"
         :descriptor="InvoiceOutDescriptor"
-        searchbar-data-key="InvoiceOutList"
+        :filter-panel="InvoiceOutFilter"
-        searchbar-url="InvoiceOuts/filter"
+        search-data-key="InvoiceOutList"
+        search-url="InvoiceOuts/filter"
         searchbar-label="Search invoice"
         searchbar-info="You can search by invoice reference"
     />

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -139,7 +139,7 @@ const openCreateInvoiceModal = () => {
                             icon="cloud_download"
                             :disable="selectedCards.size === 0"
                         >
-                            <QTooltip>{{ t('downloadPdf') }}</QTooltip>
+                            <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
                         </QBtn>
                         <QCheckbox
                             left-label
@@ -234,13 +234,11 @@ en:
     fileDenied: Browser denied file download...
     fileAllowed: Successful download of CSV file
     youCanSearchByInvoiceReference: You can search by invoice reference
-    downloadPdf: Download PDF
     createInvoice: Make invoice
 es:
     searchInvoice: Buscar factura emitida
     fileDenied: El navegador denegó la descarga de archivos...
     fileAllowed: Descarga exitosa de archivo CSV
     youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
-    downloadPdf: Descargar PDF
     createInvoice: Crear factura
 </i18n>

src/pages/Item/Card/ItemCard.vue

@@ -1,7 +1,17 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import ItemDescriptor from './ItemDescriptor.vue';
+import ItemListFilter from '../ItemListFilter.vue';
 </script>
 <template>
-    <VnCard data-key="Item" base-url="Items" :descriptor="ItemDescriptor" />
+    <VnCard
+        data-key="Item"
+        base-url="Items"
+        :descriptor="ItemDescriptor"
+        :filter-panel="ItemListFilter"
+        search-data-key="ItemList"
+        search-url="Items/filter"
+        searchbar-label="searchbar.label"
+        searchbar-info="searchbar.info"
+    />
 </template>

src/pages/Item/ItemFixedPrice.vue

@@ -309,9 +309,9 @@ const addRow = () => {
     const lastItemCopy = JSON.parse(
         JSON.stringify(fixedPrices.value[fixedPrices.value.length - 1])
     );
-    const { id, ...restOfItem } = lastItemCopy;
+    delete lastItemCopy.id;
-    fixedPricesOriginalData.value.push(restOfItem);
+    fixedPricesOriginalData.value.push(lastItemCopy);
-    fixedPrices.value.push(restOfItem);
+    fixedPrices.value.push(lastItemCopy);
 };
 
 const openEditTableCellDialog = () => {

src/pages/Item/ItemList.vue

@@ -457,6 +457,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             :limit="12"
             :expr-builder="exprBuilder"
             :user-params="params"
+            :keep-opts="['userParams']"
             :offset="50"
             auto-load
         >

src/pages/Item/ItemTypeList.vue

@@ -7,8 +7,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import ItemTypeSummary from 'src/pages/ItemType/Card/ItemTypeSummary.vue';
 import ItemTypeFilter from 'src/pages/ItemType/ItemTypeFilter.vue';
-import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import ItemTypeSearchbar from '../ItemType/ItemTypeSearchbar.vue';
-
 import { useStateStore } from 'stores/useStateStore';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 
@@ -63,13 +62,7 @@ const exprBuilder = (param, value) => {
 <template>
     <template v-if="stateStore.isHeaderMounted()">
         <Teleport to="#searchbar">
-            <VnSearchbar
+            <ItemTypeSearchbar />
-                data-key="ItemTypeList"
-                url="ItemTypes"
-                :label="t('Search item type')"
-                :info="t('Search itemType by id, name or code')"
-                :expr-builder="exprBuilder"
-            />
         </Teleport>
         <Teleport to="#actions-append">
             <div class="row q-gutter-x-sm">
@@ -132,11 +125,3 @@ const exprBuilder = (param, value) => {
         </QTooltip>
     </QPageSticky>
 </template>
-
-<i18n>
-es:
-    New item type: Nueva familia
-    Name: Nombre
-    Search item type: Buscar familia
-    Search itemType by id, name or code: Buscar familia por id, nombre o código
-</i18n>

src/pages/Item/locale/en.yml

@@ -78,3 +78,6 @@ itemTags:
     tag: Tag
     value: Value
     relevancy: Relevancy
+searchbar:
+    label: Search item
+    info: Search by item id

src/pages/Item/locale/es.yml

@@ -78,3 +78,6 @@ itemTags:
     tag: Etiqueta
     value: Valor
     relevancy: Relevancia
+searchbar:
+    label: Buscar artículo
+    info: Buscar por id de artículo

src/pages/ItemType/Card/ItemTypeCard.vue

@@ -1,12 +1,20 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
-
 import ItemTypeDescriptor from 'src/pages/ItemType/Card/ItemTypeDescriptor.vue';
+import ItemTypeFilter from 'src/pages/ItemType/ItemTypeFilter.vue';
+import ItemTypeSearchbar from '../ItemTypeSearchbar.vue';
 </script>
 <template>
     <VnCard
         data-key="ItemTypeSummary"
         base-url="ItemTypes"
         :descriptor="ItemTypeDescriptor"
-    />
+        :filter-panel="ItemTypeFilter"
+        search-data-key="ItemTypeList"
+        search-url="ItemTypes"
+    >
+        <template #searchbar>
+            <ItemTypeSearchbar />
+        </template>
+    </VnCard>
 </template>

src/pages/ItemType/ItemTypeSearchbar.vue

@@ -0,0 +1,19 @@
+<script setup>
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import { useI18n } from 'vue-i18n';
+const { t } = useI18n();
+</script>
+
+<template>
+    <VnSearchbar
+        data-key="ItemTypeList"
+        url="ItemTypes"
+        :label="t('Search item type')"
+        :info="t('Search itemType by id, name or code')"
+    />
+</template>
+<i18n>
+es:
+    Search item type: Buscar familia
+    Search itemType by id, name or code: Buscar familia por id, nombre o código
+</i18n>

src/pages/Monitor/SalesOrdersTable.vue

@@ -1,7 +1,6 @@
 <script setup>
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
 
 import FetchData from 'components/FetchData.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
@@ -16,7 +15,6 @@ import axios from 'axios';
 const { t } = useI18n();
 const { openConfirmationModal } = useVnConfirm();
 
-const router = useRouter();
 const paginateRef = ref(null);
 const workersActiveOptions = ref([]);
 const clientsOptions = ref([]);

src/pages/Monitor/SalesTicketsTable.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onMounted, reactive, watch } from 'vue';
+import { ref, computed, onMounted, reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 
@@ -18,7 +18,7 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { toDateFormat, toTimeFormat } from 'src/filters/date.js';
-import { toCurrency } from 'src/filters';
+import { toCurrency, dateRange } from 'src/filters';
 const DEFAULT_AUTO_REFRESH = 1000;
 const { t } = useI18n();
 const autoRefresh = ref(false);
@@ -32,15 +32,6 @@ const visibleColumns = ref([]);
 const allColumnNames = ref([]);
 const { viewSummary } = useSummaryDialog();
 
-const dateRange = (value) => {
-    const minHour = new Date(value);
-    minHour.setHours(0, 0, 0, 0);
-    const maxHour = new Date(value);
-    maxHour.setHours(23, 59, 59, 59);
-
-    return [minHour, maxHour];
-};
-
 function exprBuilder(param, value) {
     switch (param) {
         case 'stateFk':
@@ -54,11 +45,7 @@ function exprBuilder(param, value) {
         case 'practicalHour':
             return { 'zed.etc': value };
         case 'shippedDate':
-            return {
+            return { 't.shipped': { between: dateRange(value) } };
-                't.shipped': {
-                    between: dateRange(value),
-                },
-            };
         case 'nickname':
             return { [`t.nickname`]: { like: `%${value}%` } };
         case 'zoneFk':

src/pages/Order/Card/OrderCard.vue

@@ -1,7 +1,19 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
+import OrderFilter from './OrderFilter.vue';
+import OrderSearchbar from './OrderSearchbar.vue';
 </script>
 <template>
-    <VnCard data-key="Order" base-url="Orders" :descriptor="OrderDescriptor" />
+    <VnCard
+        data-key="Order"
+        base-url="Orders"
+        :descriptor="OrderDescriptor"
+        :filter-panel="OrderFilter"
+        search-data-key="OrderList"
+    >
+        <template #searchbar>
+            <OrderSearchbar />
+        </template>
+    </VnCard>
 </template>

src/pages/Order/Card/OrderForm.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { useRoute } from 'vue-router';
-import { reactive, ref, onMounted } from 'vue';
+import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { useState } from 'composables/useState';

src/pages/Order/Card/OrderSummary.vue

@@ -2,17 +2,14 @@
 import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
 import { dashIfEmpty, toCurrency, toDateHourMinSec } from 'src/filters';
 import VnLv from 'components/ui/VnLv.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
-import OrderSearchbar from 'pages/Order/Card/OrderSearchbar.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const stateStore = useStateStore();
 
 const $props = defineProps({
     id: {
@@ -53,10 +50,6 @@ const detailsColumns = ref([
 </script>
 
 <template>
-    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
-        <OrderSearchbar />
-    </Teleport>
-
     <div class="q-pa-md">
         <CardSummary ref="summary" :url="`Orders/${entityId}/summary`">
             <template #header="{ entity }">
@@ -158,11 +151,7 @@ const detailsColumns = ref([
                     <p class="header">
                         {{ t('order.summary.details') }}
                     </p>
-                    <QTable
+                    <QTable :columns="detailsColumns" :rows="entity?.rows" flat>
-                        :columns="detailsColumns"
-                        :rows="entity?.rows"
-                        flat
-                    >
                         <template #header="props">
                             <QTr :props="props">
                                 <QTh auto-width>{{ t('order.summary.item') }}</QTh>

src/pages/Order/OrderList.vue

@@ -61,6 +61,7 @@ function navigate(id) {
                 :limit="20"
                 :order="['landed DESC', 'clientFk', 'id DESC']"
                 :user-params="{ showEmpty: false }"
+                :keep-opts="['userParams']"
                 auto-load
             >
                 <template #body="{ rows }">

src/pages/Parking/Card/ParkingBasicData.vue

@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnRow from 'components/ui/VnRow.vue';
@@ -10,7 +10,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 
 const { t } = useI18n();
 const route = useRoute();
-const parkingId = route.params?.id || null;
+const parkingId = computed(() => route.params?.id || null);
 const sectors = ref([]);
 const sectorFilter = { fields: ['id', 'description'] };
 

src/pages/Parking/Card/ParkingCard.vue

@@ -1,6 +1,7 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import ParkingDescriptor from 'pages/Parking/Card/ParkingDescriptor.vue';
+import ParkingFilter from 'pages/Parking/ParkingFilter.vue';
 
 const filter = {
     fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
@@ -13,8 +14,9 @@ const filter = {
         base-url="Parkings"
         :filter="filter"
         :descriptor="ParkingDescriptor"
-        searchbar-data-key="ParkingList"
+        :filter-panel="ParkingFilter"
-        searchbar-url="Parkings"
+        search-data-key="ParkingList"
+        search-url="Parkings"
         searchbar-label="parking.searchBar.label"
         searchbar-info="parking.searchBar.info"
     />

src/pages/Parking/Card/ParkingDescriptor.vue

@@ -15,10 +15,10 @@ const props = defineProps({
 });
 
 const { t } = useI18n();
-const { params } = useRoute();
+const route = useRoute();
-const entityId = computed(() => props.id || params.id);
+const entityId = computed(() => props.id || route.params.id);
 const { store } = useArrayData('Parking');
-const card = computed(() => store.data);
+const parking = computed(() => store.data);
 const filter = {
     fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
     include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
@@ -29,11 +29,12 @@ const filter = {
         module="Parking"
         data-key="Parking"
         :url="`Parkings/${entityId}`"
-        :title="card?.code"
+        :title="parking?.code"
-        :subtitle="card?.id"
+        :subtitle="parking?.id"
         :filter="filter"
+        @on-fetch="(data) => (parking = data)"
     >
-        <template #body="{ entity: parking }">
+        <template #body>
             <VnLv :label="t('globals.code')" :value="parking.code" />
             <VnLv :label="t('parking.pickingOrder')" :value="parking.pickingOrder" />
             <VnLv :label="t('parking.sector')" :value="parking.sector?.description" />

src/pages/Parking/Card/ParkingSummary.vue

@@ -1,9 +1,10 @@
 <script setup>
-import { computed } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'components/ui/VnLv.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const $props = defineProps({
     id: {
@@ -14,7 +15,9 @@ const $props = defineProps({
 const router = useRoute();
 const { t } = useI18n();
 const entityId = computed(() => $props.id || router.params.id);
+const { store } = useArrayData('Parking');
 
+const parking = ref(store.data);
 const filter = {
     fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
     include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
@@ -23,9 +26,13 @@ const filter = {
 
 <template>
     <div class="q-pa-md">
-        <CardSummary :url="`Parkings/${entityId}`" :filter="filter">
+        <CardSummary
-            <template #header="{ entity: parking }">{{ parking.code }}</template>
+            :url="`Parkings/${entityId}`"
-            <template #body="{ entity: parking }">
+            :filter="filter"
+            @on-fetch="(data) => (parking = data)"
+        >
+            <template #header>{{ parking.code }}</template>
+            <template #body>
                 <QCard class="vn-one">
                     <QCardSection class="q-pa-none">
                         <a

src/pages/Route/Card/RouteCard.vue

@@ -1,7 +1,19 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import RouteDescriptor from 'pages/Route/Card/RouteDescriptor.vue';
+import RouteFilter from './RouteFilter.vue';
+import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
 </script>
 <template>
-    <VnCard data-key="Route" base-url="Routes" :descriptor="RouteDescriptor" />
+    <VnCard
+        data-key="Route"
+        base-url="Routes"
+        :descriptor="RouteDescriptor"
+        :filter-panel="RouteFilter"
+        search-data-key="RouteList"
+    >
+        <template #searchbar>
+            <RouteSearchbar />
+        </template>
+    </VnCard>
 </template>

src/pages/Route/Card/RouteSearchbar.vue

@@ -1,6 +1,6 @@
 <script setup>
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import {useI18n} from "vue-i18n";
+import { useI18n } from 'vue-i18n';
 const { t } = useI18n();
 </script>
 

src/pages/Route/Card/RouteSummary.vue

@@ -10,7 +10,6 @@ import { dashIfEmpty, toCurrency, toDate, toHour } from 'src/filters';
 import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
-import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
 import { openBuscaman } from 'src/utils/buscaman';
 
 const $props = defineProps({
@@ -118,11 +117,6 @@ const ticketColumns = ref([
 </script>
 
 <template>
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar">
-            <RouteSearchbar />
-        </Teleport>
-    </template>
     <div class="q-pa-md full-width">
         <CardSummary
             ref="summary"

src/pages/Route/Roadmap/RoadmapCreate.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 import VnRow from 'components/ui/VnRow.vue';
 import FormModel from 'components/FormModel.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
@@ -9,7 +9,6 @@ import VnInput from 'components/common/VnInput.vue';
 import VnInputTime from 'components/common/VnInputTime.vue';
 
 const { t } = useI18n();
-const route = useRoute();
 const router = useRouter();
 const defaultInitialData = {
     etd: Date.vnNew().toISOString(),
@@ -31,11 +30,7 @@ const onSave = (data, response) => {
     >
         <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput
+                <VnInput v-model="data.name" :label="t('Roadmap')" clearable />
-                    v-model="data.name"
-                    :label="t('Roadmap')"
-                    clearable
-                />
                 <VnInputDate v-model="data.etd" :label="t('ETD date')" />
                 <VnInputTime v-model="data.etd" :label="t('ETD hour')" />
             </VnRow>

src/pages/Route/Roadmap/RoadmapSummary.vue

@@ -72,7 +72,12 @@ const openAddStopDialog = () => {
 
 <template>
     <div class="q-pa-md full-width">
-        <CardSummary ref="summary" :url="`Roadmaps/${entityId}`" :filter="filter">
+        <CardSummary
+            data-key="RoadmapSummary"
+            ref="summary"
+            :url="`Roadmaps/${entityId}`"
+            :filter="filter"
+        >
             <template #header-left>
                 <RouterLink :to="{ name: `RoadmapSummary`, params: { id: entityId } }">
                     <QIcon name="open_in_new" color="white" size="sm" />

src/pages/Route/RouteTickets.vue

@@ -274,7 +274,7 @@ const openSmsDialog = async () => {
                 <QBtn
                     icon="filter_alt"
                     color="primary"
-                    class="q-mr-sm filled-icon"
+                    class="q-mr-sm fill-icon"
                     :disable="!selectedRows?.length"
                     @click="deletePriorities"
                 >
@@ -295,7 +295,7 @@ const openSmsDialog = async () => {
                 <QBtn
                     icon="sms"
                     color="primary"
-                    class="q-mr-sm filled-icon"
+                    class="q-mr-sm fill-icon"
                     :disable="!selectedRows?.length"
                     @click="openSmsDialog"
                 >
@@ -425,10 +425,6 @@ const openSmsDialog = async () => {
 .table-actions {
     gap: 12px;
 }
-
-.filled-icon {
-    font-variation-settings: 'FILL' 1;
-}
 </style>
 <i18n>
 es:

src/pages/Shelving/Card/ShelvingCard.vue

@@ -1,7 +1,19 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import ShelvingDescriptor from 'pages/Shelving/Card/ShelvingDescriptor.vue';
+import ShelvingFilter from './ShelvingFilter.vue';
+import ShelvingSearchbar from './ShelvingSearchbar.vue';
 </script>
 <template>
-    <VnCard data-key="Shelving" base-url="Shelvings" :descriptor="ShelvingDescriptor" />
+    <VnCard
+        data-key="Shelving"
+        base-url="Shelvings"
+        :descriptor="ShelvingDescriptor"
+        :filter-panel="ShelvingFilter"
+        search-data-key="ShelvingList"
+    >
+        <template #searchbar>
+            <ShelvingSearchbar />
+        </template>
+    </VnCard>
 </template>

src/pages/Shelving/Card/ShelvingSummary.vue

@@ -1,11 +1,9 @@
 <script setup>
-import { computed, onMounted, onUnmounted } from 'vue';
+import { computed } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'components/ui/VnLv.vue';
-import ShelvingFilter from 'pages/Shelving/Card/ShelvingFilter.vue';
 import VnUserLink from 'components/ui/VnUserLink.vue';
 
 const $props = defineProps({
@@ -15,19 +13,10 @@ const $props = defineProps({
     },
 });
 const route = useRoute();
-const stateStore = useStateStore();
-const router = useRouter();
 const { t } = useI18n();
 
 const entityId = computed(() => $props.id || route.params.id);
-const isDialog = false;
+
-// const hideRightDrawer = () => {
-//     if (!isDialog) {
-//         stateStore.rightDrawer = false;
-//     }
-// };
-// onMounted(hideRightDrawer);
-// onUnmounted(hideRightDrawer);
 const filter = {
     include: [
         {

src/pages/Supplier/Card/SupplierAddressesCreate.vue

@@ -2,23 +2,16 @@
 import { useI18n } from 'vue-i18n';
 import { reactive, ref, onMounted, onBeforeMount } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
-
-import FetchData from 'components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import FormModel from 'components/FormModel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
 
-const provincesOptions = ref([]);
 const postcodesOptions = ref([]);
-const townsLocationOptions = ref([]);
 const viewAction = ref();
 const updateAddressId = ref(null);
 const newAddressForm = reactive({
@@ -94,9 +87,7 @@ function handleLocation(data, location) {
                         :roles-allowed-to-create="['deliveryAssistant']"
                         :options="postcodesOptions"
                         v-model="data.location"
-                        @update:model-value="
+                        @update:model-value="(location) => handleLocation(data, location)"
-                            (location) => handleLocation(data, location)
-                        "
                     >
                     </VnLocation>
                 </VnRow>

src/pages/Supplier/Card/SupplierCard.vue

@@ -1,14 +1,16 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import SupplierDescriptor from './SupplierDescriptor.vue';
+import SupplierListFilter from '../SupplierListFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="Supplier"
         base-url="Suppliers"
         :descriptor="SupplierDescriptor"
-        searchbar-data-key="SupplierList"
+        :filter-panel="SupplierListFilter"
-        searchbar-url="Suppliers/filter"
+        search-data-key="SupplierList"
+        search-url="Suppliers/filter"
         searchbar-label="Search suppliers"
     />
 </template>

src/pages/Supplier/Card/SupplierConsumption.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { useRoute } from 'vue-router';
-import { computed, onMounted, watch, onUnmounted, ref } from 'vue';
+import { computed, onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import FetchedTags from 'components/ui/FetchedTags.vue';

src/pages/Supplier/SupplierListFilter.vue

@@ -29,7 +29,7 @@ const countriesOptions = ref([]);
     />
     <FetchData
         url="countries"
-        :filter="{ fields: ['id', 'country'], order: 'country ASC', limit: 30 }"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
         @on-fetch="(data) => (countriesOptions = data)"
         auto-load
     />
@@ -92,7 +92,7 @@ const countriesOptions = ref([]);
                         @update:model-value="searchFn()"
                         :options="countriesOptions"
                         option-value="id"
-                        option-label="country"
+                        option-label="name"
                         hide-selected
                         dense
                         outlined

src/pages/Ticket/Card/TicketCard.vue

@@ -1,14 +1,16 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import TicketDescriptor from './TicketDescriptor.vue';
+import TicketFilter from '../TicketFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="Ticket"
         base-url="Tickets"
         :descriptor="TicketDescriptor"
-        searchbar-data-key="TicketList"
+        :filter-panel="TicketFilter"
-        searchbar-url="Tickets/filter"
+        search-data-key="TicketList"
+        search-url="Tickets/filter"
         searchbar-label="Search ticket"
         searchbar-info="You can search by ticket id or alias"
     />

src/pages/Travel/TravelFilter.vue

@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 

src/pages/Wagon/Type/WagonTypeList.vue

@@ -6,7 +6,6 @@ import { useArrayData } from 'src/composables/useArrayData';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import CardList from 'components/ui/CardList.vue';
-import VnLv from 'components/ui/VnLv.vue';
 
 const quasar = useQuasar();
 const arrayData = useArrayData('WagonTypeList');

src/pages/Worker/Card/WorkerBasicData.vue

@@ -35,8 +35,8 @@ const workersFilter = {
     limit: 30,
 };
 const countriesFilter = {
-    fields: ['id', 'country', 'code'],
+    fields: ['id', 'name', 'code'],
-    order: 'country ASC',
+    order: 'name ASC',
     limit: 30,
 };
 const educationLevelsFilter = { fields: ['id', 'name'], order: 'name ASC', limit: 30 };
@@ -124,7 +124,7 @@ const maritalStatus = [
                     :label="t('Origin country')"
                     :options="countriesOptions"
                     hide-selected
-                    option-label="country"
+                    option-label="name"
                     option-value="id"
                     v-model="data.originCountryFk"
                 />

src/pages/Worker/Card/WorkerCard.vue

@@ -1,14 +1,16 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import WorkerDescriptor from './WorkerDescriptor.vue';
+import WorkerFilter from '../WorkerFilter.vue';
 </script>
 <template>
     <VnCard
         data-key="Worker"
         base-url="Workers"
         :descriptor="WorkerDescriptor"
-        searchbar-data-key="WorkerList"
+        :filter-panel="WorkerFilter"
-        searchbar-url="Workers/filter"
+        search-data-key="WorkerList"
+        search-url="Workers/filter"
         searchbar-label="Search worker"
         searchbar-info="You can search by worker id or name"
     />

src/pages/Worker/WorkerCreate.vue

@@ -9,7 +9,6 @@ import VnInputDate from 'components/common/VnInputDate.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 CustomerCreateNewPostcode from 'src/components/CreateNewPostcodeForm.vue';
 import VnLocation from 'src/components/common/VnLocation.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';

src/pages/Zone/Card/ZoneBasicData.vue

@@ -1,34 +1,24 @@
 <script setup>
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-
+import { ref } from 'vue';
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'src/components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import { QCheckbox } from 'quasar';
+import VnInputTime from 'src/components/common/VnInputTime.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
 const route = useRoute();
 const { t } = useI18n();
-const zoneFilter = {
+
-    include: [
-        {
-            relation: 'agency',
-            scope: {
-                fields: ['name'],
-                include: { relation: 'agencyModeFk', scope: { fields: ['id'] } },
-            },
-        },
-        { relation: 'sip', scope: { fields: ['extension', 'secret'] } },
-        { relation: 'department', scope: { include: { relation: 'department' } } },
-        { relation: 'client', scope: { fields: ['phone'] } },
-    ],
-};
 const agencyFilter = {
     fields: ['id', 'name'],
     order: 'name ASC',
     limit: 30,
 };
+const agencyOptions = ref([]);
 </script>
 
 <template>
@@ -36,58 +26,90 @@ const agencyFilter = {
         :filter="agencyFilter"
         @on-fetch="(data) => (agencyOptions = data)"
         auto-load
-        url="agencies"
+        url="AgencyModes/isActive"
-    />
-    <FetchData
-        :filter="zoneFilter"
-        @on-fetch="(data) => (zoneOptions = data)"
-        auto-load
-        url="zones"
     />
 
-    <FormModel
+    <FormModel :url="`Zones/${route.params.id}`" auto-load model="zone">
-        :filter="zoneFilter"
+        <template #form="{ data, validate }">
-        :url="`zone/${route.params.id}/basic-data`"
-        auto-load
-        model="Zone"
-    >
-        <template #form="{ data }">
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput :label="t('Name')" clearable v-model="data.zone.name" />
+                <VnInput :label="t('Name')" clearable v-model="data.name" />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput v-model="data.agency.name" :label="t('Agency')" clearable />
+                <VnSelect
-                <VnInput v-model="data.zone.itemMaxSize" :label="t('Max m³')" clearable />
+                    option-label="name"
-                <VnInput v-model="data.zone.m3Max" :label="t('Maximum m³')" clearable />
+                    option-value="id"
+                    v-model="data.agencyModeFk"
+                    :rules="validate('zone.agencyModeFk')"
+                    :options="agencyOptions"
+                    :label="t('Agency')"
+                    emit-value
+                    map-options
+                    use-input
+                    hide-bottom-space
+                />
+                <VnInput
+                    class="mw-10"
+                    v-model="data.itemMaxSize"
+                    :label="t('Max m³')"
+                    clearable
+                    type="number"
+                    min="0"
+                />
+                <VnInput
+                    class="mw-10"
+                    v-model="data.m3Max"
+                    :label="t('Maximum m³')"
+                    clearable
+                    type="number"
+                    min="0"
+                />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput
-                    v-model="data.zone.travelingDays"
+                    v-model="data.travelingDays"
                     :label="t('Traveling days')"
                     clearable
+                    type="number"
+                    min="0"
                 />
-                <VnInput v-model="data.zone.hour" :label="t('Closing')" clearable />
+                <VnInputTime v-model="data.hour" :label="t('Closing')" clearable />
-            </VnRow>
-
-            <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput v-model="data.zone.price" :label="t('Price')" clearable />
-                <VnInput v-model="data.zone.bonus" :label="t('Bonus')" clearable />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput
-                    v-model="data.zone.inflation"
+                    v-model="data.price"
-                    :label="t('Inflation')"
+                    :label="t('Price')"
+                    type="number"
+                    min="0"
                     clearable
                 />
-                <QCheckbox v-model="data.zone.isVolumetric" :label="t('Volumetric')" />
+                <VnInput
+                    v-model="data.bonus"
+                    :label="t('Bonus')"
+                    type="number"
+                    min="0"
+                    clearable
+                />
+            </VnRow>
+
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput v-model="data.inflation" :label="t('Inflation')" clearable />
+                <QCheckbox
+                    v-model="data.isVolumetric"
+                    :label="t('Volumetric')"
+                    :toggle-indeterminate="false"
+                />
             </VnRow>
         </template>
     </FormModel>
 </template>
-
+<style lang="scss" scoped>
+.mw-10 {
+    max-width: 10vw;
+}
+</style>
 <i18n>
 es:
     Name: Nombre

src/pages/Zone/Card/ZoneDescriptor.vue

@@ -9,6 +9,7 @@ import { toTimeFormat } from 'src/filters/date';
 import { toCurrency } from 'filters/index';
 
 import useCardDescription from 'src/composables/useCardDescription';
+import ZoneDescriptorMenuItems from './ZoneDescriptorMenuItems.vue';
 
 const $props = defineProps({
     id: {
@@ -59,7 +60,7 @@ const setData = (entity) => {
                 flat
                 dense
                 size="md"
-                icon="preview"
+                icon="vn:zone"
                 color="white"
                 class="link"
                 :to="{ name: 'ZoneList' }"
@@ -69,9 +70,9 @@ const setData = (entity) => {
                 </QTooltip>
             </QBtn>
         </template>
-        <!-- <template #menu="{ entity }">
+        <template #menu="{ entity }">
             <ZoneDescriptorMenuItems :zone="entity" />
-        </template> -->
+        </template>
         <template #body="{ entity }">
             <VnLv :label="t('summary.agency')" :value="entity.agencyMode.name" />
             <VnLv :label="t('summary.closeHour')" :value="toTimeFormat(entity.hour)" />

src/pages/Zone/Card/ZoneSummary.vue

@@ -32,7 +32,7 @@ const filter = computed(() => {
             fields: ['name'],
         },
         where: {
-            id: route.params.id,
+            id: entityId,
         },
     };
     return filter;

src/pages/Zone/ZoneCreate.vue

@@ -1,184 +1,114 @@
 <script setup>
-import { computed, onMounted, onUpdated, ref } from 'vue';
+import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { QIcon, QInput, QItem, QItemSection, QSelect } from 'quasar';
+import { useRouter } from 'vue-router';
 
+import FormModel from 'components/FormModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-
+import VnInputTime from 'components/common/VnInputTime.vue';
-import { useRoute, useRouter } from 'vue-router';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import axios from 'axios';
-
-onMounted(() => fetch());
-onUpdated(() => fetch());
 
 const { t } = useI18n();
-const route = useRoute();
 const router = useRouter();
-const $props = defineProps({
+
-    id: {
+const newZoneForm = reactive({
-        type: Number,
+    travelingDays: 0,
-        required: false,
+    price: 0.2,
-        default: null,
+    bonus: 0.2,
-    },
+    hour: Date.vnNew(),
+    isVolumetric: false,
 });
-const entityId = computed(() => $props.id || route.params.id);
+const warehousesOptions = ref([]);
+const agencyOptions = ref([]);
 
-let zoneTypes = [];
+const redirectToZoneLocations = (_, { id }) => {
-let originalData = {};
+    router.push({ name: 'ZoneLocations', params: { id } });
-const zone = ref({});
-const filteredZoneTypes = ref(zoneTypes);
-
-async function onSubmit() {
-    try {
-        const params = {
-            id: entityId.value,
-            label: zone.value.label,
-            plate: zone.value.plate,
-            volume: zone.value.volume,
-            typeFk: zone.value.typeFk,
 };
-        await axios.patch('Zones', params).then((res) => {
-            if (res.status == 200) router.push({ path: `/zone/list` });
-        });
-    } catch (error) {
-        //
-    }
-}
-
-async function onReset() {
-    if (entityId.value) {
-        zone.value = { ...originalData };
-    } else {
-        zone.value = {};
-    }
-}
-
-async function fetch() {
-    try {
-        await axios.get('ZoneTypes').then(async (res) => {
-            if (res.data) {
-                filteredZoneTypes.value = zoneTypes = res.data;
-            }
-        });
-        if (entityId.value) {
-            await axios.get(`Zones/${entityId.value}`).then(async (res) => {
-                const data = res.data;
-                if (data) {
-                    zone.value.label = data.label;
-                    zone.value.plate = data.plate;
-                    zone.value.volume = data.volume;
-                    zone.value.typeFk = data.typeFk;
-                    originalData = { ...zone.value };
-                }
-            });
-        }
-    } catch (e) {
-        //
-    }
-}
-
-function filterType(val, update) {
-    update(() => {
-        const needle = val.toLowerCase();
-        filteredZoneTypes.value = zoneTypes.filter(
-            (v) => v.name.toLowerCase().indexOf(needle) > -1
-        );
-    });
-}
 </script>
 
 <template>
-    <QPage class="q-pa-sm q-mx-xl">
+    <FetchData
-        <QForm @submit="onSubmit()" @reset="onReset()" class="q-pa-sm">
+        url="Warehouses"
-            <QCard class="q-pa-md">
+        :filter="{ order: ['name'] }"
-                <div class="row q-col-gutter-md">
+        @on-fetch="(data) => (warehousesOptions = data)"
-                    <div class="col">
+        auto-load
-                        <QInput
-                            filled
-                            v-model="zone.label"
-                            :label="t('create.name')"
-                            type="number"
-                            min="0"
-                            :rules="[(val) => !!val || t('zone.warnings.labelNotEmpty')]"
     />
-                    </div>
+    <FetchData
-                    <div class="col">
+        url="AgencyModes/isActive"
+        :filter="{ order: ['name'] }"
+        @on-fetch="(data) => (agencyOptions = data)"
+        auto-load
+    />
+    <QPage>
+        <VnSubToolbar />
+        <FormModel
+            url-create="Zones"
+            model="Zones"
+            :form-initial-data="newZoneForm"
+            @on-data-saved="redirectToZoneLocations"
+        >
+            <template #form="{ data }">
+                <VnRow class="row q-gutter-md q-mb-md">
                     <VnInput
-                            filled
+                        v-model="data.name"
-                            v-model="zone.plate"
+                        :label="t('create.name')"
-                            :label="t('create.agency')"
+                        :required="true"
-                            :rules="[(val) => !!val || t('zone.warnings.plateNotEmpty')]"
                     />
-                    </div>
+                </VnRow>
-                </div>
+                <VnRow class="row q-gutter-md q-mb-md">
-                <div class="row q-col-gutter-md">
+                    <VnSelect
-                    <div class="col">
+                        :label="t('create.warehouse')"
-                        <QInput
+                        :options="warehousesOptions"
-                            filled
-                            v-model="zone.volume"
-                            :label="t('create.close')"
-                            type="number"
-                            min="0"
-                            :rules="[(val) => !!val || t('zone.warnings.volumeNotEmpty')]"
-                        />
-                    </div>
-                    <div class="col">
-                        <QSelect
-                            filled
-                            v-model="zone.typeFk"
-                            use-input
-                            fill-input
                         hide-selected
-                            input-debounce="0"
                         option-label="name"
                         option-value="id"
-                            emit-value
+                        v-model="data.warehouseFk"
-                            map-options
+                    />
+                    <VnSelect
+                        :label="t('create.agency')"
+                        :options="agencyOptions"
+                        hide-selected
+                        option-label="name"
+                        option-value="id"
+                        v-model="data.agencyModeFk"
+                        :required="true"
+                    />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInput
+                        v-model="data.travelingDays"
+                        :label="t('create.travelingDays')"
+                        type="number"
+                        min="0"
+                    />
+
+                    <VnInputTime v-model="data.hour" :label="t('create.closingHour')" />
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <VnInput
+                        v-model="data.price"
                         :label="t('create.price')"
-                            :options="filteredZoneTypes"
+                        type="number"
-                            :rules="[(val) => !!val || t('zone.warnings.typeNotEmpty')]"
+                        min="0"
-                            @filter="filterType"
-                        >
-                            <template v-if="zone.typeFk" #append>
-                                <QIcon
-                                    name="cancel"
-                                    @click.stop.prevent="zone.typeFk = null"
-                                    class="cursor-pointer"
                     />
-                            </template>
+                    <VnInput
-                            <template #no-option>
+                        v-model="data.bonus"
-                                <QItem>
+                        :label="t('create.bonus')"
-                                    <QItemSection class="text-grey">
+                        type="number"
-                                        {{ t('zone.warnings.noData') }}
+                        min="0"
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </QSelect>
-                    </div>
-                </div>
-            </QCard>
-            <div class="q-mt-md">
-                <QBtn :label="t('type.submit')" type="submit" color="primary" />
-                <QBtn
-                    :label="t('type.reset')"
-                    type="reset"
-                    color="primary"
-                    flat
-                    class="q-ml-sm"
                     />
-            </div>
+                </VnRow>
-        </QForm>
+                <VnRow class="row q-gutter-md q-mb-md">
+                    <QCheckbox
+                        :label="t('create.volumetric')"
+                        v-model="data.isVolumetric"
+                        :toggle-indeterminate="false"
+                    />
+                </VnRow>
+            </template>
+        </FormModel>
     </QPage>
 </template>
-
-<style lang="scss" scoped>
-.q-page {
-    display: flex;
-    justify-content: center;
-    align-items: flex-start;
-}
-
-.q-form {
-    width: 70%;
-}
-</style>

src/pages/Zone/ZoneList.vue

@@ -25,9 +25,6 @@ const redirectToZoneSummary = (event, { id }) => {
     router.push({ name: 'ZoneSummary', params: { id } });
 };
 
-function redirectToCreateView() {
-    router.push({ path: `/zone/create` });
-}
 const columns = computed(() => [
     {
         name: 'ID',
@@ -84,9 +81,7 @@ const handleClone = (id) => {
         () => clone(id)
     );
 };
-onMounted(async () => {
+onMounted(() => (stateStore.rightDrawer = true));
-    stateStore.rightDrawer = true;
-});
 </script>
 
 <template>
@@ -160,7 +155,7 @@ onMounted(async () => {
             </VnPaginate>
         </div>
         <QPageSticky position="bottom-right" :offset="[18, 18]">
-            <QBtn @click="redirectToCreateView()" fab icon="add" color="primary">
+            <QBtn :to="{ path: `/zone/create` }" fab icon="add" color="primary">
                 <QTooltip>{{ t('list.create') }}</QTooltip>
             </QBtn>
         </QPageSticky>

src/pages/Zone/locale/en.yml

@@ -20,9 +20,13 @@ list:
     confirmCloneSubtitle: Do you want to clone this zone?
 create:
     name: Name
+    warehouse: Warehouse
     agency: Agency
-    close: Close
+    travelingDays: Traveling days
+    closingHour: Closing hour
     price: Price
+    bonus: Bonus
+    volumetric: Volumetric
 summary:
     agency: Agency
     price: Price

src/pages/Zone/locale/es.yml

@@ -20,9 +20,13 @@ list:
     confirmCloneSubtitle: ¿Seguro que quieres clonar esta zona?
 create:
     name: Nombre
+    warehouse: Almacén
     agency: Agencia
-    close: Cierre
+    travelingDays: Días de viaje
+    closingHour: Hora de cierre
     price: Precio
+    bonus: Bonificación
+    volumetric: Volumétrico
 summary:
     agency: Agencia
     price: Precio

src/router/modules/customer.js

@@ -87,7 +87,7 @@ export default {
                     name: 'CustomerNotifications',
                     meta: {
                         title: 'notifications',
-                        icon: 'notifications',
+                        icon: 'campaign',
                     },
                     component: () =>
                         import(
@@ -99,7 +99,7 @@ export default {
                     name: 'CustomerDefaulter',
                     meta: {
                         title: 'defaulter',
-                        icon: 'vn:risk',
+                        icon: 'vn:defaulter',
                     },
                     component: () =>
                         import('src/pages/Customer/Defaulter/CustomerDefaulter.vue'),

src/router/modules/zone.js

@@ -12,7 +12,7 @@ export default {
     redirect: { name: 'ZoneMain' },
     menus: {
         main: ['ZoneList', 'ZoneDeliveryList', 'ZoneUpcomingDeliveries'],
-        card: ['ZoneBasicData'],
+        card: ['ZoneBasicData', 'ZoneHistory', 'ZoneLocations'],
     },
     children: [
         {
@@ -48,15 +48,15 @@ export default {
                     },
                     component: () => import('src/pages/Zone/ZoneCreate.vue'),
                 },
-                {
+                // {
-                    path: 'counter',
+                //     path: 'counter',
-                    name: 'ZoneCounter',
+                //     name: 'ZoneCounter',
-                    meta: {
+                //     meta: {
-                        title: 'zoneCounter',
+                //         title: 'zoneCounter',
-                        icon: 'add_circle',
+                //         icon: 'add_circle',
-                    },
+                //     },
-                    component: () => import('src/pages/Zone/ZoneCounter.vue'),
+                //     component: () => import('src/pages/Zone/ZoneCounter.vue'),
-                },
+                // },
                 {
                     name: 'ZoneUpcomingDeliveries',
                     path: 'upcoming-deliveries',
@@ -83,6 +83,15 @@ export default {
                     },
                     component: () => import('src/pages/Zone/Card/ZoneSummary.vue'),
                 },
+                {
+                    name: 'ZoneLocations',
+                    path: 'location',
+                    meta: {
+                        title: 'locations',
+                        icon: 'vn:greuge',
+                    },
+                    component: () => import('src/pages/Zone/Card/ZoneLocations.vue'),
+                },
                 {
                     name: 'ZoneBasicData',
                     path: 'basic-data',
@@ -92,6 +101,92 @@ export default {
                     },
                     component: () => import('src/pages/Zone/Card/ZoneBasicData.vue'),
                 },
+                {
+                    name: 'ZoneHistory',
+                    path: 'history',
+                    meta: {
+                        title: 'log',
+                        icon: 'history',
+                    },
+                    component: () => import('src/pages/Zone/Card/ZoneLog.vue'),
+                },
+
+                // {
+                //     path: '/zone/delivery',
+                //     name: 'ZoneDeliveryMain',
+                //     component: () => import('src/pages/Zone/ZoneMain.vue'),
+                //     redirect: { name: 'ZoneDeliveryList' },
+                //     children: [
+                //         {
+                //             path: 'list',
+                //             name: 'ZoneDeliveryList',
+                //             meta: {
+                //                 title: 'deliveryList',
+                //                 icon: 'today',
+                //             },
+                //             component: () =>
+                //                 import('src/pages/Zone/Delivery/ZoneDeliveryList.vue'),
+                //         },
+                //         {
+                //             path: 'create',
+                //             name: 'ZoneDeliveryCreate',
+                //             meta: {
+                //                 title: 'deliveryCreate',
+                //                 icon: 'create',
+                //             },
+                //             component: () =>
+                //                 import('src/pages/Zone/Delivery/ZoneDeliveryCreate.vue'),
+                //         },
+                //         {
+                //             path: ':id/edit',
+                //             name: 'ZoneDeliveryEdit',
+                //             meta: {
+                //                 title: 'deliveryEdit',
+                //                 icon: 'edit',
+                //             },
+                //             component: () =>
+                //                 import('src/pages/Zone/Delivery/ZoneDeliveryCreate.vue'),
+                //         },
+                //     ],
+                // },
+                // {
+                //     path: '/zone/upcoming',
+                //     name: 'ZoneUpcomingMain',
+                //     component: () => import('src/pages/Zone/ZoneMain.vue'),
+                //     redirect: { name: 'ZoneUpcomingList' },
+                //     children: [
+                //         {
+                //             path: 'list',
+                //             name: 'ZoneUpcomingList',
+                //             meta: {
+                //                 title: 'upcomingList',
+                //                 icon: 'today',
+                //             },
+                //             component: () =>
+                //                 import('src/pages/Zone/Upcoming/ZoneUpcomingList.vue'),
+                //         },
+                //         {
+                //             path: 'create',
+                //             name: 'ZoneUpcomingCreate',
+                //             meta: {
+                //                 title: 'upcomingCreate',
+                //                 icon: 'create',
+                //             },
+                //             component: () =>
+                //                 import('src/pages/Zone/Upcoming/ZoneUpcomingCreate.vue'),
+                //         },
+                //         {
+                //             path: ':id/edit',
+                //             name: 'ZoneUpcomingEdit',
+                //             meta: {
+                //                 title: 'upcomingEdit',
+                //                 icon: 'edit',
+                //             },
+                //             component: () =>
+                //                 import('src/pages/Zone/Upcoming/ZoneUpcomingCreate.vue'),
+                //         },
+                //     ],
+                // },
             ],
         },
     ],

test/cypress/integration/VnLocation.spec.js

@@ -1,13 +1,13 @@
 const locationOptions = '[role="listbox"] > div.q-virtual-scroll__content > .q-item';
 describe('VnLocation', () => {
     const dialogInputs = '.q-dialog label input';
-    describe('Create', () => {
+    describe('Worker Create', () => {
         const inputLocation =
-            '.q-form .q-card> :nth-child(3) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control';
+            '.q-form .q-card > :nth-child(3) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container';
         beforeEach(() => {
             cy.viewport(1280, 720);
             cy.login('developer');
-            cy.visit('/#/worker/create');
+            cy.visit('/#/worker/create', { timeout: 5000 });
             cy.waitForElement('.q-card');
         });
         it('Show all options', function () {
@@ -25,34 +25,35 @@ describe('VnLocation', () => {
             cy.get(inputLocation).clear();
             cy.get(inputLocation).type('ecuador');
             cy.get(locationOptions).should('have.length.at.least', 1);
-            cy.get(`${locationOptions}:nth-child(1)`).click();
+            cy.get(
-            cy.get(inputLocation + '> :nth-child(2) > .q-icon').click();
+                '.q-form .q-card > :nth-child(3) > .q-field > .q-field__inner > .q-field__control > :nth-child(3) > .q-icon'
+            ).click();
         });
     });
     describe('Fiscal-data', () => {
         beforeEach(() => {
             cy.viewport(1280, 720);
             cy.login('developer');
-            cy.visit('/#/supplier/567/fiscal-data', { timeout: 2000 });
+            cy.visit('/#/supplier/567/fiscal-data', { timeout: 7000 });
-            cy.waitForElement('.q-card');
+            cy.waitForElement('.q-form');
         });
         it('Create postCode', function () {
             cy.get(
-                ':nth-child(6) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control > :nth-child(3) > .q-icon'
+                ':nth-child(6) > .q-field > .q-field__inner > .q-field__control > :nth-child(3) > .q-icon'
             ).click();
             cy.get('.q-card > h1').should('have.text', 'New postcode');
             cy.get(dialogInputs).eq(0).clear('12');
             cy.get(dialogInputs).eq(0).type('1234453');
             cy.selectOption(
-                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(4) > :nth-child(2) > .q-field > .q-field__inner > .q-field__control ',
+                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(4)   > .q-select > .q-field__inner > .q-field__control ',
                 'Valencia'
             );
             cy.selectOption(
-                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(5) > :nth-child(1) > .q-field > .q-field__inner > .q-field__control ',
+                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(5)   > .q-select > .q-field__inner > .q-field__control ',
                 'Province one'
             );
             cy.selectOption(
-                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(5) > :nth-child(2) > .q-field > .q-field__inner > .q-field__control ',
+                '.q-dialog__inner > .column > #formModel > .q-card > :nth-child(6)  > .q-select > .q-field__inner > .q-field__control ',
                 'España'
             );
             cy.get('.q-mt-lg > .q-btn--standard').click();

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

@@ -1,7 +1,8 @@
 /// <reference types="cypress" />
 describe('InvoiceInBasicData', () => {
-    const selects = '.q-form .q-card>:nth-child(1) > :nth-child(1) > .q-field';
+    const formInputs = '.q-form > .q-card input';
-    const appendBtns = 'label button';
+    const firstFormSelect = '.q-card > .vn-row:nth-child(1) > .q-select';
+    const appendBtns = '.q-form label button';
     const dialogAppendBtns = '.q-dialog label button';
     const dialogInputs = '.q-dialog input';
     const dialogActionBtns = '.q-card__actions button';
@@ -12,15 +13,14 @@ describe('InvoiceInBasicData', () => {
     });
 
     it('should edit the provideer and supplier ref', () => {
-        cy.selectOption(selects, 'Bros');
+        cy.selectOption(firstFormSelect, 'Bros');
-
         cy.get('[title="Reset"]').click();
         cy.get(appendBtns).eq(0).click();
-        cy.get('input').eq(2).type(4739);
+        cy.get(formInputs).eq(1).type(4739);
         cy.saveCard();
 
-        cy.get(`${selects} input`).eq(0).invoke('val').should('eq', 'Plants nick');
+        cy.get(`${firstFormSelect} input`).invoke('val').should('eq', 'Plants nick');
-        cy.get('input').eq(2).invoke('val').should('eq', '4739');
+        cy.get(formInputs).eq(1).invoke('val').should('eq', '4739');
     });
 
     it('should edit the dms data', () => {