Merge branch 'dev' into 8077-sumDefaulterFront

Reviewed-on: #845
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>

package.json

@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.44.0",
+    "version": "24.50.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
@@ -64,4 +64,4 @@
         "vite": "^5.1.4",
         "vitest": "^0.31.1"
     }
-}
+}

src/components/CreateManualInvoiceForm.vue

@@ -1,155 +0,0 @@
-<script setup>
-import { reactive, ref, computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-
-import FetchData from 'components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import FormModelPopup from './FormModelPopup.vue';
-import VnInputDate from './common/VnInputDate.vue';
-
-const emit = defineEmits(['onDataSaved']);
-
-const { t } = useI18n();
-const router = useRouter();
-
-const manualInvoiceFormData = reactive({
-    maxShipped: Date.vnNew(),
-});
-
-const formModelPopupRef = ref();
-const invoiceOutSerialsOptions = ref([]);
-const taxAreasOptions = ref([]);
-const ticketsOptions = ref([]);
-const clientsOptions = ref([]);
-const isLoading = computed(() => formModelPopupRef.value?.isLoading);
-
-const onDataSaved = async (formData, requestResponse) => {
-    emit('onDataSaved', formData, requestResponse);
-    if (requestResponse && requestResponse.id)
-        router.push({ name: 'InvoiceOutSummary', params: { id: requestResponse.id } });
-};
-</script>
-
-<template>
-    <FetchData
-        url="InvoiceOutSerials"
-        :filter="{ where: { code: { neq: 'R' } }, order: ['code'] }"
-        @on-fetch="(data) => (invoiceOutSerialsOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="TaxAreas"
-        :filter="{ order: ['code'] }"
-        @on-fetch="(data) => (taxAreasOptions = data)"
-        auto-load
-    />
-    <FormModelPopup
-        ref="formModelPopupRef"
-        :title="t('Create manual invoice')"
-        url-create="InvoiceOuts/createManualInvoice"
-        model="invoiceOut"
-        :form-initial-data="manualInvoiceFormData"
-        @on-data-saved="onDataSaved"
-    >
-        <template #form-inputs="{ data }">
-            <span v-if="isLoading" class="text-primary invoicing-text">
-                <QIcon name="warning" class="fill-icon q-mr-sm" size="md" />
-                {{ t('Invoicing in progress...') }}
-            </span>
-            <VnRow>
-                <VnSelect
-                    :label="t('Ticket')"
-                    :options="ticketsOptions"
-                    hide-selected
-                    option-label="id"
-                    option-value="id"
-                    v-model="data.ticketFk"
-                    @update:model-value="data.clientFk = null"
-                    url="Tickets"
-                    :where="{ refFk: null }"
-                    :fields="['id', 'nickname']"
-                    :filter-options="{ order: 'shipped DESC' }"
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                <QItemLabel caption>{{ scope.opt?.nickname }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
-                <span class="row items-center" style="max-width: max-content">{{
-                    t('Or')
-                }}</span>
-                <VnSelect
-                    :label="t('Client')"
-                    :options="clientsOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    v-model="data.clientFk"
-                    @update:model-value="data.ticketFk = null"
-                    url="Clients"
-                    :fields="['id', 'name']"
-                    :filter-options="{ order: 'name ASC' }"
-                />
-                <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
-            </VnRow>
-            <VnRow>
-                <VnSelect
-                    :label="t('Serial')"
-                    :options="invoiceOutSerialsOptions"
-                    hide-selected
-                    option-label="description"
-                    option-value="code"
-                    v-model="data.serial"
-                />
-                <VnSelect
-                    :label="t('Area')"
-                    :options="taxAreasOptions"
-                    hide-selected
-                    option-label="code"
-                    option-value="code"
-                    v-model="data.taxArea"
-                />
-            </VnRow>
-            <VnRow>
-                <VnInput
-                    :label="t('Reference')"
-                    type="textarea"
-                    v-model="data.reference"
-                    fill-input
-                    autogrow
-                />
-            </VnRow>
-        </template>
-    </FormModelPopup>
-</template>
-
-<style lang="scss" scoped>
-.invoicing-text {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    color: $primary;
-    font-size: 24px;
-    margin-bottom: 8px;
-}
-</style>
-
-<i18n>
-es:
-    Create manual invoice: Crear factura manual
-    Ticket: Ticket
-    Client: Cliente
-    Max date: Fecha límite
-    Serial: Serie
-    Area: Area
-    Reference: Referencia
-    Or: O
-    Invoicing in progress...: Facturación en progreso...
-</i18n>

src/components/CrudModel.vue

@@ -77,7 +77,7 @@ const isLoading = ref(false);
 const hasChanges = ref(false);
 const originalData = ref();
 const vnPaginateRef = ref();
-const formData = ref();
+const formData = ref([]);
 const saveButtonRef = ref(null);
 const watchChanges = ref();
 const formUrl = computed(() => $props.url);

src/components/VnTable/VnFilter.vue

@@ -25,7 +25,7 @@ const $props = defineProps({
     },
     searchUrl: {
         type: String,
-        default: 'params',
+        default: 'table',
     },
 });
 

src/components/VnTable/VnOrder.vue

@@ -17,7 +17,7 @@ const $props = defineProps({
     },
     searchUrl: {
         type: String,
-        default: 'params',
+        default: 'table',
     },
     vertical: {
         type: Boolean,

src/components/VnTable/VnTable.vue

@@ -162,9 +162,7 @@ onMounted(() => {
             : $props.defaultMode;
     stateStore.rightDrawer = quasar.screen.gt.xs;
     columnsVisibilitySkipped.value = [
-        ...splittedColumns.value.columns
+        ...splittedColumns.value.columns.filter((c) => !c.visible).map((c) => c.name),
-            .filter((c) => c.visible == false)
-            .map((c) => c.name),
         ...['tableActions'],
     ];
     createForm.value = $props.create;
@@ -237,7 +235,7 @@ function splitColumns(columns) {
         if (col.create) splittedColumns.value.create.push(col);
         if (col.cardVisible) splittedColumns.value.cardVisible.push(col);
         if ($props.isEditable && col.disable == null) col.disable = false;
-        if ($props.useModel && col.columnFilter != false)
+        if ($props.useModel && col.columnFilter !== false)
             col.columnFilter = { inWhere: true, ...col.columnFilter };
         splittedColumns.value.columns.push(col);
     }

src/components/common/VnInputDate.vue

@@ -1,8 +1,7 @@
 <script setup>
-import { onMounted, watch, computed, ref } from 'vue';
+import { onMounted, watch, computed, ref, useAttrs } from 'vue';
 import { date } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import { useAttrs } from 'vue';
 import VnDate from './VnDate.vue';
 import { useRequired } from 'src/composables/useRequired';
 

src/components/common/VnRadio.vue

@@ -2,5 +2,12 @@
 const model = defineModel({ type: Boolean, required: true });
 </script>
 <template>
-    <QRadio v-model="model" v-bind="$attrs" dense :dark="true" class="q-mr-sm" />
+    <QRadio
+        v-model="model"
+        v-bind="$attrs"
+        dense
+        :dark="true"
+        class="q-mr-sm"
+        size="xs"
+    />
 </template>

src/components/ui/CardSummary.vue

@@ -83,7 +83,7 @@ async function fetch() {
                     <slot name="header" :entity="entity" dense>
                         <VnLv :label="`${entity.id} -`" :value="entity.name" />
                     </slot>
-                    <slot name="header-right">
+                    <slot name="header-right" :entity="entity">
                         <span></span>
                     </slot>
                 </div>

src/components/ui/VnFilterPanel.vue

@@ -37,7 +37,7 @@ const $props = defineProps({
     },
     hiddenTags: {
         type: Array,
-        default: () => ['filter', 'search', 'or', 'and'],
+        default: () => ['filter', 'or', 'and'],
     },
     customTags: {
         type: Array,
@@ -49,7 +49,7 @@ const $props = defineProps({
     },
     searchUrl: {
         type: String,
-        default: 'params',
+        default: 'table',
     },
     redirect: {
         type: Boolean,
@@ -61,7 +61,6 @@ const emit = defineEmits([
     'update:modelValue',
     'refresh',
     'clear',
-    'search',
     'init',
     'remove',
     'setUserParams',

src/components/ui/VnPaginate.vue

@@ -44,7 +44,7 @@ const props = defineProps({
     },
     limit: {
         type: Number,
-        default: 10,
+        default: 20,
     },
     userParams: {
         type: Object,
@@ -100,7 +100,7 @@ const arrayData = useArrayData(props.dataKey, {
 const store = arrayData.store;
 
 onMounted(async () => {
-    if (props.autoLoad) await fetch();
+    if (props.autoLoad && !store.data?.length) await fetch();
     mounted.value = true;
 });
 
@@ -115,7 +115,11 @@ watch(
 
 watch(
     () => store.data,
-    (data) => emit('onChange', data)
+    (data) => {
+        if (!mounted.value) return;
+        emit('onChange', data);
+    },
+    { immediate: true }
 );
 
 watch(

src/components/ui/VnRow.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="vn-row q-gutter-md q-mb-md">
+    <div class="vn-row q-gutter-md">
         <slot />
     </div>
 </template>
@@ -18,6 +18,9 @@
         &:not(.wrap) {
             flex-direction: column;
         }
+        &[fixed] {
+            flex-direction: row;
+        }
     }
 }
 </style>

src/components/ui/VnSearchbar.vue

@@ -45,7 +45,7 @@ const props = defineProps({
     },
     limit: {
         type: Number,
-        default: 10,
+        default: 20,
     },
     userParams: {
         type: Object,

src/composables/useArrayData.js

@@ -75,18 +75,10 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             limit: store.limit,
         };
 
-        let exprFilter;
         let userParams = { ...store.userParams };
-        if (store?.exprBuilder) {
-            const where = buildFilter(userParams, (param, value) => {
-                const res = store.exprBuilder(param, value);
-                if (res) delete userParams[param];
-                return res;
-            });
-            exprFilter = where ? { where } : null;
-        }
 
-        Object.assign(filter, store.userFilter, exprFilter);
+        Object.assign(filter, store.userFilter);
+
         let where;
         if (filter?.where || store.filter?.where)
             where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
@@ -96,11 +88,28 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
         Object.assign(params, userParams);
         params.filter.skip = store.skip;
-        if (store.order && store.order.length) params.filter.order = store.order;
+        if (store?.order && typeof store?.order == 'string') store.order = [store.order];
+        if (store.order?.length) params.filter.order = [...store.order];
         else delete params.filter.order;
 
+        store.currentFilter = JSON.parse(JSON.stringify(params));
+        delete store.currentFilter.filter.include;
+        store.currentFilter.filter = JSON.stringify(store.currentFilter.filter);
+
+        let exprFilter;
+        if (store?.exprBuilder) {
+            exprFilter = buildFilter(params, (param, value) => {
+                if (param == 'filter') return;
+                const res = store.exprBuilder(param, value);
+                if (res) delete params[param];
+                return res;
+            });
+        }
+
+        if (params.filter.where || exprFilter)
+            params.filter.where = { ...params.filter.where, ...exprFilter };
         params.filter = JSON.stringify(params.filter);
-        store.currentFilter = params;
+
         store.isLoading = true;
         const response = await axios.get(store.url, {
             signal: canceller.signal,
@@ -271,7 +280,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
                 const pushUrl = { path: to };
                 if (to.endsWith('/list') || to.endsWith('/'))
                     pushUrl.query = newUrl.query;
-                destroy();
+                else destroy();
                 return router.push(pushUrl);
             }
         }

src/filters/getParamWhere.js

@@ -9,7 +9,7 @@ function parseJSON(str, fallback) {
 }
 export default function (route, param) {
     // catch route query params
-    const params = parseJSON(route?.query?.params, {});
+    const params = parseJSON(route?.query?.table, {});
     // extract and parse filter from params
     const { filter: filterStr = '{}' } = params;
 

src/i18n/locale/en.yml

@@ -506,6 +506,7 @@ invoiceOut:
             invoiceWithFutureDate: Exists an invoice with a future date
             noTicketsToInvoice: There are not tickets to invoice
             criticalInvoiceError: 'Critical invoicing error, process stopped'
+            invalidSerialTypeForAll: The serial type must be global when invoicing all clients
         table:
             addressId: Address id
             streetAddress: Street
@@ -857,6 +858,7 @@ components:
         downloadFile: Download file
         openCard: View
         openSummary: Summary
+        viewSummary: Summary
     cardDescriptor:
         mainList: Main list
         summary: Summary

src/i18n/locale/es.yml

@@ -509,6 +509,7 @@ invoiceOut:
             invoiceWithFutureDate: Existe una factura con una fecha futura
             noTicketsToInvoice: No existen tickets para facturar
             criticalInvoiceError: Error crítico en la facturación proceso detenido
+            invalidSerialTypeForAll: El tipo de serie debe ser global cuando se facturan todos los clientes
         table:
             addressId: Id dirección
             streetAddress: Dirección fiscal

src/pages/Account/AccountList.vue

@@ -104,7 +104,7 @@ const exprBuilder = (param, value) => {
 
 <template>
     <VnSearchbar
-        data-key="AccountUsers"
+        data-key="AccountList"
         :expr-builder="exprBuilder"
         :label="t('account.search')"
         :info="t('account.searchInfo')"
@@ -112,12 +112,12 @@ const exprBuilder = (param, value) => {
     />
     <RightMenu>
         <template #right-panel>
-            <AccountFilter data-key="AccountUsers" />
+            <AccountFilter data-key="AccountList" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="AccountUsers"
+        data-key="AccountList"
         url="VnUsers/preview"
         :filter="filter"
         order="id DESC"

src/pages/Account/Role/AccountRoles.vue

@@ -82,14 +82,14 @@ const exprBuilder = (param, value) => {
 
 <template>
     <VnSearchbar
-        data-key="Roles"
+        data-key="AccountRolesList"
         :expr-builder="exprBuilder"
         :label="t('role.searchRoles')"
         :info="t('role.searchInfo')"
     />
     <VnTable
         ref="tableRef"
-        data-key="Roles"
+        data-key="AccountRolesList"
         :url="`VnRoles`"
         :create="{
             urlCreate: 'VnRoles',

src/pages/Account/Role/Card/RoleCard.vue

@@ -9,7 +9,7 @@ const { t } = useI18n();
     <VnCard
         data-key="Role"
         :descriptor="RoleDescriptor"
-        search-data-key="AccountRoles"
+        search-data-key="AccountRolesList"
         :searchbar-props="{
             url: 'VnRoles',
             label: t('role.searchRoles'),

src/pages/Claim/ClaimFilter.vue

@@ -23,7 +23,7 @@ defineExpose({ states });
 
 <template>
     <FetchData url="ClaimStates" @on-fetch="(data) => (states = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -37,6 +37,9 @@ const entityId = computed(() => {
 
 const data = ref(useCardDescription());
 const setData = (entity) => (data.value = useCardDescription(entity?.name, entity?.id));
+const debtWarning = computed(() => {
+    return customer.value?.debt > customer.value?.credit ? 'negative' : 'primary';
+});
 </script>
 
 <template>
@@ -117,7 +120,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                     v-if="customer.debt > customer.credit"
                     name="vn:risk"
                     size="xs"
-                    color="primary"
+                    :color="debtWarning"
                 >
                     <QTooltip>{{ t('customer.card.hasDebt') }}</QTooltip>
                 </QIcon>

src/pages/Customer/Card/CustomerSummary.vue

@@ -4,7 +4,7 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
-import { toCurrency, toPercentage, toDate } from 'src/filters';
+import { toCurrency, toPercentage, toDate, dashOrCurrency } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
 import { getUrl } from 'src/composables/getUrl';
 import VnLv from 'src/components/ui/VnLv.vue';
@@ -27,21 +27,16 @@ const $props = defineProps({
 const entityId = computed(() => $props.id || route.params.id);
 const customer = computed(() => summary.value.entity);
 const summary = ref();
-const clientUrl = ref();
+const defaulterAmount = computed(() => customer.value.defaulters[0]?.amount);
-
-onMounted(async () => {
-    clientUrl.value = (await getUrl('client/')) + entityId.value + '/';
-});
-
 const balanceDue = computed(() => {
-    return (
+    const amount = defaulterAmount.value;
-        customer.value &&
+    if (!amount || amount < 0) {
-        customer.value.defaulters.length &&
+        return null;
-        customer.value.defaulters[0].amount
+    }
-    );
+    return amount;
 });
 
-const balanceDueWarning = computed(() => (balanceDue.value ? 'negative' : ''));
+const balanceDueWarning = computed(() => (defaulterAmount.value ? 'negative' : ''));
 
 const claimRate = computed(() => {
     return customer.value.claimsRatio?.claimingRate ?? 0;
@@ -305,7 +300,7 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv
                     v-if="entity.defaulters"
                     :label="t('customer.summary.balanceDue')"
-                    :value="toCurrency(balanceDue)"
+                    :value="dashOrCurrency(balanceDue)()"
                     :class="balanceDueWarning"
                     :info="t('customer.summary.balanceDueInfo')"
                 />

src/pages/Customer/CustomerFilter.vue

@@ -11,10 +11,24 @@ defineProps({
         required: true,
     },
 });
+const handleSalesModelValue = (val) => ({
+    or: [
+        { id: val },
+        { name: val },
+        { nickname: { like: '%' + val + '%' } },
+        { code: { like: `${val}%` } },
+    ],
+});
+
+const exprBuilder = (param, value) => {
+    return {
+        and: [{ active: { neq: false } }, handleSalesModelValue(value)],
+    };
+};
 </script>
 
 <template>
-    <VnFilterPanel :data-key="dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -52,14 +66,18 @@ defineProps({
             <QItem class="q-mb-sm">
                 <QItemSection>
                     <VnSelect
-                        url="Workers/activeWithInheritedRole"
+                        url="Workers/search"
-                        :where="{ role: 'salesPerson' }"
+                        :params="{
+                            departmentCodes: ['VT'],
+                        }"
                         auto-load
                         :label="t('Salesperson')"
+                        :expr-builder="exprBuilder"
                         v-model="params.salesPersonFk"
                         @update:model-value="searchFn()"
                         option-value="id"
                         option-label="name"
+                        sort-by="nickname ASC"
                         emit-value
                         map-options
                         use-input
@@ -67,7 +85,19 @@ defineProps({
                         dense
                         outlined
                         rounded
-                    />
+                        :input-debounce="0"
+                    >
+                        <template #option="{ itemProps, opt }">
+                            <QItem v-bind="itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ opt.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ opt.nickname }},{{ opt.code }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template></VnSelect
+                    >
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">

src/pages/Customer/CustomerList.vue

@@ -394,16 +394,16 @@ function handleLocation(data, location) {
     <VnSearchbar
         :info="t('You can search by customer id or name')"
         :label="t('Search customer')"
-        data-key="Customer"
+        data-key="CustomerList"
     />
     <RightMenu>
         <template #right-panel>
-            <CustomerFilter data-key="Customer" />
+            <CustomerFilter data-key="CustomerList" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="Customer"
+        data-key="CustomerList"
         url="Clients/filter"
         :create="{
             urlCreate: 'Clients/createWithUser',

src/pages/Customer/components/CustomerAddressEdit.vue

@@ -23,6 +23,7 @@ const incoterms = ref([]);
 const customsAgents = ref([]);
 const observationTypes = ref([]);
 const notes = ref([]);
+let originalNotes = [];
 const deletes = ref([]);
 
 onBeforeMount(() => {
@@ -42,7 +43,8 @@ const getData = async (observations) => {
         });
 
         if (data.length) {
-            notes.value = data
+            originalNotes = data;
+            notes.value = originalNotes
                 .map((observation) => {
                     const type = observationTypes.value.find(
                         (type) => type.id === observation.observationTypeFk
@@ -81,14 +83,24 @@ const deleteNote = (id, index) => {
 };
 
 const onDataSaved = async () => {
-    let payload = {};
+    let payload = {
-    const creates = notes.value.filter((note) => note.$isNew);
+        creates: notes.value.filter((note) => note.$isNew),
-    if (creates.length) {
+        deletes: deletes.value,
-        payload.creates = creates;
+        updates: notes.value
-    }
+            .filter((note) =>
-    if (deletes.value.length) {
+                originalNotes.some(
-        payload.deletes = deletes.value;
+                    (oNote) =>
-    }
+                        oNote.id === note.id &&
+                        (note.description !== oNote.description ||
+                            note.observationTypeFk !== oNote.observationTypeFk)
+                )
+            )
+            .map((note) => ({
+                data: note,
+                where: { id: note.id },
+            })),
+    };
+
     await axios.post('AddressObservations/crud', payload);
     notes.value = [];
     deletes.value = [];

src/pages/InvoiceIn/InvoiceInList.vue

@@ -122,7 +122,7 @@ const cols = computed(() => [
         :columns="cols"
         :right-search="false"
         :disable-option="{ card: true }"
-        :auto-load="!!$route.query.params"
+        :auto-load="!!$route.query.table"
     >
         <template #column-supplierFk="{ row }">
             <span class="link" @click.stop>

src/pages/InvoiceOut/InvoiceOutGlobalForm.vue

@@ -183,7 +183,7 @@ onMounted(async () => {
 <i18n>
 en:
     invoiceDate: Invoice date
-    maxShipped: Max date
+    maxShipped: Max date ticket
     allClients: All clients
     oneClient: One client
     company: Company
@@ -195,7 +195,7 @@ en:
 
 es:
     invoiceDate: Fecha de factura
-    maxShipped: Fecha límite
+    maxShipped: Fecha límite ticket
     allClients: Todos los clientes
     oneClient: Un solo cliente
     company: Empresa

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -6,15 +6,19 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { usePrintService } from 'composables/usePrintService';
+import { usePrintService } from 'src/composables/usePrintService';
-import VnTable from 'components/VnTable/VnTable.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
 import { toCurrency, toDate } from 'src/filters/index';
 import { useStateStore } from 'stores/useStateStore';
 import { QBtn } from 'quasar';
-import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
+import axios from 'axios';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import InvoiceOutFilter from './InvoiceOutFilter.vue';
+import VnRow from 'src/components/ui/VnRow.vue';
+import VnRadio from 'src/components/common/VnRadio.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -26,99 +30,86 @@ const selectedRows = ref([]);
 const hasSelectedCards = computed(() => selectedRows.value.length > 0);
 const MODEL = 'InvoiceOuts';
 const { openReport } = usePrintService();
+const addressOptions = ref([]);
+const selectedOption = ref('ticket');
+async function fetchClientAddress(id) {
+    const { data } = await axios.get(
+        `Clients/${id}/addresses?filter[order]=isActive DESC`
+    );
+    addressOptions.value = data;
+}
+
+const exprBuilder = (_, value) => {
+    return {
+        or: [{ code: value }, { description: { like: `%${value}%` } }],
+    };
+};
 
 const columns = computed(() => [
     {
         align: 'center',
         name: 'id',
         label: t('invoiceOutList.tableVisibleColumns.id'),
-        chip: {
+        chip: { condition: () => true },
-            condition: () => true,
-        },
         isId: true,
-        columnFilter: {
+        columnFilter: { name: 'search' },
-            name: 'search',
-        },
     },
     {
         align: 'left',
         name: 'ref',
-        label: t('invoiceOutList.tableVisibleColumns.ref'),
+        label: t('globals.reference'),
         isTitle: true,
         component: 'select',
-        attrs: {
+        attrs: { url: MODEL, optionLabel: 'ref', optionValue: 'id' },
-            url: MODEL,
+        columnField: { component: null },
-            optionLabel: 'ref',
-            optionValue: 'id',
-        },
-        columnField: {
-            component: null,
-        },
     },
     {
         align: 'left',
-        name: 'Issued',
+        name: 'issued',
-        label: t('invoiceOutList.tableVisibleColumns.issued'),
+        label: t('invoiceOut.summary.issued'),
         component: 'date',
         format: (row) => toDate(row.issued),
-        columnField: {
+        columnField: { component: null },
-            component: null,
-        },
     },
     {
         align: 'left',
         name: 'clientFk',
-        label: t('invoiceOutModule.customer'),
+        label: t('globals.client'),
         cardVisible: true,
         component: 'select',
-        attrs: {
+        attrs: { url: 'Clients', fields: ['id', 'name'] },
-            url: 'Clients',
+        columnField: { component: null },
-            fields: ['id', 'name'],
-        },
-        columnField: {
-            component: null,
-        },
     },
     {
         align: 'left',
         name: 'companyCode',
-        label: t('invoiceOutModule.company'),
+        label: t('globals.company'),
         cardVisible: true,
         component: 'select',
-        attrs: {
+        attrs: { url: 'Companies', optionLabel: 'code', optionValue: 'id' },
-            url: 'Companies',
+        columnField: { component: null },
-            optionLabel: 'code',
-            optionValue: 'id',
-        },
-        columnField: {
-            component: null,
-        },
     },
     {
         align: 'left',
         name: 'amount',
-        label: t('invoiceOutModule.amount'),
+        label: t('globals.amount'),
         cardVisible: true,
         format: (row) => toCurrency(row.amount),
     },
     {
         align: 'left',
         name: 'created',
-        label: t('invoiceOutList.tableVisibleColumns.created'),
+        label: t('globals.created'),
         component: 'date',
-        columnField: {
+        columnField: { component: null },
-            component: null,
-        },
         format: (row) => toDate(row.created),
     },
     {
         align: 'left',
         name: 'dued',
-        label: t('invoiceOutList.tableVisibleColumns.dueDate'),
+        label: t('invoiceOut.summary.dued'),
         component: 'date',
-        columnField: {
+        columnField: { component: null },
-            component: null,
-        },
         format: (row) => toDate(row.dued),
     },
     {
@@ -128,11 +119,12 @@ const columns = computed(() => [
             {
                 title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
+                isPrimary: true,
                 action: (row) => viewSummary(row.id, InvoiceOutSummary),
             },
             {
-                title: t('DownloadPdf'),
+                title: t('globals.downloadPdf'),
-                icon: 'vn:ticket',
+                icon: 'cloud_download',
                 isPrimary: true,
                 action: (row) => openPdf(row.id),
             },
@@ -181,12 +173,12 @@ watchEffect(selectedRows);
 <template>
     <VnSearchbar
         :info="t('youCanSearchByInvoiceReference')"
-        :label="t('searchInvoice')"
+        :label="t('Search invoice')"
-        data-key="invoiceOut"
+        data-key="invoiceOutList"
     />
     <RightMenu>
         <template #right-panel>
-            <InvoiceOutFilter data-key="invoiceOut" />
+            <InvoiceOutFilter data-key="invoiceOutList" />
         </template>
     </RightMenu>
     <VnSubToolbar>
@@ -197,21 +189,19 @@ watchEffect(selectedRows);
                 @click="downloadPdf()"
                 :disable="!hasSelectedCards"
             >
-                <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
+                <QTooltip>{{ t('downloadPdf') }}</QTooltip>
             </QBtn>
         </template>
     </VnSubToolbar>
     <VnTable
         ref="tableRef"
-        data-key="invoiceOut"
+        data-key="invoiceOutList"
         :url="`${MODEL}/filter`"
         :create="{
             urlCreate: 'InvoiceOuts/createManualInvoice',
-            title: t('Create manual invoice'),
+            title: t('createManualInvoice'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: {
+            formInitialData: { active: true },
-                active: true,
-            },
         }"
         :right-search="false"
         v-model:selected="selectedRows"
@@ -231,74 +221,203 @@ watchEffect(selectedRows);
             </span>
         </template>
         <template #more-create-dialog="{ data }">
-            <div class="flex no-wrap flex-center">
+            <div class="row q-col-gutter-xs">
-                <VnSelect
+                <div class="col-12">
-                    url="Tickets"
+                    <div class="q-col-gutter-xs">
-                    v-model="data.ticketFk"
+                        <VnRow fixed>
-                    :label="t('invoiceOutList.tableVisibleColumns.ticket')"
+                            <VnRadio
-                    option-label="id"
+                                v-model="selectedOption"
-                    option-value="id"
+                                val="ticket"
-                >
+                                :label="t('globals.ticket')"
-                    <template #option="scope">
+                                class="q-my-none q-mr-md"
-                        <QItem v-bind="scope.itemProps">
+                            />
-                            <QItemSection>
+
-                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                            <VnInput
-                                <QItemLabel caption>{{ scope.opt?.nickname }}</QItemLabel>
+                                v-show="selectedOption === 'ticket'"
-                            </QItemSection>
+                                v-model="data.ticketFk"
-                        </QItem>
+                                :label="t('globals.ticket')"
-                    </template>
+                                style="flex: 1"
-                </VnSelect>
+                            />
-                <span class="q-ml-md">O</span>
+
+                            <div
+                                class="row q-col-gutter-xs q-ml-none"
+                                v-show="selectedOption !== 'ticket'"
+                            >
+                                <div class="col">
+                                    <VnSelect
+                                        v-model="data.clientFk"
+                                        :label="t('globals.client')"
+                                        url="Clients"
+                                        :options="customerOptions"
+                                        option-label="name"
+                                        option-value="id"
+                                        @update:model-value="fetchClientAddress"
+                                    >
+                                        <template #option="scope">
+                                            <QItem
+                                                v-bind="scope.itemProps"
+                                                @click="selectedClient(scope.opt)"
+                                            >
+                                                <QItemSection>
+                                                    <QItemLabel>
+                                                        #{{ scope.opt?.id }} -
+                                                        {{ scope.opt?.name }}
+                                                    </QItemLabel>
+                                                </QItemSection>
+                                            </QItem>
+                                        </template>
+                                    </VnSelect>
+                                </div>
+                                <div class="col">
+                                    <VnSelect
+                                        v-model="data.addressFk"
+                                        :label="t('ticket.summary.consignee')"
+                                        :options="addressOptions"
+                                        option-label="nickname"
+                                        option-value="id"
+                                        v-if="
+                                            data.clientFk &&
+                                            selectedOption === 'consignatario'
+                                        "
+                                    >
+                                        <template #option="scope">
+                                            <QItem v-bind="scope.itemProps">
+                                                <QItemSection>
+                                                    <QItemLabel
+                                                        :class="{
+                                                            'color-vn-label':
+                                                                !scope.opt?.isActive,
+                                                        }"
+                                                    >
+                                                        {{
+                                                            `${
+                                                                !scope.opt?.isActive
+                                                                    ? t('inactive')
+                                                                    : ''
+                                                            } `
+                                                        }}
+                                                        <span>
+                                                            {{
+                                                                scope.opt?.nickname
+                                                            }}</span
+                                                        >
+                                                        <span
+                                                            v-if="
+                                                                scope.opt?.province ||
+                                                                scope.opt?.city ||
+                                                                scope.opt?.street
+                                                            "
+                                                            >, {{ scope.opt?.street }},
+                                                            {{ scope.opt?.city }},
+                                                            {{
+                                                                scope.opt?.province?.name
+                                                            }}
+                                                            -
+                                                            {{
+                                                                scope.opt?.agencyMode
+                                                                    ?.name
+                                                            }}</span
+                                                        >
+                                                    </QItemLabel>
+                                                </QItemSection>
+                                            </QItem>
+                                        </template>
+                                    </VnSelect>
+                                </div>
+                            </div>
+                        </VnRow>
+                        <VnRow fixed>
+                            <VnRadio
+                                v-model="selectedOption"
+                                val="cliente"
+                                :label="t('globals.client')"
+                                class="q-my-none q-mr-md"
+                            />
+                        </VnRow>
+                        <VnRow fixed>
+                            <VnRadio
+                                v-model="selectedOption"
+                                val="consignatario"
+                                :label="t('ticket.summary.consignee')"
+                                class="q-my-none q-mr-md"
+                            />
+                        </VnRow>
+                    </div>
+                </div>
+                <div class="full-width">
+                    <VnRow class="row q-col-gutter-xs">
+                        <VnSelect
+                            url="InvoiceOutSerials"
+                            v-model="data.serial"
+                            :label="t('invoiceIn.serial')"
+                            :options="invoiceOutSerialsOptions"
+                            option-label="description"
+                            option-value="code"
+                            option-filter
+                            :expr-builder="exprBuilder"
+                        >
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection>
+                                        <QItemLabel>
+                                            {{ scope.opt?.code }} -
+                                            {{ scope.opt?.description }}
+                                        </QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelect>
+                        <VnInputDate
+                            :label="t('invoiceOut.summary.dued')"
+                            v-model="data.maxShipped"
+                        />
+                    </VnRow>
+                    <VnRow class="row q-col-gutter-xs">
+                        <VnSelect
+                            url="TaxAreas"
+                            v-model="data.taxArea"
+                            :label="t('invoiceOutList.tableVisibleColumns.taxArea')"
+                            :options="taxAreasOptions"
+                            option-label="code"
+                            option-value="code"
+                        />
+                        <VnInput
+                            v-model="data.reference"
+                            :label="t('globals.reference')"
+                        />
+                    </VnRow>
+                </div>
             </div>
-            <VnSelect
-                url="Clients"
-                v-model="data.clientFk"
-                :label="t('invoiceOutModule.customer')"
-                :options="customerOptions"
-                option-label="name"
-                option-value="id"
-            />
-            <VnSelect
-                url="InvoiceOutSerials"
-                v-model="data.serial"
-                :label="t('invoiceOutList.tableVisibleColumns.invoiceOutSerial')"
-                :options="invoiceOutSerialsOptions"
-                option-label="description"
-                option-value="code"
-            />
-            <VnInputDate
-                :label="t('invoiceOutList.tableVisibleColumns.dueDate')"
-                v-model="data.maxShipped"
-            />
-            <VnSelect
-                url="TaxAreas"
-                v-model="data.taxArea"
-                :label="t('invoiceOutList.tableVisibleColumns.taxArea')"
-                :options="taxAreasOptions"
-                option-label="code"
-                option-value="code"
-            />
-            <QInput
-                v-model="data.reference"
-                :label="t('invoiceOutList.tableVisibleColumns.ref')"
-            />
         </template>
     </VnTable>
 </template>
 
+<style lang="scss" scoped>
+#formModel .vn-row {
+    min-height: 45px;
+
+    .q-radio {
+        align-self: flex-end;
+        flex: 0.3;
+    }
+
+    > .q-input,
+    > .q-select {
+        flex: 0.75;
+    }
+}
+</style>
+
 <i18n>
-en:
+    en:
-    searchInvoice: Search issued invoice
+        invoiceId: Invoice ID
-    fileDenied: Browser denied file download...
+        youCanSearchByInvoiceReference: You can search by invoice reference
-    fileAllowed: Successful download of CSV file
+        createManualInvoice: Create Manual Invoice
-    youCanSearchByInvoiceReference: You can search by invoice reference
+        inactive: (Inactive)
-    createInvoice: Make invoice
+
-    Create manual invoice: Create manual invoice
+    es:
-es:
+        invoiceId: ID de factura
-    searchInvoice: Buscar factura emitida
+        youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
-    fileDenied: El navegador denegó la descarga de archivos...
+        createManualInvoice: Crear factura manual
-    fileAllowed: Descarga exitosa de archivo CSV
+        inactive: (Inactivo)
-    youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
-    createInvoice: Crear factura
-    Create manual invoice: Crear factura manual
 </i18n>

src/pages/InvoiceOut/locale/en.yml

@@ -2,6 +2,7 @@ invoiceOutModule:
     customer: Client
     amount: Amount
     company: Company
+    address: Address
 invoiceOutList:
     tableVisibleColumns:
         id: ID
@@ -15,11 +16,11 @@ invoiceOutList:
 DownloadPdf: Download PDF
 InvoiceOutSummary: Summary
 negativeBases:
-        country: Country
+    country: Country
-        clientId: Client ID
+    clientId: Client ID
-        base: Base
+    base: Base
-        ticketId: Ticket
+    ticketId: Ticket
-        active: Active
+    active: Active
-        hasToInvoice: Has to invoice
+    hasToInvoice: Has to invoice
-        verifiedData: Verified data
+    verifiedData: Verified data
-        commercial: Commercial
+    commercial: Commercial

src/pages/InvoiceOut/locale/es.yml

@@ -4,6 +4,7 @@ invoiceOutModule:
     customer: Cliente
     amount: Importe
     company: Empresa
+    address: Consignatario
 invoiceOutList:
     tableVisibleColumns:
         id: ID

src/pages/Item/ItemFixedPrice.vue

@@ -64,8 +64,7 @@ const columns = computed(() => [
     },
     {
         label: t('globals.name'),
-        field: 'name',
+        name: 'name',
-        name: 'description',
         ...defaultColumnAttrs,
         create: true,
         cardVisible: true,
@@ -426,7 +425,7 @@ function handleOnDataSave({ CrudModelRef }) {
             :default-save="false"
             data-key="ItemFixedPrices"
             url="FixedPrices/filter"
-            :order="['description DESC']"
+            :order="['itemFk DESC', 'name DESC']"
             save-url="FixedPrices/crud"
             :user-params="{ warehouseFk: user.warehouseFk }"
             ref="tableRef"
@@ -480,7 +479,7 @@ function handleOnDataSave({ CrudModelRef }) {
                     </template>
                 </VnSelect>
             </template>
-            <template #column-description="{ row }">
+            <template #column-name="{ row }">
                 <span class="link">
                     {{ row.name }}
                 </span>

src/pages/Item/ItemFixedPriceFilter.vue

@@ -17,21 +17,6 @@ const props = defineProps({
 });
 
 const itemTypeWorkersOptions = ref([]);
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'name':
-            return { 'i.name': { like: `%${value}%` } };
-        case 'itemFk':
-        case 'warehouseFk':
-        case 'rate2':
-        case 'rate3':
-            param = `fp.${param}`;
-            return { [param]: value };
-        case 'minPrice':
-            param = `i.${param}`;
-            return { [param]: value };
-    }
-};
 </script>
 
 <template>
@@ -66,7 +51,7 @@ const exprBuilder = (param, value) => {
                         url="Warehouses"
                         auto-load
                         :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
-                        :label="t('components.itemsFilterPanel.warehouseFk')"
+                        :label="t('globals.warehouse')"
                         v-model="params.warehouseFk"
                         option-label="name"
                         option-value="id"

src/pages/Order/Card/OrderCatalogFilter.vue

@@ -166,6 +166,7 @@ onMounted(() => {
         :expr-builder="exprBuilder"
         :custom-tags="['tagGroups', 'categoryFk']"
         :redirect="false"
+        search-url="params"
     >
         <template #tags="{ tag, formatFn }">
             <strong v-if="tag.label === 'typeFk'">

src/pages/Order/Card/OrderCreateDialog.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { useRouter } from 'vue-router';
-import { onMounted, ref } from 'vue';
+import { reactive, onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { useState } from 'composables/useState';
@@ -9,7 +9,6 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import { useDialogPluginComponent } from 'quasar';
-import { reactive } from 'vue';
 
 const { t } = useI18n();
 const state = useState();
@@ -58,10 +57,6 @@ const fetchAgencyList = async (landed, addressFk) => {
     }
 };
 
-// const fetchOrderDetails = (order) => {
-//     fetchAddressList(order?.addressFk);
-//     fetchAgencyList(order?.landed, order?.addressFk);
-// };
 const $props = defineProps({
     clientFk: {
         type: Number,
@@ -73,39 +68,6 @@ const initialFormState = reactive({
     addressId: null,
     clientFk: $props.clientFk,
 });
-// const orderMapper = (order) => {
-//     return {
-//         addressId: order.addressFk,
-//         agencyModeId: order.agencyModeFk,
-//         landed: new Date(order.landed).toISOString(),
-//     };
-// };
-// const orderFilter = {
-//     include: [
-//         { relation: 'agencyMode', scope: { fields: ['name'] } },
-//         {
-//             relation: 'address',
-//             scope: { fields: ['nickname'] },
-//         },
-//         { relation: 'rows', scope: { fields: ['id'] } },
-//         {
-//             relation: 'client',
-//             scope: {
-//                 fields: [
-//                     'salesPersonFk',
-//                     'name',
-//                     'isActive',
-//                     'isFreezed',
-//                     'isTaxDataChecked',
-//                 ],
-//                 include: {
-//                     relation: 'salesPersonUser',
-//                     scope: { fields: ['id', 'name'] },
-//                 },
-//             },
-//         },
-//     ],
-// };
 
 const onClientChange = async (clientId = $props.clientFk) => {
     try {

src/pages/Order/Card/OrderLines.vue

@@ -111,6 +111,7 @@ const columns = computed(() => [
         component: 'select',
         attrs: {
             url: 'Items',
+            sortBy: 'name ASC ',
             fields: ['id', 'name', 'subName'],
         },
         columnField: {

src/pages/Order/OrderList.vue

@@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
-import { computed, ref } from 'vue';
+import { computed, onMounted, ref } from 'vue';
 import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
 import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
@@ -14,7 +14,6 @@ import OrderFilter from './Card/OrderFilter.vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
-import { onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 
 const { t } = useI18n();
@@ -142,8 +141,13 @@ const columns = computed(() => [
         ],
     },
 ]);
-
+onMounted(() => {
-async function fetchClientAddress(id, formData) {
+    if (!route.query.createForm) return;
+    const clientId = route.query.createForm;
+    const id = JSON.parse(clientId);
+    fetchClientAddress(id.clientFk);
+});
+async function fetchClientAddress(id, formData = {}) {
     const { data } = await axios.get(`Clients/${id}`, {
         params: { filter: { include: { relation: 'addresses' } } },
     });
@@ -170,13 +174,6 @@ const getDateColor = (date) => {
     if (comparation == 0) return 'bg-warning';
     if (comparation < 0) return 'bg-success';
 };
-
-onMounted(() => {
-    if (!route.query.createForm) return;
-    const clientId = route.query.createForm;
-    const id = JSON.parse(clientId);
-    fetchClientAddress(id.clientFk, id);
-});
 </script>
 <template>
     <OrderSearchbar />
@@ -194,7 +191,7 @@ onMounted(() => {
             urlCreate: 'Orders/new',
             title: t('module.cerateOrder'),
             onDataSaved: (url) => {
-                tableRef.redirect(url);
+               tableRef.redirect(`${url}/catalog`);
             },
             formInitialData: {
                 active: true,

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

@@ -16,12 +16,9 @@ import { useAcl } from 'src/composables/useAcl';
 import { useValidator } from 'src/composables/useValidator';
 import { toTimeFormat } from 'filters/date.js';
 
-const $props = defineProps({
+const formData = defineModel({
-    formData: {
+    type: Object,
-        type: Object,
+    required: true,
-        required: true,
-        default: () => ({}),
-    },
 });
 
 const emit = defineEmits(['updateForm']);
@@ -40,7 +37,6 @@ const agenciesOptions = ref([]);
 const zonesOptions = ref([]);
 const addresses = ref([]);
 const zoneSelectRef = ref();
-const formData = ref($props.formData);
 
 watch(
     () => formData.value,
@@ -69,47 +65,28 @@ const zoneWhere = computed(() => {
         : {};
 });
 
-const getLanded = async (params) => {
+async function getLanded(params) {
-    try {
+    getDate(`Agencies/getLanded`, params);
-        const validParams =
+}
-            shipped.value && addressId.value && agencyModeId.value && warehouseId.value;
-        if (!validParams) return;
 
-        formData.value.zoneFk = null;
+async function getShipped(params) {
-        zonesOptions.value = [];
+    getDate(`Agencies/getShipped`, params);
-        const { data } = await axios.get(`Agencies/getLanded`, { params });
+}
-        if (data) {
+
-            formData.value.zoneFk = data.zoneFk;
+async function getDate(query, params) {
-            formData.value.landed = data.landed;
+    for (const param in params) {
-            formData.value.shipped = params.shipped;
+        if (!params[param]) return;
-        }
-    } catch (error) {
-        console.error(error);
-        notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
     }
-};
 
-const getShipped = async (params) => {
+    formData.value.zoneFk = null;
-    try {
+    zonesOptions.value = [];
-        const validParams =
+    const { data } = await axios.get(query, { params });
-            landed.value && addressId.value && agencyModeId.value && warehouseId.value;
+    if (!data) return notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
-        if (!validParams) return;
 
-        formData.value.zoneFk = null;
+    formData.value.zoneFk = data.zoneFk;
-        zonesOptions.value = [];
+    if (data.landed) formData.value.landed = data.landed;
-        const { data } = await axios.get(`Agencies/getShipped`, { params });
+    if (data.shipped) formData.value.shipped = data.shipped;
-        if (data) {
+}
-            formData.value.zoneFk = data.zoneFk;
-            formData.value.landed = params.landed;
-            formData.value.shipped = data.shipped;
-        } else {
-            notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
-        }
-    } catch (error) {
-        console.error(error);
-        notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
-    }
-};
 
 const onChangeZone = async (zoneId) => {
     formData.value.agencyModeFk = null;
@@ -177,18 +154,26 @@ const clientId = computed({
     },
 });
 
-const landed = computed({
+function addDateParams(obj) {
-    get: () => formData.value?.landed,
+    return {
-    set: (val) => {
+        ...obj,
-        formData.value.landed = val;
+        ...{
-        getShipped({
-            landed: val,
             addressFk: formData.value?.addressFk,
             agencyModeFk: formData.value?.agencyModeFk,
             warehouseFk: formData.value?.warehouseFk,
-        });
+        },
-    },
+    };
-});
+}
+
+async function setLanded(landed) {
+    if (!landed) return;
+    getShipped(addDateParams({ landed }));
+}
+
+async function setShipped(shipped) {
+    if (!shipped) return;
+    getLanded(addDateParams({ shipped }));
+}
 
 const agencyModeId = computed({
     get: () => formData.value.agencyModeFk,
@@ -236,21 +221,6 @@ const warehouseId = computed({
     },
 });
 
-const shipped = computed({
-    get: () => formData.value?.shipped,
-    set: (val) => {
-        if (new Date(formData.value?.shipped).toDateString() != val.toDateString())
-            val.setHours(0, 0, 0, 0);
-        formData.value.shipped = val;
-        getLanded({
-            shipped: val,
-            addressFk: formData.value?.addressFk,
-            agencyModeFk: formData.value?.agencyModeFk,
-            warehouseFk: formData.value?.warehouseFk,
-        });
-    },
-});
-
 const onFormModelInit = () => {
     if (formData.value?.clientFk) clientAddressesList(formData.value?.clientFk);
 };
@@ -451,18 +421,21 @@ async function getZone(options) {
                 v-model="formData.shipped"
                 :required="true"
                 :rules="validate('ticketList.shipped')"
+                @update:model-value="setShipped"
             />
             <VnInputTime
                 :label="t('basicData.shippedHour')"
                 v-model="formData.shipped"
                 :required="true"
                 :rules="validate('basicData.shippedHour')"
+                @update:model-value="setShipped"
             />
             <VnInputDate
                 :label="t('basicData.landed')"
                 v-model="formData.landed"
                 :required="true"
                 :rules="validate('basicData.landed')"
+                @update:model-value="setLanded"
             />
         </VnRow>
     </QForm>

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

@@ -158,7 +158,7 @@ onBeforeMount(async () => await getTicketData());
             <TicketBasicDataForm
                 v-if="initialDataLoaded"
                 @update-form="($event) => (formData = $event)"
-                :form-data="formData"
+                v-model="formData"
             />
         </QStep>
         <QStep :name="2" :title="t('basicData.priceDifference')">

src/pages/Ticket/Card/TicketDescriptorMenu.vue

@@ -1,9 +1,9 @@
 <script setup>
 import axios from 'axios';
-import { ref, toRefs } from 'vue';
+import { computed, ref, toRefs } from 'vue';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { usePrintService } from 'composables/usePrintService';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
@@ -23,7 +23,6 @@ const props = defineProps({
         required: true,
     },
 });
-const route = useRoute();
 
 const { push, currentRoute } = useRouter();
 const { dialog, notify } = useQuasar();
@@ -31,7 +30,7 @@ const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 const ticketSummary = useArrayData('TicketSummary');
 const { ticket } = toRefs(props);
-const ticketId = currentRoute.value.params.id;
+const ticketId = computed(() => props.ticket.id ?? currentRoute.value.params.id);
 const client = ref();
 const showTransferDialog = ref(false);
 const showTurnDialog = ref(false);
@@ -68,7 +67,7 @@ const actions = {
     setWeight: async () => {
         try {
             const invoiceIds = (
-                await axios.post(`Tickets/${ticketId}/setWeight`, {
+                await axios.post(`Tickets/${ticketId.value}/setWeight`, {
                     weight: weight.value,
                 })
             ).data;
@@ -86,7 +85,7 @@ const actions = {
     },
     remove: async () => {
         try {
-            await axios.post(`Tickets/${ticketId}/setDeleted`);
+            await axios.post(`Tickets/${ticketId.value}/setDeleted`);
 
             notify({ message: t('Ticket deleted'), type: 'positive' });
             notify({
@@ -176,14 +175,14 @@ function showSmsDialog(template, customData) {
 }
 
 async function showSmsDialogWithChanges() {
-    const query = `TicketLogs/${ticketId}/getChanges`;
+    const query = `TicketLogs/${ticketId.value}/getChanges`;
     const response = await axios.get(query);
 
     showSmsDialog('orderChanges', { changes: response.data });
 }
 
 async function sendSms(body) {
-    await axios.post(`Tickets/${ticketId}/sendSms`, body);
+    await axios.post(`Tickets/${ticketId.value}/sendSms`, body);
     notify({
         message: 'Notification sent',
         type: 'positive',
@@ -256,7 +255,10 @@ async function transferClient(client) {
         clientFk: client,
     };
 
-    const { data } = await axios.patch(`Tickets/${ticketId}/transferClient`, params);
+    const { data } = await axios.patch(
+        `Tickets/${ticketId.value}/transferClient`,
+        params
+    );
 
     if (data) window.location.reload();
 }
@@ -296,7 +298,10 @@ async function changeShippedHour(time) {
         shipped: time,
     };
 
-    const { data } = await axios.post(`Tickets/${ticketId}/updateEditableTicket`, params);
+    const { data } = await axios.post(
+        `Tickets/${ticketId.value}/updateEditableTicket`,
+        params
+    );
 
     if (data) window.location.reload();
 }
@@ -313,7 +318,7 @@ function openRecalculateDialog() {
 }
 
 async function recalculateComponents() {
-    await axios.post(`Tickets/${ticketId}/recalculateComponents`);
+    await axios.post(`Tickets/${ticketId.value}/recalculateComponents`);
     notify({
         message: t('Data saved'),
         type: 'positive',
@@ -336,11 +341,11 @@ async function handleInvoiceOutData() {
 }
 
 async function docuwareDownload() {
-    await axios.get(`Tickets/${ticketId}/docuwareDownload`);
+    await axios.get(`Tickets/${ticketId.value}/docuwareDownload`);
 }
 
 async function hasDocuware() {
-    const { data } = await axios.post(`Docuwares/${ticketId}/checkFile`, {
+    const { data } = await axios.post(`Docuwares/${ticketId.value}/checkFile`, {
         fileCabinet: 'deliveryNote',
         signed: true,
     });
@@ -371,11 +376,7 @@ async function uploadDocuware(force) {
 </script>
 <template>
     <FetchData
-        :url="
+        :url="`Tickets/${ticketId}/isEditable`"
-            route.path.startsWith('/ticket')
-                ? `Tickets/${ticketId}/isEditable`
-                : `Tickets/${ticket}/isEditable`
-        "
         auto-load
         @on-fetch="handleFetchData"
     />
@@ -396,8 +397,6 @@ async function uploadDocuware(force) {
                 <VnSelect
                     url="Clients"
                     :fields="['id', 'name']"
-                    option-label="name"
-                    option-value="id"
                     v-model="client"
                     :label="t('Client')"
                     auto-load

src/pages/Ticket/Card/TicketSale.vue

@@ -94,25 +94,32 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('ticketList.id'),
+        label: t('globals.id'),
         name: 'itemFk',
     },
     {
         align: 'left',
-        label: t('basicData.quantity'),
+        label: t('globals.quantity'),
         name: 'quantity',
         format: (row) => toCurrency(row.quantity),
     },
     {
         align: 'left',
-        label: t('basicData.item'),
+        label: t('globals.item'),
         name: 'item',
         format: (row) => row?.item?.name,
         columnClass: 'expand',
     },
     {
         align: 'left',
-        label: t('basicData.price'),
+        label: t('globals.size'),
+        name: 'size',
+        format: (row) => row?.item?.size,
+        columnClass: 'expand',
+    },
+    {
+        align: 'left',
+        label: t('globals.price'),
         name: 'price',
         format: (row) => toCurrency(row.price),
     },
@@ -124,7 +131,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('ticketList.amount'),
+        label: t('globals.amount'),
         name: 'amount',
         format: (row) => parseInt(row.amount * row.quantity),
     },

src/pages/Ticket/Card/TicketSummary.vue

@@ -20,6 +20,7 @@ import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnToSummary from 'src/components/ui/VnToSummary.vue';
+import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
 
 const route = useRoute();
 const { notify } = useNotify();
@@ -116,24 +117,36 @@ function toTicketUrl(section) {
                 {{ entity.nickname }}
             </div>
         </template>
-        <template #header-right>
+        <template #header-right="{ entity }">
-            <QBtnDropdown
+            <div>
-                ref="stateBtnDropdownRef"
+                <QBtnDropdown
-                color="black"
+                    ref="stateBtnDropdownRef"
-                text-color="white"
+                    color="black"
-                :label="t('globals.changeState')"
+                    text-color="white"
-                :disable="!isEditable()"
+                    :label="t('globals.changeState')"
-            >
+                    :disable="!isEditable()"
-                <VnSelect
+                >
-                    :options="editableStates"
+                    <VnSelect
-                    hide-selected
+                        :options="editableStates"
-                    option-label="name"
+                        hide-selected
-                    option-value="code"
+                        option-label="name"
-                    hide-dropdown-icon
+                        option-value="code"
-                    focus-on-mount
+                        hide-dropdown-icon
-                    @update:model-value="changeState"
+                        focus-on-mount
-                />
+                        @update:model-value="changeState"
-            </QBtnDropdown>
+                    />
+                </QBtnDropdown>
+                <QBtn color="white" dense flat icon="more_vert" round size="md">
+                    <QTooltip>
+                        {{ t('components.cardDescriptor.moreOptions') }}
+                    </QTooltip>
+                    <QMenu>
+                        <QList>
+                            <TicketDescriptorMenu :ticket="entity" />
+                        </QList>
+                    </QMenu>
+                </QBtn>
+            </div>
         </template>
         <template #body="{ entity }">
             <QCard class="vn-one">

src/pages/Ticket/TicketFilter.vue

@@ -47,7 +47,7 @@ const getGroupedStates = (data) => {
     />
     <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
     <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>

src/pages/Ticket/TicketList.vue

@@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { computed, ref, onMounted } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@@ -18,12 +18,13 @@ import RightMenu from 'src/components/common/RightMenu.vue';
 import TicketFilter from './TicketFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'src/components/FetchData.vue';
-import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
-import ZoneDescriptorProxy from '../Zone/Card/ZoneDescriptorProxy.vue';
+import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import { toTimeFormat } from 'src/filters/date';
-import InvoiceOutDescriptorProxy from '../InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
+import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
 
 const route = useRoute();
+const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
@@ -40,23 +41,18 @@ from.setDate(from.getDate() - 7);
 const to = Date.vnNew();
 to.setHours(23, 59, 0, 0);
 to.setDate(to.getDate() + 1);
-
 const userParams = {
     from: null,
     to: null,
 };
-
 onMounted(() => {
     initializeFromQuery();
     stateStore.rightDrawer = true;
     if (!route.query.createForm) return;
     onClientSelected(JSON.parse(route.query.createForm));
 });
-// Método para inicializar las variables desde la query string
 const initializeFromQuery = () => {
     const query = route.query.table ? JSON.parse(route.query.table) : {};
-
-    // Asigna los valores a las variables correspondientes
     from.value = query.from || from.toISOString();
     to.value = query.to || to.toISOString();
     Object.assign(userParams, { from, to });
@@ -213,13 +209,19 @@ const columns = computed(() => [
             {
                 title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
-                isPrimary: true,
+                action: (row, evt) => {
-                action: (row) => viewSummary(row.id, TicketSummary),
+                    if (evt && evt.ctrlKey) {
+                        const url = router.resolve({
+                            params: { id: row.id },
+                            name: 'TicketCard',
+                        }).href;
+                        window.open(url, '_blank');
+                    } else viewSummary(row.id, TicketSummary);
+                },
             },
         ],
     },
 ]);
-
 function redirectToLines(id) {
     const url = `#/ticket/${id}/sale`;
     window.open(url, '_blank');
@@ -456,24 +458,24 @@ function setReference(data) {
         auto-load
     />
     <VnSearchbar
-        data-key="Ticket"
+        data-key="TicketList"
         :label="t('Search ticket')"
         :info="t('You can search by ticket id or alias')"
     />
     <RightMenu>
         <template #right-panel>
-            <TicketFilter data-key="Ticket" />
+            <TicketFilter data-key="TicketList" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="Ticket"
+        data-key="TicketList"
         url="Tickets/filter"
         :create="{
             urlCreate: 'Tickets/new',
             title: t('ticketList.createTicket'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: {},
+            formInitialData: { clientId: null },
         }"
         default-mode="table"
         :order="['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id']"
@@ -575,17 +577,17 @@ function setReference(data) {
             </span>
         </template>
         <template #column-stateFk="{ row }">
-            <span v-if="getColor(row)">
+            <span v-if="row.refFk">
-                <QChip :class="getColor(row)" dense square>
-                    {{ row.state }}
-                </QChip>
-            </span>
-            <span v-else-if="row.state === 'Entregado'">
                 <span class="link" @click.stop>
                     {{ row.refFk }}
                     <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
                 </span>
             </span>
+            <span v-else-if="getColor(row)">
+                <QChip :class="getColor(row)" dense square>
+                    {{ row.state }}
+                </QChip>
+            </span>
             <span v-else>
                 {{ row.state }}
             </span>
@@ -617,6 +619,7 @@ function setReference(data) {
                     option-value="id"
                     option-label="name"
                     hide-selected
+                    required
                     @update:model-value="(client) => onClientSelected(data)"
                     :sort-by="'id ASC'"
                 >
@@ -643,6 +646,7 @@ function setReference(data) {
                     option-label="nickname"
                     hide-selected
                     map-options
+                    required
                     :disable="!data.clientId"
                     :sort-by="'isActive DESC'"
                     @update:model-value="() => fetchAvailableAgencies(data)"
@@ -693,6 +697,7 @@ function setReference(data) {
                         option-value="id"
                         option-label="name"
                         hide-selected
+                        required
                         @update:model-value="() => fetchAvailableAgencies(data)"
                     />
                 </div>
@@ -706,7 +711,6 @@ function setReference(data) {
                         option-value="agencyModeFk"
                         option-label="agencyMode"
                         hide-selected
-                        :disable="!data.clientId || !data.landed || !data.warehouseId"
                     />
                 </div>
             </VnRow>
@@ -842,7 +846,14 @@ function setReference(data) {
         </QTooltip>
     </QPageSticky>
 </template>
-
+<style scoped>
+.disabled,
+.disabled *,
+[disabled],
+[disabled] * {
+    cursor: pointer !important;
+}
+</style>
 <i18n>
 es:
     Search ticket: Buscar ticket

src/pages/Ticket/locale/es.yml

@@ -138,6 +138,7 @@ ticketSale:
     ok: Ok
     more: Más
     address: Consignatario
+    size: Medida
 ticketComponents:
     serie: Serie
     components: Componentes

src/pages/Travel/Card/TravelThermographsForm.vue

@@ -205,6 +205,7 @@ const onThermographCreated = async (data) => {
                         }"
                         sort-by="thermographFk ASC"
                         option-label="thermographFk"
+                        option-filter-value="thermographFk"
                         :disable="viewAction === 'edit'"
                         :tooltip="t('New thermograph')"
                         :roles-allowed-to-create="['logistic']"

src/pages/Travel/TravelFilter.vue

@@ -24,7 +24,7 @@ defineExpose({ states });
 
 <template>
     <FetchData url="warehouses" @on-fetch="(data) => (states = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>

src/pages/Worker/Card/WorkerCard.vue

@@ -14,6 +14,7 @@ import WorkerFilter from '../WorkerFilter.vue';
             url: 'Workers/filter',
             label: 'Search worker',
             info: 'You can search by worker id or name',
+            order: 'id DESC',
         }"
         :redirect-on-error="true"
     />

src/pages/Worker/Card/WorkerNotificationsManager.vue

@@ -70,7 +70,7 @@ function setNotifications(data) {
         :default-reset="false"
         :default-remove="false"
         :default-save="false"
-        @on-fetch="setNotifications"
+        @on-fetch="(data) => data && setNotifications(data)"
         search-url="notifications"
     >
         <template #body>

src/pages/Zone/Card/ZoneCard.vue

@@ -20,12 +20,13 @@ function notIsLocations(ifIsFalse, ifIsTrue) {
 <template>
     <VnCard
         data-key="zone"
-        base-url="Zones"
+        :base-url="notIsLocations('Zones', undefined)"
         :descriptor="ZoneDescriptor"
-        :filter-panel="ZoneFilterPanel"
+        :filter-panel="notIsLocations(ZoneFilterPanel, undefined)"
-        :search-data-key="notIsLocations('ZoneList', 'ZoneLocations')"
+        :search-data-key="notIsLocations('ZoneList', undefined)"
+        :custom-url="`Zones/${route.params?.id}/getLeaves`"
         :searchbar-props="{
-            url: 'Zones',
+            url: notIsLocations('Zones', 'ZoneLocations'),
             label: notIsLocations(t('list.searchZone'), t('list.searchLocation')),
             info: t('list.searchInfo'),
             whereFilter: notIsLocations((value) => {

src/pages/Zone/Card/ZoneLocationsTree.vue

@@ -5,6 +5,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import { useArrayData } from 'composables/useArrayData';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 
 const props = defineProps({
     rootLabel: {
@@ -33,22 +34,23 @@ const state = useState();
 const treeRef = ref();
 const expanded = ref([]);
 
-const arrayData = useArrayData('ZoneLocations', {
+const datakey = 'ZoneLocations';
-    url: `Zones/${route.params.id}/getLeaves`,
+const url = computed(() => `Zones/${route.params.id}/getLeaves`);
+const arrayData = useArrayData(datakey, {
+    url: url.value,
 });
 const { store } = arrayData;
 const storeData = computed(() => store.data);
 
-const nodes = ref([
+const defaultNode = {
-    {
+    id: null,
-        id: null,
+    name: props.rootLabel,
-        name: props.rootLabel,
+    sons: true,
-        sons: true,
+    tickable: false,
-        tickable: false,
+    noTick: true,
-        noTick: true,
+    children: [{}],
-        children: [{}],
+};
-    },
+const nodes = ref([defaultNode]);
-]);
 
 const _tickedNodes = computed({
     get: () => props.tickedNodes,
@@ -128,6 +130,7 @@ function getNodeIds(node) {
 
 watch(storeData, async (val) => {
     // Se triggerea cuando se actualiza el store.data, el cual es el resultado del fetch de la searchbar
+    if (!nodes.value[0]) nodes.value = [defaultNode];
     nodes.value[0].childs = [...val];
     const fetchedNodeKeys = val.flatMap(getNodeIds);
     state.set('Tree', [...fetchedNodeKeys]);
@@ -193,6 +196,7 @@ onUnmounted(() => {
             <QBtn color="primary" icon="search" dense flat @click="reFetch()" />
         </template>
     </VnInput>
+    <VnSearchbar :data-key="datakey" :url="url" :redirect="false" />
     <QTree
         ref="treeRef"
         :nodes="nodes"

src/pages/Zone/Card/ZoneSearchbar.vue

@@ -26,7 +26,7 @@ const exprBuilder = (param, value) => {
 
 <template>
     <VnSearchbar
-        data-key="Zones"
+        data-key="ZonesList"
         url="Zones"
         :filter="{
             include: { relation: 'agencyMode', scope: { fields: ['name'] } },

src/pages/Zone/ZoneFilterPanel.vue

@@ -32,7 +32,6 @@ const agencies = ref([]);
         :data-key="props.dataKey"
         :search-button="true"
         :hidden-tags="['search']"
-        search-url="table"
     >
         <template #tags="{ tag }">
             <div class="q-gutter-x-xs">

src/pages/Zone/ZoneList.vue

@@ -139,12 +139,12 @@ onMounted(() => (stateStore.rightDrawer = true));
     <ZoneSearchbar />
     <RightMenu>
         <template #right-panel>
-            <ZoneFilterPanel data-key="Zones" />
+            <ZoneFilterPanel data-key="ZonesList" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="Zones"
+        data-key="ZonesList"
         url="Zones"
         :create="{
             urlCreate: 'Zones',

src/router/modules/Supplier.js

@@ -113,7 +113,7 @@ export default {
                     name: 'SupplierAccounts',
                     meta: {
                         title: 'accounts',
-                        icon: 'vn:account',
+                        icon: 'vn:credit',
                     },
                     component: () =>
                         import('src/pages/Supplier/Card/SupplierAccounts.vue'),

src/stores/invoiceOutGlobal.js

@@ -162,6 +162,15 @@ export const useInvoiceOutGlobalStore = defineStore({
                 );
                 throw new Error('Invalid Serial Type');
             }
+
+            if (clientsToInvoice === 'all' && params.serialType !== 'global') {
+                notify(
+                    'invoiceOut.globalInvoices.errors.invalidSerialTypeForAll',
+                    'negative'
+                );
+                throw new Error('For "all" clients, the serialType must be "global"');
+            }
+
             if (!params.companyFk) {
                 notify('invoiceOut.globalInvoices.errors.chooseValidCompany', 'negative');
                 throw new Error('Invalid company');

src/stores/useArrayDataStore.js

@@ -8,7 +8,7 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
         userFilter: {},
         userParams: {},
         url: '',
-        limit: 10,
+        limit: 20,
         skip: 0,
         order: '',
         isLoading: false,

test/vitest/__tests__/composables/useArrayData.spec.js

@@ -5,7 +5,7 @@ import { useRouter } from 'vue-router';
 import * as vueRouter from 'vue-router';
 
 describe('useArrayData', () => {
-    const filter = '{"limit":10,"skip":0}';
+    const filter = '{"limit":20,"skip":0}';
     const params = { supplierFk: 2 };
     beforeEach(() => {
         vi.spyOn(useRouter(), 'replace');