From 5891d2ced74d5bd56fe4ae60e0437257d336d56f Mon Sep 17 00:00:00 2001 From: Rick Falkvinge Date: Thu, 28 Feb 2019 11:23:36 +0100 Subject: [PATCH] Synced paid and notpaid views --- .../v5/Financial/Json-PayableCosts.aspx.cs | 28 +++++++++++-------- Site/Pages/v5/Financial/PayOutMoney.aspx | 2 +- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Site/Pages/v5/Financial/Json-PayableCosts.aspx.cs b/Site/Pages/v5/Financial/Json-PayableCosts.aspx.cs index 0d0bcc4d..3eb62635 100644 --- a/Site/Pages/v5/Financial/Json-PayableCosts.aspx.cs +++ b/Site/Pages/v5/Financial/Json-PayableCosts.aspx.cs @@ -63,14 +63,14 @@ namespace Swarmops.Frontend.Pages.Financial result.Append ("{"); result.AppendFormat ( - "\"itemId\":\"{0}\"," + + "\"itemId\":\"{7}\"," + "\"due\":\"{1}\"," + "\"recipient\":\"{2}\"," + "\"transferInfo\":\"{3}\"," + "\"amount\":\"{6}\"," + "\"ocrAvailable\":\"{4}\"," + "\"action\":\"" + - "" + + "" + "" + "" + "" + @@ -81,12 +81,13 @@ namespace Swarmops.Frontend.Pages.Financial (payout.ExpectedTransactionDate <= today ? Global.Global_ASAP : payout.ExpectedTransactionDate.ToShortDateString()), - JsonSanitize (TryLocalize (payout.Recipient)), + JsonSanitize (TryLocalize (transferInfo.Recipient)), transferInfo.Currency.Code + ", " + JsonSanitize (transferInfo.LocalizedPaymentMethodName), transferInfo.OcrAvailable? "": string.Empty, JsonSanitize (TryLocalize (payout.Reference)), payout.HasNativeAmount? payout.NativeAmountString : (payout.AmountCents/100.0).ToString("N2"), payout.ProtoIdentity.Replace ("|", ""), + string.Empty, // this is here to match the databaseid field below transferInfo.LocalizedPaymentInformation.Count, transferInfo.OcrAvailable? "yes": "no"); result.Append ("},"); @@ -106,6 +107,8 @@ namespace Swarmops.Frontend.Pages.Financial foreach (Payout payout in payouts) { + PaymentTransferInfo transferInfo = payout.PaymentTransferInfo; + result.Append("{"); result.AppendFormat( "\"itemId\":\"{7}\"," + @@ -113,12 +116,11 @@ namespace Swarmops.Frontend.Pages.Financial "\"databaseId\":\"{8}\"," + "\"due\":\"{1}\"," + "\"recipient\":\"{2}\"," + - "\"bank\":\"{3}\"," + - "\"account\":\"{4}\"," + - "\"reference\":\"{5}\"," + - "\"amount\":\"{6:N2}\"," + + "\"transferInfo\":\"{3}\"," + + "\"amount\":\"{6}\"," + + "\"ocrAvailable\":\"{4}\"," + "\"action\":\"" + - "" + + "" + "" + "" + "" + @@ -127,13 +129,15 @@ namespace Swarmops.Frontend.Pages.Financial "\"", payout.ProtoIdentity, payout.ExpectedTransactionDate.ToShortDateString(), - JsonSanitize(TryLocalize(payout.Recipient)), - JsonSanitize(payout.Bank), - JsonSanitize(payout.Account), + JsonSanitize(TryLocalize(transferInfo.Recipient)), + transferInfo.Currency.Code + ", " + JsonSanitize(transferInfo.LocalizedPaymentMethodName), + transferInfo.OcrAvailable ? "" : string.Empty, JsonSanitize(TryLocalize(payout.Reference)), payout.AmountCents / 100.0, payout.ProtoIdentity.Replace("|", ""), - payout.Identity); + payout.Identity, + transferInfo.LocalizedPaymentInformation.Count, + transferInfo.OcrAvailable ? "yes" : "no"); result.Append("},"); } diff --git a/Site/Pages/v5/Financial/PayOutMoney.aspx b/Site/Pages/v5/Financial/PayOutMoney.aspx index 2f2a4d39..86fc80dd 100644 --- a/Site/Pages/v5/Financial/PayOutMoney.aspx +++ b/Site/Pages/v5/Financial/PayOutMoney.aspx @@ -345,7 +345,7 @@ - +