From 0237a2364d1bcebc211729e5e09f56c72dd0ca73 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 5 Mar 2025 22:47:17 +0100
Subject: [PATCH] feat: revert changes and fix test
---
.../Customer/composables/__tests__/getAddresses.spec.js | 6 ++++++
.../Route/Agency/composables/__tests__/getAgencies.spec.js | 2 +-
src/pages/Route/Agency/composables/getAgencies.js | 4 +++-
src/pages/Ticket/TicketList.vue | 3 +--
4 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/src/pages/Customer/composables/__tests__/getAddresses.spec.js b/src/pages/Customer/composables/__tests__/getAddresses.spec.js
index 714693809..76825377d 100644
--- a/src/pages/Customer/composables/__tests__/getAddresses.spec.js
+++ b/src/pages/Customer/composables/__tests__/getAddresses.spec.js
@@ -22,6 +22,12 @@ describe('getAddresses', () => {
relation: 'client',
scope: {
fields: ['defaultAddressFk'],
+ include: {
+ relation: 'defaultAddress',
+ scope: {
+ fields: ['id', 'agencyModeFk'],
+ },
+ },
},
},
],
diff --git a/src/pages/Route/Agency/composables/__tests__/getAgencies.spec.js b/src/pages/Route/Agency/composables/__tests__/getAgencies.spec.js
index 24da7e073..99966569c 100644
--- a/src/pages/Route/Agency/composables/__tests__/getAgencies.spec.js
+++ b/src/pages/Route/Agency/composables/__tests__/getAgencies.spec.js
@@ -66,7 +66,7 @@ describe('getAgencies', () => {
it('should return options and agency when default agency is found', async () => {
const formData = { warehouseId: '123', addressId: '456', landed: 'true' };
- const client = { agencyModeFk: 'Agency1' };
+ const client = { defaultAddress: { agencyModeFk: 'Agency1' } };
const { options, agency } = await getAgencies(formData, client);
diff --git a/src/pages/Route/Agency/composables/getAgencies.js b/src/pages/Route/Agency/composables/getAgencies.js
index 8c6266768..180ac943e 100644
--- a/src/pages/Route/Agency/composables/getAgencies.js
+++ b/src/pages/Route/Agency/composables/getAgencies.js
@@ -21,7 +21,9 @@ export async function getAgencies(formData, client, _filter = {}) {
});
if (options && client) {
- agency = options.find(({ agencyModeFk }) => agencyModeFk === client.agencyModeFk);
+ agency = options.find(
+ ({ agencyModeFk }) => agencyModeFk === client.defaultAddress.agencyModeFk,
+ );
}
return { options, agency };
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index b47e78c99..cca1b8a1d 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -22,7 +22,6 @@ 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';
@@ -272,7 +271,7 @@ const fetchAddresses = async (formData) => {
formInitialData.value = { clientId: formData.clientId };
if (!data) return;
addressesOptions.value = data;
- selectedClient.value = { ...data[0].client, agencyModeFk: data[0].agencyModeFk };
+ selectedClient.value = data[0].client;
formData.addressId = selectedClient.value.defaultAddressFk;
formInitialData.value.addressId = formData.addressId;
};