From 67aee9bdc67ba32e3f6db3545d8083cf78dffdf4 Mon Sep 17 00:00:00 2001
From: Dennis Reimann <mail@dennisreimann.de>
Date: Wed, 29 Sep 2021 14:33:49 +0200
Subject: [PATCH] Improve display and structure of payment related
 configuration

---
 BTCPayServer/Controllers/StoresController.cs  |   2 +
 .../Models/StoreViewModels/StoreViewModel.cs  |   2 +
 BTCPayServer/Views/Stores/UpdateStore.cshtml  | 182 +++++++++---------
 3 files changed, 100 insertions(+), 86 deletions(-)

diff --git a/BTCPayServer/Controllers/StoresController.cs b/BTCPayServer/Controllers/StoresController.cs
index 90ff15373..98e6f246c 100644
--- a/BTCPayServer/Controllers/StoresController.cs
+++ b/BTCPayServer/Controllers/StoresController.cs
@@ -578,6 +578,8 @@ namespace BTCPayServer.Controllers
             vm.PayJoinEnabled = storeBlob.PayJoinEnabled;
             vm.HintWallet = storeBlob.Hints.Wallet;
             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();
             vm.CanUsePayJoin = canUseHotWallet && store
diff --git a/BTCPayServer/Models/StoreViewModels/StoreViewModel.cs b/BTCPayServer/Models/StoreViewModels/StoreViewModel.cs
index 54fe28dd5..8a48cfb09 100644
--- a/BTCPayServer/Models/StoreViewModels/StoreViewModel.cs
+++ b/BTCPayServer/Models/StoreViewModels/StoreViewModel.cs
@@ -89,6 +89,8 @@ namespace BTCPayServer.Models.StoreViewModels
         [Display(Name = "Enable Payjoin/P2EP")]
         public bool PayJoinEnabled { get; set; }
         public bool CanUsePayJoin { get; set; }
+        public bool IsOnchainSetup { get; set; }
+        public bool IsLightningSetup { get; set; }
 
         public bool HintWallet { get; set; }
         public bool HintLightning { get; set; }
diff --git a/BTCPayServer/Views/Stores/UpdateStore.cshtml b/BTCPayServer/Views/Stores/UpdateStore.cshtml
index 56cf1f2f0..14a03cb01 100644
--- a/BTCPayServer/Views/Stores/UpdateStore.cshtml
+++ b/BTCPayServer/Views/Stores/UpdateStore.cshtml
@@ -182,98 +182,108 @@
                 <input asp-for="StoreWebsite" class="form-control" />
                 <span asp-validation-for="StoreWebsite" class="text-danger"></span>
             </div>
-
-            <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>
-            @if (Model.CanUsePayJoin)
+            
+            @if (Model.IsOnchainSetup || Model.IsLightningSetup)
             {
+                <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="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">
+                    <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="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>
                         </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>
-                    <span asp-validation-for="PayJoinEnabled" 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>
+                }
+                @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>
         </form>