mirror of
https://github.com/btcpayserver/btcpayserver.git
synced 2025-03-13 19:37:37 +01:00
Merge pull request #2011 from dennisreimann/store-setup
Store setup restructuring
This commit is contained in:
Nicolas Dorier
GitHub
commit
39029adcd8
6 changed files with 315 additions and 271 deletions
|
|
@ -301,11 +301,12 @@ namespace BTCPayServer.Tests
|
|||
await s.StartAsync();
|
||||
var alice = s.RegisterNewUser();
|
||||
var storeData = s.CreateNewStore();
|
||||
var onchainHint = "A store requires a wallet to receive payments. Set up your wallet.";
|
||||
var offchainHint = "A connection to a Lightning node is required to receive Lightning payments.";
|
||||
|
||||
// verify that hints are displayed on the store page
|
||||
Assert.True(s.Driver.PageSource.Contains("Wallet not setup for the store, please provide Derviation Scheme"),
|
||||
"Wallet hint not present");
|
||||
Assert.True(s.Driver.PageSource.Contains("Review settings if you want to receive Lightning payments"),
|
||||
"Lightning hint not present");
|
||||
Assert.True(s.Driver.PageSource.Contains(onchainHint), "Wallet hint not present");
|
||||
Assert.True(s.Driver.PageSource.Contains(offchainHint), "Lightning hint not present");
|
||||
|
||||
s.GoToStores();
|
||||
Assert.True(s.Driver.PageSource.Contains("warninghint_" + storeData.storeId),
|
||||
|
|
@ -314,7 +315,7 @@ namespace BTCPayServer.Tests
|
|||
s.GoToStore(storeData.storeId);
|
||||
s.AddDerivationScheme(); // wallet hint should be dismissed
|
||||
s.Driver.AssertNoError();
|
||||
Assert.False(s.Driver.PageSource.Contains("Wallet not setup for the store, please provide Derviation Scheme"),
|
||||
Assert.False(s.Driver.PageSource.Contains(onchainHint),
|
||||
"Wallet hint not dismissed on derivation scheme add");
|
||||
|
||||
s.Driver.FindElement(By.Id("dismissLightningHint")).Click(); // dismiss lightning hint
|
||||
|
|
@ -380,8 +381,7 @@ namespace BTCPayServer.Tests
|
|||
s.Driver.FindElement(By.Id("Stores")).Click();
|
||||
|
||||
// there shouldn't be any hints now
|
||||
Assert.False(s.Driver.PageSource.Contains("Review settings if you want to receive Lightning payments"),
|
||||
"Lightning hint should be dismissed at this point");
|
||||
Assert.False(s.Driver.PageSource.Contains(offchainHint), "Lightning hint should be dismissed at this point");
|
||||
|
||||
s.Driver.FindElement(By.LinkText("Remove")).Click();
|
||||
s.Driver.FindElement(By.Id("continue")).Click();
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ namespace BTCPayServer.Models.StoreViewModels
|
|||
}
|
||||
|
||||
public bool CanDelete { get; set; }
|
||||
[Display(Name = "Store ID")]
|
||||
public string Id { get; set; }
|
||||
[Display(Name = "Store Name")]
|
||||
[Required]
|
||||
|
|
|
|||
|
|
@ -73,10 +73,12 @@
|
|||
<input id="DerivationSchemeFormat" asp-for="DerivationSchemeFormat" type="hidden" />
|
||||
<input id="AccountKey" asp-for="AccountKey" type="hidden" />
|
||||
<div class="form-group">
|
||||
<h5>Derivation scheme</h5>
|
||||
<h5>
|
||||
Derivation scheme
|
||||
<a href="https://docs.btcpayserver.org/FAQ/FAQ-Wallet/#what-is-a-derivation-scheme" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
|
||||
</h5>
|
||||
<p>
|
||||
The derivation scheme represents the destination of the funds received by your invoice.
|
||||
It is generated by your wallet software.
|
||||
A derivation scheme facilitates generation of the destination addresses for your invoices so funds can be received on-chain.
|
||||
</p>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
@using System.Text.RegularExpressions
|
||||
@using System.Text.RegularExpressions
|
||||
@model StoreViewModel
|
||||
@{
|
||||
Layout = "../Shared/_NavLayout.cshtml";
|
||||
|
|
@ -10,157 +10,154 @@
|
|||
@if (!ViewContext.ModelState.IsValid)
|
||||
{
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="col-md-8">
|
||||
<div asp-validation-summary="All" class="text-danger"></div>
|
||||
</div>
|
||||
</div>
|
||||
}
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-8">
|
||||
<div>
|
||||
<h4 class="mb-3">Wallet <span class="text-muted small">On-chain payments</span></h4>
|
||||
<div class="col-lg-10 col-xl-9">
|
||||
<div class="mb-5">
|
||||
<h4 class="mb-3">
|
||||
<span class="mr-1">Wallet</span>
|
||||
<span class="text-muted small">On-chain payments</span>
|
||||
</h4>
|
||||
@if (Model.HintWallet)
|
||||
{
|
||||
<p class="alert alert-warning">
|
||||
<span class="fa fa-warning"></span>
|
||||
Wallet not setup for the store, please provide Derviation Scheme
|
||||
<button type="button" class="close only-for-js" data-dismiss="alert" aria-label="Close"
|
||||
onclick="return dismissHint('Wallet', '@Model.Id');">
|
||||
<div class="alert alert-light d-flex align-items-start mb-3">
|
||||
<span class="fa fa-warning text-warning mt-1"></span>
|
||||
<p class="mb-0 mx-3 flex-fill">
|
||||
A store requires a wallet to receive payments. Set up your wallet.
|
||||
</p>
|
||||
<button type="button" class="close only-for-js" data-dismiss="alert" aria-label="Close" onclick="return dismissHint('Wallet', '@Model.Id');">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</p>
|
||||
</div>
|
||||
}
|
||||
<p>
|
||||
The Derivation Scheme <a href="https://docs.btcpayserver.org/FAQ/FAQ-Wallet/#what-is-a-derivation-scheme" target="_blank"><span class="fa fa-question-circle-o" title="More information..."></span></a>
|
||||
facilitates generation of the destination addresses for your invoices so funds can be received on-chain.
|
||||
</p>
|
||||
<p>
|
||||
Until wallet is defined, no invoices can be created for this store.
|
||||
Optionally, you can have a store that only receives Lightning payments, see the next section for more details.
|
||||
</p>
|
||||
|
||||
<table class="table table-sm table-responsive-md mt-0 mb-5">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Crypto</th>
|
||||
<th>Derivation Scheme</th>
|
||||
<th style="text-align:center;">Enabled</th>
|
||||
<th style="text-align:right;">Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<ul class="list-group mb-3">
|
||||
@foreach (var scheme in Model.DerivationSchemes.OrderBy(scheme => scheme.Collapsed))
|
||||
{
|
||||
<tr class="@(@scheme.Collapsed? "collapsed": "")">
|
||||
<td>@scheme.Crypto</td>
|
||||
<td title="@scheme.Value" data-toggle="tooltip" class="d-flex">
|
||||
@if (string.IsNullOrEmpty(scheme.Value))
|
||||
<li class="list-group-item @(scheme.Collapsed ? "collapsed": "")">
|
||||
<div class="d-flex align-items-center">
|
||||
<span class="d-flex align-items-center flex-fill mr-3">
|
||||
<strong>@scheme.Crypto</strong>
|
||||
@if (!string.IsNullOrWhiteSpace(scheme.Value))
|
||||
{
|
||||
<span class="smMaxWidth">Not set</span>
|
||||
}
|
||||
else
|
||||
{
|
||||
<code class="text-truncate" style="max-width:25ch">
|
||||
<span class="text-light mx-2">|</span>
|
||||
<span title="@scheme.Value" data-toggle="tooltip" class="d-flex">
|
||||
<code class="text-truncate" style="max-width:10ch">
|
||||
@scheme.Value
|
||||
</code>
|
||||
<code>
|
||||
<code class="text-nowrap">
|
||||
@if (scheme.Value.Length > 20)
|
||||
{
|
||||
var match = Regex.Match(scheme.Value, @"((?:-\[(?:[^\]])+\])+|\S{6})$");
|
||||
@match.Value;
|
||||
}
|
||||
</code>
|
||||
</span>
|
||||
@if (scheme.WalletSupported)
|
||||
{
|
||||
<span class="text-light mx-2">|</span>
|
||||
<a asp-action="WalletTransactions" asp-controller="Wallets" asp-route-walletId="@scheme.WalletId" class="text-secondary">Wallet</a>
|
||||
}
|
||||
</td>
|
||||
<td style="text-align:center;">
|
||||
}
|
||||
</span>
|
||||
<span class="d-flex align-items-center">
|
||||
@if (scheme.Enabled)
|
||||
{
|
||||
<span class="text-success fa fa-check"></span>
|
||||
<stron class="d-flex align-items-center text-primary">
|
||||
<span class="mr-2 btcpay-status btcpay-status--enabled"></span>
|
||||
Enabled
|
||||
</stron>
|
||||
}
|
||||
else
|
||||
{
|
||||
<span class="text-danger fa fa-times"></span>
|
||||
<strong class="d-flex align-items-center text-danger">
|
||||
<span class="mr-2 btcpay-status btcpay-status--disabled"></span>
|
||||
Disabled
|
||||
</strong>
|
||||
}
|
||||
</td>
|
||||
<td style="text-align:right">
|
||||
@if (!string.IsNullOrWhiteSpace(scheme.Value) && scheme.WalletSupported)
|
||||
{
|
||||
<a asp-action="WalletTransactions" asp-controller="Wallets" asp-route-walletId="@scheme.WalletId">Wallet</a><span> - </span>
|
||||
<a asp-action="AddDerivationScheme" asp-route-cryptoCode="@scheme.Crypto" asp-route-storeId="@Context.GetRouteValue("storeId")" id="@($"Modify{scheme.Crypto}")" class="btn btn-@(scheme.Enabled ? "light" : "info") py-1 ml-3">
|
||||
@(scheme.Enabled ? "Modify" : "Setup")
|
||||
</a>
|
||||
</span>
|
||||
</div>
|
||||
</li>
|
||||
}
|
||||
<a asp-action="AddDerivationScheme" asp-route-cryptoCode="@scheme.Crypto" asp-route-storeId="@this.Context.GetRouteValue("storeId")" id="@($"Modify{scheme.Crypto}")">Modify</a>
|
||||
</td>
|
||||
</tr>
|
||||
}
|
||||
|
||||
</ul>
|
||||
@if (Model.DerivationSchemes.Any(scheme => scheme.Collapsed))
|
||||
{
|
||||
<tr class="only-for-js">
|
||||
<td colspan="4"><button class="btn btn-link" id="toggle-assets" type="button">Show additional assets</button></td>
|
||||
</tr>
|
||||
<script>
|
||||
$(document).ready(function () {
|
||||
$(".collapsed").hide();
|
||||
$("#toggle-assets").click(function () {
|
||||
$(".collapsed").show();
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<button class="btn btn-link text-secondary mb-3 p-0 only-for-js" id="toggle-assets" type="button">Show additional assets</button>
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<h4 class="mt-5 mb-3">Lightning <span class="text-muted small">Off-chain payments</span></h4>
|
||||
<div class="mb-5">
|
||||
<h4 class="mb-3">
|
||||
<span class="mr-1">Lightning</span>
|
||||
<span class="text-muted small">Off-chain payments</span>
|
||||
</h4>
|
||||
@if (Model.HintLightning)
|
||||
{
|
||||
<p class="alert alert-warning">
|
||||
<span class="fa fa-warning"></span>
|
||||
Review settings if you want to receive Lightning payments
|
||||
<button id="dismissLightningHint" type="button" class="close only-for-js" data-dismiss="alert" aria-label="Close"
|
||||
onclick="return dismissHint('Lightning', '@Model.Id');">
|
||||
<div class="alert alert-light d-flex align-items-start mb-3">
|
||||
<span class="fa fa-warning text-warning mt-1"></span>
|
||||
<p class="mb-0 mx-3 flex-fill">
|
||||
A connection to a Lightning node is required to receive Lightning payments.
|
||||
</p>
|
||||
<button id="dismissLightningHint" type="button" class="close only-for-js" data-dismiss="alert" aria-label="Close" onclick="return dismissHint('Lightning', '@Model.Id');">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
</p>
|
||||
</div>
|
||||
}
|
||||
<p>
|
||||
A connection to a Lightning Node is required to generate Lightning Network enabled invoices.
|
||||
</p>
|
||||
|
||||
<table class="table table-sm table-responsive-md">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Crypto</th>
|
||||
<th>Address</th>
|
||||
<th style="text-align:center;">Enabled</th>
|
||||
<th style="text-align:right">Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<ul class="list-group mb-3">
|
||||
@foreach (var scheme in Model.LightningNodes)
|
||||
{
|
||||
<tr>
|
||||
<td>@scheme.CryptoCode</td>
|
||||
<td class="smMaxWidth text-truncate">@scheme.Address</td>
|
||||
<td style="text-align:center;">
|
||||
<li class="list-group-item">
|
||||
<div class="d-flex align-items-center">
|
||||
<span class="d-flex align-items-center flex-fill mr-3">
|
||||
<strong>@scheme.CryptoCode</strong>
|
||||
@if (!string.IsNullOrWhiteSpace(scheme.Address))
|
||||
{
|
||||
<span class="text-light mx-2">|</span>
|
||||
<code class="smMaxWidth text-truncate">@scheme.Address</code>
|
||||
}
|
||||
</span>
|
||||
<span class="d-flex align-items-center">
|
||||
@if (scheme.Enabled)
|
||||
{
|
||||
<span class="text-success fa fa-check"></span>
|
||||
<strong class="d-flex align-items-center text-success">
|
||||
<span class="mr-2 btcpay-status btcpay-status--enabled"></span>
|
||||
Enabled
|
||||
</strong>
|
||||
}
|
||||
else
|
||||
{
|
||||
<span class="text-danger fa fa-times"></span>
|
||||
<strong class="d-flex align-items-center text-danger">
|
||||
<span class="mr-2 btcpay-status btcpay-status--disabled"></span>
|
||||
Disabled
|
||||
</strong>
|
||||
}
|
||||
</td>
|
||||
<td style="text-align:right"><a asp-action="AddLightningNode" asp-route-cryptoCode="@scheme.CryptoCode" asp-route-storeId="@this.Context.GetRouteValue("storeId")" id="@($"Modify-Lightning{scheme.CryptoCode}")">Modify</a></td>
|
||||
</tr>
|
||||
<a asp-action="AddLightningNode" asp-route-cryptoCode="@scheme.CryptoCode" asp-route-storeId="@Context.GetRouteValue("storeId")" id="@($"Modify-Lightning{scheme.CryptoCode}")" class="btn btn-@(scheme.Enabled ? "light" : "info") py-1 ml-3">
|
||||
@(scheme.Enabled ? "Modify" : "Setup")
|
||||
</a>
|
||||
</span>
|
||||
</div>
|
||||
</li>
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
|
||||
<form method="post">
|
||||
<div class="form-group mb-5">
|
||||
<label asp-for="LightningDescriptionTemplate"></label>
|
||||
<input asp-for="LightningDescriptionTemplate" class="form-control" />
|
||||
<span asp-validation-for="LightningDescriptionTemplate" class="text-danger"></span>
|
||||
<p class="form-text text-muted">
|
||||
Available placeholders:
|
||||
<code>{StoreName} {ItemDescription} {OrderId}</code>
|
||||
</p>
|
||||
</ul>
|
||||
</div>
|
||||
|
||||
<h4 class="mt-5 mb-3">Store settings</h4>
|
||||
<form method="post" class="mb-5">
|
||||
<h4 class="mb-3">General</h4>
|
||||
<div class="form-group">
|
||||
<label asp-for="Id"></label>
|
||||
<input asp-for="Id" readonly class="form-control" />
|
||||
|
|
@ -176,6 +173,7 @@
|
|||
<span asp-validation-for="StoreWebsite" class="text-danger"></span>
|
||||
</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" />
|
||||
|
|
@ -261,17 +259,28 @@
|
|||
Choosing to accept an unconfirmed invoice can lead to double-spending and is strongly discouraged.
|
||||
</div>
|
||||
<span asp-validation-for="SpeedPolicy" class="text-danger"></span>
|
||||
<button name="command" type="submit" class="btn btn-primary mt-3" value="Save" id="Save">Save Store Settings</button>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label asp-for="LightningDescriptionTemplate"></label>
|
||||
<input asp-for="LightningDescriptionTemplate" class="form-control" />
|
||||
<span asp-validation-for="LightningDescriptionTemplate" class="text-danger"></span>
|
||||
<p class="form-text text-muted">
|
||||
Available placeholders:
|
||||
<code>{StoreName} {ItemDescription} {OrderId}</code>
|
||||
</p>
|
||||
</div>
|
||||
|
||||
<button name="command" type="submit" class="btn btn-primary" value="Save" id="Save">Save Store Settings</button>
|
||||
</form>
|
||||
|
||||
<h4 class="mt-5 mb-3">Additional Payment methods</h4>
|
||||
<table class="table table-sm table-responsive-md mt-1 mb-5">
|
||||
<h4 class="mb-3">Additional payment methods</h4>
|
||||
<div class="table-responsive-md">
|
||||
<table class="table table-sm mt-1 mb-5">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Provider</th>
|
||||
<th class="text-center">Enabled</th>
|
||||
<th class="text-right">Actions</th>
|
||||
<th class="text-center w-100px">Enabled</th>
|
||||
<th class="text-right w-100px">Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
@ -289,18 +298,24 @@
|
|||
<span class="text-danger fa fa-times"></span>
|
||||
}
|
||||
</td>
|
||||
<td class="text-right"><a asp-action="@scheme.Action" id='Modify-@scheme.Provider' asp-route-storeId="@this.Context.GetRouteValue("storeId")">Modify</a></td>
|
||||
<td class="text-right">
|
||||
<a asp-action="@scheme.Action" id='Modify-@scheme.Provider' asp-route-storeId="@Context.GetRouteValue("storeId")">
|
||||
@(scheme.Enabled ? "Modify" : "Setup")
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<h4 class="mt-5 mb-3">Services</h4>
|
||||
<table class="table table-sm table-responsive-md mt-1 mb-5">
|
||||
<div class="table-responsive-md">
|
||||
<table class="table table-sm mt-1 mb-5">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Service</th>
|
||||
<th style="text-align:right">Actions</th>
|
||||
<th class="text-right w-100px">Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
|
|
@ -308,33 +323,29 @@
|
|||
<td>
|
||||
Email
|
||||
</td>
|
||||
<td style="text-align:right"><a asp-action="Emails" asp-route-storeId="@this.Context.GetRouteValue("storeId")">Modify</a></td>
|
||||
<td class="text-right">
|
||||
<a asp-action="Emails" asp-route-storeId="@Context.GetRouteValue("storeId")">
|
||||
Setup
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
@if (Model.CanDelete)
|
||||
{
|
||||
<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>
|
||||
<button class="btn btn-link text-secondary mb-3 p-0" type="button" data-toggle="collapse" data-target="#danger-zone">
|
||||
See more actions
|
||||
</button>
|
||||
<div id="danger-zone" class="collapse">
|
||||
<a class="btn btn-outline-danger mb-5" asp-action="DeleteStore" asp-route-storeId="@Model.Id">Delete this store</a>
|
||||
</div>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@section Scripts {
|
||||
@await Html.PartialAsync("_ValidationScriptsPartial")
|
||||
|
||||
<script>
|
||||
$(document).ready(function () {
|
||||
$(".collapsed").hide();
|
||||
$("#toggle-assets").click(function () {
|
||||
$(".collapsed").show();
|
||||
$(this).parents("tr").hide();
|
||||
});
|
||||
});
|
||||
</script>
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3769,11 +3769,10 @@ input[type="button"].btn-block {
|
|||
font-size: 1.5rem;
|
||||
font-weight: 700;
|
||||
line-height: 1;
|
||||
color: var(--btcpay-color-dark-accent);
|
||||
color: inherit;
|
||||
text-shadow: 0 1px 0 var(--btcpay-color-white);
|
||||
opacity: .5; }
|
||||
.close:hover {
|
||||
color: var(--btcpay-color-dark-accent);
|
||||
text-decoration: none; }
|
||||
.close:not(:disabled):not(.disabled):hover, .close:not(:disabled):not(.disabled):focus {
|
||||
opacity: .75; }
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ html {
|
|||
position: relative;
|
||||
min-height: 100%;
|
||||
font-size: var(--btcpay-font-size-base);
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
}
|
||||
|
||||
.logo {
|
||||
|
|
@ -189,7 +191,7 @@ pre {
|
|||
cursor: pointer;
|
||||
}
|
||||
|
||||
.list-group-item a {
|
||||
.list-group-item a:not(.btn) {
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
|
|
@ -318,3 +320,32 @@ html[data-devenv]:before {
|
|||
.note-editor .table.table-sm td {
|
||||
border: 1px dotted var(--btcpay-color-neutral-400);
|
||||
}
|
||||
|
||||
/* Custom */
|
||||
.btcpay-status {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border: .25em solid transparent;
|
||||
border-radius: 50%;
|
||||
width: 19px;
|
||||
height: 19px;
|
||||
}
|
||||
.btcpay-status:before {
|
||||
content: '';
|
||||
border-radius: 50%;
|
||||
width: 9px;
|
||||
height: 9px;
|
||||
}
|
||||
.btcpay-status--enabled {
|
||||
background-color: rgba(0, 182, 52, .3);
|
||||
}
|
||||
.btcpay-status--enabled:before {
|
||||
background-color: #00B634;
|
||||
}
|
||||
.btcpay-status--disabled {
|
||||
background-color: rgba(251, 56, 61, .3);
|
||||
}
|
||||
.btcpay-status--disabled:before {
|
||||
background-color: #FB383D;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue