diff --git a/Site/Automation/Json-MasterPersonEditPaymentHistory.aspx.cs b/Site/Automation/Json-MasterPersonEditPaymentHistory.aspx.cs index 83cd866f..0a29af72 100644 --- a/Site/Automation/Json-MasterPersonEditPaymentHistory.aspx.cs +++ b/Site/Automation/Json-MasterPersonEditPaymentHistory.aspx.cs @@ -55,19 +55,23 @@ namespace Swarmops.Frontend.Automation foreach (ExpenseClaim claim in expenses) { - PaymentHistoryLineItem newItem = new PaymentHistoryLineItem(); - newItem.Id = "E" + claim.Identity.ToString(CultureInfo.InvariantCulture); - newItem.Name = Resources.Global.Financial_ExpenseClaim + " #" + claim.Identity.ToString("N0"); - newItem.Description = claim.Description; - newItem.OwedToPerson = claim.AmountCents; - - Payout payout = claim.Payout; - if (payout != null && payout.Open == false) + if (claim.Open || claim.PaidOut) // if both these are false, the claim was denied and shouldn't be listed { - newItem.ClosedDate = payout.FinancialTransaction.DateTime; - } + PaymentHistoryLineItem newItem = new PaymentHistoryLineItem(); + newItem.Id = "E" + claim.Identity.ToString(CultureInfo.InvariantCulture); + newItem.Name = Resources.Global.Financial_ExpenseClaim + " #" + claim.Identity.ToString("N0"); + newItem.Description = claim.Description; + newItem.OpenedDate = claim.CreatedDateTime; + newItem.OwedToPerson = claim.AmountCents; - items.Add(newItem); + Payout payout = claim.Payout; + if (payout != null && payout.Open == false) + { + newItem.ClosedDate = payout.FinancialTransaction.DateTime; + } + + items.Add(newItem); + } } return items; diff --git a/Site/Master-v5.master b/Site/Master-v5.master index feafc1db..da723a64 100644 --- a/Site/Master-v5.master +++ b/Site/Master-v5.master @@ -374,7 +374,7 @@
-

PERSONNAME: Payment History

+

PERSONNAME:

- - + + - - + + diff --git a/Site/Master-v5.master.designer.cs b/Site/Master-v5.master.designer.cs index 3ea2de24..5b68d372 100644 --- a/Site/Master-v5.master.designer.cs +++ b/Site/Master-v5.master.designer.cs @@ -516,6 +516,15 @@ namespace Swarmops.Frontend { /// protected global::System.Web.UI.WebControls.Label MasterLabelEditPerson2FAProvisioning; + /// + /// MasterLabelEditPersonHeaderPaymentHistory control. + /// + /// + /// Auto-generated field. + /// To modify move field declaration from designer file to code-behind file. + /// + protected global::System.Web.UI.WebControls.Label MasterLabelEditPersonHeaderPaymentHistory; + /// /// MasterPersonEditLiteralHeaderItemName control. ///