src/pages/Customer/components/CustomerAddressEdit.vue

@@ -2,7 +2,7 @@
 import { onBeforeMount, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
-
+import { useQuasar } from 'quasar';
 import axios from 'axios';
 import VnLocation from 'src/components/common/VnLocation.vue';
 import FetchData from 'components/FetchData.vue';
@@ -13,11 +13,12 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import CustomerNewCustomsAgent from 'src/pages/Customer/components/CustomerNewCustomsAgent.vue';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
+import VnConfirm from 'components/ui/VnConfirm.vue';
 
 const { t } = useI18n();
 const route = useRoute();
 const router = useRouter();
-
+const quasar = useQuasar();
 const urlUpdate = ref('');
 const agencyModes = ref([]);
 const incoterms = ref([]);
@@ -83,8 +84,26 @@ const deleteNote = (id, index) => {
     notes.value.splice(index, 1);
 };
 
-const onDataSaved = async () => {
-    let payload = {
+const updateAddress = async (data) => {
+    await axios.patch(urlUpdate.value, data);
+};
+
+const updateAddressTicket = async () => {
+    urlUpdate.value += '?updateObservations=true';
+};
+
+const updateObservations = async (payload) => {
+    await axios.post('AddressObservations/crud', payload);
+    notes.value = [];
+    deletes.value = [];
+    toCustomerAddress();
+};
+async function updateAll({ data, payload }) {
+    await updateObservations(payload);
+    await updateAddress(data);
+}
+function getPayload() {
+    return {
         creates: notes.value.filter((note) => note.$isNew),
         deletes: deletes.value,
         updates: notes.value
@@ -101,14 +120,40 @@ const onDataSaved = async () => {
                 where: { id: note.id },
             })),
     };
+}
 
-    await axios.post('AddressObservations/crud', payload);
-    notes.value = [];
-    deletes.value = [];
-    toCustomerAddress();
-};
+async function handleDialog(data) {
+    const payload = getPayload();
+    const body = { data, payload };
+    if (payload.updates.length) {
+        quasar
+            .dialog({
+                component: VnConfirm,
+                componentProps: {
+                    title: t(
+                        'confirmTicket'
+                    ),
+                    message: t('confirmDeletionMessage'),
+                },
+            })
+            .onOk(async () => {
+                await updateAddressTicket();
+                await updateAll(body);
+                toCustomerAddress();
+            })
+            .onCancel(async () => {
+                await updateAll(body);
+                toCustomerAddress();
+            });
+    } else {
+        updateAll(body);
+        toCustomerAddress();
+    }
+}
 
 const toCustomerAddress = () => {
+    notes.value = [];
+    deletes.value = [];
     router.push({
         name: 'CustomerAddress',
         params: {
@@ -143,7 +188,7 @@ function handleLocation(data, location) {
         :observe-form-changes="false"
         :url-update="urlUpdate"
         :url="`Addresses/${route.params.addressId}`"
-        @on-data-saved="onDataSaved()"
+        :save-fn="handleDialog"
         auto-load
     >
         <template #moreActions>
@@ -336,4 +381,9 @@ es:
     Remove note: Eliminar nota
     Longitude: Longitud
     Latitude: Latitud
+    confirmTicket: ¿Desea modificar también los estados de todos los tickets que están a punto de ser servidos?
+    confirmDeletionMessage: Si le das a aceptar, se modificaran todas las notas de los ticket a futuro
+en:
+    confirmTicket: Do you also want to modify the states of all the tickets that are about to be served?
+    confirmDeletionMessage: If you click accept, all the notes of the future tickets will be modified
 </i18n>

src/pages/Customer/composables/__tests__/getAddresses.spec.js

@@ -0,0 +1,33 @@
+import { describe, it, expect, vi, afterEach } from 'vitest';
+import axios from 'axios';
+import { getAddresses } from 'src/pages/Customer/composables/getAddresses';
+
+vi.mock('axios');
+
+describe('getAddresses', () => {
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    it('should fetch addresses with correct parameters for a valid clientId', async () => {
+        const clientId = '12345';
+
+        await getAddresses(clientId);
+
+        expect(axios.get).toHaveBeenCalledWith(`Clients/${clientId}/addresses`, {
+            params: {
+                filter: JSON.stringify({
+                    fields: ['nickname', 'street', 'city', 'id'],
+                    where: { isActive: true },
+                    order: 'nickname ASC',
+                }),
+            },
+        });
+    });
+
+    it('should return undefined when clientId is not provided', async () => {
+        await getAddresses(undefined);
+
+        expect(axios.get).not.toHaveBeenCalled();
+    });
+});

src/pages/Customer/composables/__tests__/getClient.spec.js

@@ -0,0 +1,41 @@
+import { describe, it, expect, vi, afterEach } from 'vitest';
+import axios from 'axios';
+import { getClient } from 'src/pages/Customer/composables/getClient';
+
+vi.mock('axios');
+
+describe('getClient', () => {
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    const generateParams = (clientId) => ({
+        params: {
+            filter: JSON.stringify({
+                include: {
+                    relation: 'defaultAddress',
+                    scope: {
+                        fields: ['id', 'agencyModeFk'],
+                    },
+                },
+                where: { id: clientId },
+            }),
+        },
+    });
+
+    it('should fetch client data with correct parameters for a valid clientId', async () => {
+        const clientId = '12345';
+
+        await getClient(clientId);
+
+        expect(axios.get).toHaveBeenCalledWith('Clients', generateParams(clientId));
+    });
+
+    it('should return undefined when clientId is not provided', async () => {
+        const clientId = undefined;
+
+        await getClient(clientId);
+
+        expect(axios.get).toHaveBeenCalledWith('Clients', generateParams(clientId));
+    });
+});

src/pages/Customer/composables/getAddresses.js

@@ -0,0 +1,14 @@
+import axios from 'axios';
+
+export async function getAddresses(clientId) {   
+    if (!clientId) return;
+    const filter = {
+        fields: ['nickname', 'street', 'city', 'id'],
+        where: { isActive: true },
+        order: 'nickname ASC',
+    };
+    const params = { filter: JSON.stringify(filter) };
+    return await axios.get(`Clients/${clientId}/addresses`, {
+        params,
+    });
+};

src/pages/Customer/composables/getClient.js

@@ -0,0 +1,15 @@
+import axios from 'axios';
+
+export async function getClient(clientId) {
+    const filter = {
+        include: {
+            relation: 'defaultAddress',
+            scope: {
+                fields: ['id', 'agencyModeFk'],
+            },
+        },
+        where: { id: clientId },
+    };
+    const params = { filter: JSON.stringify(filter) };
+    return await axios.get('Clients', { params });
+};

src/pages/Route/Agency/composables/__tests__/getAgencies.spec.js

@@ -0,0 +1,55 @@
+import { describe, it, expect, vi, afterEach } from 'vitest';
+import axios from 'axios';
+import { getAgencies } from 'src/pages/Route/Agency/composables/getAgencies';
+
+vi.mock('axios');
+
+describe('getAgencies', () => {
+    afterEach(() => {
+        vi.clearAllMocks();
+    });
+
+    const generateParams = (formData) => ({
+        params: {
+            warehouseFk: formData.warehouseId,
+            addressFk: formData.addressId,
+            landed: formData.landed,
+        },
+    });
+
+    it('should fetch agencies data with correct parameters for valid formData', async () => {
+        const formData = {
+            warehouseId: '123',
+            addressId: '456',
+            landed: 'true',
+        };
+
+        await getAgencies(formData);
+
+        expect(axios.get).toHaveBeenCalledWith('Agencies/getAgenciesWithWarehouse', generateParams(formData));
+    });
+
+    it('should not call API when formData is missing required landed field', async () => {
+        const formData = { warehouseId: '123', addressId: '456' };
+
+        await getAgencies(formData);
+
+        expect(axios.get).not.toHaveBeenCalled();
+    });
+
+    it('should not call API when formData is missing required addressId field', async () => {
+        const formData = { warehouseId: '123', landed: 'true' };
+
+        await getAgencies(formData);
+
+        expect(axios.get).not.toHaveBeenCalled();
+    });
+
+    it('should not call API when formData is missing required warehouseId field', async () => {
+        const formData = { addressId: '456', landed: 'true' };
+
+        await getAgencies(formData);
+
+        expect(axios.get).not.toHaveBeenCalled();
+    });
+});

src/pages/Route/Agency/composables/getAgencies.js

@@ -0,0 +1,12 @@
+import axios from 'axios';
+
+export async function getAgencies(formData) {
+    if (!formData.warehouseId || !formData.addressId || !formData.landed) return;
+    let params = {
+        warehouseFk: formData.warehouseId,
+        addressFk: formData.addressId,
+        landed: formData.landed,
+    };
+
+    return await axios.get('Agencies/getAgenciesWithWarehouse', { params });
+}

src/pages/Ticket/Card/TicketDescriptorMenu.vue

@@ -16,6 +16,8 @@ import VnInputTime from 'src/components/common/VnInputTime.vue';
 import { useAcl } from 'src/composables/useAcl';
 import VnInputNumber from 'src/components/common/VnInputNumber.vue';
 import { useArrayData } from 'src/composables/useArrayData';
+import { getAddresses } from 'src/pages/Customer/composables/getAddresses';
+import { getClient } from 'src/pages/Customer/composables/getClient';
 
 const props = defineProps({
     ticket: {
@@ -40,7 +42,10 @@ const { openReport, sendEmail } = usePrintService();
 const ticketSummary = useArrayData('TicketSummary');
 const { ticket } = toRefs(props);
 const ticketId = computed(() => props.ticket.id ?? currentRoute.value.params.id);
-const client = ref();
+const client = ref(null);
+const address = ref(null);
+const addressesOptions = ref([]);
+const selectedClient = ref();
 const showTransferDialog = ref(false);
 const showTurnDialog = ref(false);
 const showChangeTimeDialog = ref(false);
@@ -52,6 +57,31 @@ const weight = ref();
 const hasDocuwareFile = ref();
 const quasar = useQuasar();
 const canRestoreTicket = ref(false);
+
+const onClientSelected = async(clientId) =>{
+    client.value = clientId;
+    await fetchClient();
+    await fetchAddresses();
+};
+
+const onAddressSelected = (addressId) => {
+    address.value = addressId;
+}
+
+const fetchClient = async () => {
+    const { data } = await getClient(client.value)
+    const [retrievedClient] = data;
+    selectedClient.value = retrievedClient;
+};
+
+const fetchAddresses = async () => {
+    const { data } = await getAddresses(client.value); 
+    addressesOptions.value = data;
+
+    const { defaultAddress } = selectedClient.value;
+    address.value = defaultAddress.id;
+};
+
 const actions = {
     clone: async () => {
         const opts = { message: t('Ticket cloned'), type: 'positive' };
@@ -260,17 +290,14 @@ async function makeInvoice() {
     window.location.reload();
 }
 
-async function transferClient(client) {
+async function transferClient() {
     const params = {
-        clientFk: client,
+        clientFk: client.value,
+        addressFk: address.value,
     };
-
-    const { data } = await axios.patch(
-        `Tickets/${ticketId.value}/transferClient`,
-        params
-    );
-
-    if (data) window.location.reload();
+    
+    await axios.patch( `Tickets/${ticketId.value}/transferClient`, params );
+    window.location.reload();
 }
 
 async function addTurn(day) {
@@ -446,7 +473,7 @@ async function ticketToRestore() {
     </QItem>
     <QDialog ref="dialogRef" v-model="showTransferDialog">
         <FormPopup
-            @on-submit="transferClient(client)"
+            @on-submit="transferClient()"
             :title="t('Transfer client')"
             :custom-submit-button-label="t('Transfer client')"
             :default-cancel-button="false"
@@ -454,10 +481,11 @@ async function ticketToRestore() {
             <template #form-inputs>
                 <VnSelect
                     url="Clients"
-                    :fields="['id', 'name']"
+                    :fields="['id', 'name', 'defaultAddressFk']"
                     v-model="client"
                     :label="t('Client')"
                     auto-load
+                    @update:model-value="() => onClientSelected(client)"
                 >
                     <template #option="scope">
                         <QItem v-bind="scope.itemProps">
@@ -470,6 +498,29 @@ async function ticketToRestore() {
                         </QItem>
                     </template>
                 </VnSelect>
+                <VnSelect 
+                    :disable="!client"
+                    :options="addressesOptions"
+                    :fields="['id', 'nickname']"
+                    option-value="id"
+                    option-label="nickname"
+                    v-model="address"
+                    :label="t('ticketList.addressNickname')"
+                    auto-load
+                    :hint="!client ? t('Select a client to enable') : ''"
+                    @update:model-value="() => onAddressSelected(address)"
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{ `#${scope.opt.id} - ` }}
+                                    {{ scope.opt.nickname }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
             </template>
         </FormPopup>
     </QDialog>
@@ -762,7 +813,7 @@ async function ticketToRestore() {
 en:
     addTurn: Add turn
     invoiceIds: "Invoices have been generated with the following ids: {invoiceIds}"
-
+ 
 es:
     Show Delivery Note...: Ver albarán...
     Send Delivery Note...: Enviar albarán...
@@ -814,4 +865,5 @@ es:
     Are you sure you want to restore the ticket?: ¿Seguro que quieres restaurar el ticket?
     You are going to restore this ticket: Vas a restaurar este ticket
     Ticket restored: Ticket restaurado
+    Select a client to enable: Selecciona un cliente para habilitar
 </i18n>

src/pages/Ticket/TicketCreate.vue

@@ -9,9 +9,11 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import { getClient } from 'src/pages/Customer/composables/getClient';
+import { getAddresses } from 'src/pages/Customer/composables/getAddresses';
+import { getAgencies } from 'src/pages/Route/Agency/composables/getAgencies';
 
 import { useState } from 'composables/useState';
-import axios from 'axios';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -37,33 +39,13 @@ onBeforeMount(async () => {
 });
 
 const fetchClient = async (formData) => {
-    const filter = {
-        include: {
-            relation: 'defaultAddress',
-            scope: {
-                fields: ['id', 'agencyModeFk'],
-            },
-        },
-        where: { id: formData.clientId },
-    };
-    const params = { filter: JSON.stringify(filter) };
-    const { data } = await axios.get('Clients', { params });
+    const { data } = await getClient(formData.clientId);
     const [client] = data;
     selectedClient.value = client;
 };
 
 const fetchAddresses = async (formData) => {
-    if (!formData.clientId) return;
-
-    const filter = {
-        fields: ['nickname', 'street', 'city', 'id'],
-        where: { isActive: true },
-        order: 'nickname ASC',
-    };
-    const params = { filter: JSON.stringify(filter) };
-    const { data } = await axios.get(`Clients/${formData.clientId}/addresses`, {
-        params,
-    });
+    const { data } = await getAddresses(formData.clientId);
     addressesOptions.value = data;
 
     const { defaultAddress } = selectedClient.value;
@@ -76,15 +58,7 @@ const onClientSelected = async (formData) => {
 };
 
 const fetchAvailableAgencies = async (formData) => {
-    if (!formData.warehouseId || !formData.addressId || !formData.landed) return;
-    let params = {
-        warehouseFk: formData.warehouseId,
-        addressFk: formData.addressId,
-        landed: formData.landed,
-    };
-
-    const { data } = await axios.get('Agencies/getAgenciesWithWarehouse', { params });
-
+    const { data } = await getAgencies(formData);
     agenciesOptions.value = data;
 
     const defaultAgency = agenciesOptions.value.find(

src/pages/Ticket/TicketCreateDialog.vue

@@ -9,9 +9,11 @@ import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import { getClient } from 'src/pages/Customer/composables/getClient';
+import { getAddresses } from 'src/pages/Customer/composables/getAddresses';
+import { getAgencies } from 'src/pages/Route/Agency/composables/getAgencies';
 
 import { useState } from 'composables/useState';
-import axios from 'axios';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -37,33 +39,13 @@ onBeforeMount(async () => {
 });
 
 const fetchClient = async (formData) => {
-    const filter = {
-        include: {
-            relation: 'defaultAddress',
-            scope: {
-                fields: ['id', 'agencyModeFk'],
-            },
-        },
-        where: { id: formData.clientId },
-    };
-    const params = { filter: JSON.stringify(filter) };
-    const { data } = await axios.get('Clients', { params });
+    const { data } = await getClient(formData.clientId);
     const [client] = data;
     selectedClient.value = client;
 };
 
 const fetchAddresses = async (formData) => {
-    if (!formData.clientId) return;
-
-    const filter = {
-        fields: ['nickname', 'street', 'city', 'id'],
-        where: { isActive: true },
-        order: 'nickname ASC',
-    };
-    const params = { filter: JSON.stringify(filter) };
-    const { data } = await axios.get(`Clients/${formData.clientId}/addresses`, {
-        params,
-    });
+    const { data } = await getAddresses(formData.clientId);
     addressesOptions.value = data;
 
     const { defaultAddress } = selectedClient.value;
@@ -76,15 +58,7 @@ const onClientSelected = async (formData) => {
 };
 
 const fetchAvailableAgencies = async (formData) => {
-    if (!formData.warehouseId || !formData.addressId || !formData.landed) return;
-    let params = {
-        warehouseFk: formData.warehouseId,
-        addressFk: formData.addressId,
-        landed: formData.landed,
-    };
-
-    const { data } = await axios.get('Agencies/getAgenciesWithWarehouse', { params });
-
+    const { data } = await getAgencies(formData);
     agenciesOptions.value = data;
 
     const defaultAgency = agenciesOptions.value.find(

src/pages/Ticket/TicketList.vue

@@ -22,6 +22,9 @@ import { toTimeFormat } from 'src/filters/date';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
 import TicketProblems from 'src/components/TicketProblems.vue';
 import VnSection from 'src/components/common/VnSection.vue';
+import { getClient } from 'src/pages/Customer/composables/getClient';
+import { getAddresses } from 'src/pages/Customer/composables/getAddresses';
+import { getAgencies } from 'src/pages/Route/Agency/composables/getAgencies';
 
 const route = useRoute();
 const router = useRouter();
@@ -237,15 +240,7 @@ const onClientSelected = async (formData) => {
 };
 
 const fetchAvailableAgencies = async (formData) => {
-    if (!formData.warehouseId || !formData.addressId || !formData.landed) return;
-    let params = {
-        warehouseFk: formData.warehouseId,
-        addressFk: formData.addressId,
-        landed: formData.landed,
-    };
-
-    const { data } = await axios.get('Agencies/getAgenciesWithWarehouse', { params });
-
+    const { data } = await getAgencies(formData);
     agenciesOptions.value = data;
 
     const defaultAgency = agenciesOptions.value.find(
@@ -257,34 +252,13 @@ const fetchAvailableAgencies = async (formData) => {
 };
 
 const fetchClient = async (formData) => {
-    const filter = {
-        include: {
-            relation: 'defaultAddress',
-            scope: {
-                fields: ['id', 'agencyModeFk'],
-            },
-        },
-        where: { id: formData.clientId },
-    };
-    const params = { filter: JSON.stringify(filter) };
-    const { data } = await axios.get('Clients', { params });
+    const { data } = await getClient(formData.clientId);
     const [client] = data;
     selectedClient.value = client;
 };
 
 const fetchAddresses = async (formData) => {
-    if (!formData.clientId) return;
-
-    const filter = {
-        fields: ['nickname', 'street', 'city', 'id', 'isActive'],
-        order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
-    };
-    const params = { filter: JSON.stringify(filter) };
-    const { data } = await axios.get(`Clients/${formData.clientId}/addresses`, {
-        params,
-    });
-    addressesOptions.value = data;
-
+    const { data } = await getAddresses(formData.clientId);
     addressesOptions.value = data;
 
     const { defaultAddress } = selectedClient.value;