mirrors/btcpayserver
1
0
Fork 0
mirror of https://github.com/btcpayserver/btcpayserver.git synced 2025-02-21 14:04:12 +01:00
Code Issues Projects Releases Packages Wiki Activity

Minor UI improvements (#2606)

Browse source 
* Added "Checkout" button to invoice detail page

* Added missing icon

All other pages have a "plus" icon on the primary button, except this page

* Button icons are always in front, not after like here was
This commit is contained in:
Wouter Samaey 2021-06-24 12:52:41 +02:00 • committed by GitHub
parent 3338dcac1c
commit 2ea3baf36e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 19 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
BTCPayServer/Controllers/InvoiceController.UI.cs
View file

@ -129,6 +129,7 @@ namespace BTCPayServer.Controllers
PosData = PosDataParser.ParsePosData(invoice.Metadata.PosData), PosData = PosDataParser.ParsePosData(invoice.Metadata.PosData),
Archived = invoice.Archived, Archived = invoice.Archived,
CanRefund = CanRefund(invoice.GetInvoiceState()), CanRefund = CanRefund(invoice.GetInvoiceState()),
ShowCheckout = invoice.Status == InvoiceStatusLegacy.New,
Deliveries = (await _InvoiceRepository.GetWebhookDeliveries(invoiceId)) Deliveries = (await _InvoiceRepository.GetWebhookDeliveries(invoiceId))
.Select(c => new Models.StoreViewModels.DeliveryViewModel(c)) .Select(c => new Models.StoreViewModels.DeliveryViewModel(c))
.ToList() .ToList()

1
BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs
View file

@ -116,5 +116,6 @@ namespace BTCPayServer.Models.InvoicingModels
public List<PaymentEntity> Payments { get; set; } public List<PaymentEntity> Payments { get; set; }
public bool Archived { get; set; } public bool Archived { get; set; }
public bool CanRefund { get; set; } public bool CanRefund { get; set; }
public bool ShowCheckout { get; set; }
} }
} }

17
BTCPayServer/Views/Invoice/Invoice.cshtml
View file

@ -19,23 +19,32 @@
<h2 class="col-xs-12 col-lg-9 mb-4 mb-lg-0">@ViewData["Title"]</h2> <h2 class="col-xs-12 col-lg-9 mb-4 mb-lg-0">@ViewData["Title"]</h2>
<div class="col-xs-12 col-lg-3 mb-2 mb-lg-0 text-lg-end"> <div class="col-xs-12 col-lg-3 mb-2 mb-lg-0 text-lg-end">
<div class="d-inline-flex"> <div class="d-inline-flex">
@if (Model.ShowCheckout)
{
<a asp-action="Checkout" class="invoice-checkout-link btn btn-primary text-nowrap ms-2" asp-route-invoiceId="@Model.Id">
<i class="fa fa-qrcode"></i>
Checkout
</a>
}
@if (Model.CanRefund) @if (Model.CanRefund)
{ {
<a id="refundlink" class="btn btn-success text-nowrap" asp-action="Refund" asp-route-invoiceId="@Context.GetRouteValue("invoiceId")">Issue refund <span class="fa fa-undo"></span></a> <a id="refundlink" class="btn btn-success text-nowrap ms-2" asp-action="Refund" asp-route-invoiceId="@Context.GetRouteValue("invoiceId")"><span class="fa fa-undo"></span> Issue refund</a>
} }
else else
{ {
<button href="#" class="btn btn-secondary text-nowrap" data-bs-toggle="tooltip" title="You can only issue refunds on invoices with confirmed payments" disabled>Issue refund <span class="fa fa-undo"></span></button> <button href="#" class="btn btn-secondary text-nowrap ms-2" data-bs-toggle="tooltip" title="You can only issue refunds on invoices with confirmed payments" disabled><span class="fa fa-undo"></span> Issue refund</button>
} }
<form class="p-0 ms-2" asp-action="ToggleArchive" asp-route-invoiceId="@Model.Id" method="post"> <form class="p-0 ms-2" asp-action="ToggleArchive" asp-route-invoiceId="@Model.Id" method="post">
<button type="submit" class="btn @(Model.Archived ? "btn-warning" : "btn btn-danger")" id="btn-archive-toggle"> <button type="submit" class="btn @(Model.Archived ? "btn-warning" : "btn btn-danger")" id="btn-archive-toggle">
@if (Model.Archived) @if (Model.Archived)
{ {
<span class="text-nowrap" data-bs-toggle="tooltip" title="Unarchive this invoice">Archived <i class="ms-1 fa fa-close"></i></span> <span class="text-nowrap" data-bs-toggle="tooltip" title="Unarchive this invoice"><i class="ms-1 fa fa-close"></i> Archived</span>
} }
else else
{ {
<span class="text-nowrap" data-bs-toggle="tooltip" title="Archive this invoice so that it does not appear in the invoice list by default">Archive <i class="ms-1 fa fa-archive"></i></span> <span class="text-nowrap" data-bs-toggle="tooltip" title="Archive this invoice so that it does not appear in the invoice list by default"><i class="ms-1 fa fa-archive"></i> Archive</span>
} }
</button> </button>
</form> </form>

5
BTCPayServer/Views/Server/ListUsers.cshtml
View file

@ -33,7 +33,10 @@
</div> </div>
<span asp-validation-for="SearchTerm" class="text-danger"></span> <span asp-validation-for="SearchTerm" class="text-danger"></span>
</form> </form>
<a asp-action="CreateUser" class="btn btn-primary mb-2" role="button" id="CreateUser">Add User</a> <a asp-action="CreateUser" class="btn btn-primary mb-2" role="button" id="CreateUser">
<span class="fa fa-plus"></span>
Add User
</a>
</div> </div>
<table class="table table-sm"> <table class="table table-sm">