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

Improve display and structure of payment related configuration

Browse Source
This commit is contained in:
Dennis Reimann
2021-09-29 14:33:49 +02:00
committed by Andrew Camilleri
parent 975ad2f8ab
commit 67aee9bdc6
3 changed files with 100 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
BTCPayServer/Controllers/StoresController.cs
View File

@@ -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

2
BTCPayServer/Models/StoreViewModels/StoreViewModel.cs
View File

@@ -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; }

68
BTCPayServer/Views/Stores/UpdateStore.cshtml
View File

@@ -183,27 +183,16 @@
<span asp-validation-for="StoreWebsite" class="text-danger"></span> <span asp-validation-for="StoreWebsite" class="text-danger"></span>
</div> </div>
@if (Model.IsOnchainSetup || Model.IsLightningSetup)
{
<h4 class="mt-5 mb-3">Payment</h4> <h4 class="mt-5 mb-3">Payment</h4>
<div class="form-group d-flex align-items-center"> <div class="form-group d-flex align-items-center">
<input asp-for="AnyoneCanCreateInvoice" type="checkbox" class="btcpay-toggle me-2" /> <input asp-for="AnyoneCanCreateInvoice" type="checkbox" class="btcpay-toggle me-2"/>
<label asp-for="AnyoneCanCreateInvoice" class="form-label mb-0 me-1"></label> <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"> <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> <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
</a> </a>
</div> </div>
@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 mt-4"> <div class="form-group mt-4">
<label asp-for="NetworkFeeMode" class="form-label"></label> <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"> <a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#add-network-fee-to-invoice-vary-with-mining-fees" target="_blank" rel="noreferrer noopener">
@@ -221,33 +210,49 @@
<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"> <div class="input-group">
<input asp-for="InvoiceExpiration" class="form-control" style="max-width:10ch;" /> <input asp-for="InvoiceExpiration" class="form-control" style="max-width:10ch;"/>
<span class="input-group-text">minutes</span> <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">
<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"> <div class="form-group">
<label asp-for="PaymentTolerance" class="form-label"></label> <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"> <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> <span class="fa fa-question-circle-o text-secondary" title="More information..."></span>
</a> </a>
<div class="input-group"> <div class="input-group">
<input asp-for="PaymentTolerance" class="form-control" style="max-width:10ch;" /> <input asp-for="PaymentTolerance" class="form-control" style="max-width:10ch;"/>
<span class="input-group-text">percent</span> <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>
@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>
</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"> <div class="form-group">
<label asp-for="SpeedPolicy" class="form-label"></label> <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"> <a href="https://docs.btcpayserver.org/FAQ/FAQ-Stores/#consider-the-invoice-confirmed-when-the-payment-transaction" target="_blank" rel="noreferrer noopener">
@@ -264,16 +269,21 @@
</div> </div>
<span asp-validation-for="SpeedPolicy" class="text-danger"></span> <span asp-validation-for="SpeedPolicy" class="text-danger"></span>
</div> </div>
}
@if (Model.IsLightningSetup)
{
<h5 class="mt-4 mb-3">Lightning</h5>
<div class="form-group"> <div class="form-group">
<label asp-for="LightningDescriptionTemplate" class="form-label"></label> <label asp-for="LightningDescriptionTemplate" class="form-label"></label>
<input asp-for="LightningDescriptionTemplate" class="form-control" /> <input asp-for="LightningDescriptionTemplate" class="form-control"/>
<span asp-validation-for="LightningDescriptionTemplate" class="text-danger"></span> <span asp-validation-for="LightningDescriptionTemplate" class="text-danger"></span>
<p class="form-text text-muted"> <p class="form-text text-muted">
Available placeholders: Available placeholders:
<code>{StoreName} {ItemDescription} {OrderId}</code> <code>{StoreName} {ItemDescription} {OrderId}</code>
</p> </p>
</div> </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>