verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 90 Releases Wiki Activity

fix: refs #7322 handle null responses in client, agency and address fetching #1313

Merged
jtubau merged 8 commits from 7322-fixDestructuringErrorTicketSection into dev 2025-02-03 11:58:52 +00:00
Conversation 0 Commits 8 Files Changed 9 +55 -30
4 changed files with 55 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit b10cb9f09f - Show all commits

13
src/pages/Route/Agency/composables/getAgencies.js
View File

@ -1,12 +1,21 @@
import axios from 'axios';
import agency from 'src/router/modules/agency';
export async function getAgencies(formData) {
export async function getAgencies(formData, client) {
jsegarra commented 2025-02-03 09:48:05 +00:00
Outdated
Review
Copy Link

incluye la opción de pasarle un filtro personalizado, al igual que se ha hecho en getClientRisk
El mismo cambio en getClient

incluye la opción de pasarle un filtro personalizado, al igual que se ha hecho en getClientRisk El mismo cambio en getClient
if (!formData.warehouseId || !formData.addressId || !formData.landed) return;
let defaultAgency = null;
let params = {
warehouseFk: formData.warehouseId,
addressFk: formData.addressId,
landed: formData.landed,
};
return await axios.get('Agencies/getAgenciesWithWarehouse', { params });
const { data } = await axios.get('Agencies/getAgenciesWithWarehouse', { params });
if(data && client) {
defaultAgency = data.find((agency) => agency.agencyModeFk === client.defaultAddress.agencyModeFk );
};
return {options: data, agency: defaultAgency}
}

23
src/pages/Ticket/TicketCreate.vue
View File

@ -38,6 +38,11 @@ onBeforeMount(async () => {
await onClientSelected(initialFormState);
});
function resetAgenciesSelector(formData) {
agenciesOptions.value = [];
formData.agencyModeId = null;
}
const fetchClient = async (formData) => {
const response = await getClient(formData.clientId);
if (!response) return;
@ -55,21 +60,21 @@ const fetchAddresses = async (formData) => {
};
const onClientSelected = async (formData) => {
resetAgenciesSelector(formData);
await fetchClient(formData);
await fetchAddresses(formData);
};
const fetchAvailableAgencies = async (formData) => {
const response = await getAgencies(formData);
resetAgenciesSelector(formData);
const response= await getAgencies(formData, selectedClient.value);
if (!response) return;
agenciesOptions.value = response.data;
const defaultAgency = agenciesOptions.value.find(
(agency) =>
agency.agencyModeFk === selectedClient.value.defaultAddress.agencyModeFk
);
if (defaultAgency) formData.agencyModeId = defaultAgency.agencyModeFk;
const { options, agency } = response
if(options)
agenciesOptions.value = options;
if(agency)
formData.agencyModeId = agency;
};
const redirectToTicketList = (_, { id }) => {

23
src/pages/Ticket/TicketCreateDialog.vue
View File

@ -38,6 +38,11 @@ onBeforeMount(async () => {
await onClientSelected(initialFormState);
});
function resetAgenciesSelector(formData) {
agenciesOptions.value = [];
if(formData) formData.agencyModeId = null;
}
const fetchClient = async (formData) => {
const response = await getClient(formData.clientId);
if (!response) return;
@ -55,21 +60,21 @@ const fetchAddresses = async (formData) => {
};
const onClientSelected = async (formData) => {
resetAgenciesSelector(formData);
await fetchClient(formData);
await fetchAddresses(formData);
};
const fetchAvailableAgencies = async (formData) => {
const response = await getAgencies(formData);
resetAgenciesSelector(formData);
const response= await getAgencies(formData, selectedClient.value);
if (!response) return;
agenciesOptions.value = response.data;
const defaultAgency = agenciesOptions.value.find(
(agency) =>
agency.agencyModeFk === selectedClient.value.defaultAddress.agencyModeFk
);
if (defaultAgency) formData.agencyModeId = defaultAgency.agencyModeFk;
const { options, agency } = response
if(options)
agenciesOptions.value = options;
if(agency)
formData.agencyModeId = agency;
};
const redirectToTicketList = (_, { id }) => {

26
src/pages/Ticket/TicketList.vue
View File

@ -229,27 +229,33 @@ const columns = computed(() => [
],
},
]);
function resetAgenciesSelector(formData) {
agenciesOptions.value = [];
if(formData) formData.agencyModeId = null;
}
function redirectToLines(id) {
const url = `#/ticket/${id}/sale`;
window.open(url, '_blank');
}
const onClientSelected = async (formData) => {
const onClientSelected = async (formData) => {
resetAgenciesSelector(formData);
await fetchClient(formData);
await fetchAddresses(formData);
};
const fetchAvailableAgencies = async (formData) => {
const response = await getAgencies(formData);
resetAgenciesSelector(formData);
const response= await getAgencies(formData, selectedClient.value);
if (!response) return;
agenciesOptions.value = response.data;
const defaultAgency = agenciesOptions.value.find(
(agency) =>
agency.agencyModeFk === selectedClient.value.defaultAddress.agencyModeFk
);
if (defaultAgency) formData.agencyModeId = defaultAgency.agencyModeFk;
const { options, agency } = response
if(options)
agenciesOptions.value = options;
if(agency)
formData.agencyModeId = agency;
};
const fetchClient = async (formData) => {