aljaz/btcpayserver
1
0
Fork 0
mirror of https://github.com/aljazceru/btcpayserver.git synced 2025-12-18 06:24:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update Payment Request View (#3259)

Browse Source 
* removes "back to list"

* changes currency label + formats currency and amount

* adjust sizing

* Wording: Create and Save button

* Improve search responsive behaviour

Co-authored-by: Dennis Reimann <mail@dennisreimann.de>
Co-authored-by: Nicolas Dorier <nicolas.dorier@gmail.com>
This commit is contained in:
dstrukt
2022-01-11 05:16:16 -08:00
committed by GitHub
parent 5bbaa48b49
commit 323e5e14a3
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs
View File

@@ -52,7 +52,7 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
[Range(double.Epsilon, double.PositiveInfinity, ErrorMessage = "Please provide an amount greater than 0")] [Range(double.Epsilon, double.PositiveInfinity, ErrorMessage = "Please provide an amount greater than 0")]
public decimal Amount { get; set; } public decimal Amount { get; set; }
[Display(Name = "The currency used for payment request. (e.g. BTC, LTC, USD, etc.)")] [Display(Name = "Currency")]
public string Currency { get; set; } public string Currency { get; set; }
[Display(Name = "Expiration Date")] [Display(Name = "Expiration Date")]

26
BTCPayServer/Views/PaymentRequest/EditPaymentRequest.cshtml
View File

@@ -25,17 +25,18 @@
<input asp-for="Title" class="form-control" required /> <input asp-for="Title" class="form-control" required />
<span asp-validation-for="Title" class="text-danger"></span> <span asp-validation-for="Title" class="text-danger"></span>
</div> </div>
<div class="form-group"> <div class="d-flex justify-content-between">
<label asp-for="Amount" class="form-label" data-required></label> <div class="form-group flex-fill me-4">
<input type="number" step="any" asp-for="Amount" class="form-control" required /> <label asp-for="Amount" class="form-label" data-required></label>
<span asp-validation-for="Amount" class="text-danger"></span> <input type="number" step="any" asp-for="Amount" class="form-control" required />
<span asp-validation-for="Amount" class="text-danger"></span>
</div>
<div class="form-group">
<label asp-for="Currency" class="form-label"></label>
<input asp-for="Currency" class="form-control" />
<span asp-validation-for="Currency" class="text-danger"></span>
</div>
</div> </div>
<div class="form-group">
<label asp-for="Currency" class="form-label"></label>
<input asp-for="Currency" class="form-control" />
<span asp-validation-for="Currency" class="text-danger"></span>
</div>
<div class="form-group form-check"> <div class="form-group form-check">
<input asp-for="AllowCustomPaymentAmounts" type="checkbox" class="form-check-input" /> <input asp-for="AllowCustomPaymentAmounts" type="checkbox" class="form-check-input" />
<label asp-for="AllowCustomPaymentAmounts" class="form-check-label"></label> <label asp-for="AllowCustomPaymentAmounts" class="form-check-label"></label>
@@ -101,7 +102,9 @@
</div> </div>
<div class="form-group mt-4"> <div class="form-group mt-4">
<button type="submit" class="btn btn-primary" id="SaveButton">Save</button> <button type="submit" class="btn btn-primary" id="SaveButton">
@(string.IsNullOrEmpty(Model.Id) ? "Create" : "Save")
</button>
@if (!string.IsNullOrEmpty(Model.Id)) @if (!string.IsNullOrEmpty(Model.Id))
{ {
<a class="btn btn-secondary" target="_blank" asp-action="ViewPaymentRequest" asp-route-payReqId="@Model.Id" id="ViewAppButton">View</a> <a class="btn btn-secondary" target="_blank" asp-action="ViewPaymentRequest" asp-route-payReqId="@Model.Id" id="ViewAppButton">View</a>
@@ -120,7 +123,6 @@
<a class="btn btn-secondary" data-bs-toggle="tooltip" title="Unarchive this payment request" asp-controller="PaymentRequest" asp-action="TogglePaymentRequestArchival" asp-route-payReqId="@Model.Id">Unarchive</a> <a class="btn btn-secondary" data-bs-toggle="tooltip" title="Unarchive this payment request" asp-controller="PaymentRequest" asp-action="TogglePaymentRequestArchival" asp-route-payReqId="@Model.Id">Unarchive</a>
} }
} }
<a asp-action="GetPaymentRequests" asp-route-storeId="@Model.StoreId" class="btn btn-link px-0 ms-3">Back to list</a>
</div> </div>
</div> </div>
</div> </div>

8
BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml
View File

@@ -22,14 +22,14 @@
</a> </a>
</div> </div>
<div class="row"> <div class="row mb-2">
<div class="col-12 col-lg-6 mb-3 ms-auto"> <div class="col col-lg-8 col-xl-6 mr-auto">
<form asp-action="GetPaymentRequests" method="get"> <form asp-action="GetPaymentRequests" method="get">
<input type="hidden" asp-for="Count"/> <input type="hidden" asp-for="Count"/>
<input type="hidden" asp-for="TimezoneOffset" /> <input type="hidden" asp-for="TimezoneOffset" />
<div class="input-group"> <div class="input-group">
<input asp-for="SearchTerm" class="form-control" style="width:300px;"/> <input asp-for="SearchTerm" class="form-control" />
<button type="submit" class="btn btn-secondary" title="Search invoice"> <button type="submit" class="btn btn-secondary text-nowrap" title="Search invoice">
<span class="fa fa-search"></span> Search <span class="fa fa-search"></span> Search
</button> </button>
<button type="button" class="btn btn-secondary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <button type="button" class="btn btn-secondary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">