diff --git a/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx b/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx
index e25acb1f..59b20eab 100644
--- a/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx
+++ b/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx
@@ -35,6 +35,18 @@
$('input:radio[name="TxOptions"]').prop('checked', false);
$('div.radioOption').hide();
<%= this.DialogTx.ClientID %>_open();
+
+ $('#spanTransactionUnbalancedBy').text('[...]');
+ $('#<%=this.DropOpenPayouts.ClientID%>')
+
+ SwarmopsJS.ajaxCall(
+ "/Pages/v5/Ledgers/BalanceTransactions.aspx/GetTransactionMatchability",
+ { transactionId: transactionId },
+ function(data) {
+ console.log(data);
+ $('#spanTransactionUnbalancedBy').text(data.DifferingAmount);
+ });
+
}
@@ -72,7 +84,7 @@
|
|
|
- |
+ |
|
|
|
diff --git a/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx.cs b/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx.cs
index e9a50902..0fc588d9 100644
--- a/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx.cs
+++ b/Site5/Pages/v5/Ledgers/BalanceTransactions.aspx.cs
@@ -2,8 +2,10 @@
using System.Collections.Generic;
using System.Linq;
using System.Web;
+using System.Web.Services;
using System.Web.UI;
using System.Web.UI.WebControls;
+using Swarmops.Logic.Financial;
using Swarmops.Logic.Security;
namespace Swarmops.Frontend.Pages.v5.Ledgers
@@ -44,5 +46,39 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
this.LabelRadioPayout.Text = Resources.Pages.Ledgers.BalanceTransactions_ModalDialog_RadioPayout;
this.LiteralButtonPayout.Text = Resources.Pages.Ledgers.BalanceTransactions_ModalDialog_ButtonPayout;
}
+
+
+ public class TransactionMatchabilityData
+ {
+ public string DifferingAmount { get; set; }
+ public string OpenPayoutDropDownJsonData { get; set; }
+ }
+
+ [WebMethod]
+ public static TransactionMatchabilityData GetTransactionMatchability (int transactionId)
+ {
+ AuthenticationData authData = GetAuthenticationDataAndCulture();
+
+ if (
+ !authData.CurrentUser.HasAccess (new Access (authData.CurrentOrganization,
+ AccessAspect.BookkeepingDetails)))
+ {
+ throw new UnauthorizedAccessException();
+ }
+
+ FinancialTransaction transaction = FinancialTransaction.FromIdentity (transactionId);
+ if (transaction.OrganizationId != authData.CurrentOrganization.Identity)
+ {
+ throw new UnauthorizedAccessException();
+ }
+
+ TransactionMatchabilityData result = new TransactionMatchabilityData();
+
+ 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);
+
+ return result;
+ }
}
}
\ No newline at end of file
diff --git a/Site5/Pages/v5/Ledgers/Json-UnbalancedTransactions.aspx.cs b/Site5/Pages/v5/Ledgers/Json-UnbalancedTransactions.aspx.cs
index e3e135d2..0085947a 100644
--- a/Site5/Pages/v5/Ledgers/Json-UnbalancedTransactions.aspx.cs
+++ b/Site5/Pages/v5/Ledgers/Json-UnbalancedTransactions.aspx.cs
@@ -34,7 +34,7 @@ namespace Swarmops.Frontend.Pages.v5.Ledgers
string row =
String.Format (
- "\"id\":\"{0:N0}\",\"description\":\"{1}\",\"accountName\":\"{2}\",\"delta\":\"{3:+#,#.00;-#,#.00}\",\"dateTime\":\"{4:yyyy-MMM-dd HH:mm}\"",
+ "\"id\":\"{0:N0}\",\"description\":\"{1}\",\"accountName\":\"{2}\",\"delta\":\"{3:+#,#.00;−#,#.00}\",\"dateTime\":\"{4:yyyy-MMM-dd HH:mm}\"",
transaction.Identity, JsonSanitize (transaction.Description), JsonSanitize (accountName), txRows.AmountCentsTotal / 100.0, transaction.DateTime);
row +=