From 1f7b271048a487b927526cb9afc656d5cdadd73c Mon Sep 17 00:00:00 2001 From: Fabian Wessels Date: Sun, 2 Aug 2020 17:21:47 +0200 Subject: [PATCH] ausgagben im gehaltscheck formatiert --- .../Interaction/interactionmenu.ts | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/ReallifeGamemode.Client/Interaction/interactionmenu.ts b/ReallifeGamemode.Client/Interaction/interactionmenu.ts index b881f198..fc428ffa 100644 --- a/ReallifeGamemode.Client/Interaction/interactionmenu.ts +++ b/ReallifeGamemode.Client/Interaction/interactionmenu.ts @@ -91,37 +91,40 @@ export default function (globalData: IGlobalData) { paycheckMenu.AddItem(item); item = new UIMenuItem("Sonstige Einkünfte"); - item.SetRightLabel("~g~+ $" + moneyFormat(p.otheramount)); + item.SetRightLabel("~g~+ $" + moneyFormat(Number(p.otheramount.toFixed(2)))); paycheckMenu.AddItem(item); item = new UIMenuItem("Finanzhilfe"); - item.SetRightLabel("~g~+ $" + moneyFormat(p.financialHelp)); + item.SetRightLabel("~g~+ $" + moneyFormat(Number(p.financialHelp.toFixed(2)))); paycheckMenu.AddItem(item); if (p.factionMoney) { item = new UIMenuItem("Fraktionsgeld"); - item.SetRightLabel("~g~+ $" + moneyFormat(p.factionMoney)); + item.SetRightLabel("~g~+ $" + moneyFormat(Number(p.factionMoney.toFixed(2)))); paycheckMenu.AddItem(item); } item = new UIMenuItem("Fahrzeugsteuer"); - item.SetRightLabel("~r~- $" + moneyFormat(p.vehicleTaxation)); + item.SetRightLabel("~r~- $" + moneyFormat(Number(p.vehicleTaxation.toFixed(2)))); paycheckMenu.AddItem(item); item = new UIMenuItem("Grundsteuer"); - item.SetRightLabel("~r~- $" + moneyFormat(p.propertyTaxation)); + item.SetRightLabel("~r~- $" + moneyFormat(Number(p.propertyTaxation.toFixed(2)))); paycheckMenu.AddItem(item); item = new UIMenuItem("Mietkosten"); - item.SetRightLabel("~r~- $" + moneyFormat(p.rentalFees)); + item.SetRightLabel("~r~- $" + moneyFormat(Number(p.rentalFees.toFixed(2)))); paycheckMenu.AddItem(item); item = new UIMenuItem("Krankenkasse"); - item.SetRightLabel("~r~- $" + moneyFormat(p.healthInsurance)); + item.SetRightLabel("~r~- $" + moneyFormat(Number(p.healthInsurance.toFixed(2)))); paycheckMenu.AddItem(item); item = new UIMenuItem("Einkommensteuer"); - item.SetRightLabel((p.financialInterest * 100).toString() + "%"); + + //var numb = Number(p.financialInterest * 100).toFixed(3); + //var numb_format = moneyFormat(Number(numb)); + item.SetRightLabel(moneyFormat(Number((p.financialInterest * 100).toFixed(3))) + "%"); paycheckMenu.AddItem(item); menu.AddItem(paycheckItem);