From e3a8e1a187ab081c6378fc082c1b8a630c04d5d2 Mon Sep 17 00:00:00 2001
From: rockstardev <rockstardev@users.noreply.github.com>
Date: Sun, 19 Jul 2020 16:49:13 -0500
Subject: [PATCH] Applying conventions from ListInvoice on PaymentRequests

---
 .../Controllers/PaymentRequestController.cs   |   3 +-
 .../ListPaymentRequestsViewModel.cs           |   6 +-
 .../PaymentRequest/GetPaymentRequests.cshtml  | 103 ++++++++++--------
 3 files changed, 61 insertions(+), 51 deletions(-)

diff --git a/BTCPayServer/Controllers/PaymentRequestController.cs b/BTCPayServer/Controllers/PaymentRequestController.cs
index 4488285ec..ab887f7eb 100644
--- a/BTCPayServer/Controllers/PaymentRequestController.cs
+++ b/BTCPayServer/Controllers/PaymentRequestController.cs
@@ -76,10 +76,11 @@ namespace BTCPayServer.Controllers
             });
             return View(new ListPaymentRequestsViewModel()
             {
-                IncludeArchived = includeArchived,
                 Skip = skip,
                 Count = count,
                 Total = result.Total,
+                SearchTerm = searchTerm,
+                TimezoneOffset = timezoneOffset,
                 Items = result.Items.Select(data => new ViewPaymentRequestViewModel(data)).ToList()
             });
         }
diff --git a/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs b/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs
index 0abe7c75c..8f9cedc70 100644
--- a/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs
+++ b/BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs
@@ -12,11 +12,11 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
     {
         public int Skip { get; set; }
         public int Count { get; set; }
-
+        public int Total { get; set; }
+        public string SearchTerm { get; set; }
+        public int? TimezoneOffset { get; set; }
         public List<ViewPaymentRequestViewModel> Items { get; set; }
 
-        public int Total { get; set; }
-        public bool IncludeArchived { get; set; }
     }
 
     public class UpdatePaymentRequestViewModel
diff --git a/BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml b/BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml
index 3c172550d..b14e96419 100644
--- a/BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml
+++ b/BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml
@@ -10,7 +10,7 @@
         {
             <div class="row">
                 <div class="col-lg-12 text-center">
-                    <partial name="_StatusMessage"/>
+                    <partial name="_StatusMessage" />
                 </div>
             </div>
         }
@@ -18,10 +18,35 @@
             <div class="col-lg-12 section-heading">
                 <h2>Payment Requests</h2>
                 <hr class="primary">
+                <p>Create, search or pay an payment request.</p>
             </div>
         </div>
+
+        <form asp-action="GetPaymentRequests" method="get" style="float:right;">
+            <input type="hidden" asp-for="Count" />
+            <div class="input-group">
+                <input asp-for="TimezoneOffset" type="hidden" />
+                <input asp-for="SearchTerm" class="form-control" style="width:300px;" />
+                <div class="input-group-append">
+                    <button type="submit" class="btn btn-primary" title="Search invoice">
+                        <span class="fa fa-search"></span> Search
+                    </button>
+                    <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                        <span class="sr-only">Toggle Dropdown</span>
+                    </button>
+
+                    <div class="dropdown-menu dropdown-menu-right">
+                        <a class="dropdown-item" href="/payment-requests?Count=@Model.Count&SearchTerm=includearchived%3Atrue">Include Archived Payment Reqs</a>
+                        <div role="separator" class="dropdown-divider"></div>
+                        <a class="dropdown-item" href="/payment-requests?SearchTerm=">Unfiltered</a>
+                    </div>
+                </div>
+            </div>
+            <span asp-validation-for="SearchTerm" class="text-danger"></span>
+        </form>
+
         <div class="row button-row">
-            <div class="col-lg-12">
+            <div class="col-lg-24">
                 <a asp-action="EditPaymentRequest" class="btn btn-primary" role="button" id="CreatePaymentRequest"><span class="fa fa-plus"></span> Create a new payment request</a>
                 <a href="https://docs.btcpayserver.org/PaymentRequests/" target="_blank">
                     <span class="fa fa-question-circle-o" title="More information..."></span>
@@ -32,37 +57,37 @@
             <div class="col-lg-12">
                 <table class="table table-sm table-responsive-md">
                     <thead>
-                    <tr>
-                        <th>Title</th>
-                        <th>Expiry</th>
-                        <th class="text-right">Price</th>
-                        <th class="text-right">Status</th>
-                        <th class="text-right">Actions</th>
-                    </tr>
+                        <tr>
+                            <th>Title</th>
+                            <th>Expiry</th>
+                            <th class="text-right">Price</th>
+                            <th class="text-right">Status</th>
+                            <th class="text-right">Actions</th>
+                        </tr>
                     </thead>
                     <tbody>
-                    @foreach (var item in Model.Items)
-                    {
-                        <tr>
-                            <td>@item.Title</td>
-                            <td>@(item.ExpiryDate?.ToString("g") ?? "No Expiry")</td>
-                            <td class="text-right">@item.Amount @item.Currency</td>
-                            <td class="text-right">@item.Status</td>
-                            <td class="text-right">
-                                <a asp-action="EditPaymentRequest" asp-route-id="@item.Id">Edit</a>
-                                <span> - </span>
-                                <a asp-action="ViewPaymentRequest" asp-route-id="@item.Id">View</a>
-                                <span> - </span>
-                                <a target="_blank" asp-action="ListInvoices" asp-controller="Invoice" asp-route-searchterm="@($"orderid:{PaymentRequestRepository.GetOrderIdForPaymentRequest(item.Id)}")">Invoices</a>
-                                <span> - </span>
-                                <a target="_blank" asp-action="PayPaymentRequest" asp-route-id="@item.Id">Pay</a>
-                                <span> - </span>
-                                <a target="_blank" asp-action="ClonePaymentRequest" asp-route-id="@item.Id">Clone</a>
-                                <span> - </span>
-                                <a asp-action="TogglePaymentRequestArchival" asp-route-id="@item.Id">@(item.Archived ? "Unarchive" : "Archive")</a>
-                            </td>
-                        </tr>
-                    }
+                        @foreach (var item in Model.Items)
+                        {
+                            <tr>
+                                <td>@item.Title</td>
+                                <td>@(item.ExpiryDate?.ToString("g") ?? "No Expiry")</td>
+                                <td class="text-right">@item.Amount @item.Currency</td>
+                                <td class="text-right">@item.Status</td>
+                                <td class="text-right">
+                                    <a asp-action="EditPaymentRequest" asp-route-id="@item.Id">Edit</a>
+                                    <span> - </span>
+                                    <a asp-action="ViewPaymentRequest" asp-route-id="@item.Id">View</a>
+                                    <span> - </span>
+                                    <a target="_blank" asp-action="ListInvoices" asp-controller="Invoice" asp-route-searchterm="@($"orderid:{PaymentRequestRepository.GetOrderIdForPaymentRequest(item.Id)}")">Invoices</a>
+                                    <span> - </span>
+                                    <a target="_blank" asp-action="PayPaymentRequest" asp-route-id="@item.Id">Pay</a>
+                                    <span> - </span>
+                                    <a target="_blank" asp-action="ClonePaymentRequest" asp-route-id="@item.Id">Clone</a>
+                                    <span> - </span>
+                                    <a asp-action="TogglePaymentRequestArchival" asp-route-id="@item.Id">@(item.Archived ? "Unarchive" : "Archive")</a>
+                                </td>
+                            </tr>
+                        }
                     </tbody>
                 </table>
 
@@ -95,22 +120,6 @@
 
                         </ul>
                     </nav>
-                    <a class="ml-2 mt-1" href="@Url.Action("GetPaymentRequests", new
-                             {
-                                 skip = Model.Skip,
-                                 count = Model.Count,
-                                 searchTerm = "includearchived:"+ !Model.IncludeArchived
-                             })">
-                        @if (Model.IncludeArchived)
-                        {
-                            <span> Hide archived payment requests. </span>
-                        }
-                        else
-                        {
-                            <span> Show archived payment requests.</span>
-                        }
-
-                    </a>
                 </div>
             </div>
         </div>