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

Improve update store view

Browse source
This commit is contained in:
Dennis Reimann 2020-07-22 15:31:09 +02:00
parent 2496ec73bf
commit a3b4ceba50
No known key found for this signature in database
GPG key ID: 5009E1797F03F8D0
2 changed files with 55 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
BTCPayServer/Models/StoreViewModels/StoreViewModel.cs
View file

@ -56,7 +56,7 @@ namespace BTCPayServer.Models.StoreViewModels
public List<AdditionalPaymentMethod> ThirdPartyPaymentMethods { get; set; } = public List<AdditionalPaymentMethod> ThirdPartyPaymentMethods { get; set; } =
new List<AdditionalPaymentMethod>(); new List<AdditionalPaymentMethod>();
[Display(Name = "Invoice expires if the full amount has not been paid after ... minutes")] [Display(Name = "Invoice expires if the full amount has not been paid after …")]
[Range(1, 60 * 24 * 24)] [Range(1, 60 * 24 * 24)]
public int InvoiceExpiration public int InvoiceExpiration
{ {
@ -64,7 +64,7 @@ namespace BTCPayServer.Models.StoreViewModels
set; set;
} }
[Display(Name = "Payment invalid if transactions fails to confirm ... minutes after invoice expiration")] [Display(Name = "Payment invalid if transactions fails to confirm … after invoice expiration")]
[Range(10, 60 * 24 * 24)] [Range(10, 60 * 24 * 24)]
public int MonitoringExpiration public int MonitoringExpiration
{ {
@ -72,13 +72,13 @@ namespace BTCPayServer.Models.StoreViewModels
set; set;
} }
[Display(Name = "Consider the invoice confirmed when the payment transaction...")] [Display(Name = "Consider the invoice confirmed when the payment transaction …")]
public SpeedPolicy SpeedPolicy public SpeedPolicy SpeedPolicy
{ {
get; set; get; set;
} }
[Display(Name = "Add additional fee (network fee) to invoice...")] [Display(Name = "Add additional fee (network fee) to invoice …")]
public NetworkFeeMode NetworkFeeMode public NetworkFeeMode NetworkFeeMode
{ {
get; set; get; set;

74
BTCPayServer/Views/Stores/UpdateStore.cshtml
View file

@ -20,6 +20,7 @@
<div class="col-md-8"> <div class="col-md-8">
<form method="post"> <form method="post">
<div class="mb-5"> <div class="mb-5">
<h4 class="mb-3">General</h4>
<div class="form-group"> <div class="form-group">
<label asp-for="Id"></label> <label asp-for="Id"></label>
<input asp-for="Id" readonly class="form-control" /> <input asp-for="Id" readonly class="form-control" />
@ -34,6 +35,23 @@
<input asp-for="StoreWebsite" class="form-control" /> <input asp-for="StoreWebsite" class="form-control" />
<span asp-validation-for="StoreWebsite" class="text-danger"></span> <span asp-validation-for="StoreWebsite" class="text-danger"></span>
</div> </div>
<h4 class="mt-5 mb-3">Payment</h4>
<div class="form-group">
<div class="form-check">
<input asp-for="AnyoneCanCreateInvoice" type="checkbox" class="form-check-input" />
<label asp-for="AnyoneCanCreateInvoice" class="form-check-label"></label>
<a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#allow-anyone-to-create-invoice" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
</div>
</div>
<div class="form-group">
<div class="form-check">
<input asp-for="PayJoinEnabled" type="checkbox" class="form-check-input"/>
<label asp-for="PayJoinEnabled" class="form-check-label"></label>
<a href="https://docs.btcpayserver.org/Payjoin/" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
<span asp-validation-for="PayJoinEnabled" class="text-danger"></span>
</div>
</div>
<div class="form-group"> <div class="form-group">
<label asp-for="NetworkFeeMode"></label> <label asp-for="NetworkFeeMode"></label>
<a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#add-network-fee-to-invoice-vary-with-mining-fees" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a> <a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#add-network-fee-to-invoice-vary-with-mining-fees" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
@ -43,19 +61,17 @@
<option value="Never">Never add network fee</option> <option value="Never">Never add network fee</option>
</select> </select>
</div> </div>
<div class="form-group">
<div class="form-check">
<input asp-for="AnyoneCanCreateInvoice" type="checkbox" class="form-check-input" />
<label asp-for="AnyoneCanCreateInvoice" class="form-check-label"></label>
<a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#allow-anyone-to-create-invoice" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
</div>
</div>
<div class="form-group"> <div class="form-group">
<div class="mb-2"> <div class="mb-2">
<label asp-for="InvoiceExpiration" class="d-inline"></label> <label asp-for="InvoiceExpiration" class="d-inline"></label>
<a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#invoice-expires-if-the-full-amount-has-not-been-paid-after-minutes" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a> <a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#invoice-expires-if-the-full-amount-has-not-been-paid-after-minutes" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
</div> </div>
<input asp-for="InvoiceExpiration" class="form-control" /> <div class="input-group">
<input asp-for="InvoiceExpiration" class="form-control" style="max-width:10ch;"/>
<div class="input-group-append">
<span class="input-group-text">minutes</span>
</div>
</div>
<span asp-validation-for="InvoiceExpiration" class="text-danger"></span> <span asp-validation-for="InvoiceExpiration" class="text-danger"></span>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -63,7 +79,12 @@
<label asp-for="MonitoringExpiration" class="d-inline"></label> <label asp-for="MonitoringExpiration" class="d-inline"></label>
<a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#payment-invalid-if-transactions-fails-to-confirm-minutes-after-invoice-expiration" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a> <a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#payment-invalid-if-transactions-fails-to-confirm-minutes-after-invoice-expiration" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
</div> </div>
<input asp-for="MonitoringExpiration" class="form-control" /> <div class="input-group">
<input asp-for="MonitoringExpiration" class="form-control" style="max-width:10ch;"/>
<div class="input-group-append">
<span class="input-group-text">minutes</span>
</div>
</div>
<span asp-validation-for="MonitoringExpiration" class="text-danger"></span> <span asp-validation-for="MonitoringExpiration" class="text-danger"></span>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -71,7 +92,12 @@
<label asp-for="PaymentTolerance" class="d-inline"></label> <label asp-for="PaymentTolerance" class="d-inline"></label>
<a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#consider-the-invoice-paid-even-if-the-paid-amount-is-less-than-expected" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a> <a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#consider-the-invoice-paid-even-if-the-paid-amount-is-less-than-expected" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
</div> </div>
<input asp-for="PaymentTolerance" class="form-control" /> <div class="input-group">
<input asp-for="PaymentTolerance" class="form-control" style="max-width:10ch;"/>
<div class="input-group-append">
<span class="input-group-text">percent</span>
</div>
</div>
<span asp-validation-for="PaymentTolerance" class="text-danger"></span> <span asp-validation-for="PaymentTolerance" class="text-danger"></span>
</div> </div>
<div class="form-group"> <div class="form-group">
@ -79,7 +105,7 @@
<label asp-for="SpeedPolicy" class="d-inline"></label> <label asp-for="SpeedPolicy" class="d-inline"></label>
<a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#consider-the-invoice-confirmed-when-the-payment-transaction" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a> <a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#consider-the-invoice-confirmed-when-the-payment-transaction" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
</div> </div>
<select asp-for="SpeedPolicy" class="form-control"> <select asp-for="SpeedPolicy" class="form-control w-auto">
<option value="0">Is unconfirmed</option> <option value="0">Is unconfirmed</option>
<option value="1">Has at least 1 confirmation</option> <option value="1">Has at least 1 confirmation</option>
<option value="3">Has at least 2 confirmations</option> <option value="3">Has at least 2 confirmations</option>
@ -87,15 +113,9 @@
</select> </select>
<span asp-validation-for="SpeedPolicy" class="text-danger"></span> <span asp-validation-for="SpeedPolicy" class="text-danger"></span>
</div> </div>
<div class="form-check mb-5">
<input asp-for="PayJoinEnabled" type="checkbox" class="form-check-input"/>
<label asp-for="PayJoinEnabled" class="form-check-label"></label>
<a href="https://docs.btcpayserver.org/Payjoin/" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
<span asp-validation-for="PayJoinEnabled" class="text-danger"></span>
</div>
</div> </div>
<h5>Derivation Scheme</h5> <h4 class="mt-5 mb-3">Derivation Scheme</h4>
<p>The Derivation Scheme represents the destination of the funds received by your invoice on chain.</p> <p>The Derivation Scheme represents the destination of the funds received by your invoice on chain.</p>
<table class="table table-sm table-responsive-md mt-0 mb-5"> <table class="table table-sm table-responsive-md mt-0 mb-5">
@ -112,23 +132,23 @@
{ {
<tr class="@(@scheme.Collapsed? "collapsed": "")"> <tr class="@(@scheme.Collapsed? "collapsed": "")">
<td>@scheme.Crypto</td> <td>@scheme.Crypto</td>
<td title="@scheme.Value" data-toggle="tooltip"> <td title="@scheme.Value" data-toggle="tooltip" class="d-flex">
@if (string.IsNullOrEmpty(scheme.Value)) @if (string.IsNullOrEmpty(scheme.Value))
{ {
<span class="smMaxWidth">Not set</span> <span class="smMaxWidth">Not set</span>
} }
else else
{ {
<div class="d-inline-flex justify-content-between smMaxWidth"> <code class="text-truncate" style="max-width:25ch">
<span class="text-truncate ">
@scheme.Value @scheme.Value
</span> </code>
<code>
@if (scheme.Value.Length > 20) @if (scheme.Value.Length > 20)
{ {
var match = Regex.Match(scheme.Value, @"((?:-\[(?:[^\]])+\])+|\S{6})$"); var match = Regex.Match(scheme.Value, @"((?:-\[(?:[^\]])+\])+|\S{6})$");
@match.Value; @match.Value;
} }
</div> </code>
} }
</td> </td>
<td style="text-align:center;"> <td style="text-align:center;">
@ -160,7 +180,7 @@
</tbody> </tbody>
</table> </table>
<h5>Lightning nodes (Experimental)</h5> <h4 class="mt-5 mb-3">Lightning nodes (Experimental)</h4>
<p> <p>
A connection to a lightning charge node is required to generate lightning network enabled invoices. A connection to a lightning charge node is required to generate lightning network enabled invoices.
<br /> <br />
@ -208,7 +228,7 @@
</p> </p>
</div> </div>
<h5>Additional Payment methods</h5> <h4 class="mt-5 mb-3">Additional Payment methods</h4>
<table class="table table-sm table-responsive-md mt-1 mb-5"> <table class="table table-sm table-responsive-md mt-1 mb-5">
<thead> <thead>
<tr> <tr>
@ -238,7 +258,7 @@
</tbody> </tbody>
</table> </table>
<h5>Services</h5> <h4 class="mt-5 mb-3">Services</h4>
<table class="table table-sm table-responsive-md mt-1 mb-5"> <table class="table table-sm table-responsive-md mt-1 mb-5">
<thead> <thead>
<tr> <tr>
@ -258,7 +278,7 @@
@if (Model.CanDelete) @if (Model.CanDelete)
{ {
<h5>Other actions...</h5> <h4 class="mt-5 mb-3">Other actions</h4>
<p><a href="#danger-zone" data-toggle="collapse"><b>Click here to see more actions</b></a></p> <p><a href="#danger-zone" data-toggle="collapse"><b>Click here to see more actions</b></a></p>
<div id="danger-zone" class="collapse"> <div id="danger-zone" class="collapse">
<a class="btn btn-outline-danger form-control" asp-action="DeleteStore" asp-route-storeId="@Model.Id">Delete this store</a> <a class="btn btn-outline-danger form-control" asp-action="DeleteStore" asp-route-storeId="@Model.Id">Delete this store</a>