diff --git a/src/PowderCoating.Web/Views/Bills/Index.cshtml b/src/PowderCoating.Web/Views/Bills/Index.cshtml index 46e0d02..d68d9c5 100644 --- a/src/PowderCoating.Web/Views/Bills/Index.cshtml +++ b/src/PowderCoating.Web/Views/Bills/Index.cshtml @@ -92,94 +92,181 @@ {
- - - - - - - - - - - - - - - - +
+
TypeNumberVendorMemo / AccountDateDue DateStatusAmountBalance Due
+ + + + + + + + + + + + + + + + @foreach (var entry in Model) + { + + + + + + + + + + + + + } + +
TypeNumberVendorMemo / AccountDateDue DateStatusAmountBalance Due
+ @if (entry.EntryType == "Bill") + { + + Bill + + } + else + { + + Expense + + } + + @if (entry.EntryType == "Bill") + { + @entry.Number + } + else + { + @entry.Number + } + @entry.VendorName + @(entry.EntryType == "Bill" ? entry.Memo : entry.AccountName) + @if (entry.HasReceipt) + { + + } + @entry.Date.ToString("MMM d, yyyy") + @if (entry.DueDate.HasValue) + { + + @entry.DueDate.Value.ToString("MMM d, yyyy") + @if (entry.IsOverdue) { } + + } + else if (entry.EntryType == "Expense") + { + — + } + @entry.StatusLabel@entry.Total.ToString("C") + @Html.Raw(entry.EntryType == "Bill" ? entry.BalanceDue.ToString("C") : "—") + + @if (entry.EntryType == "Bill") + { + + } + else + { + + } +
+
+
+
@foreach (var entry in Model) { - - - @if (entry.EntryType == "Bill") - { - - Bill - - } - else - { - - Expense - - } - - - @if (entry.EntryType == "Bill") - { - @entry.Number - } - else - { - @entry.Number - } - - @entry.VendorName - - @(entry.EntryType == "Bill" ? entry.Memo : entry.AccountName) - @if (entry.HasReceipt) - { - - } - - @entry.Date.ToString("MMM d, yyyy") - + var isBill = entry.EntryType == "Bill"; + var detailUrl = isBill + ? Url.Action("Details", "Bills", new { id = entry.Id }) + : Url.Action("Details", "Expenses", new { id = entry.Id }); +
+
+
+ +
+
+
@entry.Number
+ @entry.VendorName +
+
+ @if (isBill) + { + Bill + } + else + { + Expense + } +
+
+
+
+ Status + @entry.StatusLabel +
+
+ Date + @entry.Date.ToString("MMM d, yyyy") +
@if (entry.DueDate.HasValue) { - - @entry.DueDate.Value.ToString("MMM d, yyyy") - @if (entry.IsOverdue) { } - +
+ Due + + @entry.DueDate.Value.ToString("MMM d, yyyy") + @if (entry.IsOverdue) { } + +
} - else if (entry.EntryType == "Expense") +
+ Amount + @entry.Total.ToString("C") +
+ @if (isBill) { - — +
+ Balance Due + + @entry.BalanceDue.ToString("C") + +
} - - @entry.StatusLabel - @entry.Total.ToString("C") - - @Html.Raw(entry.EntryType == "Bill" ? entry.BalanceDue.ToString("C") : "—") - - - @if (entry.EntryType == "Bill") + @{ + var memoText = isBill ? entry.Memo : entry.AccountName; + } + @if (!string.IsNullOrEmpty(memoText)) { - +
+ @(isBill ? "Memo" : "Account") + + @memoText + @if (entry.HasReceipt) { } + +
} - else - { - - } - - +
+
+ + View + +
+
} - - +
+
}