mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-03-03 17:36:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Adjust invoice pagination behavior

Browse source 
fix #1236
This commit is contained in:
Umar Bolatov 2019-12-26 14:53:09 -08:00
parent d689222e04
commit dc59c4ca47
No known key found for this signature in database
GPG key ID: 2C1F9AEB371D2A28
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
BTCPayServer/Views/Invoice/ListInvoices.cshtml
View file

@ -75,9 +75,9 @@
</button> </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>
<div class="modal-body"> <div class="modal-body">
<div class="form-group row"> <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="col-sm-9">
<div class="input-group"> <div class="input-group">
<input id="dtpStartDate" class="form-control flatdtpicker" type="datetime-local" <input id="dtpStartDate" class="form-control flatdtpicker" type="datetime-local"
@ -273,7 +273,7 @@
</tr> </tr>
<tr id="invoice_@invoice.InvoiceId" style="display:none;"> <tr id="invoice_@invoice.InvoiceId" style="display:none;">
<td colspan="99"> <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" /> <partial name="InvoicePaymentsPartial" model="invoice.Details" />
</div> </div>
</td> </td>
@ -284,13 +284,13 @@
<nav aria-label="..." class="w-100"> <nav aria-label="..." class="w-100">
<ul class="pagination float-left"> <ul class="pagination float-left">
<li class="page-item @(Model.Skip == 0 ? "disabled" : null)"> <li class="page-item @(Model.Skip == 0 ? "disabled" : null)">
<a class="page-link" tabindex="-1" href="@listInvoices(-1, Model.Count)">&laquo;</a> <a class="page-link" tabindex="-1" href="@ListInvoices(-1, Model.Count)">&laquo;</a>
</li> </li>
<li class="page-item disabled"> <li class="page-item disabled">
<span class="page-link">@(Model.Skip + 1) to @(Model.Skip + Model.Invoices.Count) of @Model.Total</span> <span class="page-link">@Model.Skip to @(Model.Skip + Model.Invoices.Count) of @Model.Total</span>
</li> </li>
<li class="page-item @(Model.Total > (Model.Skip + Model.Invoices.Count) ? null : "disabled")"> <li class="page-item @(Model.Total > (Model.Skip + Model.Invoices.Count) ? null : "disabled")">
<a class="page-link" href="@listInvoices(1, Model.Count)">&raquo;</a> <a class="page-link" href="@ListInvoices(1, Model.Count)">&raquo;</a>
</li> </li>
</ul> </ul>
<ul class="pagination float-right"> <ul class="pagination float-right">
@ -298,27 +298,31 @@
<span class="page-link">Page Size:</span> <span class="page-link">Page Size:</span>
</li> </li>
<li class="page-item @(Model.Count == 50 ? "active" : null)"> <li class="page-item @(Model.Count == 50 ? "active" : null)">
<a class="page-link" href="@listInvoices(0, 50)">50</a> <a class="page-link" href="@ListInvoices(0, 50)">50</a>
</li> </li>
<li class="page-item @(Model.Count == 100 ? "active" : null)"> <li class="page-item @(Model.Count == 100 ? "active" : null)">
<a class="page-link" href="@listInvoices(0, 100)">100</a> <a class="page-link" href="@ListInvoices(0, 100)">100</a>
</li> </li>
<li class="page-item @(Model.Count == 250 ? "active" : null)"> <li class="page-item @(Model.Count == 250 ? "active" : null)">
<a class="page-link" href="@listInvoices(0, 250)">250</a> <a class="page-link" href="@ListInvoices(0, 250)">250</a>
</li> </li>
<li class="page-item @(Model.Count == 500 ? "active" : null)"> <li class="page-item @(Model.Count == 500 ? "active" : null)">
<a class="page-link" href="@listInvoices(0, 500)">500</a> <a class="page-link" href="@ListInvoices(0, 500)">500</a>
</li> </li>
</ul> </ul>
</nav> </nav>
@{ @{
string listInvoices(int prevNext, int count) string ListInvoices(int prevNext, int count)
{ {
var skip = Model.Skip; var skip = Model.Skip;
if (prevNext == -1) if (prevNext == -1)
{
skip = Math.Max(0, Model.Skip - Model.Count); skip = Math.Max(0, Model.Skip - Model.Count);
}
else if (prevNext == 1) else if (prevNext == 1)
{
skip = Model.Skip + count; skip = Model.Skip + count;
}
var act = Url.Action("ListInvoices", new var act = Url.Action("ListInvoices", new
{ {