From 342b80032b6684ae9ece68a9514dd3cd1fdfa15a Mon Sep 17 00:00:00 2001 From: carlossa Date: Fri, 17 Jan 2025 08:47:40 +0100 Subject: [PATCH 1/2] fix: refs #7351 fix onFetch --- src/pages/Claim/Card/ClaimSummary.vue | 30 ++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue index 66fb151e5..a4b3f62dc 100644 --- a/src/pages/Claim/Card/ClaimSummary.vue +++ b/src/pages/Claim/Card/ClaimSummary.vue @@ -26,7 +26,8 @@ const router = useRouter(); const { t } = useI18n(); const { getTokenMultimedia } = useSession(); const token = getTokenMultimedia(); - +const amount = ref(); +const amountClaimed = ref(); const $props = defineProps({ id: { type: Number, @@ -47,7 +48,24 @@ const claimDmsFilter = ref({ }, ], }); +function onFetch(rows, newRows) { + console.log('rows: ', rows); + console.log('newRows: ', newRows); + if (newRows) rows = newRows; + amount.value = 0; + console.log('amount.value: ', amount.value); + amountClaimed.value = 0; + console.log('amountClaimed.value: ', amountClaimed.value); + if (!rows || !rows.length) return; + for (const row of rows) { + const { sale } = row; + amount.value = amount.value + totalRow(sale); + const price = row.quantity * sale.price; + const discount = (sale.discount * price) / 100; + amountClaimed.value = amountClaimed.value + (price - discount); + } +} const detailsColumns = ref([ { name: 'item', @@ -100,7 +118,11 @@ const detailsColumns = ref([ sortable: true, }, ]); - +function totalRow({ price, quantity, discount }) { + const amount = price * quantity; + const appliedDiscount = (discount * amount) / 100; + return amount - appliedDiscount; +} const markerLabels = [ { value: 1, label: t('claim.company') }, { value: 5, label: t('claim.person') }, @@ -326,8 +348,10 @@ function claimUrl(section) { - + + {{ salesClaimed }} + Date: Mon, 20 Jan 2025 10:46:12 +0100 Subject: [PATCH 2/2] fix: refs #7351 claim summary --- src/pages/Claim/Card/ClaimSummary.vue | 60 +++++++++++++++++---------- src/pages/Claim/locale/en.yml | 1 + src/pages/Claim/locale/es.yml | 1 + 3 files changed, 41 insertions(+), 21 deletions(-) diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue index a4b3f62dc..077de9fb7 100644 --- a/src/pages/Claim/Card/ClaimSummary.vue +++ b/src/pages/Claim/Card/ClaimSummary.vue @@ -1,6 +1,6 @@