From 35aa0ba20a769006396747d6a58ef10f41d480ec Mon Sep 17 00:00:00 2001 From: carlossa Date: Thu, 25 Jan 2024 13:48:42 +0100 Subject: [PATCH] refs #6664 claimPortes --- src/pages/Claim/Card/ClaimAction.vue | 29 +++++-------------- .../integration/claim/claimAction.spec.js | 1 - 2 files changed, 7 insertions(+), 23 deletions(-) diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue index 85a30600ca..371cb015f3 100644 --- a/src/pages/Claim/Card/ClaimAction.vue +++ b/src/pages/Claim/Card/ClaimAction.vue @@ -37,7 +37,7 @@ const marker_labels = [ { value: DEFAULT_MIN_RESPONSABILITY, label: t('claim.summary.company') }, { value: DEFAULT_MAX_RESPONSABILITY, label: t('claim.summary.person') }, ]; -const portesMultiplicator = ref(); +const multiplicatorValue = ref(); const columns = computed(() => [ { @@ -135,24 +135,10 @@ async function regularizeClaim() { message: t('globals.dataSaved'), type: 'positive', }); - // if (claim.value.responsibility >= Math.ceil(DEFAULT_MAX_RESPONSABILITY) / 2) { - // quasar - // .dialog({ - // component: VnConfirm, - // componentProps: { - // title: t('confirmGreuges'), - // message: ` - // - // `, - // data: { inputId: 'multiplicatorValue' }, - // promise: onUpdateGreugeAccept, - // }, - // }) - // .onOk(async () => await onUpdateGreugeAccept()); - // } + await onUpdateGreugeAccept(); } -async function onUpdateGreugeAccept({ return: multiplicatorValue }) { +async function onUpdateGreugeAccept() { const greugeTypeFreightId = ( await axios.get(`GreugeTypes/findOne`, { filter: { where: { code: 'freightPickUp' } }, @@ -160,7 +146,7 @@ async function onUpdateGreugeAccept({ return: multiplicatorValue }) { ).data.id; const freightPickUpPrice = (await axios.get(`GreugeConfigs/findOne`)).data.freightPickUpPrice * - +multiplicatorValue; + +multiplicatorValue.value; console.log(freightPickUpPrice); await axios.post(`Greuges`, { clientFk: claim.value.clientFk, @@ -267,6 +253,9 @@ async function importToNewRefundTicket() { - diff --git a/test/cypress/integration/claim/claimAction.spec.js b/test/cypress/integration/claim/claimAction.spec.js index f181722fa6..685e120cec 100644 --- a/test/cypress/integration/claim/claimAction.spec.js +++ b/test/cypress/integration/claim/claimAction.spec.js @@ -31,7 +31,6 @@ describe('ClaimAction', () => { it('should regularize', () => { cy.get('[title="Regularize"]').click(); - cy.clickConfirm(); }); it('should remove the line', () => {