diff --git a/Logic/Financial/Payout.cs b/Logic/Financial/Payout.cs
index fa31fe3b..cb130cde 100644
--- a/Logic/Financial/Payout.cs
+++ b/Logic/Financial/Payout.cs
@@ -175,6 +175,40 @@ namespace Swarmops.Logic.Financial
get { return base.AmountCents; }
}
+
+ public PaymentTransferInfo PaymentTransferInfo
+ {
+ get
+ {
+ if (this.DependentExpenseClaims.Count > 0)
+ {
+ return PaymentTransferInfo.FromObject(this.DependentExpenseClaims[0]);
+ }
+ if (this.DependentCashAdvancesPayout.Count > 0)
+ {
+ return PaymentTransferInfo.FromObject(this.DependentCashAdvancesPayout[0]);
+ }
+ if (this.DependentCashAdvancesPayback.Count > 0)
+ {
+ return PaymentTransferInfo.FromObject(this.DependentCashAdvancesPayback[0]);
+ }
+ if (this.DependentSalariesNet.Count > 0)
+ {
+ return PaymentTransferInfo.FromObject(this.DependentSalariesNet[0]);
+ }
+ if (this.DependentSalariesTax.Count > 0)
+ {
+ throw new NotImplementedException("Need to implement tax information from PaymentTransferInfo");
+ }
+ if (this.DependentInvoices.Count > 0)
+ {
+ return PaymentTransferInfo.FromObject(this.DependentInvoices[0]);
+ }
+
+ throw new NotImplementedException("Unknown object or dependency - can't construct PaymentTransferInfo");
+ }
+ }
+
public bool HasNativeAmount
{
get
diff --git a/Site/Pages/v5/Financial/Json-PayableCosts.aspx.cs b/Site/Pages/v5/Financial/Json-PayableCosts.aspx.cs
index 6c35a073..70cdd9f7 100644
--- a/Site/Pages/v5/Financial/Json-PayableCosts.aspx.cs
+++ b/Site/Pages/v5/Financial/Json-PayableCosts.aspx.cs
@@ -69,7 +69,7 @@ namespace Swarmops.Frontend.Pages.Financial
"\"reference\":\"{5}\"," +
"\"amount\":\"{6}\"," +
"\"action\":\"" +
- "" +
+ "
" +
"
" +
"
" +
"
" +
@@ -85,7 +85,8 @@ namespace Swarmops.Frontend.Pages.Financial
JsonSanitize (payout.Account),
JsonSanitize (TryLocalize (payout.Reference)),
payout.HasNativeAmount? payout.NativeAmountString : (payout.AmountCents/100.0).ToString("N2"),
- payout.ProtoIdentity.Replace ("|", ""));
+ payout.ProtoIdentity.Replace ("|", ""),
+ payout.PaymentTransferInfo.LocalizedPaymentInformation.Count);
result.Append ("},");
}
diff --git a/Site/Pages/v5/Financial/PayOutMoney.aspx b/Site/Pages/v5/Financial/PayOutMoney.aspx
index c8452b62..6a1ad5e7 100644
--- a/Site/Pages/v5/Financial/PayOutMoney.aspx
+++ b/Site/Pages/v5/Financial/PayOutMoney.aspx
@@ -83,8 +83,7 @@
// TODO: The two fields below will initially be hidden, and
// TODO: replaced with dynamically unfolding fields
- $('#idModalClearing').val(loadingBreadcrumb);
- $('#idModalAccountNumber').val(loadingBreadcrumb);
+ $('#idModalExtraField0').val($(this).attr("data-fieldcount"));
<%=this.ModalConfirmPayment.ClientID%>_open();
@@ -108,8 +107,6 @@
$('#idModalInputCurrencyAmount').val(result.CurrencyAmount);
$('#idModalReference').val($(this).attr("data-reference")); // load reference from JSON data
$('#idModalTransferMethod').val(result.TransferMethod);
- $('#idModalClearing').val(loadingBreadcrumb);
- $('#idModalAccountNumber').val(loadingBreadcrumb);
} else {
// TODO: Handle server-level concurrency lock
@@ -359,9 +356,11 @@
-