From 622743c7ac344efb367c8a42df80e2b04ff6db1c Mon Sep 17 00:00:00 2001 From: burakovec Date: Mon, 20 Jul 2026 09:57:58 +0300 Subject: [PATCH] Refactor FormMuhasebePiyangoBilgileriDisplay.vue to improve monetary calculations and formatting. Update currency display functions to include decimal precision, enhance rounding logic for calculated values, and streamline the overall calculation process for better accuracy and consistency. --- .../FormMuhasebePiyangoBilgileriDisplay.vue | 47 +++++++++++-------- 1 file changed, 27 insertions(+), 20 deletions(-) diff --git a/src/module/muhasebe/components/display/FormMuhasebePiyangoBilgileriDisplay.vue b/src/module/muhasebe/components/display/FormMuhasebePiyangoBilgileriDisplay.vue index f89e5e8..49bf9b4 100644 --- a/src/module/muhasebe/components/display/FormMuhasebePiyangoBilgileriDisplay.vue +++ b/src/module/muhasebe/components/display/FormMuhasebePiyangoBilgileriDisplay.vue @@ -68,23 +68,19 @@ İzin Bedeli Oran Tutarı: - {{ globalStore.toTrLocale(calculatedOran) }} + {{ globalStore.toTrLocale(calculatedOran, 2) }} KDV: - {{ globalStore.toTrLocale(calculatedKdv) }} + {{ globalStore.toTrLocale(calculatedKdv, 2) }} Toplam Bedel: - {{ - globalStore.toTrLocale( - Number(calculatedOran) + Number(calculatedKdv) - ) - }} + {{ globalStore.toTrLocale(calculatedToplam, 2) }} @@ -162,13 +158,16 @@ const selectedOranId = ref(null) const calculatedKdv = ref(0) const calculatedOran = ref(0) + const calculatedToplam = ref(0) const calculatedBasvuruKdv = computed(() => muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli !== undefined && muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani !== undefined - ? (Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli) * - Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani)) / - 100 + ? globalStore.roundMoney( + (Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli) * + Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani)) / + 100 + ) : 0 ) @@ -235,7 +234,8 @@ muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli !== undefined ? globalStore.toTrLocale( - muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli + muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli, + 2 ) : 0 } ₺ @@ -247,7 +247,7 @@ ${ calculatedBasvuruKdv.value !== undefined - ? globalStore.toTrLocale(calculatedBasvuruKdv.value) + ? globalStore.toTrLocale(calculatedBasvuruKdv.value, 2) : 0 } @@ -259,9 +259,12 @@ muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli !== undefined ? globalStore.toTrLocale( - Number( - muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli - ) + calculatedBasvuruKdv.value + globalStore.roundMoney( + Number( + muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli + ) + calculatedBasvuruKdv.value + ), + 2 ) : 0 } @@ -329,13 +332,17 @@ selectedOran.value = null } - calculatedOran.value = + const tutar = (Number(piyangoIkramiyeStore.totalIkramiyeValue) * Number(selectedOran.value)) / 100 - - calculatedKdv.value = - (calculatedOran.value * - Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani)) / + const kdv = + (tutar * Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani)) / 100 + + calculatedOran.value = globalStore.roundMoney(tutar) + calculatedKdv.value = globalStore.roundMoney(kdv) + calculatedToplam.value = globalStore.roundMoney( + calculatedOran.value + calculatedKdv.value + ) } const IzinBedeliMuhasebelestir = async () => {