Phase G: Add Recurring Transactions (BackgroundService + CRUD UI)
- RecurringTemplate entity with Frequency/IntervalCount/NextFireDate/EndDate/MaxOccurrences/TemplateData JSON - RecurringFrequency + RecurringTemplateType enums - RecurringTransactionService BackgroundService: hourly check, creates Draft bills or immediate expenses, advances NextFireDate, auto-deactivates on limits - RecurringTemplatesController: Index/Create/Edit/ToggleActive/Delete/GenerateNow (on-demand fire) - Three views + external JS for type-toggle and dynamic bill line items - Finance sidebar nav: Recurring Transactions - Migration: AddRecurringTemplates Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,251 @@
|
||||
@model PowderCoating.Web.Controllers.RecurringTemplateViewModel
|
||||
@using PowderCoating.Core.Enums
|
||||
@using Microsoft.AspNetCore.Mvc.Rendering
|
||||
@{
|
||||
ViewData["Title"] = "New Recurring Template";
|
||||
}
|
||||
|
||||
<div class="d-flex align-items-center mb-4">
|
||||
<a asp-action="Index" class="btn btn-outline-secondary me-3"><i class="bi bi-arrow-left"></i></a>
|
||||
<div>
|
||||
<h4 class="fw-bold mb-0">New Recurring Template</h4>
|
||||
<p class="text-muted small mb-0">Schedule automatic bill or expense generation.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<form asp-action="Create" method="post" id="recurringForm">
|
||||
@Html.AntiForgeryToken()
|
||||
<input type="hidden" asp-for="Id" />
|
||||
|
||||
<div class="row g-4">
|
||||
<!-- Left column: schedule settings -->
|
||||
<div class="col-lg-5">
|
||||
<div class="card shadow-sm">
|
||||
<div class="card-header fw-semibold"><i class="bi bi-calendar3 me-2"></i>Schedule</div>
|
||||
<div class="card-body">
|
||||
<div class="mb-3">
|
||||
<label asp-for="Name" class="form-label fw-semibold">Template Name <span class="text-danger">*</span></label>
|
||||
<input asp-for="Name" class="form-control" placeholder="e.g. Monthly Office Rent" />
|
||||
<span asp-validation-for="Name" class="text-danger small"></span>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label class="form-label fw-semibold">Type</label>
|
||||
<div>
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="radio" name="TemplateType" id="typeBill"
|
||||
value="1" @(Model.TemplateType == RecurringTemplateType.Bill ? "checked" : "") />
|
||||
<label class="form-check-label" for="typeBill">
|
||||
<i class="bi bi-receipt me-1 text-primary"></i>Bill (Draft, for review)
|
||||
</label>
|
||||
</div>
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="radio" name="TemplateType" id="typeExpense"
|
||||
value="2" @(Model.TemplateType == RecurringTemplateType.Expense ? "checked" : "") />
|
||||
<label class="form-check-label" for="typeExpense">
|
||||
<i class="bi bi-credit-card me-1 text-warning"></i>Expense (Immediate)
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row g-3 mb-3">
|
||||
<div class="col-7">
|
||||
<label asp-for="Frequency" class="form-label fw-semibold">Frequency</label>
|
||||
<select asp-for="Frequency" asp-items="Html.GetEnumSelectList<RecurringFrequency>()" class="form-select"></select>
|
||||
</div>
|
||||
<div class="col-5">
|
||||
<label asp-for="IntervalCount" class="form-label fw-semibold">Every</label>
|
||||
<div class="input-group">
|
||||
<input asp-for="IntervalCount" type="number" min="1" max="99" class="form-control" />
|
||||
<span class="input-group-text">period(s)</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label asp-for="StartDate" class="form-label fw-semibold">First Occurrence</label>
|
||||
<input asp-for="StartDate" type="date" class="form-control"
|
||||
value="@Model.StartDate.ToString("yyyy-MM-dd")" />
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label asp-for="EndDate" class="form-label fw-semibold">End Date <span class="text-muted">(optional)</span></label>
|
||||
<input asp-for="EndDate" type="date" class="form-control"
|
||||
value="@Model.EndDate?.ToString("yyyy-MM-dd")" />
|
||||
<div class="form-text">Leave blank for no end date.</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label asp-for="MaxOccurrences" class="form-label fw-semibold">Max Occurrences <span class="text-muted">(optional)</span></label>
|
||||
<input asp-for="MaxOccurrences" type="number" min="1" class="form-control" placeholder="Unlimited" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Right column: document details -->
|
||||
<div class="col-lg-7">
|
||||
<!-- Bill section -->
|
||||
<div id="billSection" class="card shadow-sm mb-3">
|
||||
<div class="card-header fw-semibold"><i class="bi bi-receipt me-2 text-primary"></i>Bill Details</div>
|
||||
<div class="card-body">
|
||||
<div class="row g-3 mb-3">
|
||||
<div class="col-6">
|
||||
<label class="form-label fw-semibold">Vendor</label>
|
||||
<select asp-for="BillVendorId" asp-items="@((IEnumerable<SelectListItem>)ViewBag.Vendors)"
|
||||
class="form-select">
|
||||
<option value="">— Select vendor —</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<label class="form-label fw-semibold">AP Account</label>
|
||||
<select asp-for="APAccountId" asp-items="@((IEnumerable<SelectListItem>)ViewBag.APAccounts)"
|
||||
class="form-select">
|
||||
<option value="">— Select —</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row g-3 mb-3">
|
||||
<div class="col-6">
|
||||
<label class="form-label fw-semibold">Terms</label>
|
||||
<select asp-for="BillTerms" class="form-select">
|
||||
<option value="">— None —</option>
|
||||
<option>Net 15</option>
|
||||
<option>Net 30</option>
|
||||
<option>Net 45</option>
|
||||
<option>Net 60</option>
|
||||
<option>Due on Receipt</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<label class="form-label fw-semibold">Tax %</label>
|
||||
<div class="input-group">
|
||||
<input asp-for="BillTaxPercent" type="number" step="0.01" min="0" class="form-control" />
|
||||
<span class="input-group-text">%</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="form-label fw-semibold">Memo / Description</label>
|
||||
<input asp-for="BillMemo" class="form-control" placeholder="e.g. Monthly office rent" />
|
||||
</div>
|
||||
|
||||
<!-- Line items -->
|
||||
<div class="d-flex align-items-center justify-content-between mb-2">
|
||||
<span class="fw-semibold small">Line Items</span>
|
||||
<button type="button" class="btn btn-sm btn-outline-secondary" onclick="addBillLine()">
|
||||
<i class="bi bi-plus"></i> Add Line
|
||||
</button>
|
||||
</div>
|
||||
<div id="billLines">
|
||||
@for (int i = 0; i < Model.LineItems.Count; i++)
|
||||
{
|
||||
<div class="row g-2 mb-2 bill-line">
|
||||
<div class="col-4">
|
||||
<select name="LineItems[@i].AccountId" class="form-select form-select-sm">
|
||||
<option value="">— Account —</option>
|
||||
@foreach (var a in (IEnumerable<SelectListItem>)ViewBag.AllExpenseAccounts)
|
||||
{
|
||||
if (a.Value == Model.LineItems[i].AccountId?.ToString())
|
||||
{
|
||||
<option value="@a.Value" selected="selected">@a.Text</option>
|
||||
}
|
||||
else
|
||||
{
|
||||
<option value="@a.Value">@a.Text</option>
|
||||
}
|
||||
}
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<input name="LineItems[@i].Description" type="text" class="form-control form-control-sm"
|
||||
placeholder="Description" value="@Model.LineItems[i].Description" />
|
||||
</div>
|
||||
<div class="col-1">
|
||||
<input name="LineItems[@i].Quantity" type="number" step="0.01" min="0" class="form-control form-control-sm"
|
||||
placeholder="Qty" value="@Model.LineItems[i].Quantity" />
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<input name="LineItems[@i].UnitPrice" type="number" step="0.01" min="0" class="form-control form-control-sm"
|
||||
placeholder="Price" value="@Model.LineItems[i].UnitPrice" />
|
||||
</div>
|
||||
<div class="col-1">
|
||||
<button type="button" class="btn btn-sm btn-outline-danger" onclick="this.closest('.bill-line').remove()">
|
||||
<i class="bi bi-x"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Expense section -->
|
||||
<div id="expenseSection" class="card shadow-sm mb-3 d-none">
|
||||
<div class="card-header fw-semibold"><i class="bi bi-credit-card me-2 text-warning"></i>Expense Details</div>
|
||||
<div class="card-body">
|
||||
<div class="row g-3 mb-3">
|
||||
<div class="col-6">
|
||||
<label class="form-label fw-semibold">Vendor <span class="text-muted">(optional)</span></label>
|
||||
<select asp-for="ExpenseVendorId" asp-items="@((IEnumerable<SelectListItem>)ViewBag.Vendors)"
|
||||
class="form-select">
|
||||
<option value="">— None —</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<label class="form-label fw-semibold">Amount</label>
|
||||
<div class="input-group">
|
||||
<span class="input-group-text">$</span>
|
||||
<input asp-for="ExpenseAmount" type="number" step="0.01" min="0" class="form-control" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row g-3 mb-3">
|
||||
<div class="col-6">
|
||||
<label class="form-label fw-semibold">Expense Account</label>
|
||||
<select asp-for="ExpenseAccountId" asp-items="@((IEnumerable<SelectListItem>)ViewBag.ExpenseAccounts)"
|
||||
class="form-select">
|
||||
<option value="">— Select —</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<label class="form-label fw-semibold">Payment Account</label>
|
||||
<select asp-for="PaymentAccountId" asp-items="@((IEnumerable<SelectListItem>)ViewBag.BankAccounts)"
|
||||
class="form-select">
|
||||
<option value="">— Select —</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row g-3 mb-3">
|
||||
<div class="col-6">
|
||||
<label class="form-label fw-semibold">Payment Method</label>
|
||||
<select asp-for="ExpensePaymentMethod" asp-items="@((IEnumerable<SelectListItem>)ViewBag.PaymentMethods)"
|
||||
class="form-select"></select>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<label class="form-label fw-semibold">Memo</label>
|
||||
<input asp-for="ExpenseMemo" class="form-control" placeholder="e.g. Monthly internet" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="d-flex gap-2 justify-content-end">
|
||||
<a asp-action="Index" class="btn btn-outline-secondary">Cancel</a>
|
||||
<button type="submit" class="btn btn-primary"><i class="bi bi-check-lg me-1"></i>Save Template</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<script src="~/js/recurring-template-form.js"></script>
|
||||
@{
|
||||
var accountsJson = System.Text.Json.JsonSerializer.Serialize(
|
||||
((IEnumerable<SelectListItem>)ViewBag.AllExpenseAccounts)
|
||||
.Select(a => new { value = a.Value, text = a.Text }));
|
||||
}
|
||||
<script>
|
||||
window.allExpenseAccounts = @Html.Raw(accountsJson);
|
||||
initRecurringForm(@((int)Model.TemplateType));
|
||||
</script>
|
||||
@@ -0,0 +1,250 @@
|
||||
@model PowderCoating.Web.Controllers.RecurringTemplateViewModel
|
||||
@using PowderCoating.Core.Enums
|
||||
@using Microsoft.AspNetCore.Mvc.Rendering
|
||||
@{
|
||||
ViewData["Title"] = "Edit Recurring Template";
|
||||
}
|
||||
|
||||
<div class="d-flex align-items-center mb-4">
|
||||
<a asp-action="Index" class="btn btn-outline-secondary me-3"><i class="bi bi-arrow-left"></i></a>
|
||||
<div>
|
||||
<h4 class="fw-bold mb-0">Edit: @Model.Name</h4>
|
||||
<p class="text-muted small mb-0">Changes take effect on the next scheduled fire.</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<form asp-action="Edit" method="post" id="recurringForm">
|
||||
@Html.AntiForgeryToken()
|
||||
<input type="hidden" asp-for="Id" />
|
||||
|
||||
<div class="row g-4">
|
||||
<!-- Left column: schedule settings -->
|
||||
<div class="col-lg-5">
|
||||
<div class="card shadow-sm">
|
||||
<div class="card-header fw-semibold"><i class="bi bi-calendar3 me-2"></i>Schedule</div>
|
||||
<div class="card-body">
|
||||
<div class="mb-3">
|
||||
<label asp-for="Name" class="form-label fw-semibold">Template Name <span class="text-danger">*</span></label>
|
||||
<input asp-for="Name" class="form-control" />
|
||||
<span asp-validation-for="Name" class="text-danger small"></span>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label class="form-label fw-semibold">Type</label>
|
||||
<div>
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="radio" name="TemplateType" id="typeBill"
|
||||
value="1" @(Model.TemplateType == RecurringTemplateType.Bill ? "checked" : "") />
|
||||
<label class="form-check-label" for="typeBill">
|
||||
<i class="bi bi-receipt me-1 text-primary"></i>Bill
|
||||
</label>
|
||||
</div>
|
||||
<div class="form-check form-check-inline">
|
||||
<input class="form-check-input" type="radio" name="TemplateType" id="typeExpense"
|
||||
value="2" @(Model.TemplateType == RecurringTemplateType.Expense ? "checked" : "") />
|
||||
<label class="form-check-label" for="typeExpense">
|
||||
<i class="bi bi-credit-card me-1 text-warning"></i>Expense
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row g-3 mb-3">
|
||||
<div class="col-7">
|
||||
<label asp-for="Frequency" class="form-label fw-semibold">Frequency</label>
|
||||
<select asp-for="Frequency" asp-items="Html.GetEnumSelectList<RecurringFrequency>()" class="form-select"></select>
|
||||
</div>
|
||||
<div class="col-5">
|
||||
<label asp-for="IntervalCount" class="form-label fw-semibold">Every</label>
|
||||
<div class="input-group">
|
||||
<input asp-for="IntervalCount" type="number" min="1" max="99" class="form-control" />
|
||||
<span class="input-group-text">period(s)</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label asp-for="StartDate" class="form-label fw-semibold">Next Fire Date</label>
|
||||
<input asp-for="StartDate" type="date" class="form-control"
|
||||
value="@Model.StartDate.ToString("yyyy-MM-dd")" />
|
||||
<div class="form-text">Editing this advances or delays the next occurrence.</div>
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label asp-for="EndDate" class="form-label fw-semibold">End Date <span class="text-muted">(optional)</span></label>
|
||||
<input asp-for="EndDate" type="date" class="form-control"
|
||||
value="@Model.EndDate?.ToString("yyyy-MM-dd")" />
|
||||
</div>
|
||||
|
||||
<div class="mb-3">
|
||||
<label asp-for="MaxOccurrences" class="form-label fw-semibold">Max Occurrences <span class="text-muted">(optional)</span></label>
|
||||
<input asp-for="MaxOccurrences" type="number" min="1" class="form-control" placeholder="Unlimited" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Right column -->
|
||||
<div class="col-lg-7">
|
||||
<!-- Bill section -->
|
||||
<div id="billSection" class="card shadow-sm mb-3">
|
||||
<div class="card-header fw-semibold"><i class="bi bi-receipt me-2 text-primary"></i>Bill Details</div>
|
||||
<div class="card-body">
|
||||
<div class="row g-3 mb-3">
|
||||
<div class="col-6">
|
||||
<label class="form-label fw-semibold">Vendor</label>
|
||||
<select asp-for="BillVendorId" asp-items="@((IEnumerable<SelectListItem>)ViewBag.Vendors)"
|
||||
class="form-select">
|
||||
<option value="">— Select vendor —</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<label class="form-label fw-semibold">AP Account</label>
|
||||
<select asp-for="APAccountId" asp-items="@((IEnumerable<SelectListItem>)ViewBag.APAccounts)"
|
||||
class="form-select">
|
||||
<option value="">— Select —</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row g-3 mb-3">
|
||||
<div class="col-6">
|
||||
<label class="form-label fw-semibold">Terms</label>
|
||||
<select asp-for="BillTerms" class="form-select">
|
||||
<option value="">— None —</option>
|
||||
<option>Net 15</option>
|
||||
<option>Net 30</option>
|
||||
<option>Net 45</option>
|
||||
<option>Net 60</option>
|
||||
<option>Due on Receipt</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<label class="form-label fw-semibold">Tax %</label>
|
||||
<div class="input-group">
|
||||
<input asp-for="BillTaxPercent" type="number" step="0.01" min="0" class="form-control" />
|
||||
<span class="input-group-text">%</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="form-label fw-semibold">Memo</label>
|
||||
<input asp-for="BillMemo" class="form-control" />
|
||||
</div>
|
||||
|
||||
<div class="d-flex align-items-center justify-content-between mb-2">
|
||||
<span class="fw-semibold small">Line Items</span>
|
||||
<button type="button" class="btn btn-sm btn-outline-secondary" onclick="addBillLine()">
|
||||
<i class="bi bi-plus"></i> Add Line
|
||||
</button>
|
||||
</div>
|
||||
<div id="billLines">
|
||||
@for (int i = 0; i < Model.LineItems.Count; i++)
|
||||
{
|
||||
<div class="row g-2 mb-2 bill-line">
|
||||
<div class="col-4">
|
||||
<select name="LineItems[@i].AccountId" class="form-select form-select-sm">
|
||||
<option value="">— Account —</option>
|
||||
@foreach (var a in (IEnumerable<SelectListItem>)ViewBag.AllExpenseAccounts)
|
||||
{
|
||||
if (a.Value == Model.LineItems[i].AccountId?.ToString())
|
||||
{
|
||||
<option value="@a.Value" selected="selected">@a.Text</option>
|
||||
}
|
||||
else
|
||||
{
|
||||
<option value="@a.Value">@a.Text</option>
|
||||
}
|
||||
}
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<input name="LineItems[@i].Description" type="text" class="form-control form-control-sm"
|
||||
placeholder="Description" value="@Model.LineItems[i].Description" />
|
||||
</div>
|
||||
<div class="col-1">
|
||||
<input name="LineItems[@i].Quantity" type="number" step="0.01" min="0" class="form-control form-control-sm"
|
||||
placeholder="Qty" value="@Model.LineItems[i].Quantity" />
|
||||
</div>
|
||||
<div class="col-2">
|
||||
<input name="LineItems[@i].UnitPrice" type="number" step="0.01" min="0" class="form-control form-control-sm"
|
||||
placeholder="Price" value="@Model.LineItems[i].UnitPrice" />
|
||||
</div>
|
||||
<div class="col-1">
|
||||
<button type="button" class="btn btn-sm btn-outline-danger" onclick="this.closest('.bill-line').remove()">
|
||||
<i class="bi bi-x"></i>
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Expense section -->
|
||||
<div id="expenseSection" class="card shadow-sm mb-3 d-none">
|
||||
<div class="card-header fw-semibold"><i class="bi bi-credit-card me-2 text-warning"></i>Expense Details</div>
|
||||
<div class="card-body">
|
||||
<div class="row g-3 mb-3">
|
||||
<div class="col-6">
|
||||
<label class="form-label fw-semibold">Vendor <span class="text-muted">(optional)</span></label>
|
||||
<select asp-for="ExpenseVendorId" asp-items="@((IEnumerable<SelectListItem>)ViewBag.Vendors)"
|
||||
class="form-select">
|
||||
<option value="">— None —</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<label class="form-label fw-semibold">Amount</label>
|
||||
<div class="input-group">
|
||||
<span class="input-group-text">$</span>
|
||||
<input asp-for="ExpenseAmount" type="number" step="0.01" min="0" class="form-control" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row g-3 mb-3">
|
||||
<div class="col-6">
|
||||
<label class="form-label fw-semibold">Expense Account</label>
|
||||
<select asp-for="ExpenseAccountId" asp-items="@((IEnumerable<SelectListItem>)ViewBag.ExpenseAccounts)"
|
||||
class="form-select">
|
||||
<option value="">— Select —</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<label class="form-label fw-semibold">Payment Account</label>
|
||||
<select asp-for="PaymentAccountId" asp-items="@((IEnumerable<SelectListItem>)ViewBag.BankAccounts)"
|
||||
class="form-select">
|
||||
<option value="">— Select —</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row g-3 mb-3">
|
||||
<div class="col-6">
|
||||
<label class="form-label fw-semibold">Payment Method</label>
|
||||
<select asp-for="ExpensePaymentMethod" asp-items="@((IEnumerable<SelectListItem>)ViewBag.PaymentMethods)"
|
||||
class="form-select"></select>
|
||||
</div>
|
||||
<div class="col-6">
|
||||
<label class="form-label fw-semibold">Memo</label>
|
||||
<input asp-for="ExpenseMemo" class="form-control" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="d-flex gap-2 justify-content-end">
|
||||
<a asp-action="Index" class="btn btn-outline-secondary">Cancel</a>
|
||||
<button type="submit" class="btn btn-primary"><i class="bi bi-check-lg me-1"></i>Save Changes</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
<script src="~/js/recurring-template-form.js"></script>
|
||||
@{
|
||||
var accountsJson = System.Text.Json.JsonSerializer.Serialize(
|
||||
((IEnumerable<SelectListItem>)ViewBag.AllExpenseAccounts)
|
||||
.Select(a => new { value = a.Value, text = a.Text }));
|
||||
}
|
||||
<script>
|
||||
window.allExpenseAccounts = @Html.Raw(accountsJson);
|
||||
initRecurringForm(@((int)Model.TemplateType));
|
||||
</script>
|
||||
@@ -0,0 +1,160 @@
|
||||
@model List<PowderCoating.Core.Entities.RecurringTemplate>
|
||||
@using PowderCoating.Core.Enums
|
||||
@{
|
||||
ViewData["Title"] = "Recurring Transactions";
|
||||
}
|
||||
|
||||
<div class="d-flex align-items-center justify-content-between mb-4">
|
||||
<div>
|
||||
<h4 class="fw-bold mb-0"><i class="bi bi-arrow-repeat me-2 text-primary"></i>Recurring Transactions</h4>
|
||||
<p class="text-muted small mb-0">Templates that auto-generate bills or expenses on a schedule.</p>
|
||||
</div>
|
||||
<a asp-action="Create" class="btn btn-primary"><i class="bi bi-plus-lg me-1"></i>New Template</a>
|
||||
</div>
|
||||
|
||||
@if (TempData["Success"] != null)
|
||||
{
|
||||
<div class="alert alert-success alert-permanent alert-dismissible fade show">
|
||||
<i class="bi bi-check-circle-fill me-2"></i>@TempData["Success"]
|
||||
<button type="button" class="btn-close" data-bs-dismiss="alert"></button>
|
||||
</div>
|
||||
}
|
||||
@if (TempData["Error"] != null)
|
||||
{
|
||||
<div class="alert alert-danger alert-permanent alert-dismissible fade show">
|
||||
<i class="bi bi-exclamation-triangle-fill me-2"></i>@TempData["Error"]
|
||||
<button type="button" class="btn-close" data-bs-dismiss="alert"></button>
|
||||
</div>
|
||||
}
|
||||
|
||||
@if (!Model.Any())
|
||||
{
|
||||
<div class="text-center py-5">
|
||||
<i class="bi bi-arrow-repeat display-4 text-muted"></i>
|
||||
<h5 class="mt-3 text-muted">No recurring templates yet</h5>
|
||||
<p class="text-muted">Create a template to automatically generate bills or expenses on a schedule.</p>
|
||||
<a asp-action="Create" class="btn btn-primary mt-2"><i class="bi bi-plus-lg me-1"></i>Create Template</a>
|
||||
</div>
|
||||
}
|
||||
else
|
||||
{
|
||||
<div class="table-responsive">
|
||||
<table class="table table-hover align-middle">
|
||||
<thead class="table-light">
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th>Type</th>
|
||||
<th>Frequency</th>
|
||||
<th>Next Fire</th>
|
||||
<th>Occurrences</th>
|
||||
<th>Status</th>
|
||||
<th>Last Error</th>
|
||||
<th class="text-end">Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach (var t in Model)
|
||||
{
|
||||
<tr class="@(t.IsActive ? "" : "table-secondary text-muted")">
|
||||
<td class="fw-semibold">@t.Name</td>
|
||||
<td>
|
||||
@if (t.TemplateType == RecurringTemplateType.Bill)
|
||||
{
|
||||
<span class="badge bg-primary-subtle text-primary"><i class="bi bi-receipt me-1"></i>Bill</span>
|
||||
}
|
||||
else
|
||||
{
|
||||
<span class="badge bg-warning-subtle text-warning"><i class="bi bi-credit-card me-1"></i>Expense</span>
|
||||
}
|
||||
</td>
|
||||
<td>
|
||||
@{
|
||||
var freqLabel = t.IntervalCount == 1
|
||||
? t.Frequency.ToString()
|
||||
: $"Every {t.IntervalCount} × {t.Frequency}";
|
||||
}
|
||||
<span class="text-body-secondary small">@freqLabel</span>
|
||||
</td>
|
||||
<td>
|
||||
@if (t.IsActive)
|
||||
{
|
||||
var isOverdue = t.NextFireDate.Date < DateTime.Today;
|
||||
<span class="@(isOverdue ? "text-danger fw-semibold" : "")">
|
||||
@t.NextFireDate.ToString("MM/dd/yyyy")
|
||||
@if (isOverdue) { <i class="bi bi-exclamation-circle ms-1"></i> }
|
||||
</span>
|
||||
}
|
||||
else
|
||||
{
|
||||
<span class="text-muted">—</span>
|
||||
}
|
||||
</td>
|
||||
<td>
|
||||
<span class="badge bg-secondary-subtle text-secondary">@t.OccurrenceCount</span>
|
||||
@if (t.MaxOccurrences.HasValue)
|
||||
{
|
||||
<span class="text-muted small"> / @t.MaxOccurrences</span>
|
||||
}
|
||||
</td>
|
||||
<td>
|
||||
@if (t.IsActive)
|
||||
{
|
||||
<span class="badge bg-success"><i class="bi bi-play-fill me-1"></i>Active</span>
|
||||
}
|
||||
else
|
||||
{
|
||||
<span class="badge bg-secondary"><i class="bi bi-pause-fill me-1"></i>Paused</span>
|
||||
}
|
||||
</td>
|
||||
<td>
|
||||
@if (!string.IsNullOrWhiteSpace(t.LastError))
|
||||
{
|
||||
<span class="text-danger small" title="@t.LastError" data-bs-toggle="tooltip">
|
||||
<i class="bi bi-exclamation-triangle-fill me-1"></i>Error
|
||||
</span>
|
||||
}
|
||||
</td>
|
||||
<td class="text-end">
|
||||
<div class="d-flex gap-1 justify-content-end">
|
||||
<a asp-action="Edit" asp-route-id="@t.Id" class="btn btn-sm btn-outline-secondary" title="Edit">
|
||||
<i class="bi bi-pencil"></i>
|
||||
</a>
|
||||
<form asp-action="ToggleActive" asp-route-id="@t.Id" method="post">
|
||||
@Html.AntiForgeryToken()
|
||||
<button type="submit" class="btn btn-sm @(t.IsActive ? "btn-outline-warning" : "btn-outline-success")"
|
||||
title="@(t.IsActive ? "Pause" : "Resume")">
|
||||
<i class="bi @(t.IsActive ? "bi-pause" : "bi-play")"></i>
|
||||
</button>
|
||||
</form>
|
||||
@if (t.IsActive)
|
||||
{
|
||||
<form asp-action="GenerateNow" asp-route-id="@t.Id" method="post"
|
||||
onsubmit="return confirm('Generate one occurrence of this template now?')">
|
||||
@Html.AntiForgeryToken()
|
||||
<button type="submit" class="btn btn-sm btn-outline-primary" title="Generate Now">
|
||||
<i class="bi bi-lightning-charge"></i>
|
||||
</button>
|
||||
</form>
|
||||
}
|
||||
<form asp-action="Delete" asp-route-id="@t.Id" method="post"
|
||||
onsubmit="return confirm('Delete this recurring template? Generated documents will not be affected.')">
|
||||
@Html.AntiForgeryToken()
|
||||
<button type="submit" class="btn btn-sm btn-outline-danger" title="Delete">
|
||||
<i class="bi bi-trash"></i>
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<p class="text-muted small mt-2">
|
||||
<i class="bi bi-info-circle me-1"></i>
|
||||
The background service checks hourly and auto-generates due templates.
|
||||
Bills are created as Draft; Expenses are recorded immediately.
|
||||
<i class="bi bi-lightning-charge ms-2 text-primary"></i> Generate Now fires one occurrence immediately.
|
||||
</p>
|
||||
}
|
||||
@@ -1142,6 +1142,10 @@
|
||||
<i class="bi bi-bank2"></i>
|
||||
<span>Bank Reconciliation</span>
|
||||
</a>
|
||||
<a asp-controller="RecurringTemplates" asp-action="Index" class="nav-link">
|
||||
<i class="bi bi-arrow-repeat"></i>
|
||||
<span>Recurring Transactions</span>
|
||||
</a>
|
||||
if (hasReports)
|
||||
{
|
||||
<a asp-controller="AccountingExport" asp-action="Index" class="nav-link">
|
||||
|
||||
Reference in New Issue
Block a user