diff --git a/Site/Pages/v5/Ledgers/BalanceTransactions.aspx b/Site/Pages/v5/Ledgers/BalanceTransactions.aspx index d6715b53..5e902c67 100644 --- a/Site/Pages/v5/Ledgers/BalanceTransactions.aspx +++ b/Site/Pages/v5/Ledgers/BalanceTransactions.aspx @@ -72,7 +72,7 @@ $('input#inputTextPurchaseDescription').val(data.TransactionDescription); $('input#inputTextPurchaseAmount').val(data.AmountAsPurchase); - if (data.OpenPayoutData == null) // amount is positive + if (data.AmountSign == 1) // amount is positive { $('#divPositiveDifference').show(); $('#divNegativeDifference').hide(); @@ -322,6 +322,25 @@ +

+
+
+
+ +
+ + + +
+ +
+
@@ -337,25 +356,6 @@
-

-
-
-
- -
- - - -
- -
-

diff --git a/Site/Pages/v5/Ledgers/BalanceTransactions.aspx.cs b/Site/Pages/v5/Ledgers/BalanceTransactions.aspx.cs index ee21e238..f163313c 100644 --- a/Site/Pages/v5/Ledgers/BalanceTransactions.aspx.cs +++ b/Site/Pages/v5/Ledgers/BalanceTransactions.aspx.cs @@ -81,6 +81,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers public string TransactionDate { get; set; } public string DifferingAmount { get; set; } public string AmountAsPurchase { get; set; } + public int AmountSign { get; set; } public string TransactionDescription { get; set; } public DropdownOption[] OpenPayoutData { get; set; } public DropdownOption[] OpenOutboundInvoiceData { get; set; } @@ -137,11 +138,13 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers if (transaction.Rows.AmountCentsTotal > 0) { result.OpenOutboundInvoiceData = GetOpenOutboundInvoiceData(transaction); + result.AmountSign = 1; } else { // Negative difference + result.AmountSign = -1; result.OpenPayoutData = GetOpenPayoutData(transaction); } diff --git a/Site/Pages/v5/Ledgers/BalanceTransactions.aspx.designer.cs b/Site/Pages/v5/Ledgers/BalanceTransactions.aspx.designer.cs index d2d43520..27a3928c 100644 --- a/Site/Pages/v5/Ledgers/BalanceTransactions.aspx.designer.cs +++ b/Site/Pages/v5/Ledgers/BalanceTransactions.aspx.designer.cs @@ -183,33 +183,6 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers { /// protected global::System.Web.UI.WebControls.Label LabelDescribePayoutForeign; - /// - /// LabelRadioOutboundInvoice control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label LabelRadioOutboundInvoice; - - /// - /// DropOpenOutboundInvoices control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::Swarmops.Frontend.Controls.Base.DropDown DropOpenOutboundInvoices; - - /// - /// LabelDescribeOutboundInvoice control. - /// - /// - /// Auto-generated field. - /// To modify move field declaration from designer file to code-behind file. - /// - protected global::System.Web.UI.WebControls.Label LabelDescribeOutboundInvoice; - /// /// LabelRadioPurchase control. /// @@ -291,6 +264,33 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers { /// protected global::System.Web.UI.WebControls.Label LabelDescribePurchaseUploadReceipt; + /// + /// LabelRadioOutboundInvoice control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label LabelRadioOutboundInvoice; + + /// + /// DropOpenOutboundInvoices control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::Swarmops.Frontend.Controls.Base.DropDown DropOpenOutboundInvoices; + + /// + /// LabelDescribeOutboundInvoice control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label LabelDescribeOutboundInvoice; + /// /// LabelRadioBalance control. ///