Merge branch 'dev' into 7202-AddCustomAgentFkColumn2

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/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/VnDateBadge.vue

@@ -11,9 +11,9 @@ function getBadgeAttrs(date) {
 
     let timeDiff = today - timeTicket;
 
-    if (timeDiff == 0) return { color: 'warning', 'text-color': 'black' };
+    if (timeDiff == 0) return { color: 'warning', class: 'black-text-color' };
-    if (timeDiff < 0) return { color: 'success', 'text-color': 'black' };
+    if (timeDiff < 0) return { color: 'success', class: 'black-text-color' };
-    return { color: 'transparent', 'text-color': 'white' };
+    return { color: 'transparent', class: 'normal-text-color' };
 }
 
 function formatShippedDate(date) {
@@ -29,3 +29,11 @@ function formatShippedDate(date) {
         {{ formatShippedDate(date) }}
     </QBadge>
 </template>
+<style lang="scss">
+.black-text-color {
+    color: var(--vn-black-text-color);
+}
+.normal-text-color {
+    color: var(--vn-text-color);
+}
+</style>

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/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/css/app.scss

@@ -3,20 +3,21 @@
 @import '@quasar/quasar-ui-qcalendar/src/QCalendarMonth.sass';
 
 body.body--light {
-    --font-color: black;
     --vn-header-color: #cecece;
     --vn-page-color: #ffffff;
     --vn-section-color: #e0e0e0;
     --vn-section-hover-color: #b9b9b9;
-    --vn-text-color: var(--font-color);
+    --vn-text-color: black;
     --vn-label-color: #5f5f5f;
     --vn-accent-color: #e7e3e3;
     --vn-empty-tag: #acacac;
+    --vn-black-text-color: black;
+    --vn-text-color-contrast: white;
 
     background-color: var(--vn-page-color);
 
     .q-header .q-toolbar {
-        color: var(--font-color);
+        color: var(--vn-text-color);
     }
 }
 body.body--dark {
@@ -28,6 +29,8 @@ body.body--dark {
     --vn-label-color: #a8a8a8;
     --vn-accent-color: #424242;
     --vn-empty-tag: #2d2d2d;
+    --vn-black-text-color: black;
+    --vn-text-color-contrast: black;
 
     background-color: var(--vn-page-color);
 }
@@ -86,6 +89,10 @@ select:-webkit-autofill {
     background-color: var(--vn-section-hover-color);
 }
 
+.bg-vn-page {
+    background-color: var(--vn-page-color);
+}
+
 .color-vn-label {
     color: var(--vn-label-color);
 }
@@ -189,7 +196,7 @@ select:-webkit-autofill {
 
 .q-tooltip {
     background-color: var(--vn-page-color);
-    color: var(--font-color);
+    color: var(--vn-text-color);
     font-size: medium;
 }
 

src/pages/Customer/Card/CustomerMandates.vue

@@ -63,9 +63,10 @@ const columns = computed(() => [
 <template>
     <QPage class="column items-center q-pa-md">
         <VnTable
+            data-key="Mandates"
+            url="Mandates"
             :filter="filter"
             auto-load
-            url="Mandates"
             :columns="columns"
             class="full-width q-mt-md"
             :right-search="false"

src/pages/Item/Card/ItemDiary.vue

@@ -233,7 +233,7 @@ async function updateWarehouse(warehouseFk) {
             </div>
         </template>
     </VnSubToolbar>
-    <QPage class="column items-center q-pa-md">
+    <QPage class="column items-center">
         <QTable
             :rows="itemBalances"
             :columns="columns"

src/pages/Item/Card/ItemLastEntries.vue

@@ -10,21 +10,12 @@ import { dashIfEmpty } from 'src/filters';
 import { toCurrency } from 'filters/index';
 import { useArrayData } from 'composables/useArrayData';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import axios from 'axios';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const from = ref();
 const to = ref();
-const hideInventory = ref(true);
-const inventorySupplierFk = ref();
-
-async function getInventorySupplier() {
-    inventorySupplierFk.value = (
-        await axios.get(`InventoryConfigs`)
-    )?.data[0]?.supplierFk;
-}
 
 const exprBuilder = (param, value) => {
     switch (param) {
@@ -49,10 +40,6 @@ const where = {
     itemFk: route.params.id,
 };
 
-if (hideInventory.value) {
-    where.supplierFk = { neq: inventorySupplierFk };
-}
-
 const arrayData = useArrayData('ItemLastEntries', {
     url: 'Items/lastEntriesFilter',
     order: ['landed DESC', 'buyFk DESC'],
@@ -110,7 +97,7 @@ const columns = computed(() => [
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('shelvings.packing'),
+        label: 'Packing',
         name: 'packing',
         field: 'packing',
         align: 'center',
@@ -182,15 +169,11 @@ const updateFilter = async () => {
     const userFilter = arrayData.store.userFilter.where;
 
     userFilter.landed = filter;
-    if (hideInventory.value) userFilter.supplierFk = { neq: inventorySupplierFk };
-    else delete userFilter.supplierFk;
 
     await fetchItemLastEntries();
 };
 
 onMounted(async () => {
-    await getInventorySupplier();
-
     const _from = Date.vnNew();
     _from.setDate(_from.getDate() - 75);
     from.value = getDate(_from, 'from');
@@ -200,12 +183,16 @@ onMounted(async () => {
 
     updateFilter();
 
-    watch([from, to, hideInventory], ([nFrom, nTo], [oFrom, oTo]) => {
+    watch([from, to], ([nFrom, nTo], [oFrom, oTo]) => {
         if (nFrom && nFrom != oFrom) nFrom = getDate(new Date(nFrom), 'from');
         if (nTo && nTo != oTo) nTo = getDate(new Date(nTo), 'to');
         updateFilter();
     });
 });
+
+function getBadgeClass(groupingMode, expectedGrouping) {
+    return groupingMode === expectedGrouping ? 'accent-badge' : 'simple-badge';
+}
 </script>
 <template>
     <VnSubToolbar>
@@ -224,13 +211,6 @@ onMounted(async () => {
                 class="q-mr-lg"
                 data-cy="to"
             />
-            <QCheckbox
-                :label="t('Hide inventory supplier')"
-                v-model="hideInventory"
-                dense
-                class="q-mr-lg"
-                data-cy="hideInventory"
-            />
         </template>
     </VnSubToolbar>
     <QPage class="column items-center q-pa-xd">
@@ -249,6 +229,11 @@ onMounted(async () => {
                     />
                 </QTd>
             </template>
+            <template #body-cell-warehouse="{ row }">
+                <QTd>
+                    <span>{{ row.warehouse }}</span>
+                </QTd>
+            </template>
             <template #body-cell-date="{ row }">
                 <QTd class="text-center">
                     <VnDateBadge :date="row.landed" />
@@ -262,32 +247,37 @@ onMounted(async () => {
                     </div>
                 </QTd>
             </template>
+            <template #body-cell-pvp="{ value }">
+                <QTd @click.stop class="text-center">
+                    <span> {{ value }}</span>
+                    <QTooltip> {{ t('lastEntries.grouping') }}/Packing </QTooltip></QTd
+                >
+            </template>
+            <template #body-cell-printedStickers="{ row }">
+                <QTd @click.stop class="text-center">
+                    <span style="color: var(--vn-label-color)">
+                        {{ row.printedStickers }}</span
+                    >
+                </QTd>
+            </template>
             <template #body-cell-packing="{ row }">
                 <QTd @click.stop>
                     <QBadge
                         class="center-content"
+                        :class="getBadgeClass(row.groupingMode, 'packing')"
                         rounded
-                        :color="row.groupingMode == 'packing' ? 'grey-13' : 'black'"
                     >
                         {{ dashIfEmpty(row.packing) }}
-                        <QTooltip>{{ t('lastEntries.packing') }}</QTooltip>
+                        <QTooltip>Packing</QTooltip>
                     </QBadge>
                 </QTd>
             </template>
-            <template #body-cell-pvp="{ value }">
-                <QTd @click.stop class="text-center">
-                    <span> {{ value }}</span>
-                    <QTooltip>
-                        {{ t('lastEntries.grouping') }}/{{ t('lastEntries.packing') }}
-                    </QTooltip></QTd
-                >
-            </template>
             <template #body-cell-grouping="{ row }">
                 <QTd @click.stop>
                     <QBadge
                         class="center-content"
+                        :class="getBadgeClass(row.groupingMode, 'grouping')"
                         rounded
-                        :color="row.groupingMode == 'grouping' ? 'grey-13' : 'black'"
                     >
                         {{ dashIfEmpty(row.grouping) }}
                         <QTooltip>{{ t('lastEntries.grouping') }}</QTooltip>
@@ -315,13 +305,16 @@ onMounted(async () => {
             </template>
             <template #body-cell-supplier="{ row }">
                 <QTd @click.stop>
-                    <div class="full-width flex justify-center">
+                    <div class="full-width flex justify-left">
-                        <SupplierDescriptorProxy
+                        <QBadge
-                            :id="row.supplierFk"
+                            :class="
-                            class="q-ma-none"
+                                row.isInventorySupplier ? 'bg-vn-page' : 'transparent'
+                            "
                             dense
-                        />
+                        >
+                            <SupplierDescriptorProxy :id="row.supplierFk" />
                             <span class="link">{{ row.supplier }}</span>
+                        </QBadge>
                     </div>
                 </QTd>
             </template>
@@ -349,4 +342,13 @@ onMounted(async () => {
         background-color: red;
     }
 }
+.accent-badge {
+    background-color: var(--vn-label-color);
+    color: var(--vn-text-color-contrast);
+}
+.simple-badge {
+    background-color: transparent;
+    color: var(--vn-text-color);
+    font-size: 14px;
+}
 </style>

src/pages/Item/ItemFixedPrice.vue

@@ -53,7 +53,6 @@ const columns = computed(() => [
         name: 'itemFk',
         ...defaultColumnAttrs,
         isId: true,
-        cardVisible: true,
         columnField: {
             component: 'input',
             type: 'number',
@@ -65,14 +64,12 @@ const columns = computed(() => [
         name: 'name',
         ...defaultColumnAttrs,
         create: true,
-        cardVisible: true,
     },
     {
         label: t('item.fixedPrice.groupingPrice'),
         field: 'rate2',
         name: 'rate2',
         ...defaultColumnAttrs,
-        cardVisible: true,
         component: 'input',
         type: 'number',
     },
@@ -81,7 +78,6 @@ const columns = computed(() => [
         field: 'rate3',
         name: 'rate3',
         ...defaultColumnAttrs,
-        cardVisible: true,
         component: 'input',
         type: 'number',
     },
@@ -91,7 +87,6 @@ const columns = computed(() => [
         field: 'minPrice',
         name: 'minPrice',
         ...defaultColumnAttrs,
-        cardVisible: true,
         component: 'input',
         type: 'number',
     },
@@ -100,7 +95,6 @@ const columns = computed(() => [
         field: 'started',
         name: 'started',
         format: ({ started }) => toDate(started),
-        cardVisible: true,
         ...defaultColumnAttrs,
         columnField: {
             component: 'date',
@@ -116,7 +110,6 @@ const columns = computed(() => [
         field: 'ended',
         name: 'ended',
         ...defaultColumnAttrs,
-        cardVisible: true,
         columnField: {
             component: 'date',
             class: 'shrink',
@@ -251,11 +244,14 @@ const upsertPrice = async (props, resetMinPrice = false) => {
     }
     if (!changes.updates && !changes.creates) return;
     const data = await upsertFixedPrice(row);
-    tableRef.value.CrudModelRef.formData[props.rowIndex] = data;
+    Object.assign(tableRef.value.CrudModelRef.formData[props.rowIndex], data);
+    notify(t('globals.dataSaved'), 'positive');
+    tableRef.value.reload();
 };
 
 async function upsertFixedPrice(row) {
     const { data } = await axios.patch('FixedPrices/upsertFixedPrice', row);
+    data.hasMinPrice = data.hasMinPrice ? 1 : 0;
     return data;
 }
 
@@ -395,18 +391,12 @@ function handleOnDataSave({ CrudModelRef }) {
         </template>
     </VnSubToolbar>
     <VnTable
-        @on-fetch="
-            (data) =>
-                data.forEach((item) => {
-                    item.hasMinPrice = `${item.hasMinPrice !== 0}`;
-                })
-        "
         :default-remove="false"
         :default-reset="false"
         :default-save="false"
         data-key="ItemFixedPrices"
         url="FixedPrices/filter"
-        :order="['itemFk DESC', 'name DESC']"
+        :order="['name DESC', 'itemFk DESC']"
         save-url="FixedPrices/crud"
         ref="tableRef"
         dense
@@ -498,14 +488,15 @@ function handleOnDataSave({ CrudModelRef }) {
                     <QCheckbox
                         :model-value="props.row.hasMinPrice"
                         @update:model-value="updateMinPrice($event, props)"
-                        :false-value="'false'"
+                        :false-value="0"
-                        :true-value="'true'"
+                        :true-value="1"
+                        :toggle-indeterminate="false"
                     />
                     <VnInput
                         class="col"
                         type="currency"
                         mask="###.##"
-                        :disable="props.row.hasMinPrice === 1"
+                        :disable="props.row.hasMinPrice === 0"
                         v-model.number="props.row.minPrice"
                         v-on="getRowUpdateInputEvents(props)"
                     >

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/Zone/Card/ZoneEventExclusionForm.vue

@@ -59,7 +59,7 @@ const arrayData = useArrayData('ZoneEvents');
 const exclusionGeoCreate = async () => {
     const params = {
         zoneFk: parseInt(route.params.id),
-        date: dated.value,
+        date: dated,
         geoIds: tickedNodes.value,
     };
     await axios.post('Zones/exclusionGeo', params);

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/item/itemLastEntries.spec.js

@@ -1,20 +0,0 @@
-describe('ItemLastEntries', () => {
-    beforeEach(() => {
-        cy.viewport(1280, 720);
-        cy.login('buyer');
-        cy.visit('/#/item/1/last-entries');
-        cy.intercept('GET', /.*lastEntriesFilter/).as('item');
-        cy.waitForElement('tbody');
-    });
-
-    it('should filter by agency', () => {
-        cy.get('tbody > tr')
-            .its('length')
-            .then((rowCount) => {
-                cy.get('[data-cy="hideInventory"]').click();
-                cy.wait('@item');
-                cy.waitForElement('tbody');
-                cy.get('tbody > tr').should('have.length.greaterThan', rowCount);
-            });
-    });
-});

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) => {