aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2026-01-03 14:14:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1238 from bolatovumar/fix-1236

Browse Source 
Adjust invoice pagination behavior
This commit is contained in:
Nicolas Dorier
2020-01-12 16:55:57 +09:00
committed by GitHub
parent 9ba1403f5c 0387306918
commit 90da81f68e
1 changed files with 34 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
BTCPayServer/Views/Invoice/ListInvoices.cshtml
View File

@@ -75,9 +75,9 @@
</button>
@{
var storeIds = String.Join(
var storeIds = string.Join(
"",
Model.StoreIds.Select(storeId => string.Format(",storeid:{0}", storeId))
Model.StoreIds.Select(storeId => $",storeid:{storeId}")
);
}
@@ -116,7 +116,7 @@
</div>
<div class="modal-body">
<div class="form-group row">
<label for="staticEmail" class="col-sm-3 col-form-label">Start Date</label>
<label for="dtpStartDate" class="col-sm-3 col-form-label">Start Date</label>
<div class="col-sm-9">
<div class="input-group">
<input id="dtpStartDate" class="form-control flatdtpicker" type="datetime-local"
@@ -273,7 +273,7 @@
</tr>
<tr id="invoice_@invoice.InvoiceId" style="display:none;">
<td colspan="99">
<div style="margin-left: 15px; margin-bottom: 0px;">
<div style="margin-left: 15px; margin-bottom: 0;">
<partial name="InvoicePaymentsPartial" model="invoice.Details" />
</div>
</td>
@@ -282,43 +282,57 @@
</tbody>
</table>
<nav aria-label="..." class="w-100">
<ul class="pagination float-left">
<li class="page-item @(Model.Skip == 0 ? "disabled" : null)">
<a class="page-link" tabindex="-1" href="@listInvoices(-1, Model.Count)">&laquo;</a>
</li>
<li class="page-item disabled">
<span class="page-link">@(Model.Skip + 1) to @(Model.Skip + Model.Invoices.Count) of @Model.Total</span>
</li>
<li class="page-item @(Model.Total > (Model.Skip + Model.Invoices.Count) ? null : "disabled")">
<a class="page-link" href="@listInvoices(1, Model.Count)">&raquo;</a>
</li>
</ul>
@if (Model.Total != 0) {
<ul class="pagination float-left">
<li class="page-item @(Model.Skip == 0 ? "disabled" : null)">
<a class="page-link" tabindex="-1" href="@ListInvoicesPage(-1, Model.Count)">&laquo;</a>
</li>
<li class="page-item disabled">
@if (Model.Total <= Model.Count) {
<span class="page-link">
1–@Model.Invoices.Count
</span>
} else {
<span class="page-link">
@(Model.Skip + 1)–@(Model.Skip + Model.Invoices.Count), Total: @Model.Total
</span>
}
</li>
<li class="page-item @(Model.Total > (Model.Skip + Model.Invoices.Count) ? null : "disabled")">
<a class="page-link" href="@ListInvoicesPage(1, Model.Count)">&raquo;</a>
</li>
</ul>
}
<ul class="pagination float-right">
<li class="page-item disabled">
<span class="page-link">Page Size:</span>
</li>
<li class="page-item @(Model.Count == 50 ? "active" : null)">
<a class="page-link" href="@listInvoices(0, 50)">50</a>
<a class="page-link" href="@ListInvoicesPage(0, 50)">50</a>
</li>
<li class="page-item @(Model.Count == 100 ? "active" : null)">
<a class="page-link" href="@listInvoices(0, 100)">100</a>
<a class="page-link" href="@ListInvoicesPage(0, 100)">100</a>
</li>
<li class="page-item @(Model.Count == 250 ? "active" : null)">
<a class="page-link" href="@listInvoices(0, 250)">250</a>
<a class="page-link" href="@ListInvoicesPage(0, 250)">250</a>
</li>
<li class="page-item @(Model.Count == 500 ? "active" : null)">
<a class="page-link" href="@listInvoices(0, 500)">500</a>
<a class="page-link" href="@ListInvoicesPage(0, 500)">500</a>
</li>
</ul>
</nav>
@{
string listInvoices(int prevNext, int count)
string ListInvoicesPage(int prevNext, int count)
{
var skip = Model.Skip;
if (prevNext == -1)
{
skip = Math.Max(0, Model.Skip - Model.Count);
}
else if (prevNext == 1)
{
skip = Model.Skip + count;
}
var act = Url.Action("ListInvoices", new
{