From 84c19d9c5744ec82528af746cb1b86885fb11a08 Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Sat, 30 Dec 2017 20:55:05 +0100 Subject: [PATCH] Fix for helper field --- Site/Pages/v5/Ledgers/BalanceTransactions.aspx | 2 +- Site/Pages/v5/Ledgers/BalanceTransactions.aspx.cs | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Site/Pages/v5/Ledgers/BalanceTransactions.aspx b/Site/Pages/v5/Ledgers/BalanceTransactions.aspx index 22d53d1d..b07a3252 100644 --- a/Site/Pages/v5/Ledgers/BalanceTransactions.aspx +++ b/Site/Pages/v5/Ledgers/BalanceTransactions.aspx @@ -70,7 +70,7 @@ $('#spanTransactionUnbalancedBy').text(data.DifferingAmount); $('span#spanModalTransactionDate').text(data.TransactionDate); $('input#inputTextPurchaseDescription').val(data.TransactionDescription); - $('input#inputTextPurchaseAmount').val(data.DifferingAmount.substring(1)); // removes the leading minus sign + $('input#inputTextPurchaseAmount').val(data.AmountAsPurchase); if (data.OpenPayoutData == null) // amount is positive { diff --git a/Site/Pages/v5/Ledgers/BalanceTransactions.aspx.cs b/Site/Pages/v5/Ledgers/BalanceTransactions.aspx.cs index efd58ddb..86eb5d44 100644 --- a/Site/Pages/v5/Ledgers/BalanceTransactions.aspx.cs +++ b/Site/Pages/v5/Ledgers/BalanceTransactions.aspx.cs @@ -80,6 +80,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers { public string TransactionDate { get; set; } public string DifferingAmount { get; set; } + public string AmountAsPurchase { get; set; } public string TransactionDescription { get; set; } public DropdownOptions OpenPayoutData { get; set; } public DropdownOptions OpenOutboundInvoiceData { get; set; } @@ -125,11 +126,14 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers TransactionMatchabilityData result = new TransactionMatchabilityData(); + Int64 transactionCents = transaction.Rows.AmountCentsTotal; + result.TransactionDate = transaction.DateTime.ToString ("yyyy-MMM-dd HH:mm"); result.TransactionDescription = transaction.Description; + result.AmountAsPurchase = ((-transactionCents)/100.0).ToString("N2"); result.DifferingAmount = String.Format ("{0} {1:+#,#.00;−#,#.00;0}", // this is a UNICODE MINUS (U+2212), not the hyphen on the keyboard - authData.CurrentOrganization.Currency.DisplayCode, transaction.Rows.AmountCentsTotal/100.0); + authData.CurrentOrganization.Currency.DisplayCode, transactionCents/100.0); if (transaction.Rows.AmountCentsTotal > 0) {