From 72a9e676c13028e71bee9c76a5c32961201eec8d Mon Sep 17 00:00:00 2001 From: dstrukt Date: Mon, 13 Feb 2023 00:25:24 -0800 Subject: [PATCH] Feature Descriptor (#3831) --- .../Bitcoin/ViewBitcoinLikePaymentData.cshtml | 4 +- .../Crowdfund/Public/ViewCrowdfund.cshtml | 4 +- .../Shared/Crowdfund/UpdateCrowdfund.cshtml | 4 +- .../LNURL/LightningAddressOption.cshtml | 4 +- .../PointOfSale/UpdatePointOfSale.cshtml | 4 +- .../Shopify/StoreIntegrationsList.cshtml | 4 +- BTCPayServer/Views/UIApps/ListApps.cshtml | 4 +- .../Views/UIInvoice/ListInvoices.cshtml | 25 +++- .../EditPaymentRequest.cshtml | 4 +- .../GetPaymentRequests.cshtml | 23 ++- .../UIPullPayment/EditPullPayment.cshtml | 2 +- .../Views/UIServer/DynamicDnsServices.cshtml | 4 +- BTCPayServer/Views/UIServer/Files.cshtml | 8 +- .../Views/UIServer/ListPlugins.cshtml | 2 +- BTCPayServer/Views/UIServer/Policies.cshtml | 12 +- .../Views/UIShopify/EditShopify.cshtml | 4 +- .../UIStorePullPayments/NewPullPayment.cshtml | 4 +- .../Views/UIStorePullPayments/Payouts.cshtml | 136 ++++++++++-------- .../UIStorePullPayments/PullPayments.cshtml | 36 +++-- .../Views/UIStores/CheckoutAppearance.cshtml | 6 +- .../Views/UIStores/GeneralSettings.cshtml | 16 +-- .../Views/UIStores/ImportWallet/Xpub.cshtml | 4 +- .../Views/UIStores/ImportWalletOptions.cshtml | 2 +- .../Views/UIStores/LightningSettings.cshtml | 2 +- BTCPayServer/Views/UIStores/ListTokens.cshtml | 4 +- BTCPayServer/Views/UIStores/Rates.cshtml | 4 +- .../Views/UIStores/WalletSettings.cshtml | 12 +- .../Views/UIStores/_GenerateWalletForm.cshtml | 2 +- .../Views/UIWallets/ListWallets.cshtml | 4 +- .../Views/UIWallets/WalletSend.cshtml | 4 +- .../UIWallets/WalletSigningOptions.cshtml | 6 +- BTCPayServer/wwwroot/img/icon-sprite.svg | 2 +- BTCPayServer/wwwroot/main/site.css | 21 ++- 33 files changed, 219 insertions(+), 158 deletions(-) diff --git a/BTCPayServer/Views/Shared/Bitcoin/ViewBitcoinLikePaymentData.cshtml b/BTCPayServer/Views/Shared/Bitcoin/ViewBitcoinLikePaymentData.cshtml index 78700c0a4..59b1a7b86 100644 --- a/BTCPayServer/Views/Shared/Bitcoin/ViewBitcoinLikePaymentData.cshtml +++ b/BTCPayServer/Views/Shared/Bitcoin/ViewBitcoinLikePaymentData.cshtml @@ -61,8 +61,8 @@ { Network Fee - - + + } diff --git a/BTCPayServer/Views/Shared/Crowdfund/Public/ViewCrowdfund.cshtml b/BTCPayServer/Views/Shared/Crowdfund/Public/ViewCrowdfund.cshtml index 59f293231..981fcabe3 100644 --- a/BTCPayServer/Views/Shared/Crowdfund/Public/ViewCrowdfund.cshtml +++ b/BTCPayServer/Views/Shared/Crowdfund/Public/ViewCrowdfund.cshtml @@ -82,14 +82,14 @@ { Hardcap Goal - + } else { Softcap Goal - + } diff --git a/BTCPayServer/Views/Shared/Crowdfund/UpdateCrowdfund.cshtml b/BTCPayServer/Views/Shared/Crowdfund/UpdateCrowdfund.cshtml index debe1df01..acb8f47cf 100644 --- a/BTCPayServer/Views/Shared/Crowdfund/UpdateCrowdfund.cshtml +++ b/BTCPayServer/Views/Shared/Crowdfund/UpdateCrowdfund.cshtml @@ -300,8 +300,8 @@
- - + + diff --git a/BTCPayServer/Views/Shared/LNURL/LightningAddressOption.cshtml b/BTCPayServer/Views/Shared/LNURL/LightningAddressOption.cshtml index bb15222fa..89a695d7f 100644 --- a/BTCPayServer/Views/Shared/LNURL/LightningAddressOption.cshtml +++ b/BTCPayServer/Views/Shared/LNURL/LightningAddressOption.cshtml @@ -11,8 +11,8 @@ Lightning Address - - + + diff --git a/BTCPayServer/Views/Shared/PointOfSale/UpdatePointOfSale.cshtml b/BTCPayServer/Views/Shared/PointOfSale/UpdatePointOfSale.cshtml index 076d89c68..3bde698d0 100644 --- a/BTCPayServer/Views/Shared/PointOfSale/UpdatePointOfSale.cshtml +++ b/BTCPayServer/Views/Shared/PointOfSale/UpdatePointOfSale.cshtml @@ -255,8 +255,8 @@
- - + + diff --git a/BTCPayServer/Views/Shared/Shopify/StoreIntegrationsList.cshtml b/BTCPayServer/Views/Shared/Shopify/StoreIntegrationsList.cshtml index fca48355c..43b8b30d5 100644 --- a/BTCPayServer/Views/Shared/Shopify/StoreIntegrationsList.cshtml +++ b/BTCPayServer/Views/Shared/Shopify/StoreIntegrationsList.cshtml @@ -10,8 +10,8 @@ Shopify - - + + diff --git a/BTCPayServer/Views/UIApps/ListApps.cshtml b/BTCPayServer/Views/UIApps/ListApps.cshtml index 4f64d330f..26af73a6f 100644 --- a/BTCPayServer/Views/UIApps/ListApps.cshtml +++ b/BTCPayServer/Views/UIApps/ListApps.cshtml @@ -16,8 +16,8 @@

@ViewData["Title"] - - + +

diff --git a/BTCPayServer/Views/UIInvoice/ListInvoices.cshtml b/BTCPayServer/Views/UIInvoice/ListInvoices.cshtml index 5c2e5d289..5041daf8e 100644 --- a/BTCPayServer/Views/UIInvoice/ListInvoices.cshtml +++ b/BTCPayServer/Views/UIInvoice/ListInvoices.cshtml @@ -126,11 +126,9 @@

@ViewData["Title"] - - - - - + + +

@@ -138,6 +136,19 @@
+
+
+
+

Invoices are documents issued by the seller to a buyer to collect payment.

+

An invoice must be paid within a defined time interval at a fixed exchange rate to protect the issuer from price fluctuations.

+ Learn More +
+ +
+
+ @@ -270,8 +281,8 @@ CSV JSON
- - + +
diff --git a/BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml b/BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml index 7e87f39be..6361fc8df 100644 --- a/BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml +++ b/BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml @@ -126,8 +126,8 @@
- - + + diff --git a/BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml b/BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml index 6d664b8c5..4e7aa9df2 100644 --- a/BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml +++ b/BTCPayServer/Views/UIPaymentRequest/GetPaymentRequests.cshtml @@ -12,11 +12,9 @@

@ViewData["Title"] - - - - - + + +

@@ -24,12 +22,25 @@
+
+
+
+

Payment requests are persistent shareable pages that enable the receiver to pay at their convenience. Funds are paid to a payment request at the current exchange rate.

+

Requests may be paid in partial. They will remain valid until time expires or when paid what is due.

+ Learn More +
+ +
+
+
- +
diff --git a/BTCPayServer/Views/UIPullPayment/EditPullPayment.cshtml b/BTCPayServer/Views/UIPullPayment/EditPullPayment.cshtml index bd44d1a44..97d45dfb7 100644 --- a/BTCPayServer/Views/UIPullPayment/EditPullPayment.cshtml +++ b/BTCPayServer/Views/UIPullPayment/EditPullPayment.cshtml @@ -72,7 +72,7 @@
- + diff --git a/BTCPayServer/Views/UIServer/DynamicDnsServices.cshtml b/BTCPayServer/Views/UIServer/DynamicDnsServices.cshtml index 968191325..8a0195dd8 100644 --- a/BTCPayServer/Views/UIServer/DynamicDnsServices.cshtml +++ b/BTCPayServer/Views/UIServer/DynamicDnsServices.cshtml @@ -10,8 +10,8 @@

@ViewData["Title"] - - + +

diff --git a/BTCPayServer/Views/UIServer/Files.cshtml b/BTCPayServer/Views/UIServer/Files.cshtml index e35b93e79..979732f01 100644 --- a/BTCPayServer/Views/UIServer/Files.cshtml +++ b/BTCPayServer/Views/UIServer/Files.cshtml @@ -18,8 +18,8 @@

Before being able to upload you first need to choose your file storage service provider. - - + +

} @@ -27,8 +27,8 @@ {

Change your file storage service provider. - - + +

diff --git a/BTCPayServer/Views/UIServer/ListPlugins.cshtml b/BTCPayServer/Views/UIServer/ListPlugins.cshtml index a61dc61f7..173e180de 100644 --- a/BTCPayServer/Views/UIServer/ListPlugins.cshtml +++ b/BTCPayServer/Views/UIServer/ListPlugins.cshtml @@ -332,7 +332,7 @@ } else if (recommended) { -
Recommended
+
Recommended
}

@plugin.Description

diff --git a/BTCPayServer/Views/UIServer/Policies.cshtml b/BTCPayServer/Views/UIServer/Policies.cshtml index ae0a9360f..b3cc5f274 100644 --- a/BTCPayServer/Views/UIServer/Policies.cshtml +++ b/BTCPayServer/Views/UIServer/Policies.cshtml @@ -24,7 +24,7 @@ - +
@@ -32,7 +32,7 @@ - +
@@ -55,7 +55,7 @@ - + @if (!isEmailConfigured) @@ -84,7 +84,7 @@ - +
@@ -92,7 +92,7 @@ - +
@@ -112,7 +112,7 @@ - +
diff --git a/BTCPayServer/Views/UIShopify/EditShopify.cshtml b/BTCPayServer/Views/UIShopify/EditShopify.cshtml index 51e32c3a9..20cb4e8a9 100644 --- a/BTCPayServer/Views/UIShopify/EditShopify.cshtml +++ b/BTCPayServer/Views/UIShopify/EditShopify.cshtml @@ -16,8 +16,8 @@

@ViewData["Title"] - - + +

diff --git a/BTCPayServer/Views/UIStorePullPayments/NewPullPayment.cshtml b/BTCPayServer/Views/UIStorePullPayments/NewPullPayment.cshtml index 184d20571..b02defc0b 100644 --- a/BTCPayServer/Views/UIStorePullPayments/NewPullPayment.cshtml +++ b/BTCPayServer/Views/UIStorePullPayments/NewPullPayment.cshtml @@ -85,8 +85,8 @@
- - + + diff --git a/BTCPayServer/Views/UIStorePullPayments/Payouts.cshtml b/BTCPayServer/Views/UIStorePullPayments/Payouts.cshtml index 70217b801..23c2fec8d 100644 --- a/BTCPayServer/Views/UIStorePullPayments/Payouts.cshtml +++ b/BTCPayServer/Views/UIStorePullPayments/Payouts.cshtml @@ -59,12 +59,34 @@ } - +
+
+

+ @ViewData["Title"] + + + +

+
+ +
+
+
+

Payouts allow you to process pull payments, in the form of refunds, salary payouts, or withdrawals.

+ Learn More +
+ +
+
+ + @if (_payoutProcessorFactories.Any(factory => factory.GetSupportedPaymentMethods().Contains(paymentMethodId)) && !(await _payoutProcessorService.GetProcessors(new PayoutProcessorService.PayoutProcessorQuery() { - Stores = new[] {storeId}, - PaymentMethods = new[] {Model.PaymentMethodId} + Stores = new[] { storeId }, + PaymentMethods = new[] { Model.PaymentMethodId } })).Any()) { } -

- @ViewData["Title"] - - - - - -

- - + +
    @foreach (var state in Model.PaymentMethods) @@ -131,7 +145,7 @@ asp-route-pullPaymentId="@Model.PullPaymentId" asp-route-paymentMethodId="@Model.PaymentMethodId" class="nav-link @(state.Key == Model.PayoutState ? "active" : "")" role="tab"> - @state.Key.GetStateString() + @state.Key.GetStateString() @if (state.Value > 0) { @state.Value @@ -146,60 +160,60 @@
    - - - - - - - @if (Model.PayoutState != PayoutState.AwaitingApproval) - { - - } - - - - @for (int i = 0; i < Model.Payouts.Count; i++) - { - var pp = Model.Payouts[i]; - - - - - - + + + + + + @if (Model.PayoutState != PayoutState.AwaitingApproval) { - + } - } + + + @for (int i = 0; i < Model.Payouts.Count; i++) + { + var pp = Model.Payouts[i]; + + + + + + + @if (Model.PayoutState != PayoutState.AwaitingApproval) + { + + } + + }
    - - - Date - SourceDestinationAmountTransaction
    - - - - - - @pp.Date.ToBrowserDate() - - @pp.PullPaymentName - - @pp.Destination - - @pp.Amount -
    + + + Date + SourceDestinationAmount - @if (!(pp.ProofLink is null)) - { - Link - } - Transaction
    + + + + + + @pp.Date.ToBrowserDate() + + @pp.PullPaymentName + + @pp.Destination + + @pp.Amount + + @if (!(pp.ProofLink is null)) + { + Link + } +
    - + } else { diff --git a/BTCPayServer/Views/UIStorePullPayments/PullPayments.cshtml b/BTCPayServer/Views/UIStorePullPayments/PullPayments.cshtml index 75ea2d6dc..e56d820a2 100644 --- a/BTCPayServer/Views/UIStorePullPayments/PullPayments.cshtml +++ b/BTCPayServer/Views/UIStorePullPayments/PullPayments.cshtml @@ -41,17 +41,27 @@

    @ViewData["Title"] - - - - - + + +

    Create Pull Payment
    +
    +
    +
    +

    Pull Payments allow receivers to claim specified funds from your wallet at their convenience. Once submitted and approved, the funds will be released.

    + Learn More +
    + +
    +
    +
@@ -92,7 +102,6 @@ - + @@ -164,13 +174,13 @@
Name Name Automatically Approved Refunded Actions
- + - + @section PageFootContent {