feat: refs #8039 canceledError not notify #850

Merged
alexm merged 17 commits from 8039-canceledError_not_notify into dev 2024-10-24 12:44:19 +00:00
14 changed files with 228 additions and 371 deletions
Showing only changes of commit dd2dc86eea - Show all commits

View File

@ -46,13 +46,9 @@ const columns = computed(() => [
]); ]);
const deleteAlias = async (row) => { const deleteAlias = async (row) => {
try { await axios.delete(`${urlPath.value}/${row.id}`);
await axios.delete(`${urlPath.value}/${row.id}`); notify(t('User removed'), 'positive');
notify(t('User removed'), 'positive'); fetchAliases();
fetchAliases();
} catch (error) {
console.error(error);
}
}; };
watch( watch(

View File

@ -61,23 +61,15 @@ const fetchAccountExistence = async () => {
}; };
const deleteMailAlias = async (row) => { const deleteMailAlias = async (row) => {
try { await axios.delete(`${urlPath}/${row.id}`);
await axios.delete(`${urlPath}/${row.id}`); fetchMailAliases();
fetchMailAliases(); notify(t('Unsubscribed from alias!'), 'positive');
notify(t('Unsubscribed from alias!'), 'positive');
} catch (error) {
console.error(error);
}
}; };
const createMailAlias = async (mailAliasFormData) => { const createMailAlias = async (mailAliasFormData) => {
try { await axios.post(urlPath, mailAliasFormData);
await axios.post(urlPath, mailAliasFormData); notify(t('Subscribed to alias!'), 'positive');
notify(t('Subscribed to alias!'), 'positive'); fetchMailAliases();
fetchMailAliases();
} catch (error) {
console.error(error);
}
}; };
const fetchMailAliases = async () => { const fetchMailAliases = async () => {

View File

@ -46,29 +46,15 @@ const columns = computed(() => [
]); ]);
const deleteSubRole = async (row) => { const deleteSubRole = async (row) => {
try { await axios.delete(`${urlPath.value}/${row.id}`);
await axios.delete(`${urlPath.value}/${row.id}`); fetchSubRoles();
fetchSubRoles(); notify(t('Role removed. Changes will take a while to fully propagate.'), 'positive');
notify(
t('Role removed. Changes will take a while to fully propagate.'),
'positive'
);
} catch (error) {
console.error(error);
}
}; };
const createSubRole = async (subRoleFormData) => { const createSubRole = async (subRoleFormData) => {
try { await axios.post(urlPath.value, subRoleFormData);
await axios.post(urlPath.value, subRoleFormData); notify(t('Role added! Changes will take a while to fully propagate.'), 'positive');
notify( fetchSubRoles();
t('Role added! Changes will take a while to fully propagate.'),
'positive'
);
fetchSubRoles();
} catch (error) {
console.error(error);
}
}; };
watch( watch(

View File

@ -112,32 +112,20 @@ const getShipped = async (params) => {
}; };
const onChangeZone = async (zoneId) => { const onChangeZone = async (zoneId) => {
try { formData.value.agencyModeFk = null;
formData.value.agencyModeFk = null; const { data } = await axios.get(`Zones/${zoneId}`);
const { data } = await axios.get(`Zones/${zoneId}`); formData.value.agencyModeFk = data.agencyModeFk;
formData.value.agencyModeFk = data.agencyModeFk;
} catch (error) {
console.error(error);
}
}; };
const onChangeAddress = async (addressId) => { const onChangeAddress = async (addressId) => {
try { formData.value.nickname = null;
formData.value.nickname = null; const { data } = await axios.get(`Addresses/${addressId}`);
const { data } = await axios.get(`Addresses/${addressId}`); formData.value.nickname = data.nickname;
formData.value.nickname = data.nickname;
} catch (error) {
console.error(error);
}
}; };
const getClientDefaultAddress = async (clientId) => { const getClientDefaultAddress = async (clientId) => {
try { const { data } = await axios.get(`Clients/${clientId}`);
const { data } = await axios.get(`Clients/${clientId}`); if (data) addressId.value = data.defaultAddressFk;
if (data) addressId.value = data.defaultAddressFk;
} catch (error) {
console.error(error);
}
}; };
const clientAddressesList = async (value) => { const clientAddressesList = async (value) => {

View File

@ -70,60 +70,51 @@ const isFormInvalid = () => {
}; };
const getPriceDifference = async () => { const getPriceDifference = async () => {
try { const params = {
const params = { landed: formData.value.landed,
landed: formData.value.landed, addressId: formData.value.addressFk,
addressId: formData.value.addressFk, agencyModeId: formData.value.agencyModeFk,
agencyModeId: formData.value.agencyModeFk, zoneId: formData.value.zoneFk,
zoneId: formData.value.zoneFk, warehouseId: formData.value.warehouseFk,
warehouseId: formData.value.warehouseFk, shipped: formData.value.shipped,
shipped: formData.value.shipped, };
}; const { data } = await axios.post(
const { data } = await axios.post( `tickets/${formData.value.id}/priceDifference`,
`tickets/${formData.value.id}/priceDifference`, params
params );
); formData.value.sale = data;
formData.value.sale = data;
} catch (error) {
console.error(error);
}
}; };
const submit = async () => { const submit = async () => {
try { if (!formData.value.option) return notify(t('basicData.chooseAnOption'), 'negative');
if (!formData.value.option)
return notify(t('basicData.chooseAnOption'), 'negative');
const params = { const params = {
clientFk: formData.value.clientFk, clientFk: formData.value.clientFk,
nickname: formData.value.nickname, nickname: formData.value.nickname,
agencyModeFk: formData.value.agencyModeFk, agencyModeFk: formData.value.agencyModeFk,
addressFk: formData.value.addressFk, addressFk: formData.value.addressFk,
zoneFk: formData.value.zoneFk, zoneFk: formData.value.zoneFk,
warehouseFk: formData.value.warehouseFk, warehouseFk: formData.value.warehouseFk,
companyFk: formData.value.companyFk, companyFk: formData.value.companyFk,
shipped: formData.value.shipped, shipped: formData.value.shipped,
landed: formData.value.landed, landed: formData.value.landed,
isDeleted: formData.value.isDeleted, isDeleted: formData.value.isDeleted,
option: formData.value.option, option: formData.value.option,
isWithoutNegatives: formData.value.withoutNegatives, isWithoutNegatives: formData.value.withoutNegatives,
withWarningAccept: formData.value.withWarningAccept, withWarningAccept: formData.value.withWarningAccept,
keepPrice: false, keepPrice: false,
}; };
const { data } = await axios.post( const { data } = await axios.post(
`tickets/${formData.value.id}/componentUpdate`, `tickets/${formData.value.id}/componentUpdate`,
params params
); );
if (!data) return; if (!data) return;
const ticketToMove = data.id; const ticketToMove = data.id;
notify(t('basicData.unroutedTicket'), 'positive'); notify(t('basicData.unroutedTicket'), 'positive');
router.push({ name: 'TicketSummary', params: { id: ticketToMove } }); router.push({ name: 'TicketSummary', params: { id: ticketToMove } });
} catch (error) {
console.error(error);
}
}; };
const submitWithNegatives = async () => { const submitWithNegatives = async () => {

View File

@ -34,26 +34,20 @@ const newTicketFormData = reactive({});
const date = new Date(); const date = new Date();
const createTicket = async () => { const createTicket = async () => {
try { const expeditionIds = $props.selectedExpeditions.map((expedition) => expedition.id);
const expeditionIds = $props.selectedExpeditions.map( const params = {
(expedition) => expedition.id clientId: $props.ticket.clientFk,
); landed: newTicketFormData.landed,
const params = { warehouseId: $props.ticket.warehouseFk,
clientId: $props.ticket.clientFk, addressId: $props.ticket.addressFk,
landed: newTicketFormData.landed, agencyModeId: $props.ticket.agencyModeFk,
warehouseId: $props.ticket.warehouseFk, routeId: newTicketFormData.routeFk,
addressId: $props.ticket.addressFk, expeditionIds: expeditionIds,
agencyModeId: $props.ticket.agencyModeFk, };
routeId: newTicketFormData.routeFk,
expeditionIds: expeditionIds,
};
const { data } = await axios.post('Expeditions/moveExpeditions', params); const { data } = await axios.post('Expeditions/moveExpeditions', params);
notify(t('globals.dataSaved'), 'positive'); notify(t('globals.dataSaved'), 'positive');
router.push({ name: 'TicketSummary', params: { id: data.id } }); router.push({ name: 'TicketSummary', params: { id: data.id } });
} catch (error) {
console.error(error);
}
}; };
</script> </script>

View File

@ -150,31 +150,19 @@ const getTotal = computed(() => {
}); });
const getComponentsSum = async () => { const getComponentsSum = async () => {
try { const { data } = await axios.get(`Tickets/${route.params.id}/getComponentsSum`);
const { data } = await axios.get(`Tickets/${route.params.id}/getComponentsSum`); componentsList.value = data;
componentsList.value = data;
} catch (error) {
console.error(error);
}
}; };
const getTheoricalCost = async () => { const getTheoricalCost = async () => {
try { const { data } = await axios.get(`Tickets/${route.params.id}/freightCost`);
const { data } = await axios.get(`Tickets/${route.params.id}/freightCost`); theoricalCost.value = data;
theoricalCost.value = data;
} catch (error) {
console.error(error);
}
}; };
const getTicketVolume = async () => { const getTicketVolume = async () => {
try { if (!ticketData.value) return;
if (!ticketData.value) return; const { data } = await axios.get(`Tickets/${ticketData.value.id}/getVolume`);
const { data } = await axios.get(`Tickets/${ticketData.value.id}/getVolume`); ticketVolume.value = data[0].volume;
ticketVolume.value = data[0].volume;
} catch (error) {
console.error(error);
}
}; };
onMounted(() => { onMounted(() => {

View File

@ -187,18 +187,12 @@ const showNewTicketDialog = (withRoute = false) => {
}; };
const deleteExpedition = async () => { const deleteExpedition = async () => {
try { const expeditionIds = selectedExpeditions.value.map((expedition) => expedition.id);
const expeditionIds = selectedExpeditions.value.map( const params = { expeditionIds };
(expedition) => expedition.id await axios.post('Expeditions/deleteExpeditions', params);
); await refetchExpeditions();
const params = { expeditionIds }; selectedExpeditions.value = [];
await axios.post('Expeditions/deleteExpeditions', params); notify(t('expedition.expeditionRemoved'), 'positive');
await refetchExpeditions();
selectedExpeditions.value = [];
notify(t('expedition.expeditionRemoved'), 'positive');
} catch (error) {
console.error(error);
}
}; };
const showLog = async (expedition) => { const showLog = async (expedition) => {
@ -207,29 +201,25 @@ const showLog = async (expedition) => {
}; };
const getExpeditionState = async (expedition) => { const getExpeditionState = async (expedition) => {
try { const filter = {
const filter = { where: { expeditionFk: expedition.id },
where: { expeditionFk: expedition.id }, order: ['created DESC'],
order: ['created DESC'], };
const { data: expeditionStates } = await axios.get(`ExpeditionStates/filter`, {
params: { filter: JSON.stringify(filter) },
});
const { data: scannedStates } = await axios.get(`ExpeditionStates`, {
params: { filter: JSON.stringify(filter), fields: ['id', 'isScanned'] },
});
expeditionsLogsData.value = expeditionStates.map((state) => {
const scannedState = scannedStates.find((s) => s.id === state.id);
return {
...state,
isScanned: scannedState ? scannedState.isScanned : false,
}; };
});
const { data: expeditionStates } = await axios.get(`ExpeditionStates/filter`, {
params: { filter: JSON.stringify(filter) },
});
const { data: scannedStates } = await axios.get(`ExpeditionStates`, {
params: { filter: JSON.stringify(filter), fields: ['id', 'isScanned'] },
});
expeditionsLogsData.value = expeditionStates.map((state) => {
const scannedState = scannedStates.find((s) => s.id === state.id);
return {
...state,
isScanned: scannedState ? scannedState.isScanned : false,
};
});
} catch (error) {
console.error(error);
}
}; };
onMounted(async () => { onMounted(async () => {

View File

@ -165,14 +165,10 @@ const createRefund = async (withWarehouse) => {
negative: true, negative: true,
}; };
try { const { data } = await axios.post('Tickets/cloneAll', params);
const { data } = await axios.post('Tickets/cloneAll', params); const [refundTicket] = data;
const [refundTicket] = data; notify(t('refundTicketCreated', { ticketId: refundTicket.id }), 'positive');
notify(t('refundTicketCreated', { ticketId: refundTicket.id }), 'positive'); push({ name: 'TicketSale', params: { id: refundTicket.id } });
push({ name: 'TicketSale', params: { id: refundTicket.id } });
} catch (error) {
console.error(error);
}
}; };
</script> </script>

View File

@ -150,18 +150,14 @@ const shelvingsTableColumns = computed(() => [
]); ]);
const getSaleTrackings = async (sale) => { const getSaleTrackings = async (sale) => {
try { const filter = {
const filter = { where: { saleFk: sale.saleFk },
where: { saleFk: sale.saleFk }, order: ['itemFk DESC'],
order: ['itemFk DESC'], };
}; const { data } = await axios.get(`SaleTrackings/listSaleTracking`, {
const { data } = await axios.get(`SaleTrackings/listSaleTracking`, { params: { filter: JSON.stringify(filter) },
params: { filter: JSON.stringify(filter) }, });
}); saleTrackings.value = data;
saleTrackings.value = data;
} catch (error) {
console.error(error);
}
}; };
const showLog = async (sale) => { const showLog = async (sale) => {
@ -170,17 +166,13 @@ const showLog = async (sale) => {
}; };
const getItemShelvingSales = async (sale) => { const getItemShelvingSales = async (sale) => {
try { const filter = {
const filter = { where: { saleFk: sale.saleFk },
where: { saleFk: sale.saleFk }, };
}; const { data } = await axios.get(`ItemShelvingSales/filter`, {
const { data } = await axios.get(`ItemShelvingSales/filter`, { params: { filter: JSON.stringify(filter) },
params: { filter: JSON.stringify(filter) }, });
}); itemShelvingsSales.value = data;
itemShelvingsSales.value = data;
} catch (error) {
console.error(error);
}
}; };
const showShelving = async (sale) => { const showShelving = async (sale) => {
@ -189,36 +181,28 @@ const showShelving = async (sale) => {
}; };
const updateQuantity = async (sale) => { const updateQuantity = async (sale) => {
try { if (oldQuantity.value === sale.quantity) return;
if (oldQuantity.value === sale.quantity) return; const params = {
const params = { quantity: sale.quantity,
quantity: sale.quantity, };
}; await axios.patch(`ItemShelvingSales/${sale.id}`, params);
await axios.patch(`ItemShelvingSales/${sale.id}`, params); oldQuantity.value = null;
oldQuantity.value = null;
} catch (error) {
console.error(error);
}
}; };
const updateParking = async (sale) => { const updateParking = async (sale) => {
try { const filter = {
const filter = { fields: ['id'],
fields: ['id'], where: {
where: { code: sale.shelvingFk,
code: sale.shelvingFk, },
}, };
}; const { data } = await axios.get(`Shelvings/findOne`, {
const { data } = await axios.get(`Shelvings/findOne`, { params: { filter: JSON.stringify(filter) },
params: { filter: JSON.stringify(filter) }, });
}); const params = {
const params = { parkingFk: sale.parkingFk,
parkingFk: sale.parkingFk, };
}; await axios.patch(`Shelvings/${data.id}`, params);
await axios.patch(`Shelvings/${data.id}`, params);
} catch (error) {
console.error(error);
}
}; };
const updateShelving = async (sale) => { const updateShelving = async (sale) => {
@ -241,61 +225,41 @@ const updateShelving = async (sale) => {
}; };
const saleTrackingNew = async (sale, stateCode, isChecked) => { const saleTrackingNew = async (sale, stateCode, isChecked) => {
try { const params = {
const params = { saleFk: sale.saleFk,
saleFk: sale.saleFk, isChecked,
isChecked, quantity: sale.quantity,
quantity: sale.quantity, stateCode,
stateCode, };
}; await axios.post(`SaleTrackings/new`, params);
await axios.post(`SaleTrackings/new`, params); notify(t('globals.dataSaved'), 'positive');
notify(t('globals.dataSaved'), 'positive');
} catch (error) {
console.error(error);
}
}; };
const saleTrackingDel = async ({ saleFk }, stateCode) => { const saleTrackingDel = async ({ saleFk }, stateCode) => {
try { const params = {
const params = { saleFk,
saleFk, stateCodes: [stateCode],
stateCodes: [stateCode], };
}; await axios.post(`SaleTrackings/delete`, params);
await axios.post(`SaleTrackings/delete`, params); notify(t('globals.dataSaved'), 'positive');
notify(t('globals.dataSaved'), 'positive');
} catch (error) {
console.error(error);
}
}; };
const clickSaleGroupDetail = async (sale) => { const clickSaleGroupDetail = async (sale) => {
try { if (!sale.saleGroupDetailFk) return;
if (!sale.saleGroupDetailFk) return;
await axios.delete(`SaleGroupDetails/${sale.saleGroupDetailFk}`); await axios.delete(`SaleGroupDetails/${sale.saleGroupDetailFk}`);
sale.hasSaleGroupDetail = false; sale.hasSaleGroupDetail = false;
notify(t('globals.dataSaved'), 'positive'); notify(t('globals.dataSaved'), 'positive');
} catch (error) {
console.error(error);
}
}; };
const clickPreviousSelected = (sale) => { const clickPreviousSelected = (sale) => {
try { qCheckBoxController(sale, 'isPreviousSelected');
qCheckBoxController(sale, 'isPreviousSelected'); if (!sale.isPreviousSelected) sale.isPrevious = false;
if (!sale.isPreviousSelected) sale.isPrevious = false;
} catch (error) {
console.error(error);
}
}; };
const clickPrevious = (sale) => { const clickPrevious = (sale) => {
try { qCheckBoxController(sale, 'isPrevious');
qCheckBoxController(sale, 'isPrevious'); if (sale.isPrevious) sale.isPreviousSelected = true;
if (sale.isPrevious) sale.isPreviousSelected = true;
} catch (error) {
console.error(error);
}
}; };
const qCheckBoxController = (sale, action) => { const qCheckBoxController = (sale, action) => {
@ -306,16 +270,12 @@ const qCheckBoxController = (sale, action) => {
isPreviousSelected: 'PREVIOUS_PREPARATION', isPreviousSelected: 'PREVIOUS_PREPARATION',
}; };
const stateCode = STATE_CODES[action]; const stateCode = STATE_CODES[action];
try { if (!sale[action]) {
if (!sale[action]) { saleTrackingNew(sale, stateCode, true);
saleTrackingNew(sale, stateCode, true); sale[action] = true;
sale[action] = true; } else {
} else { saleTrackingDel(sale, stateCode);
saleTrackingDel(sale, stateCode); sale[action] = false;
sale[action] = false;
}
} catch (error) {
console.error(error);
} }
}; };
</script> </script>

View File

@ -46,40 +46,32 @@ watch(
onMounted(async () => await getDefaultTaxClass()); onMounted(async () => await getDefaultTaxClass());
const createRefund = async () => { const createRefund = async () => {
try { if (!selected.value.length) return;
if (!selected.value.length) return;
const params = { const params = {
servicesIds: selected.value.map((s) => +s.id), servicesIds: selected.value.map((s) => +s.id),
withWarehouse: false, withWarehouse: false,
negative: true, negative: true,
}; };
const { data } = await axios.post('Sales/clone', params); const { data } = await axios.post('Sales/clone', params);
const [refundTicket] = data; const [refundTicket] = data;
notify( notify(
t('service.createRefundSuccess', { t('service.createRefundSuccess', {
ticketId: refundTicket.id, ticketId: refundTicket.id,
}), }),
'positive' 'positive'
); );
router.push({ name: 'TicketSale', params: { id: refundTicket.id } }); router.push({ name: 'TicketSale', params: { id: refundTicket.id } });
} catch (error) {
console.error(error);
}
}; };
const getDefaultTaxClass = async () => { const getDefaultTaxClass = async () => {
try { let filter = {
let filter = { where: { code: 'G' },
where: { code: 'G' }, };
}; const { data } = await axios.get('TaxClasses/findOne', {
const { data } = await axios.get('TaxClasses/findOne', { params: { filter: JSON.stringify(filter) },
params: { filter: JSON.stringify(filter) }, });
}); defaultTaxClass.value = data;
defaultTaxClass.value = data;
} catch (error) {
console.error(error);
}
}; };
const columns = computed(() => [ const columns = computed(() => [

View File

@ -75,22 +75,18 @@ const columns = computed(() => [
]); ]);
const applyVolumes = async (salesData) => { const applyVolumes = async (salesData) => {
try { if (!salesData.length) return;
if (!salesData.length) return;
sales.value = salesData; sales.value = salesData;
const ticket = sales.value[0].ticketFk; const ticket = sales.value[0].ticketFk;
const { data } = await axios.get(`Tickets/${ticket}/getVolume`); const { data } = await axios.get(`Tickets/${ticket}/getVolume`);
const volumes = new Map(data.saleVolume.map((volume) => [volume.saleFk, volume])); const volumes = new Map(data.saleVolume.map((volume) => [volume.saleFk, volume]));
sales.value.forEach((sale) => { sales.value.forEach((sale) => {
sale.saleVolume = volumes.get(sale.id); sale.saleVolume = volumes.get(sale.id);
}); });
packingTypeVolume.value = data.packingTypeVolume; packingTypeVolume.value = data.packingTypeVolume;
} catch (error) {
console.error(error);
}
}; };
onMounted(() => (stateStore.rightDrawer = true)); onMounted(() => (stateStore.rightDrawer = true));

View File

@ -27,20 +27,16 @@ const warehousesOptions = ref([]);
const itemPackingTypes = ref([]); const itemPackingTypes = ref([]);
const getItemPackingTypes = async () => { const getItemPackingTypes = async () => {
try { const filter = {
const filter = { where: { isActive: true },
where: { isActive: true }, };
}; const { data } = await axios.get('ItemPackingTypes', {
const { data } = await axios.get('ItemPackingTypes', { params: { filter: JSON.stringify(filter) },
params: { filter: JSON.stringify(filter) }, });
}); itemPackingTypes.value = data.map((ipt) => ({
itemPackingTypes.value = data.map((ipt) => ({ description: t(ipt.description),
description: t(ipt.description), code: ipt.code,
code: ipt.code, }));
}));
} catch (error) {
console.error(error);
}
}; };
onMounted(async () => await getItemPackingTypes()); onMounted(async () => await getItemPackingTypes());

View File

@ -24,33 +24,25 @@ const itemPackingTypes = ref([]);
const stateOptions = ref([]); const stateOptions = ref([]);
const getItemPackingTypes = async () => { const getItemPackingTypes = async () => {
try { const filter = {
const filter = { where: { isActive: true },
where: { isActive: true }, };
}; const { data } = await axios.get('ItemPackingTypes', {
const { data } = await axios.get('ItemPackingTypes', { params: { filter: JSON.stringify(filter) },
params: { filter: JSON.stringify(filter) }, });
}); itemPackingTypes.value = data.map((ipt) => ({
itemPackingTypes.value = data.map((ipt) => ({ description: t(ipt.description),
description: t(ipt.description), code: ipt.code,
code: ipt.code, }));
}));
} catch (error) {
console.error(error);
}
}; };
const getGroupedStates = async () => { const getGroupedStates = async () => {
try { const { data } = await axios.get('AlertLevels');
const { data } = await axios.get('AlertLevels'); stateOptions.value = data.map((state) => ({
stateOptions.value = data.map((state) => ({ id: state.id,
id: state.id, name: t(`futureTickets.${state.code}`),
name: t(`futureTickets.${state.code}`), code: state.code,
code: state.code, }));
}));
} catch (error) {
console.error(error);
}
}; };
onMounted(async () => { onMounted(async () => {