diff --git a/BTCPayServer/Views/Apps/ListApps.cshtml b/BTCPayServer/Views/Apps/ListApps.cshtml index db1b81dc0..0fc64c60e 100644 --- a/BTCPayServer/Views/Apps/ListApps.cshtml +++ b/BTCPayServer/Views/Apps/ListApps.cshtml @@ -20,51 +20,52 @@

Create and manage apps.

- -
-
+
+
Create a new app
- - - - - - - - - - - @foreach (var app in Model.Apps) - { +
+
StoreNameApp typeActions
+ - - - - + + + + - } - -
- @if (app.IsOwner) - { - @app.StoreName - } - else - { - @app.StoreName - } - @app.AppName@app.AppType - @if (app.IsOwner) - { - Settings - - } - View - - Remove - StoreNameApp typeActions
+ + + @foreach (var app in Model.Apps) + { + + + @if (app.IsOwner) + { + @app.StoreName + } + else + { + @app.StoreName + } + + @app.AppName + @app.AppType + + @if (app.IsOwner) + { + Settings - + } + View - + Remove + + + } + + +
diff --git a/BTCPayServer/Views/Invoice/ListInvoices.cshtml b/BTCPayServer/Views/Invoice/ListInvoices.cshtml index 49c4653c9..5cf8ad89c 100644 --- a/BTCPayServer/Views/Invoice/ListInvoices.cshtml +++ b/BTCPayServer/Views/Invoice/ListInvoices.cshtml @@ -45,7 +45,7 @@ -
+
Create a new invoice
- @{ - string listInvoices(int prevNext, int count) - { - var skip = Model.Skip; - if (prevNext == -1) - skip = Math.Max(0, Model.Skip - Model.Count); - else if (prevNext == 1) - skip = Model.Skip + count; - - var act = Url.Action("ListInvoices", new + + + @foreach (var invoice in Model.Invoices) + { + + + + @invoice.Date.ToBrowserDate() + + + + @if (invoice.RedirectUrl != string.Empty) + { + @invoice.OrderId + } + else + { + @invoice.OrderId + } + + @invoice.InvoiceId + + @if (invoice.CanMarkStatus) + { +
+ +
+ @if (invoice.CanMarkInvalid) + { + + } + @if (invoice.CanMarkComplete) + { + + } +
+
+ } + else + { + @invoice.StatusString + } + + @invoice.AmountCurrency + + @if (invoice.ShowCheckout) + { + + Checkout + [^] + @if (!invoice.CanMarkStatus) + { + - + } + + } +   + Details + @**@ +   + + + + + + + +
+ +
+ + + } + + + + @{ + string listInvoices(int prevNext, int count) { - searchTerm = Model.SearchTerm, - skip = skip, - count = count, - }); + var skip = Model.Skip; + if (prevNext == -1) + skip = Math.Max(0, Model.Skip - Model.Count); + else if (prevNext == 1) + skip = Model.Skip + count; - return act; + var act = Url.Action("ListInvoices", new + { + searchTerm = Model.SearchTerm, + skip = skip, + count = count, + }); + + return act; + } } - } +
diff --git a/BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml b/BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml index 443bc00d3..1fd458ac6 100644 --- a/BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml +++ b/BTCPayServer/Views/PaymentRequest/GetPaymentRequests.cshtml @@ -19,70 +19,72 @@
-
-
+
+
Create a new payment request
- - - - - - - - - - - - @foreach (var item in Model.Items) - { +
+
TitleExpiryPriceStatusActions
+ - - - - - + + + + + - } - -
@item.Title@(item.ExpiryDate?.ToString("g") ?? "No Expiry")@item.Amount @item.Currency@item.Status - Edit - - - View - - - Invoices - - - Pay - - - Clone - - - Remove - TitleExpiryPriceStatusActions
+ + + @foreach (var item in Model.Items) + { + + @item.Title + @(item.ExpiryDate?.ToString("g") ?? "No Expiry") + @item.Amount @item.Currency + @item.Status + + Edit + - + View + - + Invoices + - + Pay + - + Clone + - + Remove + + + } + + - + +
diff --git a/BTCPayServer/Views/Server/ListUsers.cshtml b/BTCPayServer/Views/Server/ListUsers.cshtml index d97bbced8..f0a7f1e62 100644 --- a/BTCPayServer/Views/Server/ListUsers.cshtml +++ b/BTCPayServer/Views/Server/ListUsers.cshtml @@ -5,7 +5,7 @@ -
+
Total Users: @Model.Total
-
- Create a new store - - - - - - - - - - @foreach (var store in Model.Stores) - { - - - - - - } - -
NameWebsiteActions
@store.Name - @if (!string.IsNullOrEmpty(store.WebSite)) - { - @store.WebSite - } - - Invoices - - @if (store.IsOwner) - { - Settings - - } - Remove -
+
+
+ Create a new store +
+
+
+ + + + + + + + + + @foreach (var store in Model.Stores) + { + + + + + + } + +
NameWebsiteActions
@store.Name + @if (!string.IsNullOrEmpty(store.WebSite)) + { + @store.WebSite + } + + Invoices - + @if (store.IsOwner) + { + Settings - + } + Remove +
+
+
diff --git a/BTCPayServer/Views/Wallets/ListWallets.cshtml b/BTCPayServer/Views/Wallets/ListWallets.cshtml index 9ea3b1327..645424849 100644 --- a/BTCPayServer/Views/Wallets/ListWallets.cshtml +++ b/BTCPayServer/Views/Wallets/ListWallets.cshtml @@ -23,36 +23,38 @@
- - - - - - - - - - - @foreach (var wallet in Model.Wallets) - { +
+
Store NameCrypto CodeBalanceActions
+ - @if (wallet.IsOwner) - { - - } - else - { - - } - - - + + + + - } - -
@wallet.StoreName@wallet.StoreName@wallet.CryptoCode@wallet.Balance - Manage - Store NameCrypto CodeBalanceActions
+ + + @foreach (var wallet in Model.Wallets) + { + + @if (wallet.IsOwner) + { + @wallet.StoreName + } + else + { + @wallet.StoreName + } + @wallet.CryptoCode + @wallet.Balance + + Manage + + + } + + +
diff --git a/BTCPayServer/Views/Wallets/WalletSend.cshtml b/BTCPayServer/Views/Wallets/WalletSend.cshtml index 71172d4be..82ba6b75e 100644 --- a/BTCPayServer/Views/Wallets/WalletSend.cshtml +++ b/BTCPayServer/Views/Wallets/WalletSend.cshtml @@ -6,7 +6,7 @@ ViewData.SetActivePageAndTitle(WalletsNavPages.Send); } -
+