Work on Payment History

This commit is contained in:
Rick Falkvinge
2019-01-29 12:27:36 +01:00
parent 5fd612b5bd
commit 5b5955ad99
3 changed files with 29 additions and 16 deletions
@@ -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;
+5 -5
View File
@@ -374,7 +374,7 @@
</div>
</div>
<div title="<img src='/Images/PageIcons/iconshock-money-calculator-128px.png' height='64' width='64' />">
<h2><span class="spanModalEditingPersonName">PERSONNAME</span>: Payment History</h2>
<h2><span class="spanModalEditingPersonName">PERSONNAME</span>: <asp:Label ID="MasterLabelEditPersonHeaderPaymentHistory" runat="server" Text="Payment History XYZ"/></h2>
<table id="masterPersonEditTablePaymentHistory" title="" class="easyui-treegrid" style="width: 100%; height: 400px"
rownumbers="false"
@@ -384,11 +384,11 @@
footer="true">
<thead>
<tr>
<th field="name" width="178"><asp:Literal ID="MasterPersonEditLiteralHeaderItemName" Text="Item Type XYZ" runat="server"/></th>
<th field="description" width="180"><asp:Literal ID="MasterPersonEditLiteralHeaderItemDescription" Text="Description XYZ" runat="server"/></th>
<th field="name" width="138"><asp:Literal ID="MasterPersonEditLiteralHeaderItemName" Text="Item Type XYZ" runat="server"/></th>
<th field="description" width="220"><asp:Literal ID="MasterPersonEditLiteralHeaderItemDescription" Text="Description XYZ" runat="server"/></th>
<th field="opened" width="120"><asp:Literal ID="MasterPersonEditLiteralHeaderItemOpenedDate" Text="Opened date XYZ" runat="server"/></th>
<th field="owedToPerson" width="120" align="right"><asp:Literal ID="MasterPersonEditLiteralHeaderAmountOwed" Text="Payment XYZ" runat="server"/></th>
<th field="paidToPerson" width="120" align="right"><asp:Literal ID="MasterPersonEditLiteralHeaderAmountPaid" Text="Owed to you XYZ" runat="server"/></th>
<th field="owedToPerson" width="120" align="right"><asp:Literal ID="MasterPersonEditLiteralHeaderAmountOwed" Text="Owed to you XYZ" runat="server"/></th>
<th field="paidToPerson" width="120" align="right"><asp:Literal ID="MasterPersonEditLiteralHeaderAmountPaid" Text="Paid to you XYZ" runat="server"/></th>
<th field="closed" width="120"><asp:Literal ID="MasterPersonEditLiteralHeaderItemClosedDate" Text="Closed date XYZ" runat="server"/></th>
<th field="notes" width="80"><asp:Literal ID="MasterPersonEditLiteralHeaderItemNotes" Text="Notes XYZ" runat="server"/></th>
</tr>
+9
View File
@@ -516,6 +516,15 @@ namespace Swarmops.Frontend {
/// </remarks>
protected global::System.Web.UI.WebControls.Label MasterLabelEditPerson2FAProvisioning;
/// <summary>
/// MasterLabelEditPersonHeaderPaymentHistory control.
/// </summary>
/// <remarks>
/// Auto-generated field.
/// To modify move field declaration from designer file to code-behind file.
/// </remarks>
protected global::System.Web.UI.WebControls.Label MasterLabelEditPersonHeaderPaymentHistory;
/// <summary>
/// MasterPersonEditLiteralHeaderItemName control.
/// </summary>