src/components/LeftMenu.vue

@@ -34,26 +34,18 @@ const search = ref(null);
 
 const filteredItems = computed(() => {
     if (!search.value) return items.value;
-    const normalizedSearch = normalize(search.value);
     return items.value.filter((item) => {
-        const locale = normalize(t(item.title));
-        return locale.includes(normalizedSearch);
+        const locale = t(item.title).toLowerCase();
+        return locale.includes(search.value.toLowerCase());
     });
 });
 
 const filteredPinnedModules = computed(() => {
     if (!search.value) return pinnedModules.value;
-    const normalizedSearch = search.value
-        .normalize('NFD')
-        .replace(/[\u0300-\u036f]/g, '')
-        .toLowerCase();
     const map = new Map();
     for (const [key, pinnedModule] of pinnedModules.value) {
-        const locale = t(pinnedModule.title)
-            .normalize('NFD')
-            .replace(/[\u0300-\u036f]/g, '')
-            .toLowerCase();
-        if (locale.includes(normalizedSearch)) map.set(key, pinnedModule);
+        const locale = t(pinnedModule.title).toLowerCase();
+        if (locale.includes(search.value.toLowerCase())) map.set(key, pinnedModule);
     }
     return map;
 });
@@ -155,13 +147,6 @@ async function togglePinned(item, event) {
 const handleItemExpansion = (itemName) => {
     expansionItemElements[itemName].scrollToLastElement();
 };
-
-function normalize(text) {
-    return text
-        .normalize('NFD')
-        .replace(/[\u0300-\u036f]/g, '')
-        .toLowerCase();
-}
 </script>
 
 <template>

src/components/common/VnSelect.vue

@@ -1,7 +1,7 @@
 <script setup>
 import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useArrayData } from 'src/composables/useArrayData';
+import FetchData from 'src/components/FetchData.vue';
 import { useRequired } from 'src/composables/useRequired';
 import dataByOrder from 'src/utils/dataByOrder';
 
@@ -90,10 +90,6 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
-    dataKey: {
-        type: String,
-        default: null,
-    },
 });
 
 const mixinRules = [requiredFieldRule, ...($attrs.rules ?? [])];
@@ -102,14 +98,14 @@ const { optionLabel, optionValue, optionFilter, optionFilterValue, options, mode
 const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
 const vnSelectRef = ref();
+const dataRef = ref();
 const lastVal = ref();
 const noOneText = t('globals.noOne');
 const noOneOpt = ref({
     [optionValue.value]: false,
     [optionLabel.value]: noOneText,
 });
-const isLoading = ref(false);
-const useURL = computed(() => $props.url);
+
 const value = computed({
     get() {
         return $props.modelValue;
@@ -133,18 +129,11 @@ watch(modelValue, async (newValue) => {
 
 onMounted(() => {
     setOptions(options.value);
-    if (useURL.value && $props.modelValue && !findKeyInOptions())
+    if ($props.url && $props.modelValue && !findKeyInOptions())
         fetchFilter($props.modelValue);
     if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
 });
 
-defineExpose({ opts: myOptions });
-
-const arrayDataKey =
-    $props.dataKey ?? ($props.url?.length > 0 ? $props.url : $attrs.name ?? $attrs.label);
-
-const arrayData = useArrayData(arrayDataKey, { url: $props.url, searchUrl: false });
-
 function findKeyInOptions() {
     if (!$props.options) return;
     return filter($props.modelValue, $props.options)?.length;
@@ -179,7 +168,7 @@ function filter(val, options) {
 }
 
 async function fetchFilter(val) {
-    if (!$props.url) return;
+    if (!$props.url || !dataRef.value) return;
 
     const { fields, include, sortBy, limit } = $props;
     const key =
@@ -201,8 +190,8 @@ async function fetchFilter(val) {
     const fetchOptions = { where, include, limit };
     if (fields) fetchOptions.fields = fields;
     if (sortBy) fetchOptions.order = sortBy;
-    arrayData.reset(['skip', 'filter.skip', 'page']);
-    return (await arrayData.applyFilter({ filter: fetchOptions }))?.data;
+
+    return dataRef.value.fetch(fetchOptions);
 }
 
 async function filterHandler(val, update) {
@@ -242,23 +231,20 @@ function nullishToTrue(value) {
 
 const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 
-async function onScroll({ to, direction, from, index }) {
-    const lastIndex = myOptions.value.length - 1;
-
-    if (from === 0 && index === 0) return;
-    if (!useURL.value && !$props.fetchRef) return;
-    if (direction === 'decrease') return;
-    if (to === lastIndex && arrayData.store.hasMoreData && !isLoading.value) {
-        isLoading.value = true;
-        await arrayData.loadMore();
-        setOptions(arrayData.store.data);
-        vnSelectRef.value.scrollTo(lastIndex);
-        isLoading.value = false;
-    }
-}
+defineExpose({ opts: myOptions });
 </script>
 
 <template>
+    <FetchData
+        ref="dataRef"
+        :url="$props.url"
+        @on-fetch="(data) => setOptions(data)"
+        :where="where || { [optionValue]: value }"
+        :limit="limit"
+        :sort-by="sortBy"
+        :fields="fields"
+        :params="params"
+    />
     <QSelect
         v-model="value"
         :options="myOptions"
@@ -277,9 +263,6 @@ async function onScroll({ to, direction, from, index }) {
         :rules="mixinRules"
         virtual-scroll-slice-size="options.length"
         hide-bottom-space
-        :input-debounce="useURL ? '300' : '0'"
-        :loading="isLoading"
-        @virtual-scroll="onScroll"
     >
         <template v-if="isClearable" #append>
             <QIcon

src/components/ui/VnLinkPhone.vue

@@ -17,12 +17,19 @@ const config = reactive({
 const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
 
 onBeforeMount(async () => {
+    let url;
     let { channel } = config[type];
 
     if (type === 'say-simple') {
-        const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
-            .data;
-        if (!channel) channel = defaultChannel;
+        url = (await axios.get('SaySimpleConfigs/findOne')).data.url;
+        if (!channel)
+            channel = (
+                await axios.get('SaySimpleCountries/findOne', {
+                    params: {
+                        filter: { fields: ['channel'], where: { countryFk: 0 } },
+                    },
+                })
+            ).data?.channel;
 
         config[
             type

src/components/ui/VnNotes.vue

@@ -65,9 +65,13 @@ onBeforeRouteLeave((to, from, next) => {
         auto-load
         @on-fetch="(data) => (observationTypes = data)"
     />
-    <QCard class="q-pa-xs q-mb-lg full-width" v-if="$props.addNote">
+    <QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote">
         <QCardSection horizontal>
-            {{ t('New note') }}
+            <VnAvatar :worker-id="currentUser.id" size="md" />
+            <div class="full-width row justify-between q-pa-xs">
+                <VnUserLink :name="t('New note')" :worker-id="currentUser.id" />
+                {{ t('globals.now') }}
+            </div>
         </QCardSection>
         <QCardSection class="q-px-xs q-my-none q-py-none">
             <VnRow class="full-width">
@@ -140,7 +144,7 @@ onBeforeRouteLeave((to, from, next) => {
                         <div class="full-width row justify-between q-pa-xs">
                             <div>
                                 <VnUserLink
-                                    :name="`${note.worker.user.name}`"
+                                    :name="`${note.worker.user.nickname}`"
                                     :worker-id="note.worker.id"
                                 />
                                 <QBadge

src/composables/useArrayData.js

@@ -247,7 +247,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     }
 
     function updateStateParams() {
-        if (!route?.path) return;
         const newUrl = { path: route.path, query: { ...(route.query ?? {}) } };
         if (store?.searchUrl)
             newUrl.query[store.searchUrl] = JSON.stringify(store.currentFilter);

src/composables/useOpenURL.js

@@ -1,8 +0,0 @@
-import { openURL } from 'quasar';
-const defaultWindowFeatures = {
-    noopener: true,
-    noreferrer: true,
-};
-export default function (url, windowFeatures = defaultWindowFeatures, fn = undefined) {
-    openURL(url, fn, windowFeatures);
-}

src/pages/Customer/Card/CustomerDescriptor.vue

@@ -174,6 +174,23 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 >
                     <QTooltip>{{ t('Customer ticket list') }}</QTooltip>
                 </QBtn>
+                <QBtn
+                    :to="{
+                        name: 'TicketList',
+                        query: {
+                            table: JSON.stringify({
+                                clientFk: entity.id,
+                            }),
+                            createForm: JSON.stringify({ clientId: entity.id }),
+                        },
+                    }"
+                    size="md"
+                    color="primary"
+                    target="_blank"
+                    icon="vn:ticketAdd"
+                >
+                    <QTooltip>{{ t('New ticket') }}</QTooltip>
+                </QBtn>
                 <QBtn
                     :to="{
                         name: 'InvoiceOutList',
@@ -185,6 +202,23 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 >
                     <QTooltip>{{ t('Customer invoice out list') }}</QTooltip>
                 </QBtn>
+                <QBtn
+                    :to="{
+                        name: 'OrderList',
+                        query: {
+                            table: JSON.stringify({
+                                clientFk: entity.id,
+                            }),
+                            createForm: JSON.stringify({ clientFk: entity.id }),
+                        },
+                    }"
+                    size="md"
+                    target="_blank"
+                    icon="vn:basketadd"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('New order') }}</QTooltip>
+                </QBtn>
                 <QBtn
                     :to="{
                         name: 'AccountSummary',

src/pages/Customer/Card/CustomerDescriptorMenu.vue

@@ -6,8 +6,8 @@ import axios from 'axios';
 import { useQuasar } from 'quasar';
 
 import useNotify from 'src/composables/useNotify';
+
 import VnSmsDialog from 'src/components/common/VnSmsDialog.vue';
-import useOpenURL from 'src/composables/useOpenURL';
 
 const $props = defineProps({
     customer: {
@@ -15,6 +15,7 @@ const $props = defineProps({
         required: true,
     },
 });
+
 const { notify } = useNotify();
 const { t } = useI18n();
 const quasar = useQuasar();
@@ -39,42 +40,9 @@ const sendSms = async (payload) => {
         notify(error.message, 'positive');
     }
 };
-
-const openCreateForm = (type) => {
-    const query = {
-        table: {
-            clientFk: $props.customer.id,
-        },
-        createForm: {
-            addressId: $props.customer.defaultAddressFk,
-        },
-    };
-    const clientFk = {
-        ticket: 'clientId',
-        order: 'clientFk',
-    };
-    const key = clientFk[type];
-    if (!key) return;
-    query.createForm[key] = $props.customer.id;
-
-    const params = Object.entries(query)
-        .map(([key, value]) => `${key}=${JSON.stringify(value)}`)
-        .join('&');
-    useOpenURL(`/#/${type}/list?${params}`);
-};
 </script>
 
 <template>
-    <QItem v-ripple clickable @click="openCreateForm('ticket')">
-        <QItemSection>
-            {{ t('globals.pageTitles.createTicket') }}
-        </QItemSection>
-    </QItem>
-    <QItem v-ripple clickable @click="openCreateForm('order')">
-        <QItemSection>
-            {{ t('globals.pageTitles.createOrder') }}
-        </QItemSection>
-    </QItem>
     <QItem v-ripple clickable>
         <QItemSection @click="showSmsDialog()">{{ t('Send SMS') }}</QItemSection>
     </QItem>

src/pages/Customer/Card/CustomerUnpaid.vue

@@ -2,9 +2,10 @@
 import { computed, onBeforeMount, ref, watch, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
+
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnRow from 'components/ui/VnRow.vue';
+
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify';
 import { useStateStore } from 'stores/useStateStore';

src/pages/Customer/CustomerFilter.vue

@@ -53,7 +53,7 @@ defineProps({
                 <QItemSection>
                     <VnSelect
                         url="Workers/activeWithInheritedRole"
-                        :where="{ role: 'salesPerson' }"
+                        :filter="{ where: { role: 'salesPerson' } }"
                         auto-load
                         :label="t('Salesperson')"
                         v-model="params.salesPersonFk"
@@ -67,6 +67,7 @@ defineProps({
                         dense
                         outlined
                         rounded
+                        :input-debounce="0"
                     />
                 </QItemSection>
             </QItem>

src/pages/Customer/components/CustomerSummaryTable.vue

@@ -194,14 +194,14 @@ const getItemPackagingType = (ticketSales) => {
         redirect="ticket"
     >
         <template #column-nickname="{ row }">
-            <span class="link" @click.stop>
+            <span class="link">
                 {{ row.nickname }}
                 <CustomerDescriptorProxy :id="row.clientFk" />
             </span>
         </template>
 
         <template #column-routeFk="{ row }">
-            <span class="link" @click.stop>
+            <span class="link">
                 {{ row.routeFk }}
                 <RouteDescriptorProxy :id="row.routeFk" />
             </span>
@@ -218,7 +218,7 @@ const getItemPackagingType = (ticketSales) => {
             <span v-else> {{ toCurrency(row.totalWithVat) }}</span>
         </template>
         <template #column-state="{ row }">
-            <span v-if="row.invoiceOut" @click.stop>
+            <span v-if="row.invoiceOut">
                 <span :class="{ link: row.invoiceOut.ref }">
                     {{ row.invoiceOut.ref }}
                     <InvoiceOutDescriptorProxy :id="row.invoiceOut.id" />

src/pages/Entry/EntryStockBought.vue

@@ -99,7 +99,7 @@ const travelDialogRef = ref(false);
 const tableRef = ref();
 const travel = ref(null);
 const userParams = ref({
-    dated: Date.vnNew().toJSON(),
+    dated: Date.vnNew(),
 });
 
 const filter = ref({
@@ -219,7 +219,6 @@ function round(value) {
                 data-key="StockBoughts"
                 url="StockBoughts/getStockBought"
                 save-url="StockBoughts/crud"
-                search-url="StockBoughts"
                 order="reserve DESC"
                 :right-search="false"
                 :is-editable="true"

src/pages/Entry/EntryStockBoughtDetail.vue

@@ -18,7 +18,7 @@ const $props = defineProps({
         required: true,
     },
 });
-const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}&dated=${$props.dated}`;
+const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}&date=${$props.dated}`;
 const columns = [
     {
         align: 'left',

src/pages/Entry/EntryStockBoughtFilter.vue

@@ -27,7 +27,7 @@ onMounted(async () => {
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"
-        search-url="StockBoughts"
+        search-url="table"
         @set-user-params="setUserParams"
     >
         <template #tags="{ tag, formatFn }">
@@ -36,19 +36,12 @@ onMounted(async () => {
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params, searchFn }">
+        <template #body="{ params }">
             <QItem class="q-my-sm">
                 <QItemSection>
                     <VnInputDate
                         id="date"
                         v-model="params.dated"
-                        @update:model-value="
-                            (value) => {
-                                params.dated = value;
-                                setUserParams(params);
-                                searchFn();
-                            }
-                        "
                         :label="t('Date')"
                         is-outlined
                     />

src/pages/Route/Cmr/CmrList.vue

@@ -116,7 +116,7 @@ function getApiUrl() {
     return new URL(window.location).origin;
 }
 function getCmrUrl(value) {
-    return `${getApiUrl()}/api/Cmrs/${value}/print?access_token=${token}`;
+    return `${getApiUrl()}/api/Routes/${value}/cmr?access_token=${token}`;
 }
 function downloadPdfs() {
     if (!selectedRows.value.length) {
@@ -129,7 +129,7 @@ function downloadPdfs() {
     let cmrs = [];
     for (let value of selectedRows.value) cmrs.push(value.cmrFk);
     // prettier-ignore
-    return window.open(`${getApiUrl()}/api/Cmrs/downloadZip?ids=${cmrs.join(',')}&access_token=${token}`);
+    return window.open(`${getApiUrl()}/api/Routes/downloadCmrsZip?ids=${cmrs.join(',')}&access_token=${token}`);
 }
 </script>
 <template>
@@ -149,7 +149,7 @@ function downloadPdfs() {
     <VnTable
         ref="tableRef"
         data-key="CmrList"
-        url="Cmrs/filter"
+        url="Routes/cmrs"
         :columns="columns"
         :right-search="true"
         default-mode="table"

src/pages/Ticket/Card/TicketPurchaseRequest.vue

@@ -268,7 +268,6 @@ onMounted(() => (stateStore.rightDrawer = false));
                 :label="t('basicData.price')"
                 type="number"
                 min="0"
-                step="any"
             />
         </template>
     </VnTable>

src/pages/Ticket/TicketList.vue

@@ -45,13 +45,6 @@ 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) : {};
@@ -308,6 +301,11 @@ const getDateColor = (date) => {
     if (comparation < 0) return 'bg-success';
 };
 
+onMounted(() => {
+    initializeFromQuery();
+    stateStore.rightDrawer = true;
+});
+
 async function makeInvoice(ticket) {
     const ticketsIds = ticket.map((item) => item.id);
     const { data } = await axios.post(`Tickets/invoiceTicketsAndPdf`, { ticketsIds });

src/pages/Zone/ZoneDeliveryPanel.vue

@@ -105,14 +105,11 @@ watch(
                 <template #option="{ itemProps, opt }">
                     <QItem v-bind="itemProps">
                         <QItemSection v-if="opt.code">
-                            <QItemLabel>
-                                {{ `${opt.code}, ${opt.town?.name}` }}
-                            </QItemLabel>
-                            <QItemLabel caption>
-                                {{
-                                    `${opt.town?.province?.name}, ${opt.town?.province?.country?.name}`
-                                }}
-                            </QItemLabel>
+                            <QItemLabel>{{ opt.code }}</QItemLabel>
+                            <QItemLabel caption
+                                >{{ opt.town?.province?.name }},
+                                {{ opt.town?.province?.country?.name }}</QItemLabel
+                            >
                         </QItemSection>
                     </QItem>
                 </template>

src/pages/Zone/ZoneFilterPanel.vue

@@ -22,12 +22,7 @@ const agencies = ref([]);
 </script>
 
 <template>
-    <FetchData
-        url="AgencyModes"
-        :filter="{ fields: ['id', 'name'] }"
-        @on-fetch="(data) => (agencies = data)"
-        auto-load
-    />
+    <FetchData url="agencies" @on-fetch="(data) => (agencies = data)" auto-load />
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"

src/pages/Zone/ZoneList.vue

@@ -73,7 +73,6 @@ const columns = computed(() => [
             inWhere: true,
             attrs: {
                 url: 'AgencyModes',
-                fields: ['id', 'name'],
             },
         },
         columnField: {