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.
This commit is contained in:
@ -68,23 +68,19 @@
|
|||||||
<tr>
|
<tr>
|
||||||
<td>İzin Bedeli Oran Tutarı:</td>
|
<td>İzin Bedeli Oran Tutarı:</td>
|
||||||
<td>
|
<td>
|
||||||
{{ globalStore.toTrLocale(calculatedOran) }}
|
{{ globalStore.toTrLocale(calculatedOran, 2) }}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>KDV:</td>
|
<td>KDV:</td>
|
||||||
<td>
|
<td>
|
||||||
{{ globalStore.toTrLocale(calculatedKdv) }}
|
{{ globalStore.toTrLocale(calculatedKdv, 2) }}
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td>Toplam Bedel:</td>
|
<td>Toplam Bedel:</td>
|
||||||
<td>
|
<td>
|
||||||
{{
|
{{ globalStore.toTrLocale(calculatedToplam, 2) }}
|
||||||
globalStore.toTrLocale(
|
|
||||||
Number(calculatedOran) + Number(calculatedKdv)
|
|
||||||
)
|
|
||||||
}}
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
@ -162,13 +158,16 @@
|
|||||||
const selectedOranId = ref<number | null>(null)
|
const selectedOranId = ref<number | null>(null)
|
||||||
const calculatedKdv = ref<number>(0)
|
const calculatedKdv = ref<number>(0)
|
||||||
const calculatedOran = ref<number>(0)
|
const calculatedOran = ref<number>(0)
|
||||||
|
const calculatedToplam = ref<number>(0)
|
||||||
|
|
||||||
const calculatedBasvuruKdv = computed<number>(() =>
|
const calculatedBasvuruKdv = computed<number>(() =>
|
||||||
muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli !== undefined &&
|
muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli !== undefined &&
|
||||||
muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani !== undefined
|
muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani !== undefined
|
||||||
? (Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli) *
|
? globalStore.roundMoney(
|
||||||
Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani)) /
|
(Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli) *
|
||||||
100
|
Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani)) /
|
||||||
|
100
|
||||||
|
)
|
||||||
: 0
|
: 0
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -235,7 +234,8 @@
|
|||||||
muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli !==
|
muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli !==
|
||||||
undefined
|
undefined
|
||||||
? globalStore.toTrLocale(
|
? globalStore.toTrLocale(
|
||||||
muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli
|
muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli,
|
||||||
|
2
|
||||||
)
|
)
|
||||||
: 0
|
: 0
|
||||||
} ₺</td>
|
} ₺</td>
|
||||||
@ -247,7 +247,7 @@
|
|||||||
<td>
|
<td>
|
||||||
${
|
${
|
||||||
calculatedBasvuruKdv.value !== undefined
|
calculatedBasvuruKdv.value !== undefined
|
||||||
? globalStore.toTrLocale(calculatedBasvuruKdv.value)
|
? globalStore.toTrLocale(calculatedBasvuruKdv.value, 2)
|
||||||
: 0
|
: 0
|
||||||
}
|
}
|
||||||
</td>
|
</td>
|
||||||
@ -259,9 +259,12 @@
|
|||||||
muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli !==
|
muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli !==
|
||||||
undefined
|
undefined
|
||||||
? globalStore.toTrLocale(
|
? globalStore.toTrLocale(
|
||||||
Number(
|
globalStore.roundMoney(
|
||||||
muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli
|
Number(
|
||||||
) + calculatedBasvuruKdv.value
|
muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeli
|
||||||
|
) + calculatedBasvuruKdv.value
|
||||||
|
),
|
||||||
|
2
|
||||||
)
|
)
|
||||||
: 0
|
: 0
|
||||||
}
|
}
|
||||||
@ -329,13 +332,17 @@
|
|||||||
selectedOran.value = null
|
selectedOran.value = null
|
||||||
}
|
}
|
||||||
|
|
||||||
calculatedOran.value =
|
const tutar =
|
||||||
(Number(piyangoIkramiyeStore.totalIkramiyeValue) * Number(selectedOran.value)) / 100
|
(Number(piyangoIkramiyeStore.totalIkramiyeValue) * Number(selectedOran.value)) / 100
|
||||||
|
const kdv =
|
||||||
calculatedKdv.value =
|
(tutar * Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani)) /
|
||||||
(calculatedOran.value *
|
|
||||||
Number(muhasebeSettingsStore.muhasebeSettingsForm.basvuruBedeliKdvOrani)) /
|
|
||||||
100
|
100
|
||||||
|
|
||||||
|
calculatedOran.value = globalStore.roundMoney(tutar)
|
||||||
|
calculatedKdv.value = globalStore.roundMoney(kdv)
|
||||||
|
calculatedToplam.value = globalStore.roundMoney(
|
||||||
|
calculatedOran.value + calculatedKdv.value
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
const IzinBedeliMuhasebelestir = async () => {
|
const IzinBedeliMuhasebelestir = async () => {
|
||||||
|
|||||||
Reference in New Issue
Block a user