Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev

src/components/ui/VnLinkPhone.vue

@@ -1,6 +1,7 @@
 <script setup>
 import { reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
 import axios from 'axios';
+import { parsePhone } from 'src/filters';
 const props = defineProps({
     phoneNumber: { type: [String, Number], default: null },
     channel: { type: Number, default: null },
@@ -24,9 +25,9 @@ onBeforeMount(async () => {
             .data;
         if (!channel) channel = defaultChannel;
 
-        config[
+        config[type].href = `${url}?customerIdentity=%2B${parsePhone(
-            type
+            props.phoneNumber
-        ].href = `${url}?customerIdentity=%2B${props.phoneNumber}&channelId=${channel}`;
+        )}&channelId=${channel}`;
     }
 });
 </script>

src/components/ui/VnPaginate.vue

@@ -133,7 +133,7 @@ const addFilter = async (filter, params) => {
 async function fetch(params) {
     useArrayData(props.dataKey, params);
     arrayData.reset(['filter.skip', 'skip', 'page']);
-    await arrayData.fetch({ append: false });
+    await arrayData.fetch({ append: false, updateRouter: mounted.value });
     return emitStoreData();
 }
 

src/filters/index.js

@@ -12,10 +12,12 @@ import dateRange from './dateRange';
 import toHour from './toHour';
 import dashOrCurrency from './dashOrCurrency';
 import getParamWhere from './getParamWhere';
+import parsePhone from './parsePhone';
 import isDialogOpened from './isDialogOpened';
 
 export {
     isDialogOpened,
+    parsePhone,
     toLowerCase,
     toLowerCamel,
     toDate,

src/filters/parsePhone.js

@@ -0,0 +1,12 @@
+export default function (phone, prefix = 34) {
+    if (phone.startsWith('+')) {
+        return `${phone.slice(1)}`;
+    }
+    if (phone.startsWith('00')) {
+        return `${phone.slice(2)}`;
+    }
+    if (phone.startsWith(prefix) && phone.length === prefix.length + 9) {
+        return `${prefix}${phone.slice(prefix.length)}`;
+    }
+    return `${prefix}${phone}`;
+}

src/i18n/locale/en.yml

@@ -864,7 +864,6 @@ components:
     cardDescriptor:
         mainList: Main list
         summary: Summary
-        moreOptions: More options
     leftMenu:
         addToPinned: Add to pinned
         removeFromPinned: Remove from pinned

src/pages/Customer/CustomerFilter.vue

@@ -101,8 +101,8 @@ const exprBuilder = (param, value) => {
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">
-                <QItemSection
+                <QItemSection>
-                    ><VnSelect
+                    <VnSelect
                         url="Provinces"
                         :label="t('Province')"
                         v-model="params.provinceFk"
@@ -120,14 +120,12 @@ const exprBuilder = (param, value) => {
                     />
                 </QItemSection>
             </QItem>
-            <QItem class="q-mb-md">
+            <QItem class="q-mb-sm">
                 <QItemSection>
                     <VnInput :label="t('City')" v-model="params.city" is-outlined />
                 </QItemSection>
             </QItem>
-            <QSeparator />
+            <QItem class="q-mb-sm">
-            <QExpansionItem :label="t('More options')" expand-separator>
-                <QItem>
                 <QItemSection>
                     <VnInput :label="t('Phone')" v-model="params.phone" is-outlined>
                         <template #prepend>
@@ -136,7 +134,7 @@ const exprBuilder = (param, value) => {
                     </VnInput>
                 </QItemSection>
             </QItem>
-                <QItem>
+            <QItem class="q-mb-sm">
                 <QItemSection>
                     <VnInput :label="t('Email')" v-model="params.email" is-outlined>
                         <template #prepend>
@@ -145,7 +143,8 @@ const exprBuilder = (param, value) => {
                     </VnInput>
                 </QItemSection>
             </QItem>
-                <QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
                     <VnSelect
                         url="Zones"
                         :label="t('Zone')"
@@ -160,9 +159,9 @@ const exprBuilder = (param, value) => {
                         outlined
                         rounded
                         auto-load
-                    />
+                /></QItemSection>
             </QItem>
-                <QItem>
+            <QItem class="q-mb-sm">
                 <QItemSection>
                     <VnInput
                         :label="t('Postcode')"
@@ -171,7 +170,6 @@ const exprBuilder = (param, value) => {
                     />
                 </QItemSection>
             </QItem>
-            </QExpansionItem>
         </template>
     </VnFilterPanel>
 </template>
@@ -203,7 +201,6 @@ es:
     Salesperson: Comercial
     Province: Provincia
     City: Ciudad
-    More options: Más opciones
     Phone: Teléfono
     Email: Email
     Zone: Zona

src/pages/Entry/EntryBuysTableDialog.vue

@@ -86,7 +86,7 @@ const entriesTableColumns = computed(() => [
                     color="primary"
                     icon="print"
                     :loading="isLoading"
-                    @click="openReport(`Entries/${entityId}/print`)"
+                    @click="openReport(`Entries/${entityId}/buy-label-supplier`)"
                     unelevated
                     autofocus
                 />

src/pages/InvoiceIn/InvoiceInFilter.vue

@@ -184,5 +184,4 @@ es:
     Amount: Importe
     Issued: Fecha factura
     Id or supplier: Id o proveedor
-    More options: Más opciones
 </i18n>

src/pages/InvoiceOut/InvoiceOutFilter.vue

@@ -83,8 +83,6 @@ const states = ref();
                     />
                 </QItemSection>
             </QItem>
-            <QSeparator />
-            <QExpansionItem :label="t('More options')" expand-separator>
             <QItem>
                 <QItemSection>
                     <VnInputDate
@@ -105,14 +103,9 @@ const states = ref();
             </QItem>
             <QItem>
                 <QItemSection>
-                        <VnInputDate
+                    <VnInputDate v-model="params.dued" :label="t('Dued')" is-outlined />
-                            v-model="params.dued"
-                            :label="t('Dued')"
-                            is-outlined
-                        />
                 </QItemSection>
             </QItem>
-            </QExpansionItem>
         </template>
     </VnFilterPanel>
 </template>
@@ -149,5 +142,4 @@ es:
     Issued: Fecha emisión
     Created: Fecha creación
     Dued: Fecha vencimiento
-    More options: Más opciones
 </i18n>

src/pages/InvoiceOut/InvoiceOutList.vue

@@ -60,8 +60,15 @@ const columns = computed(() => [
         label: t('globals.reference'),
         isTitle: true,
         component: 'select',
-        attrs: { url: MODEL, optionLabel: 'ref', optionValue: 'id' },
+        attrs: {
+            url: MODEL,
+            optionLabel: 'ref',
+            optionValue: 'ref',
+        },
         columnField: { component: null },
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
         align: 'left',
@@ -146,9 +153,7 @@ function downloadPdf() {
         const [invoiceOut] = selectedCardsArray;
         openPdf(invoiceOut.id);
     } else {
-            const invoiceOutIdsArray = selectedCardsArray.map(
+        const invoiceOutIdsArray = selectedCardsArray.map((invoiceOut) => invoiceOut.id);
-                (invoiceOut) => invoiceOut.id
-            );
         const invoiceOutIds = invoiceOutIdsArray.join(',');
 
         const params = {
@@ -157,7 +162,6 @@ function downloadPdf() {
 
         openReport(`${MODEL}/downloadZip`, params);
     }
-
 }
 
 watchEffect(selectedRows);

src/pages/Order/OrderList.vue

@@ -15,6 +15,7 @@ import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vu
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
 import { useRoute } from 'vue-router';
+import dataByOrder from 'src/utils/dataByOrder';
 
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
@@ -149,7 +150,12 @@ onMounted(() => {
 });
 async function fetchClientAddress(id, formData = {}) {
     const { data } = await axios.get(`Clients/${id}`, {
-        params: { filter: { include: { relation: 'addresses' } } },
+        params: {
+            filter: {
+                order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
+                include: { relation: 'addresses' },
+            },
+        },
     });
     addressesList.value = data.addresses;
     formData.addressId = data.defaultAddressFk;
@@ -162,7 +168,7 @@ async function fetchAgencies({ landed, addressId }) {
     const { data } = await axios.get('Agencies/landsThatDay', {
         params: { addressFk: addressId, landed },
     });
-    agencyList.value = data;
+    agencyList.value = dataByOrder(data, 'agencyMode ASC');
 }
 
 const getDateColor = (date) => {
@@ -253,22 +259,27 @@ const getDateColor = (date) => {
                 @update:model-value="() => fetchAgencies(data)"
             >
                 <template #option="scope">
-                    <QItem v-bind="scope.itemProps">
+                    <QItem
-                        <QItemSection>
+                        v-bind="scope.itemProps"
-                            <QItemLabel
+                        :class="{ disabled: !scope.opt.isActive }"
-                                :class="{
-                                    'color-vn-label': !scope.opt?.isActive,
-                                }"
                     >
-                                {{
+                        <QItemSection style="min-width: min-content" avatar>
-                                    `${
+                            <QIcon
-                                        !scope.opt?.isActive
+                                v-if="
-                                            ? t('basicData.inactive')
+                                    scope.opt.isActive && data.addressId === scope.opt.id
-                                            : ''
+                                "
-                                    } `
+                                size="sm"
-                                }}
+                                color="grey"
-                                {{ scope.opt?.nickname }}: {{ scope.opt?.street }},
+                                name="star"
-                                {{ scope.opt?.city }}
+                                class="fill-icon"
+                            />
+                        </QItemSection>
+                        <QItemSection>
+                            <QItemLabel>
+                                {{ scope.opt.nickname }}
+                            </QItemLabel>
+                            <QItemLabel caption>
+                                {{ `${scope.opt.street}, ${scope.opt.city}` }}
                             </QItemLabel>
                         </QItemSection>
                     </QItem>

src/pages/Ticket/TicketFilter.vue

@@ -212,8 +212,6 @@ const getGroupedStates = (data) => {
                     />
                 </QItemSection>
             </QItem>
-            <QSeparator />
-            <QExpansionItem :label="t('More options')" expand-separator>
             <QItem>
                 <QItemSection v-if="!provinces">
                     <QSkeleton type="QInput" class="full-width" />
@@ -286,7 +284,6 @@ const getGroupedStates = (data) => {
                     />
                 </QItemSection>
             </QItem>
-            </QExpansionItem>
         </template>
     </VnFilterPanel>
 </template>
@@ -340,7 +337,6 @@ es:
     With problems: Con problemas
     Invoiced: Facturado
     Routed: Enrutado
-    More options: Más opciones
     Province: Provincia
     Agency: Agencia
     Warehouse: Almacén

src/pages/Ticket/TicketList.vue

@@ -274,7 +274,7 @@ const fetchAddresses = async (formData) => {
 
     const filter = {
         fields: ['nickname', 'street', 'city', 'id', 'isActive'],
-        order: 'nickname ASC',
+        order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
     };
     const params = { filter: JSON.stringify(filter) };
     const { data } = await axios.get(`Clients/${formData.clientId}/addresses`, {
@@ -590,7 +590,22 @@ function setReference(data) {
                     @update:model-value="() => fetchAvailableAgencies(data)"
                 >
                     <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
+                        <QItem
+                            v-bind="scope.itemProps"
+                            :class="{ disabled: !scope.opt.isActive }"
+                        >
+                            <QItemSection style="min-width: min-content" avatar>
+                                <QIcon
+                                    v-if="
+                                        scope.opt.isActive &&
+                                        selectedClient?.defaultAddressFk === scope.opt.id
+                                    "
+                                    size="sm"
+                                    color="grey"
+                                    name="star"
+                                    class="fill-icon"
+                                />
+                            </QItemSection>
                             <QItemSection>
                                 <QItemLabel
                                     :class="{

test/vitest/__tests__/components/common/VnLinkPhone.spec.js

@@ -0,0 +1,29 @@
+import { describe, it, expect } from 'vitest';
+import parsePhone from 'src/filters/parsePhone';
+
+describe('parsePhone filter', () => {
+    it("adds prefix +34 if it doesn't have one", () => {
+        const resultado = parsePhone('123456789', '34');
+        expect(resultado).toBe('34123456789');
+    });
+
+    it('maintains prefix +34 if it is already correct', () => {
+        const resultado = parsePhone('+34123456789', '34');
+        expect(resultado).toBe('34123456789');
+    });
+
+    it('converts prefix 0034 to +34', () => {
+        const resultado = parsePhone('0034123456789', '34');
+        expect(resultado).toBe('34123456789');
+    });
+
+    it('converts prefix 34 without symbol to +34', () => {
+        const resultado = parsePhone('34123456789', '34');
+        expect(resultado).toBe('34123456789');
+    });
+
+    it('replaces incorrect prefix with the correct one', () => {
+        const resultado = parsePhone('+44123456789', '34');
+        expect(resultado).toBe('44123456789');
+    });
+});