Merge branch 'dev' into 8338-traduccionesVnTable

CHANGELOG.md

@@ -1,3 +1,167 @@
+# Version 24.52 - 2024-01-07
+
+### Added 🆕
+
+-   chore: refs #8197 remove console log by:alexm
+-   chore: refs #8197 replace name by:alexm
+-   chore: refs #8197 unnecessary file by:alexm
+-   feat: #8110 apply mixin in quasar components by:Javier Segarra
+-   feat(Account & AccountRole): refs #8197 add VnCardMain by:alexm
+-   feat: addDptoLink by:Jtubau
+-   feat: added restore ticket function in ticket descriptor menu by:Jon
+-   feat: add support service wip by:jorgep
+-   feat: focus menu searchbar by:jorgep
+-   feat: make additional data object by:jorgep
+-   feat: message to grant access by:jorgep
+-   feat: refs #6583 add default param by:jorgep
+-   feat: refs #6583 add destination opt filter by:jorgep
+-   feat: refs #6583 add icon by:jorgep
+-   feat: refs #6583 add locale by:jorgep
+-   feat: refs #7072 added test to computed fn total by:Jtubau
+-   feat: refs #7235 update invoice out global form to fetch config based on serial type by:jgallego
+-   feat: refs #7301 add exclude inventory supplier from list by:pablone
+-   feat: refs #7301 enhance VnDateBadge styling and improve ItemLastEntries component by:pablone
+-   feat: refs #7882 Added distribution point by:guillermo
+-   feat: refs #7882 Added longitude & latitude by:guillermo
+-   feat: refs #7936 add autocomplete on tab fn by:jorgep
+-   feat: refs #7936 add company filter by:jorgep
+-   feat: refs #7936 add currency check before fetching by:jorgep
+-   feat: refs #7936 add dueDated field by:jorgep
+-   feat: refs #7936 add number validation to VnInputNumber & new daysAgo filter in InvoiceInFilter by:jorgep
+-   feat: refs #7936 add optionCaption by:jorgep
+-   feat: refs #7936 add row click navigation to InvoiceInSerial by:jorgep
+-   feat: refs #7936 add unit tests by:jorgep
+-   feat: refs #7936 add useAccountShortToStandard composable by:jorgep
+-   feat: refs #7936 calculate exchange & update taxable base by:jorgep
+-   feat: refs #7936 enhance downloadFile function to support opening in a new tab by:jorgep
+-   feat: refs #7936 enhance getTotal fn & add unit tests by:jorgep
+-   feat: refs #7936 enhance vn-select by:jorgep
+-   feat: refs #7936 improve optionLabel logic in InvoiceInVat component for better handling of numeric values by:jorgep
+-   feat: refs #7936 limit decimal places by:jorgep
+-   feat: refs #7936 make fields required by:jorgep
+-   feat: refs #7936 show country code & isVies fields by:jorgep
+-   feat: refs #7936 show id & value by:jorgep
+-   feat: refs #7936 simplify optionLabel wip by:jorgep
+-   feat: refs #7936 update 'isVies' label to use global translation key by:jorgep
+-   feat: refs #7936 update option labels in InvoiceIn components for better clarity by:jorgep
+-   feat: refs #7936 use default invoice data by:jorgep
+-   feat: refs #8001 change request by:robert
+-   feat: refs #8001 ticketExpeditionGrafana by:robert
+-   feat: refs #8194 created VnSelectWorker component and use it in Lilium by:Jon
+-   feat: refs #8197 better leftMenu and VnCardMain improvements by:alexm
+-   feat: refs #8197 default leftMenu by:alexm
+-   feat: refs #8197 default sectionName by:alexm
+-   feat: refs #8197 keepData in VnSection by:alexm
+-   feat: refs #8197 vnTableFilter by:alexm
+-   feat: refs #8197 working rightMenu by:alexm
+-   feat: remove re-fetch when add element by:Javier Segarra
+-   feat: remove search after category by:Javier Segarra
+-   feat: requested changes in item module by:Jon
+-   feat: update quantity by:Javier Segarra
+-   feat(VnPaginate): refs #8197 hold data when change to Card by:alexm
+
+### Changed 📦
+
+-   perf: #6896 REMOVE COMMENTS by:Javier Segarra
+-   perf: qFormMixin by:Javier Segarra
+-   perf: qFormMixin improvement by:Javier Segarra
+-   perf: refs #8194 select worker component by:Jon
+-   perf: refs #8197 perf by:alexm
+-   perf: remove comments by:Javier Segarra
+-   perf: remove unused variables (origin/warmfix_noUsedVars) by:Javier Segarra
+-   refactor: added again search emit by:Jon
+-   refactor: add useCau composable by:jorgep
+-   refactor: deleted log by:Jon
+-   refactor: deleted onUnmounted code by:Jon
+-   refactor: deleted useless hidden tag by:Jon
+-   refactor: deleted warnings and corrected itemTag by:Jon
+-   refactor: drop logic by:jorgep
+-   refactor: ignore params when searching by id on searchbar (origin/VnSearchbar-SearchRemoveParams) by:Jon
+-   refactor: log error by:Jon
+-   refactor: refs #7936 locale by:jorgep
+-   refactor: refs #7936 simplify getTotal fn by:jorgep
+-   refactor: refs #7936 update label capitalization and replace invoice type options by:jorgep
+-   refactor: refs #8194 deleted unnecessary label by:Jon
+-   refactor: refs #8194 modified select worker template by:Jon
+-   refactor: refs #8194 modified select worker to allow no one filter from monitor ticket by:Jon
+-   refactor: refs #8194 moved translation to the correct place by:Jon
+-   refactor: refs #8194 requested changes by:Jon
+-   refactor: refs #8194 structure changes in component and related files by:Jon
+-   refactor: refs #8197 adapt AccountAcls to VnCardMain by:alexm
+-   refactor: refs #8197 adapt AccountAlias by:alexm
+-   refactor: refs #8197 adapt Ticket to VnCardMain by:alexm
+-   refactor: refs #8197 backward compatible (8197-VnCardMain_backwardCompatibility) by:alexm
+-   refactor: refs #8197 rename VnSectionMain to VnModule and VnCardMain to VnSection by:alexm
+-   refactor: refs #8288 changed invoice out spanish translation by:provira
+-   refactor: use locale keys by:jorgep
+-   refactor: use teleport to avoid qdrawer overlapping by:Jon
+-   refactor: use VnSelectWorker by:Jon
+
+### Fixed 🛠️
+
+-   fix: account by:carlossa
+-   fix: account create by:carlossa
+-   fix: accountList create by:carlossa
+-   fix(AccountList): use $refs by:alexm
+-   fix: add data-key by:alexm
+-   fix: addLocales by:Jtubau
+-   fix: dated field by:Jon
+-   fix: e2e by:jorgep
+-   fix: fix department filter by:carlossa
+-   fix: fixed translations by:Javier Segarra
+-   fix: fixed translations by:provira
+-   fix: get total from api by:Javier Segarra
+-   fix: handle non-object options by:jorgep
+-   fix: monitorPayMethodFilter by:carlossa
+-   fix: orderBy priority by:Javier Segarra
+-   fix: prevent null by:jorgep
+-   fix: redirection vnTable VnTableFilter by:alexm
+-   fix: refs #6389 fix filter trad by:carlossa
+-   fix: refs #6389 fix front, filters, itp by:carlossa
+-   fix: refs #6389 front add packing filter by:carlossa
+-   fix: refs #6389 front by:carlossa
+-   fix: refs #6389 front filters by:carlossa
+-   fix: refs #6389 ipt by:carlossa
+-   fix: refs #6389 packing by:carlossa
+-   fix: refs #6583 update checkbox for filtering by destination in TicketAdvanceFilter by:jorgep
+-   fix: refs #7031 add test e2e by:carlossa
+-   fix: refs #7031 fix zoneTest by:carlossa
+-   fix: refs #7301 unnecessary console logs from ItemLastEntries.vue by:pablone
+-   fix: refs #7936 changes by:jorgep
+-   fix: refs #7936 decimal places & locale by:jorgep
+-   fix: refs #7936 descriptor & dueday by:jorgep
+-   fix: refs #7936 exclude disabled els on tab by:jorgep
+-   fix: refs #7936 format tax calculation to two decimal places by:jorgep
+-   fix: refs #7936 improve error handling by:jorgep
+-   fix: refs #7936 redirection by:jorgep
+-   fix: refs #7936 rollback by:jorgep
+-   fix: refs #7936 serial by:jorgep
+-   fix: refs #7936 tabulation wip by:jorgep
+-   fix: refs #7936 test by:jorgep
+-   fix: refs #8114 clean by:carlossa
+-   fix: refs #8114 fix agencyList by:carlossa
+-   fix: refs #8114 fix lifeCycle hooks by:carlossa
+-   fix: refs #8114 fix pr by:carlossa
+-   fix: refs #8114 fix removeAddress by:carlossa
+-   fix: refs #8114 orderList by:carlossa
+-   fix: refs #8114 remove logs by:carlossa
+-   fix: refs #8197 mapKey (origin/8197-perf_vnTableInside, 8197-perf_vnTableInside) by:alexm
+-   fix: refs #8197 redirection (8197-perf_redirection) by:alexm
+-   fix: refs #8197 staticParams and redirect by:alexm
+-   fix: refs #8197 vnPaginate onFetch emit by:alexm
+-   fix: refs #8197 vnPaginate when change :id by:alexm
+-   fix: refs #8197 vnTableFilter in vnTable by:alexm
+-   fix: refs #8315 ticketBoxing test by:alexm
+-   fix: remove url by:carlossa
+-   fix: rollback by:jorgep
+-   fix: test by:jorgep
+-   fix(VnDmsList): refs #8197 add mapKey by:alexm
+-   revert: refs #8197 arrayData changes by:alexm
+-   test: refs #8197 fix e2e by:alexm
+-   test: refs #8315 fix claimDevelopment fixtures by:alexm
+-   test: refs #8315 fix clientList by:alexm
+-   test: refs #8315 fix VnSelect in e2e by:alexm
+
 # Version 24.50 - 2024-12-10
 
 ### Added 🆕

package.json

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

src/components/CreateNewPostcodeForm.vue

@@ -62,6 +62,7 @@ async function setProvince(id, data) {
     postcodeFormData.provinceFk = id;
     await fetchTowns();
 }
+
 async function onProvinceCreated(data) {
     postcodeFormData.provinceFk = data.id;
 }

src/components/VnTable/VnTable.vue

@@ -314,7 +314,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
         show-if-above
     >
         <QScrollArea class="fit">
-            <VnTableFilter :data-key="$attrs['data-key']" :columns="columns" />
+            <VnTableFilter :data-key="$attrs['data-key']" :columns="columns" :redirect="redirect" />
         </QScrollArea>
     </QDrawer>
     <CrudModel

src/components/common/VnBtnSelect.vue

@@ -14,6 +14,7 @@ defineProps({
             hide-dropdown-icon
             focus-on-mount
             @update:model-value="promise"
+            data-cy="vnBtnSelect_select"
         />
     </QBtnDropdown>
 </template>

src/components/common/VnDmsList.vue

@@ -297,7 +297,7 @@ defineExpose({
         ref="dmsRef"
         :data-key="$props.model"
         :url="$props.model"
-        :filter="dmsFilter"
+        :user-filter="dmsFilter"
         :order="['dmsFk DESC']"
         :auto-load="true"
         @on-fetch="setData"

src/components/common/VnInputDate.vue

@@ -1,14 +1,12 @@
 <script setup>
 import { onMounted, watch, computed, ref, useAttrs } from 'vue';
 import { date } from 'quasar';
-import { useI18n } from 'vue-i18n';
 import VnDate from './VnDate.vue';
 import { useRequired } from 'src/composables/useRequired';
 
 const $attrs = useAttrs();
 const { isRequired, requiredFieldRule } = useRequired($attrs);
 const model = defineModel({ type: [String, Date] });
-const { t } = useI18n();
 
 const $props = defineProps({
     isOutlined: {

src/components/common/VnInputTime.vue

@@ -1,13 +1,11 @@
 <script setup>
 import { computed, ref, useAttrs } from 'vue';
-import { useI18n } from 'vue-i18n';
 import { date } from 'quasar';
 import VnTime from './VnTime.vue';
 import { useRequired } from 'src/composables/useRequired';
 
 const $attrs = useAttrs();
 const { isRequired, requiredFieldRule } = useRequired($attrs);
-const { t } = useI18n();
 const model = defineModel({ type: String });
 const props = defineProps({
     timeOnly: {

src/components/common/VnModule.vue

@@ -20,16 +20,15 @@ const hasContent = ref();
 let observer;
 
 onMounted(() => {
-    if (teleportRef.value) {
+    if (!teleportRef.value) return;
     const checkContent = () => {
-            hasContent.value = teleportRef.value.innerHTML.trim() !== '';
+        hasContent.value = teleportRef.value?.innerHTML?.trim() !== '';
     };
 
     observer = new MutationObserver(checkContent);
     observer.observe(teleportRef.value, { childList: true, subtree: true });
 
     checkContent();
-    }
 });
 </script>
 

src/components/common/VnSection.vue

@@ -4,11 +4,12 @@ import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnTableFilter from '../VnTable/VnTableFilter.vue';
 import { onBeforeMount, computed } from 'vue';
 import { useArrayData } from 'src/composables/useArrayData';
+import { useRoute } from 'vue-router';
 
 const $props = defineProps({
     section: {
         type: String,
-        required: true,
+        default: null,
     },
     dataKey: {
         type: String,
@@ -38,14 +39,28 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    keepData: {
+        type: Boolean,
+        default: true,
+    },
 });
 
-const sectionValue = computed(() => $props.section ?? $props.dataKey);
+const route = useRoute();
 let arrayData;
+const sectionValue = computed(() => $props.section ?? $props.dataKey);
+const isMainSection = computed(() => {
+    const isSame = sectionValue.value == route.name;
+    if (!isSame && arrayData) {
+        arrayData.reset(['userParams', 'userFilter']);
+    }
+    return isSame;
+});
+
 onBeforeMount(() => {
     if ($props.dataKey)
         arrayData = useArrayData($props.dataKey, {
             searchUrl: 'table',
+            keepData: $props.keepData,
             ...$props.arrayDataProps,
             navigate: $props.redirect,
         });
@@ -74,6 +89,6 @@ onBeforeMount(() => {
             </slot>
         </template>
     </RightMenu>
-    <slot name="body" v-if="sectionValue == $route.name" />
+    <slot name="body" v-if="isMainSection" />
     <RouterView v-else />
 </template>

src/components/ui/VnNotes.vue

@@ -110,7 +110,7 @@ onBeforeRouteLeave((to, from, next) => {
         :url="$props.url"
         order="created DESC"
         :limit="0"
-        :filter="$props.filter"
+        :user-filter="$props.filter"
         auto-load
         ref="vnPaginateRef"
         class="show"

src/components/ui/VnPaginate.vue

@@ -111,6 +111,7 @@ onMounted(async () => {
 });
 
 onBeforeUnmount(() => {
+    if (!store.keepData) arrayData.reset(['data']);
     arrayData.resetPagination();
 });
 

src/components/ui/VnSearchbar.vue

@@ -126,6 +126,7 @@ async function search() {
         delete filter.params.search;
     }
     await arrayData.applyFilter(filter);
+    searchText.value = undefined;
 }
 </script>
 <template>

src/composables/useArrayData.js

@@ -53,6 +53,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             'searchUrl',
             'navigate',
             'mapKey',
+            'keepData',
         ];
         if (typeof userOptions === 'object') {
             for (const option in userOptions) {
@@ -302,7 +303,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             for (const row of data) {
                 const key = row[store.mapKey];
                 const val = { ...row, key };
-                if (store.map.has(key)) {
+                if (key && store.map.has(key)) {
                     const { position } = store.map.get(key);
                     val.position = position;
                     store.map.set(key, val);

src/pages/Entry/Card/EntrySummary.vue

@@ -12,6 +12,8 @@ import { getUrl } from 'src/composables/getUrl';
 import axios from 'axios';
 import FetchedTags from 'src/components/ui/FetchedTags.vue';
 import VnToSummary from 'src/components/ui/VnToSummary.vue';
+import VnRow from 'src/components/ui/VnRow.vue';
+import VnTitle from 'src/components/common/VnTitle.vue';
 
 const route = useRoute();
 const { t } = useI18n();
@@ -149,7 +151,6 @@ async function setEntryData(data) {
 const fetchEntryBuys = async () => {
     const { data } = await axios.get(`Entries/${entry.value.id}/getBuys`);
     if (data) entryBuys.value = data;
-
 };
 </script>
 
@@ -173,13 +174,10 @@ const fetchEntryBuys = async () => {
         </template>
         <template #body>
             <QCard class="vn-one">
-                <router-link
-                    :to="{ name: 'EntryBasicData', params: { id: entityId } }"
-                    class="header header-link"
-                >
-                    {{ t('globals.summary.basicData') }}
-                    <QIcon name="open_in_new" />
-                </router-link>
+                <VnTitle
+                    :url="`#/entry/${entityId}/basic-data`"
+                    :text="t('globals.summary.basicData')"
+                />
                 <VnLv :label="t('entry.summary.commission')" :value="entry.commission" />
                 <VnLv
                     :label="t('entry.summary.currency')"
@@ -193,13 +191,10 @@ const fetchEntryBuys = async () => {
                 />
             </QCard>
             <QCard class="vn-one">
-                <router-link
-                    :to="{ name: 'EntryBasicData', params: { id: entityId } }"
-                    class="header header-link"
-                >
-                    {{ t('globals.summary.basicData') }}
-                    <QIcon name="open_in_new" />
-                </router-link>
+                <VnTitle
+                    :url="`#/entry/${entityId}/basic-data`"
+                    :text="t('globals.summary.basicData')"
+                />
                 <VnLv :label="t('entry.summary.travelReference')">
                     <template #value>
                         <span class="link">
@@ -217,56 +212,37 @@ const fetchEntryBuys = async () => {
                     :label="t('globals.warehouseOut')"
                     :value="entry.travel.warehouseOut?.name"
                 />
-                <QCheckbox
+                <VnLv
                     :label="t('entry.summary.travelDelivered')"
-                    v-model="entry.travel.isDelivered"
-                    :disable="true"
+                    :value="entry.travel.isDelivered"
                 />
                 <VnLv :label="t('globals.landed')" :value="toDate(entry.travel.landed)" />
                 <VnLv
                     :label="t('globals.warehouseIn')"
                     :value="entry.travel.warehouseIn?.name"
                 />
-                <QCheckbox
+                <VnLv
                     :label="t('entry.summary.travelReceived')"
-                    v-model="entry.travel.isReceived"
-                    :disable="true"
+                    :value="entry.travel.isReceived"
                 />
             </QCard>
             <QCard class="vn-one">
-                <router-link
-                    :to="{ name: 'TravelSummary', params: { id: entry.travel.id } }"
-                    class="header header-link"
-                >
-                    {{ t('Travel data') }}
-                    <QIcon name="open_in_new" />
-                </router-link>
-                <QCheckbox
-                    :label="t('entry.summary.ordered')"
-                    v-model="entry.isOrdered"
-                    :disable="true"
-                />
-                <QCheckbox
-                    :label="t('globals.confirmed')"
-                    v-model="entry.isConfirmed"
-                    :disable="true"
-                />
-                <QCheckbox
-                    :label="t('entry.summary.booked')"
-                    v-model="entry.isBooked"
-                    :disable="true"
-                />
-                <QCheckbox
+                <VnTitle :url="`#/travel/${entityId}/summary`" :text="t('Travel data')" />
+                <VnRow class="block">
+                    <VnLv :label="t('entry.summary.ordered')" :value="entry.isOrdered" />
+                    <VnLv :label="t('globals.confirmed')" :value="entry.isConfirmed" />
+                    <VnLv :label="t('entry.summary.booked')" :value="entry.isBooked" />
+                    <VnLv
                         :label="t('entry.summary.excludedFromAvailable')"
-                    v-model="entry.isExcludedFromAvailable"
-                    :disable="true"
+                        :value="entry.isExcludedFromAvailable"
                     />
+                </VnRow>
             </QCard>
-            <QCard class="vn-two" style="min-width: 100%">
-                <a class="header header-link">
-                    {{ t('entry.summary.buys') }}
-                    <QIcon name="open_in_new" />
-                </a>
+            <QCard class="vn-max">
+                <VnTitle
+                    :url="`#/entry/${entityId}/buys`"
+                    :text="t('entry.summary.buys')"
+                />
                 <QTable
                     :rows="entryBuys"
                     :columns="entriesTableColumns"

src/pages/Entry/EntryList.vue

@@ -1,9 +1,8 @@
 <script setup>
-import { onMounted, ref, computed } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import EntryFilter from './EntryFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import { useStateStore } from 'stores/useStateStore';
 import VnTable from 'components/VnTable/VnTable.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import { toDate } from 'src/filters';
@@ -12,7 +11,6 @@ import EntrySummary from './Card/EntrySummary.vue';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import TravelDescriptorProxy from 'src/pages/Travel/Card/TravelDescriptorProxy.vue';
 
-const stateStore = useStateStore();
 const { t } = useI18n();
 const tableRef = ref();
 

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -126,6 +126,13 @@ const columns = computed(() => [
         columnField: { component: null },
         format: (row) => toDate(row.dued),
     },
+    {
+        align: 'left',
+        name: 'customsAgentFk',
+        label: t('invoiceOutList.tableVisibleColumns.customsAgent'),
+        cardVisible: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(row.customsAgentName),
+    },
     {
         align: 'right',
         name: 'tableActions',

src/pages/InvoiceOut/locale/en.yml

@@ -13,6 +13,7 @@ invoiceOutList:
         invoiceOutSerial: Serial
         ticket: Ticket
         taxArea: Tax area
+        customsAgent: Custom Agent
 DownloadPdf: Download PDF
 InvoiceOutSummary: Summary
 negativeBases:

src/pages/InvoiceOut/locale/es.yml

@@ -15,6 +15,7 @@ invoiceOutList:
         invoiceOutSerial: Serial
         ticket: Ticket
         taxArea: Area
+        customsAgent: Agente de aduanas
 DownloadPdf: Descargar PDF
 InvoiceOutSummary: Resumen
 negativeBases:

src/pages/Item/ItemFixedPrice.vue

@@ -396,6 +396,7 @@ function handleOnDataSave({ CrudModelRef }) {
         :default-save="false"
         data-key="ItemFixedPrices"
         url="FixedPrices/filter"
+        :order="['name DESC', 'itemFk DESC']"
         save-url="FixedPrices/crud"
         ref="tableRef"
         dense

src/pages/Order/Card/OrderSummary.vue

@@ -221,7 +221,7 @@ async function handleConfirm() {
                                             </span>
                                         </div>
                                     </div>
-                                    <FetchedTags :item="props.row.item" />
+                                    <FetchedTags :item="props.row.item" :columns="3" />
                                 </QTd>
                                 <QTd key="quantity" :props="props">
                                     {{ props.row.quantity }}

src/pages/Ticket/Card/TicketExpedition.vue

@@ -319,6 +319,7 @@ onMounted(async () => {
                 }
             }
         "
+        :redirect="false"
         order="created DESC"
     >
         <template #column-freightItemName="{ row }">

src/pages/Zone/ZoneList.vue

@@ -17,6 +17,7 @@ import VnInputTime from 'src/components/common/VnInputTime.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import ZoneFilterPanel from './ZoneFilterPanel.vue';
 import ZoneSearchbar from './Card/ZoneSearchbar.vue';
+import FetchData from 'src/components/FetchData.vue';
 
 const { t } = useI18n();
 const router = useRouter();
@@ -25,6 +26,7 @@ const { viewSummary } = useSummaryDialog();
 const { openConfirmationModal } = useVnConfirm();
 const tableRef = ref();
 const warehouseOptions = ref([]);
+const validAddresses = ref([]);
 
 const tableFilter = {
     include: [
@@ -34,6 +36,32 @@ const tableFilter = {
                 fields: ['id', 'name'],
             },
         },
+        {
+            relation: 'address',
+            scope: {
+                fields: ['id', 'nickname', 'provinceFk', 'postalCode'],
+                include: [
+                    {
+                        relation: 'province',
+                        scope: {
+                            fields: ['id', 'name'],
+                        },
+                    },
+                    {
+                        relation: 'postcode',
+                        scope: {
+                            fields: ['code', 'townFk'],
+                            include: {
+                                relation: 'town',
+                                scope: {
+                                    fields: ['id', 'name'],
+                                },
+                            },
+                        },
+                    },
+                ],
+            },
+        },
     ],
 };
 
@@ -95,7 +123,14 @@ const columns = computed(() => [
         label: t('list.close'),
         cardVisible: true,
         format: (row) => toTimeFormat(row.hour),
-        hidden: true,
+        columnFilter: false,
+    },
+    {
+        align: 'left',
+        name: 'addressFk',
+        label: t('list.addressFk'),
+        cardVisible: true,
+        columnFilter: false,
     },
     {
         align: 'right',
@@ -129,9 +164,27 @@ const handleClone = (id) => {
         () => clone(id)
     );
 };
+
+function showValidAddresses(row) {
+    if (row.addressFk) {
+        const isValid = validAddresses.value.some(
+            (address) => address.addressFk === row.addressFk
+        );
+        if (isValid)
+            return `${row.address?.nickname},
+            ${row.address?.postcode?.town?.name} (${row.address?.province?.name})`;
+        else return '-';
+    }
+    return '-';
+}
 </script>
 
 <template>
+    <FetchData
+        url="RoadmapAddresses"
+        auto-load
+        @on-fetch="(data) => (validAddresses = data)"
+    />
     <ZoneSearchbar />
     <RightMenu>
         <template #right-panel>
@@ -153,6 +206,9 @@ const handleClone = (id) => {
         redirect="zone"
         :right-search="false"
     >
+        <template #column-addressFk="{ row }">
+            {{ showValidAddresses(row) }}
+        </template>
         <template #more-create-dialog="{ data }">
             <VnSelect
                 url="AgencyModes"

src/pages/Zone/locale/en.yml

@@ -32,6 +32,7 @@ list:
     warehouse: Warehouse
     createZone: Create zone
     zoneSummary: Summary
+    addressFk: Address
 create:
     name: Name
     closingHour: Closing hour

src/pages/Zone/locale/es.yml

@@ -33,6 +33,7 @@ list:
     isVolumetric: Volumétrico
     createZone: Crear zona
     zoneSummary: Resumen
+    addressFk: Consignatario
 create:
     closingHour: Hora de cierre
     itemMaxSize: Medida máxima

src/stores/useArrayDataStore.js

@@ -18,6 +18,7 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
         navigate: null,
         page: 1,
         mapKey: 'id',
+        keepData: false,
     };
 
     function get(key) {

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

@@ -11,21 +11,6 @@ describe('OrderCatalog', () => {
         cy.dataCy('catalogFilterCustomTag').contains(filterName);
     };
 
-    const checkFilterTag = (filterName = 'Plant') => {
-        cy.dataCy('vnFilterPanelChip').should('exist');
-        cy.dataCy('vnFilterPanelChip').contains(filterName);
-    };
-
-    const selectCategory = (categoryIndex = 1, categoryName = 'Plant') => {
-        cy.get(
-            `div.q-page-container div:nth-of-type(${categoryIndex}) > [data-cy='catalogFilterCategory']`
-        ).should('exist');
-        cy.get(
-            `div.q-page-container div:nth-of-type(${categoryIndex}) > [data-cy='catalogFilterCategory']`
-        ).click();
-        checkCustomFilterTag(categoryName);
-    };
-
     const searchByCustomTagInput = (option) => {
         cy.dataCy('catalogFilterValueInput').find('input').last().focus();
         cy.dataCy('catalogFilterValueInput').find('input').last().type(option);
@@ -33,31 +18,19 @@ describe('OrderCatalog', () => {
         checkCustomFilterTag(option);
     };
 
-    const selectTypeFilter = (option) => {
-        cy.selectOption(
-            'div.q-page-container div.list > div:nth-of-type(2) div:nth-of-type(3)',
-            option
-        );
-        checkFilterTag(option);
-    };
-
     it('Shows empty state', () => {
         cy.dataCy('orderCatalogPage').should('exist');
         cy.dataCy('orderCatalogPage').contains('No data to display');
     });
 
-    it('filter by category', () => {
-        selectCategory();
+    it('filter by category and type', () => {
+        cy.get(':nth-child(1) > [data-cy="catalogFilterCategory"]').click();
+        cy.selectOption('[data-cy="catalogFilterType"]', 'Anthurium');
         cy.dataCy('orderCatalogItem').should('exist');
     });
 
-    it('filters by type', () => {
-        selectCategory();
-        selectTypeFilter('Anthurium');
-    });
-
     it('filters by custom value select', () => {
-        selectCategory();
+        cy.get(':nth-child(1) > [data-cy="catalogFilterCategory"]').click();
         searchByCustomTagInput('Silver');
     });
 
@@ -67,10 +40,12 @@ describe('OrderCatalog', () => {
                 return false;
             }
         });
-        selectCategory();
-        cy.dataCy('catalogFilterValueDialogBtn').should('exist');
+        cy.get(
+            '[data-cy="vnSearchBar"] > .q-field > .q-field__inner > .q-field__control'
+        ).type('{enter}');
+        cy.get(':nth-child(1) > [data-cy="catalogFilterCategory"]').click();
         cy.dataCy('catalogFilterValueDialogBtn').last().click();
-        cy.dataCy('catalogFilterValueDialogTagSelect').should('exist');
+        cy.get('[data-cy="catalogFilterValueDialogTagSelect"]').click();
         cy.selectOption("[data-cy='catalogFilterValueDialogTagSelect']", 'Tallos');
         cy.dataCy('catalogFilterValueDialogValueInput').find('input').focus();
         cy.dataCy('catalogFilterValueDialogValueInput').find('input').type('2');
@@ -79,34 +54,16 @@ describe('OrderCatalog', () => {
     });
 
     it('removes a secondary tag', () => {
-        selectCategory();
-        selectTypeFilter('Anthurium');
+        cy.get(':nth-child(1) > [data-cy="catalogFilterCategory"]').click();
+        cy.selectOption('[data-cy="catalogFilterType"]', 'Anthurium');
         cy.dataCy('vnFilterPanelChip').should('exist');
-        cy.get(
-            "div.q-page-container [data-cy='vnFilterPanelChip'] > i.q-chip__icon--remove"
-        )
-            .contains('cancel')
-            .should('exist');
-        cy.get(
-            "div.q-page-container [data-cy='vnFilterPanelChip'] > i.q-chip__icon--remove"
-        )
-            .contains('cancel')
-            .click();
+        cy.get('[data-cy="catalogFilterCustomTag"] > .q-chip__icon--remove').click();
         cy.dataCy('vnFilterPanelChip').should('not.exist');
     });
 
     it('Removes category tag', () => {
-        selectCategory();
-        cy.get(
-            "div.q-page-container [data-cy='catalogFilterCustomTag'] > i.q-chip__icon--remove"
-        )
-            .contains('cancel')
-            .should('exist');
-        cy.get(
-            "div.q-page-container [data-cy='catalogFilterCustomTag'] > i.q-chip__icon--remove"
-        )
-            .contains('cancel')
-            .click();
+        cy.get(':nth-child(1) > [data-cy="catalogFilterCategory"]').click();
+        cy.get('.q-chip__icon--remove').click();
         cy.dataCy('catalogFilterCustomTag').should('not.exist');
     });
 });

test/cypress/integration/client/clientList.spec.js

@@ -15,7 +15,7 @@ describe('Client list', () => {
         });
     });
 
-    it('Client list create new client', () => {
+    it.skip('Client list create new client', () => {
         cy.addBtnClick();
         const randomInt = Math.floor(Math.random() * 90) + 10;
 

test/cypress/integration/item/ItemFixedPrice.spec.js

@@ -14,7 +14,7 @@ describe('Handle Items FixedPrice', () => {
             '.q-header > .q-toolbar > :nth-child(1) > .q-btn__content > .q-icon'
         ).click();
     });
-    it('filter', function () {
+    it.skip('filter', function () {
         cy.get('.category-filter > :nth-child(1) > .q-btn__content > .q-icon').click();
         cy.selectOption('.list > :nth-child(2)', 'Alstroemeria');
         cy.get('.q-gutter-x-sm > .q-btn > .q-btn__content > .q-icon').click();
@@ -27,7 +27,7 @@ describe('Handle Items FixedPrice', () => {
         cy.get('.q-notification__message').should('have.text', 'Data saved');
         /* ==== End Cypress Studio ==== */
     });
-    it('Create and delete ', function () {
+    it.skip('Create and delete ', function () {
         cy.get('.q-gutter-x-sm > .q-btn > .q-btn__content > .q-icon').click();
         cy.addBtnClick();
         cy.selectOption(`${firstRow} > :nth-child(2)`, '#11');
@@ -43,7 +43,7 @@ describe('Handle Items FixedPrice', () => {
         cy.get('.q-notification__message').should('have.text', 'Data saved');
     });
 
-    it('Massive edit', function () {
+    it.skip('Massive edit', function () {
         cy.get(' .bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner ').click();
         cy.get('#subToolbar > .q-btn--standard').click();
         cy.selectOption("[data-cy='field-to-edit']", 'Min price');
@@ -52,7 +52,7 @@ describe('Handle Items FixedPrice', () => {
         cy.get('.q-mt-lg > .q-btn--standard').click();
         cy.get('.q-notification__message').should('have.text', 'Data saved');
     });
-    it('Massive remove', function () {
+    it.skip('Massive remove', function () {
         cy.get(' .bg-header > :nth-child(1) > .q-checkbox > .q-checkbox__inner ').click();
         cy.get('#subToolbar > .q-btn--flat').click();
         cy.get(

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

@@ -16,7 +16,9 @@ describe('Ticket expedtion', () => {
 
         cy.wait('@show');
         cy.selectRows([1, 2]);
-        cy.selectOption('[data-cy="change-state"]', 'Perdida');
+
+        cy.dataCy('change-state').click();
+        cy.selectOption('[data-cy="vnBtnSelect_select"]', 'Perdida');
         cy.wait('@add');
 
         cy.get(`${tableContent} tr:nth-child(-n+2) ${stateTd}`).each(($el) => {

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

@@ -37,7 +37,7 @@ describe('TicketList', () => {
         cy.dataCy('ticketSummary').should('exist');
     });
 
-    it('Client list create new client', () => {
+    it.skip('Client list create new client', () => {
         cy.dataCy('vnTableCreateBtn').should('exist');
         cy.dataCy('vnTableCreateBtn').click();
         const data = {

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

@@ -6,7 +6,7 @@ describe('TicketRequest', () => {
         cy.visit('/#/ticket/31/request');
     });
 
-    it('Creates a new request', () => {
+    it.skip('Creates a new request', () => {
         cy.dataCy('vnTableCreateBtn').should('exist');
         cy.dataCy('vnTableCreateBtn').click();
         const data = {

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

@@ -66,7 +66,7 @@ describe('TicketSale', () => {
         cy.dataCy('ticketSaleMoreActionsDropdown').click();
         cy.dataCy('createClaimItem').click();
         cy.dataCy('VnConfirm_confirm').click();
-        cy.url().should('match', /\/claim\/\d+\/basic-data/);
+        cy.url().should('contain', 'claim/');
         // Delete created claim to avoid cluttering the database
         cy.dataCy('descriptor-more-opts').click();
         cy.dataCy('deleteClaim').click();
@@ -106,22 +106,15 @@ describe('TicketSale', () => {
         cy.checkNotification('The following refund ticket have been created');
     });
 
-    it('transfers ticket', () => {
+    it('transfer sale to a new ticket', () => {
         cy.visit('/#/ticket/32/sale');
+        cy.get('.q-item > .q-item__label').should('have.text', ' #32');
         selectFirstRow();
         cy.dataCy('ticketSaleTransferBtn').click();
         cy.dataCy('ticketTransferPopup').should('exist');
         cy.dataCy('ticketTransferNewTicketBtn').click();
-        // existen 3 elementos "tbody" necesito checkear que el segundo elemento tbody tenga una row sola
-        cy.get('tbody').eq(1).find('tr').should('have.length', 1);
-        selectFirstRow();
-        cy.dataCy('ticketSaleTransferBtn').click();
-        cy.dataCy('ticketTransferPopup').should('exist');
-        cy.dataCy('ticketTransferDestinationTicketInput').find('input').focus();
-        cy.dataCy('ticketTransferDestinationTicketInput').find('input').type('32');
-        cy.dataCy('ticketTransferTransferBtn').click();
-        // checkear que la url contenga /ticket/1000002/sale
-        cy.url().should('match', /\/ticket\/32\/sale/);
+        //check the new ticket has been created succesfully
+        cy.get('.q-item > .q-item__label').should('not.have.text', ' #32');
     });
 
     it('should redirect to ticket logs', () => {

test/cypress/integration/vnComponent/VnLocation.spec.js

@@ -38,10 +38,7 @@ describe('VnLocation', () => {
             const province = 'Province five';
 
             cy.selectOption(countrySelector, country);
-            cy.selectOption(
-                `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix}`,
-                province
-            );
+            cy.dataCy('locationProvince').type(`${province}{enter}`);
             cy.get(
                 `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(3) `
             ).click();
@@ -134,13 +131,9 @@ describe('VnLocation', () => {
         it('Create city with country', () => {
             const cityName = 'Saskatchew'.concat(Math.random(1 * 100));
             cy.get(createLocationButton).click();
-            cy.selectOption(
-                `${createForm.prefix} > :nth-child(5) > :nth-child(3) `,
-                'Italia'
-            );
+            cy.dataCy('locationCountry').type('Italia{enter}');
             cy.dataCy('City_icon').click();
             cy.selectOption('[data-cy="locationProvince"]:last', 'Province four');
-            cy.countSelectOptions('[data-cy="locationProvince"]:last', 1);
 
             cy.dataCy('cityName').type(cityName);
             cy.dataCy('FormModelPopup_save').eq(1).click();

test/cypress/integration/vnComponent/VnLog.spec.js

@@ -10,14 +10,14 @@ describe('VnLog', () => {
         cy.openRightMenu();
     });
 
-    it('should filter by insert actions', () => {
+    it.skip('should filter by insert actions', () => {
         cy.checkOption(':nth-child(7) > .q-checkbox');
         cy.get('.q-page').click();
         cy.validateContent(chips[0], 'Document');
         cy.validateContent(chips[1], 'Beginning');
     });
 
-    it('should filter by entity', () => {
+    it.skip('should filter by entity', () => {
         cy.selectOption('.q-drawer--right .q-item > .q-select', 'Claim');
         cy.get('.q-page').click();
         cy.validateContent(chips[0], 'Claim');

test/cypress/integration/wagon/wagonCreate.spec.js

@@ -2,41 +2,22 @@ describe('WagonCreate', () => {
     beforeEach(() => {
         cy.viewport(1280, 720);
         cy.login('developer');
-        cy.visit('/#/wagon/create');
+        cy.visit('/#/wagon');
     });
 
     it('should create and delete a new wagon', () => {
-        cy.waitForElement('.q-card');
-        cy.get('input').eq(0).type('1234');
-        cy.get('input').eq(1).type('1234ABCD');
-        cy.get('input').eq(2).type('100');
-        cy.get('input').eq(3).click();
-        cy.get('.q-select > .q-field__inner > .q-field__control').type(
-            '{downarrow}{enter}'
-        );
-
-        // Save
-        cy.get('button[type="submit"]').click();
-
-        // Check data has been saved successfully
-        cy.waitForElement('.q-card');
-
+        cy.dataCy('vnTableCreateBtn').click();
         cy.get(
-            '[to="/null/1"] > .q-card > .no-padding > .q-py-none > .cursor-text'
-        ).should('have.text', '1234');
+            '.grid-create > [label="Label"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Label_input"]'
+        ).type('1234');
         cy.get(
-            '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(1) > .vn-label-value > .value > :nth-child(1) > .row > span'
-        ).should('have.text', '1234ABCD');
+            '.grid-create > [label="Plate"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Plate_input"]'
+        ).type('1234ABCD');
         cy.get(
-            '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(2) > .vn-label-value > .value > :nth-child(1) > .row > span'
-        ).should('have.text', '100');
-        cy.get(
-            '[to="/null/1"] > .q-card > .no-padding > .q-pr-lg > :nth-child(3) > .vn-label-value > .value > :nth-child(1) > .row > span'
-        ).should('have.text', 'Wagon Type #1');
-
-        // Delete wagon type created
-        cy.get(
-            '[to="/null/2"] > .q-card > .column > [title="Remove"] > .q-btn__content > .q-icon'
-        ).click();
+            '.grid-create > [label="Volume"] > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > [data-cy="Volume_input"]'
+        ).type('100');
+        cy.dataCy('Type_select').type('{downarrow}{enter}');
+        // // Delete wagon type created
+        cy.get('[to="/null/1"] > .q-card > .column > [title="Remove"]').click();
     });
 });

test/cypress/support/commands.js

@@ -101,7 +101,6 @@ Cypress.Commands.add('selectOption', (selector, option, timeout = 5000) => {
                 .then(() => {
                     cy.get('@dataUrl').then((url) => {
                         if (url) {
-                            cy.log('url: ', url);
                             // Esperar a que el menú no esté visible (desaparezca)
                             cy.get('.q-menu').should('not.be.visible');
                             // Ahora esperar a que el menú vuelva a aparecer