diff --git a/src/composables/useUserConfig.js b/src/composables/useUserConfig.js index 692943978..e05d7fb5c 100644 --- a/src/composables/useUserConfig.js +++ b/src/composables/useUserConfig.js @@ -16,7 +16,7 @@ export function useUserConfig() { return data; } catch (error) { - notify('globals.errors.userConfig', 'negative'); + notify('errors.userConfig', 'negative'); console.error('Error fetching user config:', error); } } diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue index 44575f1d6..fb47eeee2 100644 --- a/src/pages/Claim/Card/ClaimAction.vue +++ b/src/pages/Claim/Card/ClaimAction.vue @@ -127,11 +127,14 @@ async function updateDestination(claimDestinationFk, row, options = {}) { } async function regularizeClaim() { - const query = `Claims/${claimId}/regularizeClaim`; - - await axios.post(query); + await axios.post(`Claims/${claimId}/regularizeClaim`); + await claimRef.value.fetch(); + await arrayData.fetch({ append: false }); + quasar.notify({ + message: t('globals.dataSaved'), + type: 'positive', + }); if (claim.value.responsibility >= Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2) { - await claimRef.value.fetch(); quasar .dialog({ component: VnConfirm, @@ -141,29 +144,19 @@ async function regularizeClaim() { }, }) .onOk(async () => await onUpdateGreugeAccept()); - } else { - quasar.notify({ - message: t('globals.dataSaved'), - type: 'positive', - }); } - await arrayData.fetch({ append: false }); -} - -async function updateGreuge(greuges) { - const { data } = await axios.post(`Greuges`, greuges); - quasar.notify({ - message: t('globals.dataSaved'), - type: 'positive', - }); - return data; } async function onUpdateGreugeAccept() { - const greugeTypeFreightId = await getGreugeTypeId(); - const freightPickUpPrice = await getGreugeConfig(); + const greugeTypeFreightId = ( + await axios.get(`GreugeTypes/findOne`, { + filter: { where: { code: 'freightPickUp' } }, + }) + ).data.id; + const freightPickUpPrice = (await axios.get(`GreugeConfigs/findOne`)).data + .freightPickUpPrice; - await updateGreuge({ + await axios.post(`Greuges`, { clientFk: claim.value.clientFk, description: `${t('ClaimGreugeDescription')} ${claimId}`.toUpperCase(), amount: freightPickUpPrice, @@ -176,19 +169,6 @@ async function onUpdateGreugeAccept() { }); } -async function getGreugeTypeId() { - const params = { filter: { where: { code: 'freightPickUp' } } }; - const query = `GreugeTypes/findOne`; - const { data } = await axios.get(query, { params }); - return data.id; -} - -async function getGreugeConfig() { - const query = `GreugeConfigs/findOne`; - const { data } = await axios.get(query); - return data.freightPickUpPrice; -} - async function save(data) { const query = `Claims/${claimId}/updateClaimAction`; await axios.patch(query, data); diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue index cfc35c032..4114b0c8e 100644 --- a/src/pages/Ticket/Card/TicketSummary.vue +++ b/src/pages/Ticket/Card/TicketSummary.vue @@ -49,7 +49,7 @@ async function setData(data) { function formattedAddress() { if (!ticket.value) return ''; - const address = this.ticket.address; + const address = ticket.value.address; const postcode = address.postalCode; const province = address.province ? `(${address.province.name})` : ''; @@ -58,7 +58,7 @@ function formattedAddress() { function isEditable() { try { - return !this.ticket.ticketState.state.alertLevel; + return !ticket.value.ticketState.state.alertLevel; } catch (e) { console.error(e); } @@ -67,10 +67,10 @@ function isEditable() { } async function changeState(value) { - if (!this.ticket.id) return; + if (!ticket.value.id) return; const formData = { - ticketFk: this.ticket.id, + ticketFk: ticket.value.id, code: value, };