mirror of
https://github.com/aljazceru/btcpayserver.git
synced 2025-12-18 14:34:23 +01:00
Improve display and structure of payment related configuration
This commit is contained in:
Dennis Reimann
committed by
Andrew Camilleri
Andrew Camilleri
parent
975ad2f8ab
commit
67aee9bdc6
@@ -578,6 +578,8 @@ namespace BTCPayServer.Controllers
|
|||||||
vm.PayJoinEnabled = storeBlob.PayJoinEnabled;
|
vm.PayJoinEnabled = storeBlob.PayJoinEnabled;
|
||||||
vm.HintWallet = storeBlob.Hints.Wallet;
|
vm.HintWallet = storeBlob.Hints.Wallet;
|
||||||
vm.HintLightning = storeBlob.Hints.Lightning;
|
vm.HintLightning = storeBlob.Hints.Lightning;
|
||||||
|
vm.IsOnchainSetup = vm.DerivationSchemes.Any(scheme => !string.IsNullOrWhiteSpace(scheme.Value));
|
||||||
|
vm.IsLightningSetup = vm.LightningNodes.Any(scheme => !string.IsNullOrWhiteSpace(scheme.Address));
|
||||||
|
|
||||||
(bool canUseHotWallet, _) = await CanUseHotWallet();
|
(bool canUseHotWallet, _) = await CanUseHotWallet();
|
||||||
vm.CanUsePayJoin = canUseHotWallet && store
|
vm.CanUsePayJoin = canUseHotWallet && store
|
||||||
|
|||||||
@@ -89,6 +89,8 @@ namespace BTCPayServer.Models.StoreViewModels
|
|||||||
[Display(Name = "Enable Payjoin/P2EP")]
|
[Display(Name = "Enable Payjoin/P2EP")]
|
||||||
public bool PayJoinEnabled { get; set; }
|
public bool PayJoinEnabled { get; set; }
|
||||||
public bool CanUsePayJoin { get; set; }
|
public bool CanUsePayJoin { get; set; }
|
||||||
|
public bool IsOnchainSetup { get; set; }
|
||||||
|
public bool IsLightningSetup { get; set; }
|
||||||
|
|
||||||
public bool HintWallet { get; set; }
|
public bool HintWallet { get; set; }
|
||||||
public bool HintLightning { get; set; }
|
public bool HintLightning { get; set; }
|
||||||
|
|||||||
@@ -183,97 +183,107 @@
|
|||||||
<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>
|
@if (Model.IsOnchainSetup || Model.IsLightningSetup)
|
||||||
<div class="form-group d-flex align-items-center">
|
|
||||||
<input asp-for="AnyoneCanCreateInvoice" type="checkbox" class="btcpay-toggle me-2" />
|
|
||||||
<label asp-for="AnyoneCanCreateInvoice" class="form-label mb-0 me-1"></label>
|
|
||||||
<a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#allow-anyone-to-create-invoice" target="_blank" rel="noreferrer noopener">
|
|
||||||
<span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
@if (Model.CanUsePayJoin)
|
|
||||||
{
|
{
|
||||||
|
<h4 class="mt-5 mb-3">Payment</h4>
|
||||||
|
<div class="form-group d-flex align-items-center">
|
||||||
|
<input asp-for="AnyoneCanCreateInvoice" type="checkbox" class="btcpay-toggle me-2"/>
|
||||||
|
<label asp-for="AnyoneCanCreateInvoice" class="form-label mb-0 me-1"></label>
|
||||||
|
<a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#allow-anyone-to-create-invoice" target="_blank" rel="noreferrer noopener">
|
||||||
|
<span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
<div class="form-group mt-4">
|
||||||
|
<label asp-for="NetworkFeeMode" class="form-label"></label>
|
||||||
|
<a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#add-network-fee-to-invoice-vary-with-mining-fees" target="_blank" rel="noreferrer noopener">
|
||||||
|
<span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
|
||||||
|
</a>
|
||||||
|
<select asp-for="NetworkFeeMode" class="form-select">
|
||||||
|
<option value="MultiplePaymentsOnly">... only if the customer makes more than one payment for the invoice</option>
|
||||||
|
<option value="Always">... on every payment</option>
|
||||||
|
<option value="Never">Never add network fee</option>
|
||||||
|
</select>
|
||||||
|
</div>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
<div class="d-flex align-items-center">
|
<label asp-for="InvoiceExpiration" class="form-label"></label>
|
||||||
<input asp-for="PayJoinEnabled" type="checkbox" class="btcpay-toggle me-2"/>
|
<a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#invoice-expires-if-the-full-amount-has-not-been-paid-after-minutes" target="_blank" rel="noreferrer noopener">
|
||||||
<label asp-for="PayJoinEnabled" class="form-label mb-0 me-1"></label>
|
<span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
|
||||||
<a href="https://docs.btcpayserver.org/Payjoin/" target="_blank" rel="noreferrer noopener">
|
</a>
|
||||||
|
<div class="input-group">
|
||||||
|
<input asp-for="InvoiceExpiration" class="form-control" style="max-width:10ch;"/>
|
||||||
|
<span class="input-group-text">minutes</span>
|
||||||
|
</div>
|
||||||
|
<span asp-validation-for="InvoiceExpiration" class="text-danger"></span>
|
||||||
|
</div>
|
||||||
|
<div class="form-group">
|
||||||
|
<label asp-for="PaymentTolerance" class="form-label"></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" rel="noreferrer noopener">
|
||||||
|
<span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
|
||||||
|
</a>
|
||||||
|
<div class="input-group">
|
||||||
|
<input asp-for="PaymentTolerance" class="form-control" style="max-width:10ch;"/>
|
||||||
|
<span class="input-group-text">percent</span>
|
||||||
|
</div>
|
||||||
|
<span asp-validation-for="PaymentTolerance" class="text-danger"></span>
|
||||||
|
</div>
|
||||||
|
@if (Model.IsOnchainSetup)
|
||||||
|
{
|
||||||
|
<h5 class="mt-4 mb-3">Onchain</h5>
|
||||||
|
@if (Model.CanUsePayJoin)
|
||||||
|
{
|
||||||
|
<div class="form-group">
|
||||||
|
<div class="d-flex align-items-center">
|
||||||
|
<input asp-for="PayJoinEnabled" type="checkbox" class="btcpay-toggle me-2"/>
|
||||||
|
<label asp-for="PayJoinEnabled" class="form-label mb-0 me-1"></label>
|
||||||
|
<a href="https://docs.btcpayserver.org/Payjoin/" target="_blank" rel="noreferrer noopener">
|
||||||
|
<span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
<span asp-validation-for="PayJoinEnabled" class="text-danger"></span>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
<div class="form-group">
|
||||||
|
<label asp-for="MonitoringExpiration" class="form-label"></label>
|
||||||
|
<a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#payment-invalid-if-transactions-fails-to-confirm-minutes-after-invoice-expiration" target="_blank" rel="noreferrer noopener">
|
||||||
<span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
|
<span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
|
||||||
</a>
|
</a>
|
||||||
|
<div class="input-group">
|
||||||
|
<input asp-for="MonitoringExpiration" class="form-control" style="max-width:10ch;"/>
|
||||||
|
<span class="input-group-text">minutes</span>
|
||||||
|
</div>
|
||||||
|
<span asp-validation-for="MonitoringExpiration" class="text-danger"></span>
|
||||||
</div>
|
</div>
|
||||||
<span asp-validation-for="PayJoinEnabled" class="text-danger"></span>
|
<div class="form-group">
|
||||||
</div>
|
<label asp-for="SpeedPolicy" class="form-label"></label>
|
||||||
|
<a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#consider-the-invoice-confirmed-when-the-payment-transaction" target="_blank" rel="noreferrer noopener">
|
||||||
|
<span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
|
||||||
|
</a>
|
||||||
|
<select asp-for="SpeedPolicy" class="form-select w-auto" onchange="document.getElementById('unconfirmed-warning').hidden = this.value !== '0';">
|
||||||
|
<option value="0">Is unconfirmed</option>
|
||||||
|
<option value="1">Has at least 1 confirmation</option>
|
||||||
|
<option value="3">Has at least 2 confirmations</option>
|
||||||
|
<option value="2">Has at least 6 confirmations</option>
|
||||||
|
</select>
|
||||||
|
<div class="alert alert-warning my-2" hidden="@(Model.SpeedPolicy != 0)" id="unconfirmed-warning" role="alert">
|
||||||
|
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>
|
||||||
|
</div>
|
||||||
|
}
|
||||||
|
@if (Model.IsLightningSetup)
|
||||||
|
{
|
||||||
|
<h5 class="mt-4 mb-3">Lightning</h5>
|
||||||
|
<div class="form-group">
|
||||||
|
<label asp-for="LightningDescriptionTemplate" class="form-label"></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>
|
||||||
|
}
|
||||||
}
|
}
|
||||||
<div class="form-group mt-4">
|
|
||||||
<label asp-for="NetworkFeeMode" class="form-label"></label>
|
|
||||||
<a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#add-network-fee-to-invoice-vary-with-mining-fees" target="_blank" rel="noreferrer noopener">
|
|
||||||
<span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
|
|
||||||
</a>
|
|
||||||
<select asp-for="NetworkFeeMode" class="form-select">
|
|
||||||
<option value="MultiplePaymentsOnly">... only if the customer makes more than one payment for the invoice</option>
|
|
||||||
<option value="Always">... on every payment</option>
|
|
||||||
<option value="Never">Never add network fee</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label asp-for="InvoiceExpiration" class="form-label"></label>
|
|
||||||
<a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#invoice-expires-if-the-full-amount-has-not-been-paid-after-minutes" target="_blank" rel="noreferrer noopener">
|
|
||||||
<span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
|
|
||||||
</a>
|
|
||||||
<div class="input-group">
|
|
||||||
<input asp-for="InvoiceExpiration" class="form-control" style="max-width:10ch;" />
|
|
||||||
<span class="input-group-text">minutes</span>
|
|
||||||
</div>
|
|
||||||
<span asp-validation-for="InvoiceExpiration" class="text-danger"></span>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label asp-for="MonitoringExpiration" class="form-label"></label>
|
|
||||||
<a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#payment-invalid-if-transactions-fails-to-confirm-minutes-after-invoice-expiration" target="_blank" rel="noreferrer noopener">
|
|
||||||
<span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
|
|
||||||
</a>
|
|
||||||
<div class="input-group">
|
|
||||||
<input asp-for="MonitoringExpiration" class="form-control" style="max-width:10ch;" />
|
|
||||||
<span class="input-group-text">minutes</span>
|
|
||||||
</div>
|
|
||||||
<span asp-validation-for="MonitoringExpiration" class="text-danger"></span>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label asp-for="PaymentTolerance" class="form-label"></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" rel="noreferrer noopener">
|
|
||||||
<span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
|
|
||||||
</a>
|
|
||||||
<div class="input-group">
|
|
||||||
<input asp-for="PaymentTolerance" class="form-control" style="max-width:10ch;" />
|
|
||||||
<span class="input-group-text">percent</span>
|
|
||||||
</div>
|
|
||||||
<span asp-validation-for="PaymentTolerance" class="text-danger"></span>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label asp-for="SpeedPolicy" class="form-label"></label>
|
|
||||||
<a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#consider-the-invoice-confirmed-when-the-payment-transaction" target="_blank" rel="noreferrer noopener">
|
|
||||||
<span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
|
|
||||||
</a>
|
|
||||||
<select asp-for="SpeedPolicy" class="form-select w-auto" onchange="document.getElementById('unconfirmed-warning').hidden = this.value !== '0';">
|
|
||||||
<option value="0">Is unconfirmed</option>
|
|
||||||
<option value="1">Has at least 1 confirmation</option>
|
|
||||||
<option value="3">Has at least 2 confirmations</option>
|
|
||||||
<option value="2">Has at least 6 confirmations</option>
|
|
||||||
</select>
|
|
||||||
<div class="alert alert-warning my-2" hidden="@(Model.SpeedPolicy != 0)" id="unconfirmed-warning" role="alert">
|
|
||||||
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>
|
|
||||||
</div>
|
|
||||||
<div class="form-group">
|
|
||||||
<label asp-for="LightningDescriptionTemplate" class="form-label"></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>
|
<button name="command" type="submit" class="btn btn-primary" value="Save" id="Save">Save Store Settings</button>
|
||||||
</form>
|
</form>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user