POS: Don't show free items in print view (#6009)

We cannot generate a proper LNURL response for free items, hence we should not show them in the print view.

Closes #5999.

BTCPayServer.Abstractions/BTCPayServer.Abstractions.csproj

@@ -32,8 +32,8 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="HtmlSanitizer" Version="8.0.838" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.1" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.5" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.5" />
     <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.0-beta.2" />
   </ItemGroup>

BTCPayServer.Abstractions/Contracts/BaseDbContextFactory.cs

@@ -5,6 +5,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata;
 using Microsoft.EntityFrameworkCore.Migrations;
 using Microsoft.Extensions.Options;
+using Npgsql;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Migrations;
 using Npgsql.EntityFrameworkCore.PostgreSQL.Migrations.Operations;
 
@@ -85,10 +86,9 @@ namespace BTCPayServer.Abstractions.Contracts
                         {
                             o.EnableRetryOnFailure(10);
                             o.SetPostgresVersion(12, 0);
-                            if (!string.IsNullOrEmpty(_schemaPrefix))
-                            {
-                                o.MigrationsHistoryTable(_schemaPrefix);
-                            }
+                            var mainSearchPath = GetSearchPath(_options.Value.ConnectionString);
+                            var schemaPrefix = string.IsNullOrEmpty(_schemaPrefix) ? "__EFMigrationsHistory" : _schemaPrefix;
+                            o.MigrationsHistoryTable(schemaPrefix, mainSearchPath);
                         })
                         .ReplaceService<IMigrationsSqlGenerator, CustomNpgsqlMigrationsSqlGenerator>();
                     break;
@@ -108,5 +108,11 @@ namespace BTCPayServer.Abstractions.Contracts
             }
         }
 
+        private string GetSearchPath(string connectionString)
+        {
+            var connectionStringBuilder = new NpgsqlConnectionStringBuilder(connectionString);
+            var searchPaths = connectionStringBuilder.SearchPath?.Split(',');
+            return searchPaths is not { Length: > 0 } ? null : searchPaths[0];
+        }
     }
 }

BTCPayServer.Abstractions/Extensions/HttpRequestExtensions.cs

@@ -36,6 +36,17 @@ public static class HttpRequestExtensions
             request.Path.ToUriComponent());
     }
 
+    public static string GetCurrentUrlWithQueryString(this HttpRequest request)
+    {
+        return string.Concat(
+            request.Scheme,
+            "://",
+            request.Host.ToUriComponent(),
+            request.PathBase.ToUriComponent(),
+            request.Path.ToUriComponent(),
+            request.QueryString.ToUriComponent());
+    }
+
     public static string GetCurrentPath(this HttpRequest request)
     {
         return string.Concat(

BTCPayServer.Client/BTCPayServer.Client.csproj

@@ -31,7 +31,7 @@
   </ItemGroup>
     <ItemGroup>
       <PackageReference Include="BTCPayServer.Lightning.Common" Version="1.5.1" />
-      <PackageReference Include="NBitcoin" Version="7.0.34" />
+      <PackageReference Include="NBitcoin" Version="7.0.37" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     </ItemGroup>
   <ItemGroup>

BTCPayServer.Common/BTCPayServer.Common.csproj

@@ -4,7 +4,7 @@
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="NBXplorer.Client" Version="4.3.0" />
+    <PackageReference Include="NBXplorer.Client" Version="4.3.1" />
     <PackageReference Include="NicolasDorier.StandardConfiguration" Version="2.0.1" />
   </ItemGroup>
   <ItemGroup Condition="'$(Altcoins)' != 'true'">

BTCPayServer.Data/BTCPayServer.Data.csproj

@@ -3,11 +3,11 @@
   <Import Project="../Build/Common.csproj" />
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.1">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.5">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.5" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\BTCPayServer.Abstractions\BTCPayServer.Abstractions.csproj" />

BTCPayServer.Rating/BTCPayServer.Rating.csproj

@@ -4,9 +4,9 @@
 
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.8.0" />
-    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
-    <PackageReference Include="NBitcoin" Version="7.0.34" />
+    <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
+    <PackageReference Include="NBitcoin" Version="7.0.37" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="DigitalRuby.ExchangeSharp" Version="1.0.4" />
   </ItemGroup>

BTCPayServer.Tests/FastTests.cs

@@ -1347,17 +1347,22 @@ bc1qfzu57kgu5jthl934f9xrdzzx8mmemx7gn07tf0grnvz504j6kzusu2v0ku
 
             filter = "status:abed, status:abed2";
             search = new SearchString(filter);
-            Assert.Equal("", search.TextSearch);
+            Assert.Null(search.TextSearch);
+            Assert.Null(search.TextFilters);
             Assert.Equal("status:abed, status:abed2", search.ToString());
             Assert.Throws<KeyNotFoundException>(() => search.Filters["test"]);
             Assert.Equal(2, search.Filters["status"].Count);
             Assert.Equal("abed", search.Filters["status"].First());
             Assert.Equal("abed2", search.Filters["status"].Skip(1).First());
 
-            filter = "StartDate:2019-04-25 01:00 AM, hekki";
+            filter = "StartDate:2019-04-25 01:00 AM, hekki,orderid:MYORDERID,orderid:MYORDERID_2";
             search = new SearchString(filter);
             Assert.Equal("2019-04-25 01:00 AM", search.Filters["startdate"].First());
             Assert.Equal("hekki", search.TextSearch);
+            Assert.Equal("orderid:MYORDERID,orderid:MYORDERID_2", search.TextFilters);
+            Assert.Equal("orderid:MYORDERID,orderid:MYORDERID_2,hekki", search.TextCombined);
+            Assert.Equal("StartDate:2019-04-25 01:00 AM", search.WithoutSearchText());
+            Assert.Equal(filter, search.ToString());
 
             // modify search
             filter = $"status:settled,exceptionstatus:paidLate,unusual:true, fulltext searchterm, storeid:{storeId},startdate:2019-04-25 01:00:00";

BTCPayServer.Tests/SeleniumTests.cs

@@ -2620,9 +2620,9 @@ namespace BTCPayServer.Tests
 
             // Receipt
             s.Driver.WaitForElement(By.Id("ReceiptLink")).Click();
-            var additionalData = s.Driver.FindElement(By.CssSelector("#AdditionalData table"));
-            var items = additionalData.FindElements(By.CssSelector("tbody tr"));
-            var sums = additionalData.FindElements(By.CssSelector("tfoot tr"));
+            var cartData = s.Driver.FindElement(By.CssSelector("#CartData table"));
+            var items = cartData.FindElements(By.CssSelector("tbody tr"));
+            var sums = cartData.FindElements(By.CssSelector("tfoot tr"));
             Assert.Equal(2, items.Count);
             Assert.Equal(4, sums.Count);
             Assert.Contains("Manual entry 1", items[0].FindElement(By.CssSelector("th")).Text);
@@ -2676,21 +2676,19 @@ namespace BTCPayServer.Tests
             // Receipt
             s.Driver.WaitForElement(By.Id("ReceiptLink")).Click();
 
-            additionalData = s.Driver.FindElement(By.CssSelector("#AdditionalData table"));
-            items = additionalData.FindElements(By.CssSelector("tbody tr"));
-            sums = additionalData.FindElements(By.CssSelector("tfoot tr"));
+            cartData = s.Driver.FindElement(By.CssSelector("#CartData table"));
+            items = cartData.FindElements(By.CssSelector("tbody tr"));
+            sums = cartData.FindElements(By.CssSelector("tfoot tr"));
             Assert.Equal(3, items.Count);
-            Assert.Equal(2, sums.Count);
+            Assert.Single(sums);
             Assert.Contains("Black Tea", items[0].FindElement(By.CssSelector("th")).Text);
             Assert.Contains("1 x 1,00 € = 1,00 €", items[0].FindElement(By.CssSelector("td")).Text);
             Assert.Contains("Green Tea", items[1].FindElement(By.CssSelector("th")).Text);
             Assert.Contains("2 x 1,00 € = 2,00 €", items[1].FindElement(By.CssSelector("td")).Text);
             Assert.Contains("Manual entry 1", items[2].FindElement(By.CssSelector("th")).Text);
             Assert.Contains("1,23 €", items[2].FindElement(By.CssSelector("td")).Text);
-            Assert.Contains("Subtotal", sums[0].FindElement(By.CssSelector("th")).Text);
+            Assert.Contains("Total", sums[0].FindElement(By.CssSelector("th")).Text);
             Assert.Contains("4,23 €", sums[0].FindElement(By.CssSelector("td")).Text);
-            Assert.Contains("Total", sums[1].FindElement(By.CssSelector("th")).Text);
-            Assert.Contains("4,23 €", sums[1].FindElement(By.CssSelector("td")).Text);
             
             // Guest user can access recent transactions
             s.GoToHome();
@@ -2837,9 +2835,9 @@ namespace BTCPayServer.Tests
 
             // Receipt
             s.Driver.WaitForElement(By.Id("ReceiptLink")).Click();
-            var additionalData = s.Driver.FindElement(By.CssSelector("#AdditionalData table"));
-            var items = additionalData.FindElements(By.CssSelector("tbody tr"));
-            var sums = additionalData.FindElements(By.CssSelector("tfoot tr"));
+            var cartData = s.Driver.FindElement(By.CssSelector("#CartData table"));
+            var items = cartData.FindElements(By.CssSelector("tbody tr"));
+            var sums = cartData.FindElements(By.CssSelector("tfoot tr"));
             Assert.Equal(7, items.Count);
             Assert.Equal(4, sums.Count);
             Assert.Contains("Black Tea", items[0].FindElement(By.CssSelector("th")).Text);

BTCPayServer.Tests/ThirdPartyTests.cs

@@ -464,7 +464,7 @@ retry:
 
             actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "dom-confetti", "dom-confetti.min.js").Trim();
             version = Regex.Match(actual, "Original file: /npm/dom-confetti@([0-9]+.[0-9]+.[0-9]+)/lib/main.js").Groups[1].Value;
-            expected = (await (await client.GetAsync($"https://cdn.jsdelivr.net/npm/dom-confetti@{version}/lib/main.min.js")).Content.ReadAsStringAsync()).Trim();
+            expected = (await (await client.GetAsync($"https://cdn.jsdelivr.net/npm/dom-confetti@{version}")).Content.ReadAsStringAsync()).Trim();
             EqualJsContent(expected, actual);
 
             actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "vue-sortable", "sortable.min.js").Trim();

BTCPayServer.Tests/UnitTest1.cs

@@ -2985,7 +2985,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        [Trait("Selenium", "Selenium")]
+        [Trait("Integration", "Integration")]
         public async Task CanCreateReports()
         {
             using var tester = CreateServerTester(newDb: true);
@@ -3093,6 +3093,48 @@ namespace BTCPayServer.Tests
             var invoiceIdIndex = report.GetIndex("InvoiceId");
             var oldPaymentsCount = report.Data.Count(d => d[invoiceIdIndex].Value<string>() == "Q7RqoHLngK9svM4MgRyi9y");
             Assert.Equal(8, oldPaymentsCount); // 10 payments, but 2 unaccounted
+
+            var addr = await tester.ExplorerNode.GetNewAddressAsync();
+            // Two invoices get refunded
+            for (int i = 0; i < 2; i++)
+            {
+                var inv = await client.CreateInvoice(acc.StoreId, new CreateInvoiceRequest() { Amount = 10m, Currency = "USD" });
+                await acc.PayInvoice(inv.Id);
+                await client.MarkInvoiceStatus(acc.StoreId, inv.Id, new MarkInvoiceStatusRequest() { Status = InvoiceStatus.Settled });
+                var refund = await client.RefundInvoice(acc.StoreId, inv.Id, new RefundInvoiceRequest() { RefundVariant = RefundVariant.Fiat, PaymentMethod = "BTC" });
+
+                async Task AssertData(string currency, decimal awaiting, decimal limit, decimal completed, bool fullyPaid)
+                {
+                    report = await GetReport(acc, new() { ViewName = "Refunds" });
+                    var currencyIndex = report.GetIndex("Currency");
+                    var awaitingIndex = report.GetIndex("Awaiting");
+                    var fullyPaidIndex = report.GetIndex("FullyPaid");
+                    var completedIndex = report.GetIndex("Completed");
+                    var limitIndex = report.GetIndex("Limit");
+                    var d = Assert.Single(report.Data.Where(d => d[report.GetIndex("InvoiceId")].Value<string>() == inv.Id));
+                    Assert.Equal(fullyPaid, (bool)d[fullyPaidIndex]);
+                    Assert.Equal(currency, d[currencyIndex].Value<string>());
+                    Assert.Equal(completed, (((JObject)d[completedIndex])["v"]).Value<decimal>());
+                    Assert.Equal(awaiting, (((JObject)d[awaitingIndex])["v"]).Value<decimal>());
+                    Assert.Equal(limit, (((JObject)d[limitIndex])["v"]).Value<decimal>());
+                }
+
+                await AssertData("USD", awaiting: 0.0m, limit: 10.0m, completed: 0.0m, fullyPaid: false);
+                var payout = await client.CreatePayout(refund.Id, new CreatePayoutRequest() { Destination = addr.ToString(), PaymentMethod = "BTC" });
+                await AssertData("USD", awaiting: 10.0m, limit: 10.0m, completed: 0.0m, fullyPaid: false);
+                await client.ApprovePayout(acc.StoreId, payout.Id, new ApprovePayoutRequest());
+                await AssertData("USD", awaiting: 10.0m, limit: 10.0m, completed: 0.0m, fullyPaid: false);
+                if (i == 0)
+                {
+                    await client.MarkPayoutPaid(acc.StoreId, payout.Id);
+                    await AssertData("USD", awaiting: 0.0m, limit: 10.0m, completed: 10.0m, fullyPaid: true);
+                }
+                if (i == 1)
+                {
+                    await client.CancelPayout(acc.StoreId, payout.Id);
+                    await AssertData("USD", awaiting: 0.0m, limit: 10.0m, completed: 0.0m, fullyPaid: false);
+                }
+            }
         }
 
         private async Task<StoreReportResponse> GetReport(TestAccount acc, StoreReportRequest req)

BTCPayServer.Tests/docker-compose.altcoins.yml

@@ -99,7 +99,7 @@ services:
       custom:
 
   nbxplorer:
-    image: nicolasdorier/nbxplorer:2.5.0
+    image: nicolasdorier/nbxplorer:2.5.4
     restart: unless-stopped
     ports:
       - "32838:32838"
@@ -163,7 +163,7 @@ services:
       - "bitcoin_datadir:/data"
 
   customer_lightningd:
-    image: btcpayserver/lightning:v23.08-dev
+    image: btcpayserver/lightning:v24.02.2
     stop_signal: SIGKILL
     restart: unless-stopped
     environment:
@@ -171,6 +171,7 @@ services:
       LIGHTNINGD_CHAIN: "btc"
       LIGHTNINGD_NETWORK: "regtest"
       LIGHTNINGD_OPT: |
+        developer
         bitcoin-datadir=/etc/bitcoin
         bitcoin-rpcconnect=bitcoind
         announce-addr=customer_lightningd:9735
@@ -190,13 +191,14 @@ services:
       - bitcoind
 
   merchant_lightningd:
-    image: btcpayserver/lightning:v23.08-dev
+    image: btcpayserver/lightning:v24.02.2
     stop_signal: SIGKILL
     environment:
       EXPOSE_TCP: "true"
       LIGHTNINGD_CHAIN: "btc"
       LIGHTNINGD_NETWORK: "regtest"
       LIGHTNINGD_OPT: |
+        developer
         bitcoin-datadir=/etc/bitcoin
         bitcoin-rpcconnect=bitcoind
         announce-addr=merchant_lightningd:9735
@@ -224,7 +226,7 @@ services:
       - "5432"
 
   merchant_lnd:
-    image: btcpayserver/lnd:v0.17.4-beta
+    image: btcpayserver/lnd:v0.18.0-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
@@ -259,7 +261,7 @@ services:
       - bitcoind
 
   customer_lnd:
-    image: btcpayserver/lnd:v0.17.4-beta
+    image: btcpayserver/lnd:v0.18.0-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"

BTCPayServer.Tests/docker-compose.yml

@@ -96,7 +96,7 @@ services:
       custom:
 
   nbxplorer:
-    image: nicolasdorier/nbxplorer:2.5.0
+    image: nicolasdorier/nbxplorer:2.5.4
     restart: unless-stopped
     ports:
       - "32838:32838"
@@ -149,7 +149,7 @@ services:
       - "bitcoin_datadir:/data"
 
   customer_lightningd:
-    image: btcpayserver/lightning:v23.08-dev
+    image: btcpayserver/lightning:v24.02.2
     stop_signal: SIGKILL
     restart: unless-stopped
     environment:
@@ -157,6 +157,7 @@ services:
       LIGHTNINGD_CHAIN: "btc"
       LIGHTNINGD_NETWORK: "regtest"
       LIGHTNINGD_OPT: |
+        developer
         bitcoin-datadir=/etc/bitcoin
         bitcoin-rpcconnect=bitcoind
         announce-addr=customer_lightningd:9735
@@ -176,13 +177,14 @@ services:
       - bitcoind
 
   merchant_lightningd:
-    image: btcpayserver/lightning:v23.08-dev
+    image: btcpayserver/lightning:v24.02.2
     stop_signal: SIGKILL
     environment:
       EXPOSE_TCP: "true"
       LIGHTNINGD_CHAIN: "btc"
       LIGHTNINGD_NETWORK: "regtest"
       LIGHTNINGD_OPT: |
+        developer
         bitcoin-datadir=/etc/bitcoin
         bitcoin-rpcconnect=bitcoind
         announce-addr=merchant_lightningd:9735
@@ -211,7 +213,7 @@ services:
       - "5432"
 
   merchant_lnd:
-    image: btcpayserver/lnd:v0.17.4-beta
+    image: btcpayserver/lnd:v0.18.0-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
@@ -248,7 +250,7 @@ services:
       - bitcoind
 
   customer_lnd:
-    image: btcpayserver/lnd:v0.17.4-beta
+    image: btcpayserver/lnd:v0.18.0-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"

BTCPayServer/BTCPayServer.csproj

@@ -46,13 +46,13 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="BTCPayServer.NTag424" Version="1.0.22" />
+    <PackageReference Include="BTCPayServer.NTag424" Version="1.0.23" />
     <PackageReference Include="YamlDotNet" Version="8.0.0" />
     <PackageReference Include="BIP78.Sender" Version="0.2.2" />
     <PackageReference Include="BTCPayServer.Hwi" Version="2.0.2" />
-    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.5.4" />
-    <PackageReference Include="CsvHelper" Version="15.0.5" />
-    <PackageReference Include="Dapper" Version="2.1.28" />
+    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.6.0" />
+    <PackageReference Include="CsvHelper" Version="32.0.3" />
+    <PackageReference Include="Dapper" Version="2.1.35" />
     <PackageReference Include="Fido2" Version="2.0.2" />
     <PackageReference Include="Fido2.AspNet" Version="2.0.2" />
     <PackageReference Include="LNURL" Version="0.0.34" />
@@ -77,8 +77,8 @@
     <PackageReference Include="TwentyTwenty.Storage.Azure" Version="2.12.1" />
     <PackageReference Include="TwentyTwenty.Storage.Google" Version="2.12.1" />
     <PackageReference Include="TwentyTwenty.Storage.Local" Version="2.12.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.1" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="8.0.5" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.5" />
   </ItemGroup>
 
 	<ItemGroup>

BTCPayServer/Components/StoreRecentInvoices/Default.cshtml

@@ -34,34 +34,36 @@
     }
     else if (Model.Invoices.Any())
     {
-        <table class="table table-hover mt-3 mb-0">
-            <thead>
-            <tr>
-                <th class="w-125px">Date</th>
-                <th class="text-nowrap">Invoice Id</th>
-                <th>Status</th>
-                <th class="text-end">Amount</th>
-            </tr>
-            </thead>
-            <tbody>
-            @foreach (var invoice in Model.Invoices)
-            {
+        <div class="table-responsive mt-3 mb-0">
+            <table class="table table-hover mb-0">
+                <thead>
                 <tr>
-                    <td>@invoice.Date.ToTimeAgo()</td>
-                    <td>
-                        <a asp-controller="UIInvoice" asp-action="Invoice" asp-route-invoiceId="@invoice.InvoiceId" class="text-break">@invoice.InvoiceId</a>
-                    </td>
-                    <td>
-                        <vc:invoice-status state="invoice.Status" payments="invoice.Details.Payments" invoice-id="@invoice.InvoiceId"
-                           is-archived="invoice.Details.Archived" has-refund="invoice.HasRefund" />
-                    </td>
-                    <td class="text-end">
-                        <span data-sensitive>@DisplayFormatter.Currency(invoice.Amount, invoice.Currency)</span>
-                    </td>
+                    <th class="w-125px">Date</th>
+                    <th class="text-nowrap">Invoice Id</th>
+                    <th>Status</th>
+                    <th class="text-end">Amount</th>
                 </tr>
-            }
-            </tbody>
-        </table>
+                </thead>
+                <tbody>
+                @foreach (var invoice in Model.Invoices)
+                {
+                    <tr>
+                        <td>@invoice.Date.ToTimeAgo()</td>
+                        <td>
+                            <a asp-controller="UIInvoice" asp-action="Invoice" asp-route-invoiceId="@invoice.InvoiceId" class="text-break">@invoice.InvoiceId</a>
+                        </td>
+                        <td>
+                            <vc:invoice-status state="invoice.Status" payments="invoice.Details.Payments" invoice-id="@invoice.InvoiceId"
+                               is-archived="invoice.Details.Archived" has-refund="invoice.HasRefund" />
+                        </td>
+                        <td class="text-end">
+                            <span data-sensitive>@DisplayFormatter.Currency(invoice.Amount, invoice.Currency)</span>
+                        </td>
+                    </tr>
+                }
+                </tbody>
+            </table>
+        </div>
     }
     else
     {

BTCPayServer/Components/StoreRecentTransactions/Default.cshtml

@@ -31,61 +31,63 @@
     }
     else if (Model.Transactions.Any())
     {
-        <table class="table table-hover mt-3 mb-0">
-            <thead>
-            <tr>
-                <th class="w-125px">Date</th>
-                <th>Transaction</th>
-                <th>Labels</th>
-                <th class="text-end">Amount</th>
-            </tr>
-            </thead>
-            <tbody>
-            @foreach (var tx in Model.Transactions)
-            {
+        <div class="table-responsive mt-3 mb-0">
+            <table class="table table-hover mb-0">
+                <thead>
                 <tr>
-                    <td>@tx.Timestamp.ToTimeAgo()</td>
-                    <td>
-                        <vc:truncate-center text="@tx.Id" link="@tx.Link" classes="truncate-center-id" />
-                    </td>
-                    <td>
-                        @if (tx.Labels.Any())
-                        {
-                            <div class="d-flex flex-wrap gap-2 align-items-center">
-                                @foreach (var label in tx.Labels)
-                                {
-                                    <div class="transaction-label" style="--label-bg:@label.Color;--label-fg:@label.TextColor">
-                                        <span>@label.Text</span>
-                                        @if (!string.IsNullOrEmpty(label.Link))
-                                        {
-                                            <a class="transaction-label-info transaction-details-icon" href="@label.Link"
-                                               target="_blank" rel="noreferrer noopener" title="@label.Tooltip" data-bs-html="true"
-                                               data-bs-toggle="tooltip" data-bs-custom-class="transaction-label-tooltip">
-                                                <vc:icon symbol="info" />
-                                            </a>
-                                        }
-                                    </div>
-                                }
-                            </div>
-                        }
-                        
-                    </td>
-                    @if (tx.Positive)
-                    {
-                        <td class="text-end text-success">
-                            <span data-sensitive>@DisplayFormatter.Currency(tx.Balance, tx.Currency)</span>
-                        </td>
-                    }
-                    else
-                    {
-                        <td class="text-end text-danger">
-                            <span data-sensitive>@DisplayFormatter.Currency(tx.Balance, tx.Currency)</span>
-                        </td>
-                    }
+                    <th class="w-125px">Date</th>
+                    <th>Transaction</th>
+                    <th>Labels</th>
+                    <th class="text-end">Amount</th>
                 </tr>
-            }
-            </tbody>
-        </table>
+                </thead>
+                <tbody>
+                @foreach (var tx in Model.Transactions)
+                {
+                    <tr>
+                        <td>@tx.Timestamp.ToTimeAgo()</td>
+                        <td>
+                            <vc:truncate-center text="@tx.Id" link="@tx.Link" classes="truncate-center-id" />
+                        </td>
+                        <td>
+                            @if (tx.Labels.Any())
+                            {
+                                <div class="d-flex flex-wrap gap-2 align-items-center">
+                                    @foreach (var label in tx.Labels)
+                                    {
+                                        <div class="transaction-label" style="--label-bg:@label.Color;--label-fg:@label.TextColor">
+                                            <span>@label.Text</span>
+                                            @if (!string.IsNullOrEmpty(label.Link))
+                                            {
+                                                <a class="transaction-label-info transaction-details-icon" href="@label.Link"
+                                                   target="_blank" rel="noreferrer noopener" title="@label.Tooltip" data-bs-html="true"
+                                                   data-bs-toggle="tooltip" data-bs-custom-class="transaction-label-tooltip">
+                                                    <vc:icon symbol="info" />
+                                                </a>
+                                            }
+                                        </div>
+                                    }
+                                </div>
+                            }
+                            
+                        </td>
+                        @if (tx.Positive)
+                        {
+                            <td class="text-end text-success">
+                                <span data-sensitive>@DisplayFormatter.Currency(tx.Balance, tx.Currency)</span>
+                            </td>
+                        }
+                        else
+                        {
+                            <td class="text-end text-danger">
+                                <span data-sensitive>@DisplayFormatter.Currency(tx.Balance, tx.Currency)</span>
+                            </td>
+                        }
+                    </tr>
+                }
+                </tbody>
+            </table>
+        </div>
     }
     else
     {

BTCPayServer/Controllers/GreenField/GreenfieldPullPaymentController.cs

@@ -14,7 +14,6 @@ using BTCPayServer.Client;
 using BTCPayServer.Client.Models;
 using BTCPayServer.Data;
 using BTCPayServer.HostedServices;
-using BTCPayServer.Logging;
 using BTCPayServer.NTag424;
 using BTCPayServer.Payments;
 using BTCPayServer.Security;
@@ -29,7 +28,6 @@ using Microsoft.Extensions.Logging;
 using NBitcoin.DataEncoders;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
-using Org.BouncyCastle.Bcpg.OpenPgp;
 using MarkPayoutRequest = BTCPayServer.HostedServices.MarkPayoutRequest;
 
 namespace BTCPayServer.Controllers.Greenfield
@@ -49,7 +47,6 @@ namespace BTCPayServer.Controllers.Greenfield
         private readonly IAuthorizationService _authorizationService;
         private readonly SettingsRepository _settingsRepository;
         private readonly BTCPayServerEnvironment _env;
-        private readonly Logs _logs;
 
         public GreenfieldPullPaymentController(PullPaymentHostedService pullPaymentService,
             LinkGenerator linkGenerator,
@@ -60,7 +57,7 @@ namespace BTCPayServer.Controllers.Greenfield
             BTCPayNetworkProvider btcPayNetworkProvider,
             IAuthorizationService authorizationService,
             SettingsRepository settingsRepository,
-            BTCPayServerEnvironment env, Logs logs)
+            BTCPayServerEnvironment env)
         {
             _pullPaymentService = pullPaymentService;
             _linkGenerator = linkGenerator;
@@ -72,7 +69,6 @@ namespace BTCPayServer.Controllers.Greenfield
             _authorizationService = authorizationService;
             _settingsRepository = settingsRepository;
             _env = env;
-            _logs = logs;
         }
 
         [HttpGet("~/api/v1/stores/{storeId}/pull-payments")]
@@ -161,20 +157,7 @@ namespace BTCPayServer.Controllers.Greenfield
             }
             if (!ModelState.IsValid)
                 return this.CreateValidationError(ModelState);
-            var ppId = await _pullPaymentService.CreatePullPayment(new CreatePullPayment()
-            {
-                StartsAt = request.StartsAt,
-                ExpiresAt = request.ExpiresAt,
-                Period = request.Period,
-                BOLT11Expiration = request.BOLT11Expiration,
-                Name = request.Name,
-                Description = request.Description,
-                Amount = request.Amount,
-                Currency = request.Currency,
-                StoreId = storeId,
-                PaymentMethodIds = paymentMethods,
-                AutoApproveClaims = request.AutoApproveClaims
-            });
+            var ppId = await _pullPaymentService.CreatePullPayment(storeId, request);
             var pp = await _pullPaymentService.GetPullPayment(ppId, false);
             return this.Ok(CreatePullPaymentData(pp));
         }
@@ -212,8 +195,6 @@ namespace BTCPayServer.Controllers.Greenfield
         {
             if (pullPaymentId is null)
                 return PullPaymentNotFound();
-            this._logs.PayServer.LogInformation($"RegisterBoltcard: onExisting queryParam: {onExisting}");
-            this._logs.PayServer.LogInformation($"{JsonConvert.SerializeObject(request)}");
             var pp = await _pullPaymentService.GetPullPayment(pullPaymentId, false);
             if (pp is null)
                 return PullPaymentNotFound();
@@ -259,13 +240,7 @@ namespace BTCPayServer.Controllers.Greenfield
                 _ => request.OnExisting
             };
 
-            this._logs.PayServer.LogInformation($"After");
-            this._logs.PayServer.LogInformation($"{JsonConvert.SerializeObject(request)}");
-
             var version = await _dbContextFactory.LinkBoltcardToPullPayment(pullPaymentId, issuerKey, request.UID, request.OnExisting);
-            this._logs.PayServer.LogInformation($"Version: " + version);
-            this._logs.PayServer.LogInformation($"ID: " + Encoders.Hex.EncodeData(issuerKey.GetId(request.UID)));
-
             var keys = issuerKey.CreatePullPaymentCardKey(request.UID, version, pullPaymentId).DeriveBoltcardKeys(issuerKey);
 
             var boltcardUrl = Url.Action(nameof(UIBoltcardController.GetWithdrawRequest), "UIBoltcard");
@@ -282,9 +257,6 @@ namespace BTCPayServer.Controllers.Greenfield
                 K3 = Encoders.Hex.EncodeData(keys.K3.ToBytes()).ToUpperInvariant(),
                 K4 = Encoders.Hex.EncodeData(keys.K4.ToBytes()).ToUpperInvariant(),
             };
-            this._logs.PayServer.LogInformation($"Response");
-            this._logs.PayServer.LogInformation($"{JsonConvert.SerializeObject(resp)}");
-
             return Ok(resp);
         }
 

BTCPayServer/Controllers/UIInvoiceController.UI.cs

@@ -162,10 +162,10 @@ namespace BTCPayServer.Controllers
             model.Overpaid = details.Overpaid;
             model.StillDue = details.StillDue;
             model.HasRates = details.HasRates;
-            
-            if (additionalData.ContainsKey("receiptData"))
+
+            if (additionalData.TryGetValue("receiptData", out object? receiptData))
             {
-                model.ReceiptData = (Dictionary<string, object>)additionalData["receiptData"];
+                model.ReceiptData = (Dictionary<string, object>)receiptData;
                 additionalData.Remove("receiptData");
             }
             
@@ -226,15 +226,40 @@ namespace BTCPayServer.Controllers
             {
                 return View(vm);
             }
-
-            JToken? receiptData = null;
-            i.Metadata?.AdditionalData?.TryGetValue("receiptData", out receiptData);
+            
+            var metaData = PosDataParser.ParsePosData(i.Metadata?.ToJObject());
+            var additionalData = metaData
+                .Where(dict => !InvoiceAdditionalDataExclude.Contains(dict.Key))
+                .ToDictionary(dict => dict.Key, dict => dict.Value);
+                
+            // Split receipt data into cart and additional data 
+            if (additionalData.TryGetValue("receiptData", out object? combinedReceiptData))
+            {
+                var receiptData = new Dictionary<string, object>((Dictionary<string, object>)combinedReceiptData, StringComparer.OrdinalIgnoreCase);
+                string[] cartKeys = ["cart", "subtotal", "discount", "tip", "total"];
+                // extract cart data and lowercase keys to handle data uniformly in PosData partial
+                if (receiptData.Keys.Any(key => cartKeys.Contains(key.ToLowerInvariant())))
+                {
+                    vm.CartData = new Dictionary<string, object>();
+                    foreach (var key in cartKeys)
+                    {
+                        if (!receiptData.ContainsKey(key)) continue;
+                        // add it to cart data and remove it from the general data
+                        vm.CartData.Add(key.ToLowerInvariant(), receiptData[key]);
+                        receiptData.Remove(key);
+                    }
+                }
+                // assign the rest to additional data
+                if (receiptData.Any())
+                {
+                    vm.AdditionalData = receiptData;
+                }
+            }
 
             var payments = ViewPaymentRequestViewModel.PaymentRequestInvoicePayment.GetViewModels(i, _displayFormatter, _transactionLinkProviders);
 
             vm.Amount = i.PaidAmount.Net;
             vm.Payments = receipt.ShowPayments is false ? null : payments;
-            vm.AdditionalData = PosDataParser.ParsePosData(receiptData);
 
             return View(print ? "InvoiceReceiptPrint" : "InvoiceReceipt", vm);
         }
@@ -1073,7 +1098,7 @@ namespace BTCPayServer.Controllers
                     storeIds.Add(i);
             }
             model.Search = fs;
-            model.SearchText = fs.TextSearch;
+            model.SearchText = fs.TextCombined;
 
             var apps = await _appService.GetAllApps(GetUserId(), false, storeId);
             InvoiceQuery invoiceQuery = GetInvoiceQuery(fs, apps, timezoneOffset);

BTCPayServer/Controllers/UILNURLController.cs

@@ -296,11 +296,11 @@ namespace BTCPayServer
                 return NotFound();
             }
 
-            var createInvoice = new CreateInvoiceRequest()
+            var createInvoice = new CreateInvoiceRequest
             {
-                Amount =  item?.PriceType == ViewPointOfSaleViewModel.ItemPriceType.Topup? null:  item?.Price,
+                Amount =  item?.PriceType == ViewPointOfSaleViewModel.ItemPriceType.Topup ? null : item?.Price,
                 Currency = currencyCode,
-                Checkout = new InvoiceDataBase.CheckoutOptions()
+                Checkout = new InvoiceDataBase.CheckoutOptions
                 {
                     RedirectURL = app.AppType switch
                     {
@@ -312,6 +312,7 @@ namespace BTCPayServer
                 AdditionalSearchTerms = new[] { AppService.GetAppSearchTerm(app) }
             };
 
+            var allowOverpay = item?.PriceType is not ViewPointOfSaleViewModel.ItemPriceType.Fixed;
             var invoiceMetadata = new InvoiceMetadata { OrderId = AppService.GetRandomOrderId() };
             if (item != null)
             {
@@ -326,7 +327,7 @@ namespace BTCPayServer
                 store.GetStoreBlob(),
                 createInvoice,
                 additionalTags: new List<string> { AppService.GetAppInternalTag(appId) },
-                allowOverpay: false);
+                allowOverpay: allowOverpay);
         }
 
         public class EditLightningAddressVM
@@ -495,7 +496,7 @@ namespace BTCPayServer
                 });
         }
 
-        private async Task<IActionResult> GetLNURLRequest(
+        public async Task<IActionResult> GetLNURLRequest(
             string cryptoCode,
             Data.StoreData store,
             Data.StoreBlob blob,
@@ -522,7 +523,9 @@ namespace BTCPayServer
                 return this.CreateAPIError(null, e.Message);
             }
             lnurlRequest = await CreateLNUrlRequestFromInvoice(cryptoCode, i, store, blob, lnurlRequest, lnUrlMetadata, allowOverpay);
-            return lnurlRequest is null ? NotFound() : Ok(lnurlRequest);
+            return lnurlRequest is null
+                ? BadRequest(new LNUrlStatusResponse { Status = "ERROR", Reason = "Unable to create LNURL request." })
+                : Ok(lnurlRequest);
         }
 
         private async Task<LNURLPayRequest> CreateLNUrlRequestFromInvoice(

BTCPayServer/Controllers/UIPaymentRequestController.cs

@@ -277,6 +277,10 @@ namespace BTCPayServer.Controllers
                 if (FormDataService.Validate(form, ModelState))
                 {
                     prBlob.FormResponse = FormDataService.GetValues(form);
+                    if(string.IsNullOrEmpty(prBlob.Email) && form.GetFieldByFullName("buyerEmail") is { } emailField)
+                    {
+                        prBlob.Email = emailField.Value;
+                    }
                     result.SetBlob(prBlob);
                     await _PaymentRequestRepository.CreateOrUpdatePaymentRequest(result);
                     return RedirectToAction("PayPaymentRequest", new { payReqId });

BTCPayServer/Controllers/UIPullPaymentController.cs

@@ -227,6 +227,7 @@ namespace BTCPayServer.Controllers
             var supported = ppBlob.SupportedPaymentMethods;
             PaymentMethodId paymentMethodId = null;
             IClaimDestination destination = null;
+            string error = null;
             if (string.IsNullOrEmpty(vm.SelectedPaymentMethod))
             {
                 foreach (var pmId in supported)
@@ -235,6 +236,7 @@ namespace BTCPayServer.Controllers
                     (IClaimDestination dst, string err) = handler == null
                         ? (null, "No payment handler found for this payment method")
                         : await handler.ParseAndValidateClaimDestination(pmId, vm.Destination, ppBlob, cancellationToken);
+                    error = err;
                     if (dst is not null && err is null)
                     {
                         paymentMethodId = pmId;
@@ -247,12 +249,15 @@ namespace BTCPayServer.Controllers
             {
                 paymentMethodId = supported.FirstOrDefault(id => vm.SelectedPaymentMethod == id.ToString());
                 var payoutHandler = paymentMethodId is null ? null : _payoutHandlers.FindPayoutHandler(paymentMethodId);
-                destination = payoutHandler is null ? null : (await payoutHandler.ParseAndValidateClaimDestination(paymentMethodId, vm.Destination, ppBlob, cancellationToken)).destination;
+                if (payoutHandler is not null)
+                {
+                    (destination, error) = await payoutHandler.ParseAndValidateClaimDestination(paymentMethodId, vm.Destination, ppBlob, cancellationToken);
+                }
             }
 
             if (destination is null)
             {
-                ModelState.AddModelError(nameof(vm.Destination), "Invalid destination or payment method");
+                ModelState.AddModelError(nameof(vm.Destination), error ?? "Invalid destination or payment method");
                 return await ViewPullPayment(pullPaymentId);
             }
 

BTCPayServer/Controllers/UIReportsController.CheatMode.cs

@@ -64,7 +64,27 @@ public partial class UIReportsController
             decimal randomValue = ((decimal)rand.NextDouble() * range) + from;
             return decimal.Round(randomValue, precision);
         }
-
+        JObject GetFormattedAmount()
+        {
+            string? curr = null;
+            decimal value = 0m;
+            int offset = 0;
+            while (curr is null)
+            {
+                curr = row[fi - 1 - offset]?.ToString();
+                value = curr switch
+                {
+                    "USD" or "EUR" or "CHF" => GenerateDecimal(30_000m, 60_000, 2),
+                    "JPY" => GenerateDecimal(400_0000m, 1000_0000m, 0),
+                    _ => 0.0m
+                };
+                if (value != 0.0m)
+                    break;
+                curr = null;
+                offset++;
+            }
+            return DisplayFormatter.ToFormattedAmount(value, curr);
+        }
         var fiatCurrency = rand.NextSingle() > 0.2 ? "USD" : TakeOne("JPY", "EUR", "CHF");
         var cryptoCurrency = rand.NextSingle() > 0.2 ? "BTC" : TakeOne("LTC", "DOGE", "DASH");
         
@@ -116,14 +136,11 @@ public partial class UIReportsController
             return Encoders.Hex.EncodeData(GenerateBytes(32));
         if (f.Name == "Rate")
         {
-            var curr = row[fi - 1]?.ToString();
-            var value = curr switch
-            {
-                "USD" or "EUR" or "CHF" => GenerateDecimal(30_000m, 60_000, 2),
-                "JPY" => GenerateDecimal(400_0000m, 1000_0000m, 0),
-                _ => GenerateDecimal(30_000m, 60_000, 2)
-            };
-            return DisplayFormatter.ToFormattedAmount(value, curr);
+            return GetFormattedAmount();
+        }
+        if (f.Type == "amount")
+        {
+            return GetFormattedAmount();
         }
         return null;
     }

BTCPayServer/Controllers/UIStorePullPaymentsController.PullPayments.cs

@@ -10,10 +10,9 @@ using BTCPayServer.Client;
 using BTCPayServer.Client.Models;
 using BTCPayServer.Data;
 using BTCPayServer.HostedServices;
-using BTCPayServer.Models;
 using BTCPayServer.Models.WalletViewModels;
 using BTCPayServer.Payments;
-using BTCPayServer.Rating;
+using BTCPayServer.PayoutProcessors;
 using BTCPayServer.Services;
 using BTCPayServer.Services.Rates;
 using Microsoft.AspNetCore.Authorization;
@@ -23,7 +22,6 @@ using Microsoft.EntityFrameworkCore;
 using Newtonsoft.Json.Linq;
 using MarkPayoutRequest = BTCPayServer.HostedServices.MarkPayoutRequest;
 using PayoutData = BTCPayServer.Data.PayoutData;
-using PullPaymentData = BTCPayServer.Data.PullPaymentData;
 using StoreData = BTCPayServer.Data.StoreData;
 
 namespace BTCPayServer.Controllers
@@ -40,6 +38,8 @@ namespace BTCPayServer.Controllers
         private readonly ApplicationDbContextFactory _dbContextFactory;
         private readonly BTCPayNetworkJsonSerializerSettings _jsonSerializerSettings;
         private readonly IAuthorizationService _authorizationService;
+        private readonly PayoutProcessorService _payoutProcessorService;
+        private readonly IEnumerable<IPayoutProcessorFactory> _payoutProcessorFactories;
 
         public StoreData CurrentStore
         {
@@ -55,6 +55,8 @@ namespace BTCPayServer.Controllers
             DisplayFormatter displayFormatter,
             PullPaymentHostedService pullPaymentHostedService,
             ApplicationDbContextFactory dbContextFactory,
+            PayoutProcessorService payoutProcessorService,
+            IEnumerable<IPayoutProcessorFactory> payoutProcessorFactories,
             BTCPayNetworkJsonSerializerSettings jsonSerializerSettings,
             IAuthorizationService authorizationService)
         {
@@ -66,8 +68,10 @@ namespace BTCPayServer.Controllers
             _dbContextFactory = dbContextFactory;
             _jsonSerializerSettings = jsonSerializerSettings;
             _authorizationService = authorizationService;
+            _payoutProcessorService = payoutProcessorService;
+            _payoutProcessorFactories = payoutProcessorFactories;
         }
-
+        
         [HttpGet("stores/{storeId}/pull-payments/new")]
         [Authorize(Policy = Policies.CanCreateNonApprovedPullPayments, AuthenticationSchemes = AuthenticationSchemes.Cookie)]
         public async Task<IActionResult> NewPullPayment(string storeId)
@@ -287,6 +291,7 @@ namespace BTCPayServer.Controllers
                 return NotFound();
 
             vm.PaymentMethods = await _payoutHandlers.GetSupportedPaymentMethods(HttpContext.GetStoreData());
+            vm.HasPayoutProcessor = await HasPayoutProcessor(storeId, vm.PaymentMethodId);
             var paymentMethodId = PaymentMethodId.Parse(vm.PaymentMethodId);
             var handler = _payoutHandlers
                 .FindPayoutHandler(paymentMethodId);
@@ -370,7 +375,7 @@ namespace BTCPayServer.Controllers
                             break;
                         }
 
-                        if (command == "approve-pay")
+                        if (command == "approve-pay" && !vm.HasPayoutProcessor)
                         {
                             goto case "pay";
                         }
@@ -486,16 +491,18 @@ namespace BTCPayServer.Controllers
                 return RedirectToAction(nameof(UIStoresController.Index), "UIStores", new { storeId });
             }
 
+            paymentMethodId ??= paymentMethods.First().ToString();
             var vm = this.ParseListQuery(new PayoutsModel
             {
                 PaymentMethods = paymentMethods,
-                PaymentMethodId = paymentMethodId ?? paymentMethods.First().ToString(),
+                PaymentMethodId = paymentMethodId,
                 PullPaymentId = pullPaymentId,
                 PayoutState = payoutState,
                 Skip = skip,
-                Count = count
+                Count = count,
+                Payouts = new List<PayoutsModel.PayoutModel>(),
+                HasPayoutProcessor = await HasPayoutProcessor(storeId, paymentMethodId)
             });
-            vm.Payouts = new List<PayoutsModel.PayoutModel>();
             await using var ctx = _dbContextFactory.CreateContext();
             var payoutRequest =
                 ctx.Payouts.Where(p => p.StoreDataId == storeId && (p.PullPaymentDataId == null || !p.PullPaymentData.Archived));
@@ -577,5 +584,13 @@ namespace BTCPayServer.Controllers
             }
             return View(vm);
         }
+
+        private async Task<bool> HasPayoutProcessor(string storeId, string paymentMethodId)
+        {
+            var pmId = PaymentMethodId.Parse(paymentMethodId);
+            var processors = await _payoutProcessorService.GetProcessors(
+                new PayoutProcessorService.PayoutProcessorQuery { Stores = [storeId], PaymentMethods = [paymentMethodId] });
+            return _payoutProcessorFactories.Any(factory => factory.GetSupportedPaymentMethods().Contains(pmId)) && processors.Any();
+        }
     }
 }

BTCPayServer/Controllers/UIWalletsController.PSBT.cs

@@ -151,13 +151,12 @@ namespace BTCPayServer.Controllers
             WalletId walletId, WalletPSBTViewModel vm, string command = null)
         {
             var network = NetworkProvider.GetNetwork<BTCPayNetwork>(walletId.CryptoCode);
-            var psbt = await vm.GetPSBT(network.NBitcoinNetwork);
+            var psbt = await vm.GetPSBT(network.NBitcoinNetwork, ModelState);
 
             vm.BackUrl ??= HttpContext.Request.GetTypedHeaders().Referer?.AbsolutePath;
 
             if (psbt is null || vm.InvalidPSBT)
             {
-                ModelState.AddModelError(nameof(vm.PSBT), "Invalid PSBT");
                 return View("WalletSigningOptions", new WalletSigningOptionsModel
                 {
                     SigningContext = vm.SigningContext,
@@ -241,10 +240,9 @@ namespace BTCPayServer.Controllers
             vm.NBXSeedAvailable = await CanUseHotWallet() && derivationSchemeSettings.IsHotWallet;
             vm.BackUrl ??= HttpContext.Request.GetTypedHeaders().Referer?.AbsolutePath;
 
-            var psbt = await vm.GetPSBT(network.NBitcoinNetwork);
+            var psbt = await vm.GetPSBT(network.NBitcoinNetwork, ModelState);
             if (vm.InvalidPSBT)
             {
-                ModelState.AddModelError(nameof(vm.PSBT), "Invalid PSBT");
                 return View(vm);
             }
             if (psbt is null)
@@ -477,7 +475,7 @@ namespace BTCPayServer.Controllers
             WalletId walletId, WalletPSBTViewModel vm, string command, CancellationToken cancellationToken = default)
         {
             var network = NetworkProvider.GetNetwork<BTCPayNetwork>(walletId.CryptoCode);
-            PSBT psbt = await vm.GetPSBT(network.NBitcoinNetwork);
+            PSBT psbt = await vm.GetPSBT(network.NBitcoinNetwork, ModelState);
             if (vm.InvalidPSBT || psbt is null)
             {
                 if (vm.InvalidPSBT)
@@ -637,16 +635,14 @@ namespace BTCPayServer.Controllers
             WalletId walletId, WalletPSBTCombineViewModel vm)
         {
             var network = NetworkProvider.GetNetwork<BTCPayNetwork>(walletId.CryptoCode);
-            var psbt = await vm.GetPSBT(network.NBitcoinNetwork);
+            var psbt = await vm.GetPSBT(network.NBitcoinNetwork, ModelState);
             if (psbt == null)
             {
-                ModelState.AddModelError(nameof(vm.PSBT), "Invalid PSBT");
                 return View(vm);
             }
-            var sourcePSBT = vm.GetSourcePSBT(network.NBitcoinNetwork);
-            if (sourcePSBT == null)
+            var sourcePSBT = vm.GetSourcePSBT(network.NBitcoinNetwork, ModelState);
+            if (sourcePSBT is null)
             {
-                ModelState.AddModelError(nameof(vm.OtherPSBT), "Invalid PSBT");
                 return View(vm);
             }
             sourcePSBT = sourcePSBT.Combine(psbt);

BTCPayServer/Controllers/UIWalletsController.cs

@@ -738,7 +738,7 @@ namespace BTCPayServer.Controllers
             foreach (var transactionOutput in vm.Outputs.Where(output => output.Labels?.Any() is true))
             {
                 var labels = transactionOutput.Labels.Where(s => !string.IsNullOrWhiteSpace(s)).ToArray();
-                var walletObjectAddress = new WalletObjectId(walletId, WalletObjectData.Types.Address, transactionOutput.DestinationAddress.ToLowerInvariant());
+                var walletObjectAddress = new WalletObjectId(walletId, WalletObjectData.Types.Address, transactionOutput.DestinationAddress);
                 var obj = await WalletRepository.GetWalletObject(walletObjectAddress);
                 if (obj is null)
                 {

BTCPayServer/Data/Payouts/LightningLike/BoltInvoiceClaimDestination.cs

@@ -11,7 +11,7 @@ namespace BTCPayServer.Data.Payouts.LightningLike
             Bolt11 = bolt11 ?? throw new ArgumentNullException(nameof(bolt11));
             PaymentRequest = paymentRequest;
             PaymentHash = paymentRequest.Hash;
-            Amount = paymentRequest.MinimumAmount.ToDecimal(LightMoneyUnit.BTC);
+            Amount =  paymentRequest.MinimumAmount.MilliSatoshi == LightMoney.Zero ? null:  paymentRequest.MinimumAmount.ToDecimal(LightMoneyUnit.BTC);
         }
 
         public override string ToString()

BTCPayServer/Filters/DomainMappingConstraintAttribute.cs

@@ -37,11 +37,11 @@ namespace BTCPayServer.Filters
             }
 
             // If we have an appId, we can redirect to the canonical domain
-            if ((string)context.RouteContext.RouteData.Values["appId"] is { } appId && !req.IsOnion())
+            if ((string)context.RouteContext.RouteData.Values["appId"] is { } appId)
             {
                 var redirectDomain = mapping.FirstOrDefault(item => item.AppId == appId)?.Domain;
                 // App is accessed via path, redirect to canonical domain
-                if (!string.IsNullOrEmpty(redirectDomain) && req.Method != "POST" && !req.HasFormContentType)
+                if (!string.IsNullOrEmpty(redirectDomain) && req.Method != "POST" && !req.HasFormContentType && !req.IsOnion())
                 {
                     var uri = new UriBuilder(req.Scheme, redirectDomain);
                     if (req.Host.Port.HasValue)

BTCPayServer/HostedServices/PullPaymentHostedService.cs

@@ -7,11 +7,13 @@ using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Extensions;
 using BTCPayServer.Client.Models;
 using BTCPayServer.Data;
+using BTCPayServer.Events;
 using BTCPayServer.Logging;
 using BTCPayServer.Models.WalletViewModels;
 using BTCPayServer.Payments;
 using BTCPayServer.Rating;
 using BTCPayServer.Services;
+using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Notifications;
 using BTCPayServer.Services.Notifications.Blobs;
 using BTCPayServer.Services.Rates;
@@ -47,7 +49,7 @@ namespace BTCPayServer.HostedServices
     public class PullPaymentHostedService : BaseAsyncService
     {
         private readonly string[] _lnurlSupportedCurrencies = { "BTC", "SATS" };
-        
+
         public class CancelRequest
         {
             public CancelRequest(string pullPaymentId)
@@ -107,7 +109,23 @@ namespace BTCPayServer.HostedServices
                 }
             }
         }
-
+        public Task<string> CreatePullPayment(string storeId, CreatePullPaymentRequest request)
+        {
+            return CreatePullPayment(new CreatePullPayment()
+            {
+                StartsAt = request.StartsAt,
+                ExpiresAt = request.ExpiresAt,
+                Period = request.Period,
+                BOLT11Expiration = request.BOLT11Expiration,
+                Name = request.Name,
+                Description = request.Description,
+                Amount = request.Amount,
+                Currency = request.Currency,
+                StoreId = storeId,
+                PaymentMethodIds = request.PaymentMethods.Select(p => PaymentMethodId.Parse(p)).ToArray(),
+                AutoApproveClaims = request.AutoApproveClaims
+            });
+        }
         public async Task<string> CreatePullPayment(CreatePullPayment create)
         {
             ArgumentNullException.ThrowIfNull(create);
@@ -263,7 +281,7 @@ namespace BTCPayServer.HostedServices
 
             return await query.FirstOrDefaultAsync(data => data.Id == pullPaymentId);
         }
-
+        record TopUpRequest(string PullPaymentId, InvoiceEntity InvoiceEntity);
         class PayoutRequest
         {
             public PayoutRequest(TaskCompletionSource<ClaimRequest.ClaimResponse> completionSource,
@@ -327,6 +345,17 @@ namespace BTCPayServer.HostedServices
             return new[] { Loop() };
         }
 
+        private void TopUpInvoice(InvoiceEvent evt)
+        {
+            if (evt.EventCode == InvoiceEventCode.Completed || evt.EventCode == InvoiceEventCode.MarkedCompleted)
+            {
+                foreach (var pullPaymentId in evt.Invoice.GetInternalTags("PULLPAY#"))
+                {
+                    _Channel.Writer.TryWrite(new TopUpRequest(pullPaymentId, evt.Invoice));
+                }
+            }
+        }
+
         private void Subscribe(params Type[] events)
         {
             foreach (Type @event in events)
@@ -339,6 +368,11 @@ namespace BTCPayServer.HostedServices
         {
             await foreach (var o in _Channel.Reader.ReadAllAsync())
             {
+                if (o is TopUpRequest topUp)
+                {
+                    await HandleTopUp(topUp);
+                }
+
                 if (o is PayoutRequest req)
                 {
                     await HandleCreatePayout(req);
@@ -373,10 +407,44 @@ namespace BTCPayServer.HostedServices
             }
         }
 
+        private async Task HandleTopUp(TopUpRequest topUp)
+        {
+            var pp = await this.GetPullPayment(topUp.PullPaymentId, false);
+            var currency = pp.GetBlob().Currency;
+            using var ctx = _dbContextFactory.CreateContext();
+
+            var payout = new Data.PayoutData()
+            {
+                Id = Encoders.Base58.EncodeData(RandomUtils.GetBytes(20)),
+                Date = DateTimeOffset.UtcNow,
+                State = PayoutState.Completed,
+                PullPaymentDataId = pp.Id,
+                PaymentMethodId = new PaymentMethodId("BTC", PaymentTypes.LightningLike).ToString(),
+                Destination = null,
+                StoreDataId = pp.StoreId
+            };
+            if (topUp.InvoiceEntity.Currency != currency ||
+                currency is not ("SATS" or "BTC"))
+                return;
+            var paidAmount = topUp.InvoiceEntity.Price;
+            var cryptoAmount = paidAmount;
+
+            var payoutBlob = new PayoutBlob()
+            {
+                CryptoAmount = -cryptoAmount,
+                Amount = -paidAmount,
+                Destination = topUp.InvoiceEntity.Id,
+                Metadata = new JObject(),
+            };
+            payout.SetBlob(payoutBlob, _jsonSerializerSettings);
+            await ctx.Payouts.AddAsync(payout);
+            await ctx.SaveChangesAsync();
+        }
+
         public bool SupportsLNURL(PullPaymentBlob blob)
         {
-            var pms = blob.SupportedPaymentMethods.FirstOrDefault(id => 
-                id.PaymentType == LightningPaymentType.Instance && 
+            var pms = blob.SupportedPaymentMethods.FirstOrDefault(id =>
+                id.PaymentType == LightningPaymentType.Instance &&
                 _networkProvider.DefaultNetwork.CryptoCode == id.CryptoCode);
             return pms is not null && _lnurlSupportedCurrencies.Contains(blob.Currency);
         }
@@ -633,7 +701,7 @@ namespace BTCPayServer.HostedServices
                 {
                     Amount = claimed,
                     Destination = req.ClaimRequest.Destination.ToString(),
-                    Metadata = req.ClaimRequest.Metadata?? new JObject(),
+                    Metadata = req.ClaimRequest.Metadata ?? new JObject(),
                 };
                 payout.SetBlob(payoutBlob, _jsonSerializerSettings);
                 await ctx.Payouts.AddAsync(payout);
@@ -826,6 +894,10 @@ namespace BTCPayServer.HostedServices
             return time;
         }
 
+        public static string GetInternalTag(string id)
+        {
+            return $"PULLPAY#{id}";
+        }
 
         class InternalPayoutPaidRequest
         {
@@ -880,25 +952,25 @@ namespace BTCPayServer.HostedServices
             {
                 null when destination.Amount is null && ppCurrency is null => ("Amount is not specified in destination or payout request", null),
                 null when destination.Amount is null => (null, null),
-                null when destination.Amount != null => (null,destination.Amount),
-                not null when destination.Amount is null => (null,amount),
+                null when destination.Amount != null => (null, destination.Amount),
+                not null when destination.Amount is null => (null, amount),
                 not null when destination.Amount != null && amount != destination.Amount &&
                               destination.IsExplicitAmountMinimum &&
                               payoutCurrency == "BTC" && ppCurrency == "SATS" &&
                               new Money(amount.Value, MoneyUnit.Satoshi).ToUnit(MoneyUnit.BTC) < destination.Amount =>
-                    ($"Amount is implied in both destination ({destination.Amount}) and payout request ({amount}), but the payout request amount is less than the destination amount",null),
+                    ($"Amount is implied in both destination ({destination.Amount}) and payout request ({amount}), but the payout request amount is less than the destination amount", null),
                 not null when destination.Amount != null && amount != destination.Amount &&
                               destination.IsExplicitAmountMinimum &&
                               !(payoutCurrency == "BTC" && ppCurrency == "SATS") &&
                               amount < destination.Amount =>
-                    ($"Amount is implied in both destination ({destination.Amount}) and payout request ({amount}), but the payout request amount is less than the destination amount",null),
+                    ($"Amount is implied in both destination ({destination.Amount}) and payout request ({amount}), but the payout request amount is less than the destination amount", null),
                 not null when destination.Amount != null && amount != destination.Amount &&
                               !destination.IsExplicitAmountMinimum =>
                     ($"Amount is implied in destination ({destination.Amount}) that does not match the payout amount provided {amount})", null),
                 _ => (null, amount)
             };
         }
-        
+
         public static string GetErrorMessage(ClaimResult result)
         {
             switch (result)

BTCPayServer/Hosting/BTCPayServerServices.cs

@@ -347,6 +347,8 @@ namespace BTCPayServer.Hosting
                 htmlSanitizer.AllowedAttributes.Add("webkitallowfullscreen");
                 htmlSanitizer.AllowedAttributes.Add("allowfullscreen");
                 htmlSanitizer.AllowedSchemes.Add("mailto");
+                htmlSanitizer.AllowedSchemes.Add("bitcoin");
+                htmlSanitizer.AllowedSchemes.Add("lightning");
                 return htmlSanitizer;
             });
 
@@ -385,6 +387,7 @@ namespace BTCPayServer.Hosting
             services.AddReportProvider<ProductsReportProvider>();
             services.AddReportProvider<PayoutsReportProvider>();
             services.AddReportProvider<LegacyInvoiceExportReportProvider>();
+            services.AddReportProvider<RefundsReportProvider>();
             services.AddWebhooks();
             services.AddSingleton<BitcoinLikePayoutHandler>();
             services.AddSingleton<IPayoutHandler>(provider => provider.GetRequiredService<BitcoinLikePayoutHandler>());

BTCPayServer/Models/InvoicingModels/InvoiceReceiptViewModel.cs

@@ -17,6 +17,7 @@ namespace BTCPayServer.Models.InvoicingModels
         public decimal Amount { get; set; }
         public DateTimeOffset Timestamp { get; set; }
         public Dictionary<string, object> AdditionalData { get; set; }
+        public Dictionary<string, object> CartData { get; set; }
         public ReceiptOptions ReceiptOptions { get; set; }
         public List<ViewPaymentRequestViewModel.PaymentRequestInvoicePayment> Payments { get; set; }
         public string OrderUrl { get; set; }

BTCPayServer/Models/WalletViewModels/PayoutsModel.cs

@@ -19,6 +19,7 @@ namespace BTCPayServer.Models.WalletViewModels
         public IEnumerable<PaymentMethodId> PaymentMethods { get; set; }
         public PayoutState PayoutState { get; set; }
         public string PullPaymentName { get; set; }
+        public bool HasPayoutProcessor { get; set; }
 
         public class PayoutModel
         {

BTCPayServer/Models/WalletViewModels/WalletPSBTCombineViewModel.cs

@@ -2,6 +2,7 @@ using System;
 using System.ComponentModel.DataAnnotations;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 using NBitcoin;
 
 namespace BTCPayServer.Models.WalletViewModels
@@ -17,7 +18,7 @@ namespace BTCPayServer.Models.WalletViewModels
         public string BackUrl { get; set; }
         public string ReturnUrl { get; set; }
 
-        public PSBT GetSourcePSBT(Network network)
+        public PSBT GetSourcePSBT(Network network, ModelStateDictionary modelState)
         {
             if (!string.IsNullOrEmpty(OtherPSBT))
             {
@@ -25,12 +26,12 @@ namespace BTCPayServer.Models.WalletViewModels
                 {
                     return NBitcoin.PSBT.Parse(OtherPSBT, network);
                 }
-                catch
-                { }
+                catch (Exception ex)
+                { modelState.AddModelError(nameof(OtherPSBT), ex.Message); }
             }
             return null;
         }
-        public async Task<PSBT> GetPSBT(Network network)
+        public async Task<PSBT> GetPSBT(Network network, ModelStateDictionary modelState)
         {
             if (UploadedPSBTFile != null)
             {
@@ -45,8 +46,9 @@ namespace BTCPayServer.Models.WalletViewModels
                 {
                     return NBitcoin.PSBT.Load(bytes, network);
                 }
-                catch
+                catch (FormatException ex)
                 {
+                    modelState.AddModelError(nameof(UploadedPSBTFile), ex.Message);
                     return null;
                 }
             }
@@ -56,8 +58,10 @@ namespace BTCPayServer.Models.WalletViewModels
                 {
                     return NBitcoin.PSBT.Parse(PSBT, network);
                 }
-                catch
-                { }
+                catch (FormatException ex)
+                {
+                    modelState.AddModelError(nameof(UploadedPSBTFile), ex.Message);
+                }
             }
             return null;
         }

BTCPayServer/Models/WalletViewModels/WalletPSBTViewModel.cs

@@ -4,6 +4,7 @@ using System.ComponentModel.DataAnnotations;
 using System.IO;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
 using NBitcoin;
 
 namespace BTCPayServer.Models.WalletViewModels
@@ -35,9 +36,9 @@ namespace BTCPayServer.Models.WalletViewModels
         public IFormFile UploadedPSBTFile { get; set; }
 
 
-        public async Task<PSBT> GetPSBT(Network network)
+        public async Task<PSBT> GetPSBT(Network network, ModelStateDictionary modelState)
         {
-            var psbt = await GetPSBTCore(network);
+            var psbt = await GetPSBTCore(network, modelState);
             if (psbt != null)
             {
                 Decoded = psbt.ToString();
@@ -52,7 +53,7 @@ namespace BTCPayServer.Models.WalletViewModels
         }
         public bool InvalidPSBT { get; set; }
 
-        async Task<PSBT> GetPSBTCore(Network network)
+        async Task<PSBT> GetPSBTCore(Network network, ModelStateDictionary modelState)
         {
             if (UploadedPSBTFile != null)
             {
@@ -68,16 +69,20 @@ namespace BTCPayServer.Models.WalletViewModels
                     }
                     return NBitcoin.PSBT.Load(bytes, network);
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
                     using var stream = new StreamReader(UploadedPSBTFile.OpenReadStream());
                     PSBT = await stream.ReadToEndAsync();
+                    modelState.Remove(nameof(PSBT));
+                    modelState.AddModelError(nameof(PSBT), ex.Message);
                     InvalidPSBT = true;
                 }
             }
             if (SigningContext != null && !string.IsNullOrEmpty(SigningContext.PSBT))
             {
                 PSBT = SigningContext.PSBT;
+                modelState.Remove(nameof(PSBT));
+                InvalidPSBT = false;
             }
             if (!string.IsNullOrEmpty(PSBT))
             {
@@ -86,8 +91,11 @@ namespace BTCPayServer.Models.WalletViewModels
                     InvalidPSBT = false;
                     return NBitcoin.PSBT.Parse(PSBT, network);
                 }
-                catch
-                { InvalidPSBT = true; }
+                catch (Exception ex) when (!InvalidPSBT)
+                {
+                    modelState.AddModelError(nameof(PSBT), ex.Message);
+                    InvalidPSBT = true;
+                }
             }
             return null;
         }

BTCPayServer/Plugins/Altcoins/Monero/RPC/Models/GetInfoResponse.cs

@@ -3,10 +3,10 @@ using Newtonsoft.Json;
 
 namespace BTCPayServer.Services.Altcoins.Monero.RPC.Models
 {
-    public partial class SyncInfoResponse
+    public partial class GetInfoResponse
     {
         [JsonProperty("height")] public long Height { get; set; }
-        [JsonProperty("peers")] public List<Peer> Peers { get; set; }
+        [JsonProperty("busy_syncing")] public bool BusySyncing { get; set; }
         [JsonProperty("status")] public string Status { get; set; }
         [JsonProperty("target_height")] public long? TargetHeight { get; set; }
     }

BTCPayServer/Plugins/Shopify/OrderTransactionRegisterLogic.cs

@@ -1,87 +0,0 @@
-using System;
-using System.Linq;
-using System.Threading.Tasks;
-using BTCPayServer.Plugins.Shopify.ApiModels;
-
-namespace BTCPayServer.Plugins.Shopify
-{
-    public class OrderTransactionRegisterLogic
-    {
-        private readonly ShopifyApiClient _client;
-
-        public OrderTransactionRegisterLogic(ShopifyApiClient client)
-        {
-            _client = client;
-        }
-
-        private static string[] _keywords = new[] { "bitcoin", "btc", "btcpayserver", "btcpay server" };
-        public async Task<TransactionsCreateResp> Process(string orderId, string invoiceId, string currency, string amountCaptured, bool success)
-        {
-            currency = currency.ToUpperInvariant().Trim();
-            var existingShopifyOrderTransactions = (await _client.TransactionsList(orderId)).transactions;
-
-            //if there isn't a record for btcpay payment gateway, abort
-            var baseParentTransaction = existingShopifyOrderTransactions.FirstOrDefault(holder => _keywords.Any(a => holder.gateway.Contains(a, StringComparison.InvariantCultureIgnoreCase)));
-            if (baseParentTransaction is null)
-            {
-                return null;
-            }
-
-            //technically, this exploit should not be possible as we use internal invoice tags to verify that the invoice was created by our controlled, dedicated endpoint.
-            if (currency.ToUpperInvariant().Trim() != baseParentTransaction.currency.ToUpperInvariant().Trim())
-            {
-                // because of parent_id present, currency will always be the one from parent transaction
-                // malicious attacker could potentially exploit this by creating invoice 
-                // in different currency and paying that one, registering order on Shopify as paid
-                // so if currency is supplied and is different from parent transaction currency we just won't register
-                return null;
-            }
-
-            var kind = "capture";
-            var parentId = baseParentTransaction.id;
-            var status = success ? "success" : "failure";
-            //find all existing transactions recorded around this invoice id 
-            var existingShopifyOrderTransactionsOnSameInvoice =
-                existingShopifyOrderTransactions.Where(holder => holder.authorization == invoiceId);
-
-            //filter out the successful ones
-            var successfulActions =
-                existingShopifyOrderTransactionsOnSameInvoice.Where(holder => holder.status == "success").ToArray();
-
-            //of the successful ones, get the ones we registered as a valid payment
-            var successfulCaptures = successfulActions.Where(holder => holder.kind == "capture").ToArray();
-
-            //of the successful ones, get the ones we registered as a voiding of a previous successful payment
-            var refunds = successfulActions.Where(holder => holder.kind == "refund").ToArray();
-
-            //if we are working with a non-success registration, but see that we have previously registered this invoice as a success, we switch to creating a "void" transaction, which in shopify terms is a refund.
-            if (!success && successfulCaptures.Length > 0 && (successfulCaptures.Length - refunds.Length) > 0)
-            {
-                kind = "void";
-                parentId = successfulCaptures.Last().id;
-                status = "success";
-            }
-            //if we are working with a success registration, but can see that we have already had a successful transaction saved, get outta here
-            else if (success && successfulCaptures.Length > 0 && (successfulCaptures.Length - refunds.Length) > 0)
-            {
-                return null;
-            }
-            var createTransaction = new TransactionsCreateReq
-            {
-                transaction = new TransactionsCreateReq.DataHolder
-                {
-                    parent_id = parentId,
-                    currency = currency,
-                    amount = amountCaptured,
-                    kind = kind,
-                    gateway = "BTCPayServer",
-                    source = "external",
-                    authorization = invoiceId,
-                    status = status
-                }
-            };
-            var createResp = await _client.TransactionCreate(orderId, createTransaction);
-            return createResp;
-        }
-    }
-}

BTCPayServer/Plugins/Shopify/ShopifyApiClient.cs

@@ -35,10 +35,10 @@ namespace BTCPayServer.Plugins.Shopify
         }
 
         private HttpRequestMessage CreateRequest(string shopName, HttpMethod method, string action,
-            string relativeUrl = null)
+            string relativeUrl = null, string apiVersion = "2020-07")
         {
             var url =
-                $"https://{(shopName.Contains('.', StringComparison.InvariantCulture) ? shopName : $"{shopName}.myshopify.com")}/{relativeUrl ?? ("admin/api/2020-07/" + action)}";
+                $"https://{(shopName.Contains('.', StringComparison.InvariantCulture) ? shopName : $"{shopName}.myshopify.com")}/{relativeUrl ?? ($"admin/api/{apiVersion}/" + action)}";
             var req = new HttpRequestMessage(method, url);
             return req;
         }
@@ -115,6 +115,15 @@ namespace BTCPayServer.Plugins.Shopify
 
             return JObject.Parse(strResp)["order"].ToObject<ShopifyOrder>();
         }
+        public async Task<ShopifyOrder> CancelOrder(string orderId)
+        {
+            var req = CreateRequest(_credentials.ShopName, HttpMethod.Post,
+                $"orders/{orderId}/close.json", null, "2024-04");
+
+            var strResp = await SendRequest(req);
+
+            return JObject.Parse(strResp)["order"].ToObject<ShopifyOrder>();
+        }
 
         public async Task<long> OrdersCount()
         {

BTCPayServer/Plugins/Shopify/ShopifyOrderMarkerHostedService.cs

@@ -1,116 +0,0 @@
-using System;
-using System.Globalization;
-using System.Linq;
-using System.Net.Http;
-using System.Threading;
-using System.Threading.Tasks;
-using BTCPayServer.Client.Models;
-using BTCPayServer.Data;
-using BTCPayServer.Events;
-using BTCPayServer.HostedServices;
-using BTCPayServer.Logging;
-using BTCPayServer.Plugins.Shopify.Models;
-using BTCPayServer.Services.Invoices;
-using BTCPayServer.Services.Stores;
-using Microsoft.Extensions.Logging;
-
-namespace BTCPayServer.Plugins.Shopify
-{
-    public class ShopifyOrderMarkerHostedService : EventHostedServiceBase
-    {
-        private readonly StoreRepository _storeRepository;
-        private readonly IHttpClientFactory _httpClientFactory;
-
-        public ShopifyOrderMarkerHostedService(EventAggregator eventAggregator,
-            StoreRepository storeRepository,
-            IHttpClientFactory httpClientFactory,
-            Logs logs) : base(eventAggregator, logs)
-        {
-            _storeRepository = storeRepository;
-            _httpClientFactory = httpClientFactory;
-        }
-
-        public const string SHOPIFY_ORDER_ID_PREFIX = "shopify-";
-
-        protected override void SubscribeToEvents()
-        {
-            Subscribe<InvoiceEvent>();
-            base.SubscribeToEvents();
-        }
-
-        protected override async Task ProcessEvent(object evt, CancellationToken cancellationToken)
-        {
-            if (evt is InvoiceEvent invoiceEvent && !new[]
-            {
-                InvoiceEvent.Created, InvoiceEvent.ExpiredPaidPartial,
-                InvoiceEvent.ReceivedPayment, InvoiceEvent.PaidInFull
-            }.Contains(invoiceEvent.Name))
-            {
-                var invoice = invoiceEvent.Invoice;
-                var shopifyOrderId = invoice.GetInternalTags(SHOPIFY_ORDER_ID_PREFIX).FirstOrDefault();
-                if (shopifyOrderId != null)
-                {
-                    if (new[] { InvoiceStatusLegacy.Invalid, InvoiceStatusLegacy.Expired }.Contains(invoice.GetInvoiceState()
-                        .Status) && invoice.ExceptionStatus != InvoiceExceptionStatus.None)
-                    {
-                        //you have failed us, customer
-
-                        await RegisterTransaction(invoice, shopifyOrderId, false);
-                    }
-                    else if (new[] { InvoiceStatusLegacy.Complete, InvoiceStatusLegacy.Confirmed }.Contains(
-                        invoice.Status))
-                    {
-                        await RegisterTransaction(invoice, shopifyOrderId, true);
-                    }
-                }
-            }
-
-            await base.ProcessEvent(evt, cancellationToken);
-        }
-
-        private async Task RegisterTransaction(InvoiceEntity invoice, string shopifyOrderId, bool success)
-        {
-            var storeData = await _storeRepository.FindStore(invoice.StoreId);
-            var storeBlob = storeData.GetStoreBlob();
-
-            // ensure that store in question has shopify integration turned on 
-            // and that invoice's orderId has shopify specific prefix
-            var settings = storeBlob.GetShopifySettings();
-            if (settings?.IntegratedAt.HasValue == true)
-            {
-                var client = CreateShopifyApiClient(settings);
-                if (!await client.OrderExists(shopifyOrderId))
-                {
-                    // don't register transactions for orders that don't exist on shopify
-                    return;
-                }
-
-                // if we got this far, we likely need to register this invoice's payment on Shopify
-                // OrderTransactionRegisterLogic has check if transaction is already registered which is why we're passing invoice.Id
-                try
-                {
-                    var logic = new OrderTransactionRegisterLogic(client);
-                    var resp = await logic.Process(shopifyOrderId, invoice.Id, invoice.Currency,
-                        invoice.Price.ToString(CultureInfo.InvariantCulture), success);
-                    if (resp != null)
-                    {
-                        Logs.PayServer.LogInformation($"Registered order transaction {invoice.Price}{invoice.Currency} on Shopify. " +
-                                                      $"Triggered by invoiceId: {invoice.Id}, Shopify orderId: {shopifyOrderId}, Success: {success}");
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Logs.PayServer.LogError(ex,
-                        $"Shopify error while trying to register order transaction. " +
-                        $"Triggered by invoiceId: {invoice.Id}, Shopify orderId: {shopifyOrderId}");
-                }
-            }
-        }
-
-
-        private ShopifyApiClient CreateShopifyApiClient(ShopifySettings shopify)
-        {
-            return new ShopifyApiClient(_httpClientFactory, shopify.CreateShopifyApiCredentials());
-        }
-    }
-}

BTCPayServer/Plugins/Shopify/ShopifyPlugin.cs

@@ -14,7 +14,8 @@ namespace BTCPayServer.Plugins.Shopify
 
         public override void Execute(IServiceCollection applicationBuilder)
         {
-            applicationBuilder.AddSingleton<IHostedService, ShopifyOrderMarkerHostedService>();
+            applicationBuilder.AddSingleton<ShopifyService>();
+            applicationBuilder.AddSingleton<IHostedService, ShopifyService>(provider => provider.GetRequiredService<ShopifyService>());
             applicationBuilder.AddSingleton<IUIExtension>(new UIExtension("Shopify/NavExtension", "header-nav"));
             base.Execute(applicationBuilder);
         }

BTCPayServer/Plugins/Shopify/ShopifyService.cs

@@ -0,0 +1,234 @@
+using System;
+using System.Globalization;
+using System.Linq;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using BTCPayServer.Client.Models;
+using BTCPayServer.Data;
+using BTCPayServer.Events;
+using BTCPayServer.HostedServices;
+using BTCPayServer.Logging;
+using BTCPayServer.Plugins.Shopify.ApiModels;
+using BTCPayServer.Plugins.Shopify.Models;
+using BTCPayServer.Services.Invoices;
+using BTCPayServer.Services.Stores;
+using Microsoft.Extensions.Logging;
+
+namespace BTCPayServer.Plugins.Shopify
+{
+    public class ShopifyService : EventHostedServiceBase
+    {
+        private readonly StoreRepository _storeRepository;
+        private readonly InvoiceRepository _invoiceRepository;
+        private readonly IHttpClientFactory _httpClientFactory;
+
+        public ShopifyService(EventAggregator eventAggregator,
+            StoreRepository storeRepository,
+            InvoiceRepository invoiceRepository,
+            IHttpClientFactory httpClientFactory,
+            Logs logs) : base(eventAggregator, logs)
+        {
+            _storeRepository = storeRepository;
+            _invoiceRepository = invoiceRepository;
+            _httpClientFactory = httpClientFactory;
+        }
+
+        public const string SHOPIFY_ORDER_ID_PREFIX = "shopify-";
+
+        protected override void SubscribeToEvents()
+        {
+            Subscribe<InvoiceEvent>();
+            base.SubscribeToEvents();
+        }
+
+        protected override async Task ProcessEvent(object evt, CancellationToken cancellationToken)
+        {
+            if (evt is InvoiceEvent invoiceEvent && new[]
+                {
+                    InvoiceEvent.MarkedCompleted, 
+                    InvoiceEvent.MarkedInvalid, 
+                    InvoiceEvent.Expired,
+                    InvoiceEvent.Confirmed,
+                    InvoiceEvent.Completed
+                }.Contains(invoiceEvent.Name))
+            {
+                var invoice = invoiceEvent.Invoice;
+                var shopifyOrderId = invoice.GetInternalTags(SHOPIFY_ORDER_ID_PREFIX).FirstOrDefault();
+                if (shopifyOrderId != null)
+                {
+                    var success = invoice.Status.ToModernStatus() switch
+                    {
+                        InvoiceStatus.Settled => true,
+                        InvoiceStatus.Invalid or InvoiceStatus.Expired => false,
+                        _ => (bool?)null
+                    };
+
+                    if (success.HasValue)
+                        await RegisterTransaction(invoice, shopifyOrderId, success.Value);
+                }
+            }
+
+            await base.ProcessEvent(evt, cancellationToken);
+        }
+
+        private async Task RegisterTransaction(InvoiceEntity invoice, string shopifyOrderId, bool success)
+        {
+            var storeData = await _storeRepository.FindStore(invoice.StoreId);
+            var storeBlob = storeData.GetStoreBlob();
+
+            // ensure that store in question has shopify integration turned on 
+            // and that invoice's orderId has shopify specific prefix
+            var settings = storeBlob.GetShopifySettings();
+            if (settings?.IntegratedAt.HasValue == true)
+            {
+                var client = CreateShopifyApiClient(settings);
+                if (!await client.OrderExists(shopifyOrderId))
+                {
+                    // don't register transactions for orders that don't exist on shopify
+                    return;
+                }
+
+                // if we got this far, we likely need to register this invoice's payment on Shopify
+                // OrderTransactionRegisterLogic has check if transaction is already registered which is why we're passing invoice.Id
+                try
+                {
+                    var resp = await Process(client, shopifyOrderId, invoice.Id, invoice.Currency,
+                        invoice.Price.ToString(CultureInfo.InvariantCulture), success);
+                    if (resp != null)
+                    {
+                        await _invoiceRepository.AddInvoiceLogs(invoice.Id, resp);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    Logs.PayServer.LogError(ex,
+                        $"Shopify error while trying to register order transaction. " +
+                        $"Triggered by invoiceId: {invoice.Id}, Shopify orderId: {shopifyOrderId}");
+                }
+            }
+        }
+
+
+        private ShopifyApiClient CreateShopifyApiClient(ShopifySettings shopify)
+        {
+            return new ShopifyApiClient(_httpClientFactory, shopify.CreateShopifyApiCredentials());
+        }
+
+
+        private static string[] _keywords = new[] {"bitcoin", "btc", "btcpayserver", "btcpay server"};
+
+        public async Task<InvoiceLogs> Process(ShopifyApiClient client, string orderId, string invoiceId,
+            string currency, string amountCaptured, bool success)
+        {
+            var result = new InvoiceLogs();
+            currency = currency.ToUpperInvariant().Trim();
+            var existingShopifyOrderTransactions = (await client.TransactionsList(orderId)).transactions;
+
+            //if there isn't a record for btcpay payment gateway, abort
+            var baseParentTransaction = existingShopifyOrderTransactions.FirstOrDefault(holder =>
+                _keywords.Any(a => holder.gateway.Contains(a, StringComparison.InvariantCultureIgnoreCase)));
+            if (baseParentTransaction is null)
+            {
+                result.Write("Couldn't find the order on Shopify.", InvoiceEventData.EventSeverity.Error);
+                return result;
+            }
+
+            //technically, this exploit should not be possible as we use internal invoice tags to verify that the invoice was created by our controlled, dedicated endpoint.
+            if (currency.ToUpperInvariant().Trim() != baseParentTransaction.currency.ToUpperInvariant().Trim())
+            {
+                // because of parent_id present, currency will always be the one from parent transaction
+                // malicious attacker could potentially exploit this by creating invoice 
+                // in different currency and paying that one, registering order on Shopify as paid
+                // so if currency is supplied and is different from parent transaction currency we just won't register
+                result.Write("Currency mismatch on Shopify.", InvoiceEventData.EventSeverity.Error);
+                return result;
+            }
+
+            var kind = "capture";
+            var parentId = baseParentTransaction.id;
+            var status = success ? "success" : "failure";
+            //find all existing transactions recorded around this invoice id 
+            var existingShopifyOrderTransactionsOnSameInvoice =
+                existingShopifyOrderTransactions.Where(holder => holder.authorization == invoiceId);
+
+            //filter out the successful ones
+            var successfulActions =
+                existingShopifyOrderTransactionsOnSameInvoice.Where(holder => holder.status == "success").ToArray();
+
+            //of the successful ones, get the ones we registered as a valid payment
+            var successfulCaptures = successfulActions.Where(holder => holder.kind == "capture").ToArray();
+
+            //of the successful ones, get the ones we registered as a voiding of a previous successful payment
+            var refunds = successfulActions.Where(holder => holder.kind == "refund").ToArray();
+
+            //if we are working with a non-success registration, but see that we have previously registered this invoice as a success, we switch to creating a "void" transaction, which in shopify terms is a refund.
+            if (!success && successfulCaptures.Length > 0 && (successfulCaptures.Length - refunds.Length) > 0)
+            {
+                kind = "void";
+                parentId = successfulCaptures.Last().id;
+                status = "success";
+                result.Write(
+                    "A transaction was previously recorded against the Shopify order. Creating a void transaction.",
+                    InvoiceEventData.EventSeverity.Warning);
+            }
+            else if (!success)
+            {
+                kind = "void";
+                status = "success";
+                result.Write("Attempting to void the payment on Shopify order due to failure in payment.",
+                    InvoiceEventData.EventSeverity.Warning);
+            }
+            //if we are working with a success registration, but can see that we have already had a successful transaction saved, get outta here
+            else if (success && successfulCaptures.Length > 0 && (successfulCaptures.Length - refunds.Length) > 0)
+            {
+                result.Write("A transaction was previously recorded against the Shopify order. Skipping.",
+                    InvoiceEventData.EventSeverity.Warning);
+                return result;
+            }
+
+            var createTransaction = new TransactionsCreateReq
+            {
+                transaction = new TransactionsCreateReq.DataHolder
+                {
+                    parent_id = parentId,
+                    currency = currency,
+                    amount = amountCaptured,
+                    kind = kind,
+                    gateway = "BTCPayServer",
+                    source = "external",
+                    authorization = invoiceId,
+                    status = status
+                }
+            };
+            var createResp = await client.TransactionCreate(orderId, createTransaction);
+
+            if (createResp.transaction is null)
+            {
+                result.Write("Failed to register the transaction on Shopify.", InvoiceEventData.EventSeverity.Error);
+            }
+            else
+            {
+                result.Write(
+                    $"Successfully registered the transaction on Shopify. tx status:{createResp.transaction.status}, kind: {createResp.transaction.kind}, order id:{createResp.transaction.order_id}",
+                    InvoiceEventData.EventSeverity.Info);
+            }
+
+            if (!success)
+            {
+                try
+                {
+                    await client.CancelOrder(orderId);
+                    result.Write("Cancelling the Shopify order.", InvoiceEventData.EventSeverity.Warning);
+                }
+                catch (Exception e)
+                {
+                    result.Write($"Failed to cancel the Shopify order. {e.Message}",
+                        InvoiceEventData.EventSeverity.Error);
+                }
+            }
+
+            return result;
+        }
+    }
+}

BTCPayServer/Plugins/Shopify/UIShopifyController.cs

@@ -34,6 +34,7 @@ namespace BTCPayServer.Plugins.Shopify
     [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)]
     public class UIShopifyController : Controller
     {
+        private readonly ShopifyService _shopifyService;
         private readonly BTCPayServerEnvironment _btcPayServerEnvironment;
         private readonly IOptions<BTCPayServerOptions> _btcPayServerOptions;
         private readonly IWebHostEnvironment _webHostEnvironment;
@@ -43,7 +44,9 @@ namespace BTCPayServer.Plugins.Shopify
         private readonly IJsonHelper _jsonHelper;
         private readonly IHttpClientFactory _clientFactory;
 
-        public UIShopifyController(BTCPayServerEnvironment btcPayServerEnvironment,
+        public UIShopifyController(
+            ShopifyService shopifyService,
+            BTCPayServerEnvironment btcPayServerEnvironment,
             IOptions<BTCPayServerOptions> btcPayServerOptions,
             IWebHostEnvironment webHostEnvironment,
             StoreRepository storeRepository,
@@ -52,6 +55,7 @@ namespace BTCPayServer.Plugins.Shopify
             IJsonHelper jsonHelper,
             IHttpClientFactory clientFactory)
         {
+            _shopifyService = shopifyService;
             _btcPayServerEnvironment = btcPayServerEnvironment;
             _btcPayServerOptions = btcPayServerOptions;
             _webHostEnvironment = webHostEnvironment;
@@ -106,14 +110,14 @@ namespace BTCPayServer.Plugins.Shopify
         public async Task<IActionResult> ShopifyInvoiceEndpoint(
             string storeId, string orderId, decimal amount, bool checkOnly = false)
         {
-            var shopifySearchTerm = $"{ShopifyOrderMarkerHostedService.SHOPIFY_ORDER_ID_PREFIX}{orderId}";
+            var shopifySearchTerm = $"{ShopifyService.SHOPIFY_ORDER_ID_PREFIX}{orderId}";
             var matchedExistingInvoices = await _invoiceRepository.GetInvoices(new InvoiceQuery()
             {
                 TextSearch = shopifySearchTerm,
                 StoreId = new[] { storeId }
             });
             matchedExistingInvoices = matchedExistingInvoices.Where(entity =>
-                    entity.GetInternalTags(ShopifyOrderMarkerHostedService.SHOPIFY_ORDER_ID_PREFIX)
+                    entity.GetInternalTags(ShopifyService.SHOPIFY_ORDER_ID_PREFIX)
                         .Any(s => s == orderId))
                 .ToArray();
 
@@ -155,7 +159,7 @@ namespace BTCPayServer.Plugins.Shopify
                 if (client != null && order?.FinancialStatus == "pending" &&
                     firstInvoiceSettled.Status != InvoiceStatusLegacy.Paid)
                 {
-                    await new OrderTransactionRegisterLogic(client).Process(orderId, firstInvoiceSettled.Id,
+                    await _shopifyService.Process(client, orderId, firstInvoiceSettled.Id,
                         firstInvoiceSettled.Currency,
                         firstInvoiceSettled.Price.ToString(CultureInfo.InvariantCulture), true);
                     order = await client.GetOrder(orderId);

BTCPayServer/SearchString.cs

@@ -9,7 +9,8 @@ namespace BTCPayServer
     {
         private const char FilterSeparator = ',';
         private const char ValueSeparator = ':';
-        
+        private static readonly string[] StripFilters = ["status", "exceptionstatus", "unusual", "includearchived", "appid", "startdate", "enddate"];
+
         private readonly string _originalString;
         private readonly int _timezoneOffset;
 
@@ -27,12 +28,18 @@ namespace BTCPayServer
                     .Where(kv => kv.Length == 2)
                     .Select(kv => new KeyValuePair<string, string>(UnifyKey(kv[0]), kv[1]))
                     .ToMultiValueDictionary(o => o.Key, o => o.Value);
-
-            var val = splitted.FirstOrDefault(a => a.IndexOf(ValueSeparator, StringComparison.OrdinalIgnoreCase) == -1);
-            TextSearch = val != null ? val.Trim() : string.Empty;
+            // combine raw search term and filters which don't have a special UI (e.g. orderid)
+            var textFilters = Filters
+                .Where(f => !StripFilters.Contains(f.Key))
+                .Select(f => string.Join(FilterSeparator, f.Value.Select(v => $"{f.Key}{ValueSeparator}{v}"))).ToList();
+            TextFilters = textFilters.Any() ? string.Join(FilterSeparator, textFilters) : null;
+            TextSearch = splitted.FirstOrDefault(a => a.IndexOf(ValueSeparator, StringComparison.OrdinalIgnoreCase) == -1)?.Trim();
         }
 
         public string TextSearch { get; private set; }
+        public string TextFilters { get; private set; }
+
+        public string TextCombined => string.Join(FilterSeparator, new []{ TextFilters, TextSearch }.Where(x => !string.IsNullOrEmpty(x)));
 
         public MultiValueDictionary<string, string> Filters { get; }
 
@@ -82,9 +89,10 @@ namespace BTCPayServer
 
         public string WithoutSearchText()
         {
-            return string.IsNullOrEmpty(TextSearch)
-                ? Finalize(ToString())
-                : Finalize(ToString()).Replace(TextSearch, string.Empty);
+            var txt = ToString();
+            if (!string.IsNullOrEmpty(TextSearch)) txt = Finalize(txt.Replace(TextSearch, string.Empty));
+            if (!string.IsNullOrEmpty(TextFilters)) txt = Finalize(txt.Replace(TextFilters, string.Empty));
+            return Finalize(txt).Trim();
         }
 
         public string[] GetFilterArray(string key)
@@ -144,7 +152,7 @@ namespace BTCPayServer
         
         private static string Finalize(string str)
         {
-            var value = str.TrimStart(FilterSeparator).TrimEnd(FilterSeparator);
+            var value = str.Trim().TrimStart(FilterSeparator).TrimEnd(FilterSeparator);
             return string.IsNullOrEmpty(value) ? " " : value;
         }
     }

BTCPayServer/Services/Altcoins/Monero/Services/MoneroRPCProvider.cs

@@ -59,12 +59,12 @@ namespace BTCPayServer.Services.Altcoins.Monero.Services
             try
             {
                 var daemonResult =
-                    await daemonRpcClient.SendCommandAsync<JsonRpcClient.NoRequestModel, SyncInfoResponse>("sync_info",
+                    await daemonRpcClient.SendCommandAsync<JsonRpcClient.NoRequestModel, GetInfoResponse>("get_info",
                         JsonRpcClient.NoRequestModel.Instance);
                 summary.TargetHeight = daemonResult.TargetHeight.GetValueOrDefault(0);
                 summary.CurrentHeight = daemonResult.Height;
                 summary.TargetHeight = summary.TargetHeight == 0 ? summary.CurrentHeight : summary.TargetHeight;
-                summary.Synced = daemonResult.Height >= summary.TargetHeight && summary.CurrentHeight > 0;
+                summary.Synced = !daemonResult.BusySyncing;
                 summary.UpdatedAt = DateTime.UtcNow;
                 summary.DaemonAvailable = true;
             }

BTCPayServer/Services/Altcoins/Monero/UI/MoneroLikeStoreController.cs

@@ -104,14 +104,19 @@ namespace BTCPayServer.Services.Altcoins.Monero.UI
                 new SelectListItem(
                     $"{account.AccountIndex} - {(string.IsNullOrEmpty(account.Label) ? "No label" : account.Label)}",
                     account.AccountIndex.ToString(CultureInfo.InvariantCulture)));
-            var settlementThresholdChoice = settings.InvoiceSettledConfirmationThreshold switch
+
+            var settlementThresholdChoice = MoneroLikeSettlementThresholdChoice.StoreSpeedPolicy;
+            if (settings != null && settings.InvoiceSettledConfirmationThreshold is { } confirmations)
             {
-                null => MoneroLikeSettlementThresholdChoice.StoreSpeedPolicy,
-                0 => MoneroLikeSettlementThresholdChoice.ZeroConfirmation,
-                1 => MoneroLikeSettlementThresholdChoice.AtLeastOne,
-                10 => MoneroLikeSettlementThresholdChoice.AtLeastTen,
-                _ => MoneroLikeSettlementThresholdChoice.Custom
-            };
+                settlementThresholdChoice = confirmations switch
+                {
+                    0 => MoneroLikeSettlementThresholdChoice.ZeroConfirmation,
+                    1 => MoneroLikeSettlementThresholdChoice.AtLeastOne,
+                    10 => MoneroLikeSettlementThresholdChoice.AtLeastTen,
+                    _ => MoneroLikeSettlementThresholdChoice.Custom
+                };
+            }
+
             return new MoneroLikePaymentMethodViewModel()
             {
                 WalletFileFound = System.IO.File.Exists(fileAddress),
@@ -124,9 +129,11 @@ namespace BTCPayServer.Services.Altcoins.Monero.UI
                 Accounts = accounts == null ? null : new SelectList(accounts, nameof(SelectListItem.Value),
                     nameof(SelectListItem.Text)),
                 SettlementConfirmationThresholdChoice = settlementThresholdChoice,
-                CustomSettlementConfirmationThreshold = settlementThresholdChoice is MoneroLikeSettlementThresholdChoice.Custom
-                    ? settings.InvoiceSettledConfirmationThreshold
-                    : null
+                CustomSettlementConfirmationThreshold =
+                    settings != null &&
+                    settlementThresholdChoice is MoneroLikeSettlementThresholdChoice.Custom
+                        ? settings.InvoiceSettledConfirmationThreshold
+                        : null
             };
         }
 

BTCPayServer/Services/Reporting/RefundsReportProvider.cs

@@ -0,0 +1,133 @@
+#nullable enable
+using System;
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using BTCPayServer.Client.Models;
+using BTCPayServer.Data;
+using Dapper;
+using Microsoft.EntityFrameworkCore;
+
+namespace BTCPayServer.Services.Reporting
+{
+    public class RefundsReportProvider : ReportProvider
+    {
+        private readonly BTCPayNetworkJsonSerializerSettings _serializerSettings;
+        private readonly DisplayFormatter _displayFormatter;
+
+        private ViewDefinition CreateDefinition()
+        {
+            return new ViewDefinition
+            {
+                Fields = new List<StoreReportResponse.Field>
+                {
+                    new("Date", "datetime"),
+                    new("InvoiceId", "invoice_id"),
+                    new("Currency", "string"),
+                    new("Completed", "amount"),
+                    new("Awaiting", "amount"),
+                    new("Limit", "amount"),
+                    new("FullyPaid", "boolean")
+                },
+                Charts =
+                {
+                    new ()
+                    {
+                        Name = "Aggregated amount",
+                        Groups = { "Currency" },
+                        HasGrandTotal = false,
+                        Aggregates = { "Awaiting", "Completed", "Limit" }
+                    }
+                }
+            };
+        }
+        public override string Name => "Refunds";
+
+        public ApplicationDbContextFactory DbContextFactory { get; }
+
+        public RefundsReportProvider(
+            ApplicationDbContextFactory dbContextFactory,
+            BTCPayNetworkJsonSerializerSettings serializerSettings,
+            DisplayFormatter displayFormatter)
+        {
+            DbContextFactory = dbContextFactory;
+            _serializerSettings = serializerSettings;
+            _displayFormatter = displayFormatter;
+        }
+        record RefundRow(DateTimeOffset Created, string InvoiceId, string PullPaymentId, string Currency, decimal Limit)
+        {
+            public decimal Completed { get; set; }
+            public decimal Awaiting { get; set; }
+        }
+        public override async Task Query(QueryContext queryContext, CancellationToken cancellation)
+        {
+            queryContext.ViewDefinition = CreateDefinition();
+            RefundRow? currentRow = null;
+            await using var ctx = DbContextFactory.CreateContext();
+            var conn = ctx.Database.GetDbConnection();
+            var rows = await conn.QueryAsync(
+            """
+            SELECT i."Created", i."Id" AS "InvoiceId", p."State", p."PaymentMethodId", pp."Id" AS "PullPaymentId", pp."Blob" AS "ppBlob", p."Blob" AS "pBlob" FROM "Invoices" i
+            JOIN "Refunds" r ON r."InvoiceDataId"= i."Id"
+            JOIN "PullPayments" pp ON r."PullPaymentDataId"=pp."Id"
+            LEFT JOIN "Payouts" p ON p."PullPaymentDataId"=pp."Id"
+            WHERE i."StoreDataId" = @storeId
+            AND i."Created" >= @start AND i."Created" <= @end
+            AND pp."Archived" IS FALSE
+            ORDER BY i."Created", pp."Id"
+            """, new { start = queryContext.From, end = queryContext.To, storeId = queryContext.StoreId });
+            foreach (var r in rows)
+            {
+                PullPaymentBlob ppBlob = GetPullPaymentBlob(r);
+                PayoutBlob? pBlob = GetPayoutBlob(r);
+
+                if ((string)r.PullPaymentId != currentRow?.PullPaymentId)
+                {
+                    AddRow(queryContext, currentRow);
+                    currentRow = new(r.Created, r.InvoiceId, r.PullPaymentId, ppBlob.Currency, ppBlob.Limit);
+                }
+                if (pBlob is null)
+                    continue;
+                var state = Enum.Parse<PayoutState>((string)r.State);
+                if (state == PayoutState.Cancelled)
+                    continue;
+                if (state is PayoutState.Completed)
+                    currentRow.Completed += pBlob.Amount;
+                else
+                    currentRow.Awaiting += pBlob.Amount;
+            }
+            AddRow(queryContext, currentRow);
+        }
+
+        private PayoutBlob? GetPayoutBlob(dynamic r)
+        {
+            if (r.pBlob is null)
+                return null;
+            Data.PayoutData p = new Data.PayoutData();
+            p.PaymentMethodId = r.PaymentMethodId;
+            p.Blob = (string)r.pBlob;
+            return p.GetBlob(_serializerSettings);
+        }
+
+        private static PullPaymentBlob GetPullPaymentBlob(dynamic r)
+        {
+            Data.PullPaymentData pp = new Data.PullPaymentData();
+            pp.Blob = (string)r.ppBlob;
+            return pp.GetBlob();
+        }
+
+        private void AddRow(QueryContext queryContext, RefundRow? currentRow)
+        {
+            if (currentRow is null)
+                return;
+            var data = queryContext.AddData();
+            data.Add(currentRow.Created);
+            data.Add(currentRow.InvoiceId);
+            data.Add(currentRow.Currency);
+            data.Add(_displayFormatter.ToFormattedAmount(currentRow.Completed, currentRow.Currency));
+            data.Add(_displayFormatter.ToFormattedAmount(currentRow.Awaiting, currentRow.Currency));
+            data.Add(_displayFormatter.ToFormattedAmount(currentRow.Limit, currentRow.Currency));
+            data.Add(currentRow.Limit <= currentRow.Completed);
+        }
+    }
+}

BTCPayServer/Services/Wallets/Export/TransactionsExport.cs

@@ -91,7 +91,7 @@ namespace BTCPayServer.Services.Wallets.Export
         {
             using StringWriter writer = new();
             using var csvWriter = new CsvHelper.CsvWriter(writer, new CsvConfiguration(CultureInfo.InvariantCulture), true);
-            csvWriter.Configuration.RegisterClassMap<ExportTransactionMap>();
+            csvWriter.Context.RegisterClassMap<ExportTransactionMap>();
             csvWriter.WriteHeader<ExportTransaction>();
             csvWriter.NextRecord();
             csvWriter.WriteRecords(invoices);
@@ -105,7 +105,7 @@ namespace BTCPayServer.Services.Wallets.Export
         public ExportTransactionMap()
         {
             AutoMap(CultureInfo.InvariantCulture);
-            Map(m => m.Labels).ConvertUsing(row => row.Labels == null ? string.Empty : string.Join(", ", row.Labels));
+            Map(m => m.Labels).Convert(row => row.Value.Labels == null ? string.Empty : string.Join(", ", row.Value.Labels));
         }
     }
 

BTCPayServer/Views/Shared/Crowdfund/UpdateCrowdfund.cshtml

@@ -326,7 +326,7 @@
                                 <div class="accordion-body">
                                     <div class="form-group">
                                         <label asp-for="CustomCSSLink" class="form-label"></label>
-                                        <a href="https://docs.btcpayserver.org/Development/Theme/#2-bootstrap-themes" target="_blank" rel="noreferrer noopener" title="More information...">
+                                        <a href="https://docs.btcpayserver.org/Development/Theme/" target="_blank" rel="noreferrer noopener" title="More information...">
                                             <vc:icon symbol="info" />
                                         </a>
                                         <input asp-for="CustomCSSLink" class="form-control" />

BTCPayServer/Views/Shared/EmailsBody.cshtml

@@ -1,6 +1,7 @@
 @using BTCPayServer.Client
 @using Microsoft.AspNetCore.Mvc.TagHelpers
 @using BTCPayServer.Abstractions.TagHelpers
+@using BTCPayServer.Models.ServerViewModels
 @model BTCPayServer.Models.EmailsViewModel
 
 <div class="row">
@@ -44,7 +45,7 @@
             <div class="form-text">For many email providers (like Gmail) your login is your email address.</div>
             <span asp-validation-for="Settings.Login" class="text-danger"></span>
         </div>
-        <div class="form-group" permission="@Policies.CanModifyStoreSettings">
+        <div class="form-group" permission="@(Model is ServerEmailsViewModel ? Policies.CanModifyServerSettings : Policies.CanModifyStoreSettings)">
             @if (!Model.PasswordSet)
             {
                 <label asp-for="Settings.Password" class="form-label"></label>
@@ -81,7 +82,6 @@
 
 <script>
     document.addEventListener("DOMContentLoaded", function () {
-
         delegate('click', '#quick-fill .dropdown-menu a', function (e) {
             e.preventDefault();
             

BTCPayServer/Views/Shared/PointOfSale/Public/Print.cshtml

@@ -72,6 +72,7 @@ else
             {
                 var item = Model.Items[x];
                 var formatted = DisplayFormatter.Currency(item.Price ?? 0, Model.CurrencyCode, DisplayFormatter.CurrencyFormat.Symbol);
+                if (item.PriceType == ViewPointOfSaleViewModel.ItemPriceType.Fixed && item.Price == 0) continue;
                 <div class="d-flex flex-wrap">
                     <div class="card px-0" data-id="@x">
                         <div class="card-body p-3 d-flex flex-column gap-2">

BTCPayServer/Views/Shared/PointOfSale/UpdatePointOfSale.cshtml

@@ -304,7 +304,7 @@
                                 <div class="accordion-body">
                                     <div class="form-group">
                                         <label asp-for="CustomCSSLink" class="form-label"></label>
-                                        <a href="https://docs.btcpayserver.org/Development/Theme/#2-bootstrap-themes" target="_blank" rel="noreferrer noopener" title="More information...">
+                                        <a href="https://docs.btcpayserver.org/Development/Theme/" target="_blank" rel="noreferrer noopener" title="More information...">
                                             <vc:icon symbol="info" />
                                         </a>
                                         <input asp-for="CustomCSSLink" class="form-control" />

BTCPayServer/Views/Shared/PosData.cshtml

@@ -1,3 +1,4 @@
+@using Microsoft.AspNetCore.Mvc.TagHelpers
 @model (Dictionary<string, object> Items, int Level)
 
 @functions {
@@ -10,14 +11,20 @@
 
 @if (Model.Items.Any())
 {
-    var hasCart = Model.Items.ContainsKey("Cart");
+    @* Use titlecase and lowercase versions for backwards-compatibility *@
+    string[] cartKeys = ["cart", "subtotal", "discount", "tip", "total"];
     <table class="table my-0" v-pre>
-        @if (hasCart || (Model.Items.ContainsKey("Subtotal") && Model.Items.ContainsKey("Total")))
+        @if (Model.Items.Keys.Any(key => cartKeys.Contains(key.ToLowerInvariant())))
         {
-            @if (hasCart)
+            _ = Model.Items.TryGetValue("cart", out var cart) || Model.Items.TryGetValue("Cart", out cart);
+            var hasTotal = Model.Items.TryGetValue("total", out var total) || Model.Items.TryGetValue("Total", out total);
+            var hasSubtotal = Model.Items.TryGetValue("subtotal", out var subtotal) || Model.Items.TryGetValue("subTotal", out subtotal) || Model.Items.TryGetValue("Subtotal", out subtotal);
+            var hasDiscount = Model.Items.TryGetValue("discount", out var discount) || Model.Items.TryGetValue("Discount", out discount);
+            var hasTip = Model.Items.TryGetValue("tip", out var tip) || Model.Items.TryGetValue("Tip", out tip);
+            if (cart is Dictionary<string, object> { Keys.Count: > 0 } cartDict)
             {
                 <tbody>
-                @foreach (var (key, value) in (Dictionary<string, object>)Model.Items["Cart"])
+                @foreach (var (key, value) in cartDict)
                 {
                     <tr>
                         <th>@key</th>
@@ -26,35 +33,46 @@
                 }
                 </tbody>
             }
-            <tfoot style="border-top-width:@(hasCart ? "3px" : "0")">
-                @if (Model.Items.ContainsKey("Subtotal"))
+            else if (cart is ICollection<object> { Count: > 0 } cartCollection)
+            {
+                <tbody>
+                @foreach (var value in cartCollection)
                 {
                     <tr>
-                        <th>Subtotal</th>
-                        <td class="text-end">@Model.Items["Subtotal"]</td>
-                    </tr>
-                }
-                @if (Model.Items.ContainsKey("Discount"))
-                {
-                    <tr>
-                        <th>Discount</th>
-                        <td class="text-end">@Model.Items["Discount"]</td>
-                    </tr>
-                }
-                @if (Model.Items.ContainsKey("Tip"))
-                {
-                    <tr>
-                        <th>Tip</th>
-                        <td class="text-end">@Model.Items["Tip"]</td>
-                    </tr>
-                }
-                @if (Model.Items.ContainsKey("Total"))
-                {
-                    <tr style="border-top-width:3px">
-                        <th>Total</th>
-                        <td class="text-end">@Model.Items["Total"]</td>
+                        <td>@value</td>
                     </tr>
                 }
+                </tbody>
+            }
+            <tfoot style="border-top-width:0">
+            @if (hasSubtotal && (hasDiscount || hasTip))
+            {
+                <tr style="border-top-width:3px">
+                    <th>Subtotal</th>
+                    <td class="text-end">@subtotal</td>
+                </tr>
+            }
+            @if (hasDiscount)
+            {
+                <tr>
+                    <th>Discount</th>
+                    <td class="text-end">@discount</td>
+                </tr>
+            }
+            @if (hasTip)
+            {
+                <tr>
+                    <th>Tip</th>
+                    <td class="text-end">@tip</td>
+                </tr>
+            }
+            @if (hasTotal)
+            {
+                <tr style="border-top-width:3px">
+                    <th>Total</th>
+                    <td class="text-end">@total</td>
+                </tr>
+            }
             </tfoot>
         }
         else

BTCPayServer/Views/Shared/_LayoutSimple.cshtml

@@ -18,7 +18,10 @@
             @RenderBody()
         </div>
     </section>
-    <partial name="_Footer"/>
+    @if (ViewData["ShowFooter"] is not false)
+    {
+        <partial name="_Footer"/>
+    }
     <partial name="LayoutFoot" />
     @await RenderSectionAsync("PageFootContent", false)
 </body>

BTCPayServer/Views/UIInvoice/Invoice.cshtml

@@ -431,7 +431,7 @@
                     </table>
                 </div>
             }
-            @if (Model.ReceiptData != null && Model.ReceiptData.Any())
+            @if (Model.ReceiptData?.Any() is true)
             {
                 <div>
                     <h3 class="mb-3">
@@ -443,7 +443,7 @@
                     <partial name="PosData" model="(Model.ReceiptData, 1)" />
                 </div>
             }
-            @if (Model.AdditionalData != null && Model.AdditionalData.Any())
+            @if (Model.AdditionalData?.Any() is true)
             {
                 <div>
                     <h3 class="mb-3">

BTCPayServer/Views/UIInvoice/InvoiceReceipt.cshtml

@@ -35,8 +35,8 @@
         #InvoiceSummary { gap: var(--btcpay-space-l); }
         #PaymentDetails table tbody tr:first-child td { padding-top: 1rem; }
         #PaymentDetails table tbody:not(:last-child) tr:last-child > th,td { padding-bottom: 1rem; }
-        #posData td > table:last-child { margin-bottom: 0 !important; }
-        #posData table > tbody > tr:first-child > td > h4 { margin-top: 0 !important; }
+        #AdditionalData td > table:last-child, #CartData td > table:last-child { margin-bottom: 0 !important; }
+        #AdditionalData table > tbody > tr:first-child > td > h4, #CartData table > tbody > tr:first-child > td > h4 { margin-top: 0 !important; }
     </style>
 </head>
 <body class="min-vh-100">
@@ -62,7 +62,7 @@
                     {
                         if (Model.ReceiptOptions.ShowQR is true)
                         {
-                            <vc:qr-code data="@Context.Request.GetCurrentUrl()"></vc:qr-code>
+                            <vc:qr-code data="@Context.Request.GetCurrentUrl()" />
                         }
                         <div class="d-flex gap-4 mb-0 flex-fill">
                             <dl class="d-flex flex-column gap-4 mb-0 flex-fill">
@@ -102,6 +102,15 @@
                             </div>
                         </div>
                     }
+                    if (Model.CartData?.Any() is true)
+                    {
+                        <div id="CartData" class="tile">
+                            <h2 class="h4 mb-3">Cart</h2>
+                            <div class="table-responsive my-0">
+                                <partial name="PosData" model="(Model.CartData, 1)" />
+                            </div>
+                        </div>
+                    }
                     if (Model.Payments?.Any() is true)
                     {
                         <div id="PaymentDetails" class="tile">

BTCPayServer/Views/UIInvoice/InvoiceReceiptPrint.cshtml

@@ -1,4 +1,17 @@
 @model BTCPayServer.Models.InvoicingModels.InvoiceReceiptViewModel
+
+@functions {
+	public bool IsManualEntryCart(Dictionary<string, object> additionalData)
+    {
+		_ = additionalData.TryGetValue("cart", out var data) || additionalData.TryGetValue("Cart", out data);
+        if (data is Dictionary<string, object> cart)
+        {
+            return cart.Count == 1 && cart.ContainsKey("Manual entry 1");
+        }
+
+        return false;
+    }
+}
 @using BTCPayServer.Client.Models
 @using BTCPayServer.Components.QRCode
 @using BTCPayServer.Services
@@ -90,6 +103,7 @@
         }
         else
         {
+            var hasCart = Model.CartData?.Any() is true;
             <div id="PaymentDetails">
                 <div class="my-2 text-center small">
                     @if (!string.IsNullOrEmpty(Model.OrderId))
@@ -99,19 +113,29 @@
                     @Model.Timestamp.ToBrowserDate()
                 </div>
                 <table class="table table-borderless table-sm small my-0">
-                    <tr>
-                        <td class="text-nowrap text-secondary">Total</td>
-                        <td class="text-end fw-semibold">@DisplayFormatter.Currency(Model.Amount, Model.Currency, DisplayFormatter.CurrencyFormat.Symbol)</td>
-                    </tr>
-                    <tr>
-                        <td colspan="2"><hr class="w-100 my-0"/></td>
-                    </tr>
-                    @if (Model.AdditionalData?.Any() is true &&
-                        (Model.AdditionalData.ContainsKey("Cart") || Model.AdditionalData.ContainsKey("Discount") || Model.AdditionalData.ContainsKey("Tip")))
+                    @if (Model.AdditionalData?.Any() is true)
                     {
-                        @if (Model.AdditionalData.ContainsKey("Cart"))
+                        @foreach (var (key, value) in Model.AdditionalData)
                         {
-                            @foreach (var (key, value) in (Dictionary<string, object>)Model.AdditionalData["Cart"])
+                            <tr>
+                                <td class="text-secondary">@key</td>
+                                <td class="text-end">@value</td>
+                            </tr>
+                        }
+                        <tr>
+                            <td colspan="2"><hr class="w-100 my-0"/></td>
+                        </tr>
+                    }
+					@if (hasCart && !IsManualEntryCart(Model.AdditionalData))
+                    {
+						_ = Model.CartData.TryGetValue("cart", out var cart) || Model.CartData.TryGetValue("Cart", out cart);
+                        var hasTotal = Model.CartData.TryGetValue("total", out var total) || Model.CartData.TryGetValue("Total", out total);
+                        var hasSubtotal = Model.CartData.TryGetValue("subtotal", out var subtotal) || Model.CartData.TryGetValue("subTotal", out subtotal) || Model.CartData.TryGetValue("Subtotal", out subtotal);
+                        var hasDiscount = Model.CartData.TryGetValue("discount", out var discount) || Model.CartData.TryGetValue("Discount", out discount);
+                        var hasTip = Model.CartData.TryGetValue("tip", out var tip) || Model.CartData.TryGetValue("Tip", out tip);
+                        if (cart is Dictionary<string, object> { Keys.Count: > 0 } cartDict) 
+                        {
+                            @foreach (var (key, value) in cartDict)
                             {
                                 <tr>
                                     <td class="text-secondary">@key</td>
@@ -119,33 +143,62 @@
                                 </tr>
                             }
                         }
-                        @if (Model.AdditionalData.ContainsKey("Subtotal"))
+                        else if (cart is ICollection<object> { Count: > 0 } cartCollection) 
+                        { 
+                            @foreach (var value in cartCollection)
+                            {
+                                <tr>
+                                    <td class="text-end">@value</td>
+                                </tr>
+                            }
+                        }
+                        if (hasSubtotal && (hasDiscount || hasTip))
                         {
+                            <tr>
+                                <td colspan="2"><hr class="w-100 my-0"/></td>
+                            </tr>
                             <tr>
                                 <td class="text-secondary">Subtotal</td>
-                                <td class="text-end">@Model.AdditionalData["Subtotal"]</td>
+                                <td class="text-end">@subtotal</td>
                             </tr>
                         }
-                        @if (Model.AdditionalData.ContainsKey("Discount"))
+                        if (hasDiscount)
                         {
                             <tr>
                                 <td class="text-secondary">Discount</td>
-                                <td class="text-end">@Model.AdditionalData["Discount"]</td>
+                                <td class="text-end">@discount</td>
                             </tr>
                         }
-                        @if (Model.AdditionalData.ContainsKey("Tip"))
+                        if (hasTip)
                         {
                             <tr>
                                 <td class="text-secondary">Tip</td>
-                                <td class="text-end">@Model.AdditionalData["Tip"]</td>
+                                <td class="text-end">@tip</td>
                             </tr>
                         }
+                        if (hasTotal)
+                        {
+                            <tr>
+                                <td colspan="2"><hr class="w-100 my-0"/></td>
+                            </tr>
+                            <tr>
+                                <th class="text-secondary">Total</th>
+                                <td class="text-end fw-semibold">@total</td>
+                            </tr>
+                        }
+                    }
+                    else
+                    {
                         <tr>
-                            <td colspan="2"><hr class="w-100 my-0"/></td>
+                            <td class="text-nowrap text-secondary">Total</td>
+                            <td class="text-end fw-semibold">@DisplayFormatter.Currency(Model.Amount, Model.Currency, DisplayFormatter.CurrencyFormat.Symbol)</td>
                         </tr>
                     }
                     @if (Model.Payments?.Any() is true)
                     {
+                        <tr>
+                            <td colspan="2"><hr class="w-100 my-0"/></td>
+                        </tr>
                         @for (var i = 0; i < Model.Payments.Count; i++)
                         {
                             var payment = Model.Payments[i];
@@ -178,9 +231,9 @@
                                         @if (payment.Destination.Length > 69)
                                         {
                                             <span>
-                                                <span>@payment.Destination[..30]</span>
+                                                <span>@payment.Destination[..19]</span>
                                                 <span>...</span>
-                                                <span>@payment.Destination.Substring(payment.Destination.Length - 30, 30)</span>
+                                                <span>@payment.Destination.Substring(payment.Destination.Length - 20, 20)</span>
                                             </span>
                                         }
                                         else
@@ -216,7 +269,9 @@
     <hr class="w-100 my-0 bg-none"/>
 </center>
 </body>
+<script src="~/main/utils.js" asp-append-version="true"></script>
 <script>
+    formatDateTimes();
     window.print();
 </script>
 </html>

BTCPayServer/Views/UIPaymentRequest/EditPaymentRequest.cshtml

@@ -144,7 +144,7 @@
                                 <div class="accordion-body">
                                     <div class="form-group">
                                         <label asp-for="CustomCSSLink" class="form-label"></label>
-                                        <a href="https://docs.btcpayserver.org/Development/Theme/#2-bootstrap-themes" target="_blank" rel="noreferrer noopener" title="More information...">
+                                        <a href="https://docs.btcpayserver.org/Development/Theme/" target="_blank" rel="noreferrer noopener" title="More information...">
                                             <vc:icon symbol="info" />
                                         </a>
                                         <input asp-for="CustomCSSLink" class="form-control" />

BTCPayServer/Views/UIPaymentRequest/ViewPaymentRequest.cshtml

@@ -118,7 +118,10 @@
                     </p>
                     <dl class="mt-n1 mb-4" v-if="srvModel.amountCollected > 0 && srvModel.amountDue > 0">
                         <div class="progress bg-light d-flex mb-3 d-print-none" style="height:5px">
-                            <div class="progress-bar bg-primary" role="progressbar" style="width:@(Model.AmountCollected/Model.Amount*100)%" v-bind:style="{ width: (srvModel.amountCollected/srvModel.amount*100) + '%' }"></div>
+                            @{
+                                var prcnt = Model.Amount == 0? 100:  Model.AmountCollected / Model.Amount * 100;
+                            }
+                            <div class="progress-bar bg-primary" role="progressbar" style="width:@prcnt%" v-bind:style="{ width: (srvModel.amountCollected/srvModel.amount*100) + '%' }"></div>
                         </div>
                         <div class="d-flex flex-wrap gap-3 align-items-center justify-content-between">
                             <div class="d-flex d-print-inline-block flex-column gap-1">

BTCPayServer/Views/UIPullPayment/EditPullPayment.cshtml

@@ -74,7 +74,7 @@
                                 <div class="accordion-body">
                                     <div class="form-group">
                                         <label asp-for="CustomCSSLink" class="form-label"></label>
-                                        <a href="https://docs.btcpayserver.org/Development/Theme/#2-bootstrap-themes" target="_blank" rel="noreferrer noopener">
+                                        <a href="https://docs.btcpayserver.org/Development/Theme/" target="_blank" rel="noreferrer noopener">
                                             <vc:icon symbol="info" />
                                         </a>
                                         <input asp-for="CustomCSSLink" class="form-control" />

BTCPayServer/Views/UIPullPayment/ViewPullPayment.cshtml

@@ -58,7 +58,7 @@
                                         <select class="form-select w-auto" asp-for="SelectedPaymentMethod" asp-items="Model.PaymentMethods.Select(id => new SelectListItem(id.ToPrettyString(), id.ToString()))"></select>
                                     }
                                     <button type="button" class="btn btn-secondary only-for-js" data-bs-toggle="modal" data-bs-target="#scanModal" title="Scan destination with camera" id="scandestination-button">
-                                        <i class="fa fa-camera"></i>
+                                        <vc:icon symbol="scan-qr"/>
                                     </button>
                                 </div>
                             </div>
@@ -202,7 +202,7 @@
             </p>
 			@if (Model.LnurlEndpoint is not null)
 			{
-				<p id="BoltcardActions" style="visibility:hidden">
+				<p id="BoltcardActions">
 					<a id="SetupBoltcard" asp-action="SetupBoltcard" asp-controller="UIPullPayment" asp-route-pullPaymentId="@Model.Id" asp-route-command="configure-boltcard">
 						Setup Boltcard
 					</a>
@@ -226,14 +226,13 @@
     <script src="~/vendor/ur-registry/urlib.min.js" asp-append-version="true"></script>
     <script>
         document.addEventListener("DOMContentLoaded", () => {
-			const isAndroid = /(android)/i.test(navigator.userAgent);
-			if (isAndroid) {
+			var isMobile = /Android|webOS|iPhone|iPad|iPod|BlackBerry|IEMobile|Opera Mini/i.test(navigator.userAgent);
+			if (isMobile) {
 				document.getElementById("SetupBoltcard").setAttribute('target', '_blank');
-				document.getElementById("SetupBoltcard").setAttribute('href', @Safe.Json(@Model.SetupDeepLink));
+				document.getElementById("SetupBoltcard").setAttribute('href', @Safe.Json(Model.SetupDeepLink));
 				document.getElementById("ResetBoltcard").setAttribute('target', '_blank');
-				document.getElementById("ResetBoltcard").setAttribute('href', @Safe.Json(@Model.ResetDeepLink));
+				document.getElementById("ResetBoltcard").setAttribute('href', @Safe.Json(Model.ResetDeepLink));
 			}
-			document.getElementById("BoltcardActions").style.visibility = "visible";
 
             window.qrApp = initQRShow({});
             delegate('click', 'button[page-qr]', event => {

BTCPayServer/Views/UIReports/StoreReports.cshtml

@@ -32,7 +32,7 @@
             </a>
         </h2>
         <div class="d-flex flex-wrap gap-3">
-	        <a cheat-mode="true" class="btn btn-outline-info text-nowrap" asp-action="StoreReports" asp-route-fakeData="true" asp-route-viewName="@Model.Request?.ViewName">Create fake date</a>
+	        <a cheat-mode="true" class="btn btn-outline-info text-nowrap" asp-action="StoreReports" asp-route-fakeData="true" asp-route-viewName="@Model.Request?.ViewName">Create fake data</a>
 	        <button id="exportCSV" class="btn btn-primary text-nowrap" type="button">Export</button>
         </div>
     </div>

BTCPayServer/Views/UIServer/Branding.cshtml

@@ -69,7 +69,7 @@
                 <div>
                     <label asp-for="CustomTheme" class="form-check-label"></label>
                     <div class="text-muted">
-                        <a href="https://docs.btcpayserver.org/Development/Theme/#1-custom-themes" target="_blank" rel="noreferrer noopener">Adjust the design</a>
+                        <a href="https://docs.btcpayserver.org/Development/Theme/" target="_blank" rel="noreferrer noopener">Adjust the design</a>
                         of your BTCPay Server instance to your needs.
                     </div>
                 </div>

BTCPayServer/Views/UIStorePullPayments/NewPullPayment.cshtml

@@ -110,7 +110,7 @@
                             <div class="accordion-body">
                                 <div class="form-group">
                                     <label asp-for="CustomCSSLink" class="form-label"></label>
-                                    <a href="https://docs.btcpayserver.org/Development/Theme/#2-bootstrap-themes" target="_blank" rel="noreferrer noopener" title="More information...">
+                                    <a href="https://docs.btcpayserver.org/Development/Theme/" target="_blank" rel="noreferrer noopener" title="More information...">
                                         <vc:icon symbol="info" />
                                     </a>
                                     <input asp-for="CustomCSSLink" class="form-control" />

BTCPayServer/Views/UIStorePullPayments/Payouts.cshtml

@@ -7,8 +7,6 @@
 @model BTCPayServer.Models.WalletViewModels.PayoutsModel
 
 @inject IEnumerable<IPayoutHandler> PayoutHandlers;
-@inject PayoutProcessorService _payoutProcessorService;
-@inject IEnumerable<IPayoutProcessorFactory> _payoutProcessorFactories;
 @{
     var storeId = Context.GetRouteValue("storeId") as string;
     ViewData.SetActivePage(StoreNavPages.Payouts, $"Payouts{(string.IsNullOrEmpty(Model.PullPaymentName) ? string.Empty : " for pull payment " + Model.PullPaymentName)}", Context.GetStoreData().Id);
@@ -24,15 +22,16 @@
             return;
         stateActions.AddRange(payoutHandler.GetPayoutSpecificActions().Where(pair => pair.Key == Model.PayoutState).SelectMany(pair => pair.Value));
     }
+
     switch (Model.PayoutState)
     {
         case PayoutState.AwaitingApproval:
+            if (!Model.HasPayoutProcessor) stateActions.Add(("approve-pay", "Approve & Send"));
             stateActions.Add(("approve", "Approve"));
-            stateActions.Add(("approve-pay", "Approve & Send"));
             stateActions.Add(("cancel", "Cancel"));
             break;
         case PayoutState.AwaitingPayment:
-            stateActions.Add(("pay", "Send"));
+            if (!Model.HasPayoutProcessor) stateActions.Add(("pay", "Send"));
             stateActions.Add(("cancel", "Cancel"));
             stateActions.Add(("mark-paid", "Mark as already paid"));
             break;
@@ -87,11 +86,7 @@
 
 <partial name="_StatusMessage" />
 
-@if (_payoutProcessorFactories.Any(factory => factory.GetSupportedPaymentMethods().Contains(paymentMethodId)) && !(await _payoutProcessorService.GetProcessors(new PayoutProcessorService.PayoutProcessorQuery()
-{
-    Stores = new[] { storeId },
-    PaymentMethods = new[] { Model.PaymentMethodId }
-})).Any())
+@if (!Model.HasPayoutProcessor)
 {
     <div class="alert alert-info mb-5" role="alert" permission="@Policies.CanModifyStoreSettings">
         <strong>Pro tip:</strong> There are supported but unconfigured Payout Processors for this payout payment method.<br/>

BTCPayServer/Views/UIStores/CheckoutAppearance.cshtml

@@ -205,7 +205,7 @@
                 </div>
                 <div class="form-group">
                     <label asp-for="CustomLogo" class="form-label"></label>
-                    <a href="https://docs.btcpayserver.org/Development/Theme/#checkout-page-themes" target="_blank" rel="noreferrer noopener">
+                    <a href="https://docs.btcpayserver.org/Development/Theme/" target="_blank" rel="noreferrer noopener">
                         <vc:icon symbol="info" />
                     </a>
                     <input asp-for="CustomLogo" class="form-control" />
@@ -213,7 +213,7 @@
                 </div>
                 <div class="form-group mb-0">
                     <label asp-for="CustomCSS" class="form-label"></label>
-                    <a href="https://docs.btcpayserver.org/Development/Theme/#checkout-page-themes" target="_blank" rel="noreferrer noopener">
+                    <a href="https://docs.btcpayserver.org/Development/Theme/" target="_blank" rel="noreferrer noopener">
                         <vc:icon symbol="info" />
                     </a>
                     <input asp-for="CustomCSS" class="form-control" />

BTCPayServer/wwwroot/img/readme/supporter_strike.svg

@@ -1 +1,12 @@
-<svg width="150" height="100" style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision" version="1.1" id="svg587" xml:space="preserve" xmlns="http://www.w3.org/2000/svg"><style id="style324">.st2{fill:#ffc214}.st3{fill:#f9f185}.st0{fill:#222221}.st1{fill:#272425}</style><g id="g931" transform="matrix(.375 0 0 .375 -306.863 -123.51)"><path fill-rule="evenodd" clip-rule="evenodd" d="M911.118 436.635c-7.865-3.02-11.793-11.842-8.774-19.707s11.842-11.793 19.707-8.774l56.773 21.793c.062.026.126.05.19.074l28.48 10.932c7.864 3.02 16.689-.909 19.706-8.774 3.02-7.865-.908-16.688-8.774-19.707v-.003l-28.48-10.932c-7.865-3.02-11.793-11.842-8.774-19.707 3.02-7.865 11.842-11.793 19.707-8.774l83.768 32.155c.2.077.399.158.594.242a84 84 0 0 1 1.08.406c39.325 15.095 58.967 59.21 43.87 98.535-15.095 39.324-59.21 58.965-98.534 43.87a78.402 78.402 0 0 1-2.249-.903c-.36-.11-.72-.232-1.076-.37l-82.117-31.521c-7.865-3.02-11.793-11.842-8.774-19.707s11.842-11.793 19.707-8.774l28.477 10.931-.002-.007.006.002c7.865 3.02 16.688-.909 19.706-8.774 3.02-7.865-.908-16.688-8.773-19.707l-12.817-4.92v-.001z" fill="currentColor" id="path1" style="clip-rule:evenodd;fill:#000;fill-rule:evenodd;stroke-width:1.52532;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"/></g></svg>
+<svg width="150" height="100" style="clip-rule:evenodd;fill-rule:evenodd;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision" version="1.1" id="svg587" xml:space="preserve" xmlns="http://www.w3.org/2000/svg">
+<rect width="100%" height="100%" fill="#ffffff"/>
+    <style id="style324">
+.st2{fill:#ffc214}
+.st3{fill:#f9f185}
+.st0{fill:#222221}
+.st1{fill:#272425}
+</style>
+    <g id="g931" transform="matrix(.375 0 0 .375 -306.863 -123.51)">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M911.118 436.635c-7.865-3.02-11.793-11.842-8.774-19.707s11.842-11.793 19.707-8.774l56.773 21.793c.062.026.126.05.19.074l28.48 10.932c7.864 3.02 16.689-.909 19.706-8.774 3.02-7.865-.908-16.688-8.774-19.707v-.003l-28.48-10.932c-7.865-3.02-11.793-11.842-8.774-19.707 3.02-7.865 11.842-11.793 19.707-8.774l83.768 32.155c.2.077.399.158.594.242a84 84 0 0 1 1.08.406c39.325 15.095 58.967 59.21 43.87 98.535-15.095 39.324-59.21 58.965-98.534 43.87a78.402 78.402 0 0 1-2.249-.903c-.36-.11-.72-.232-1.076-.37l-82.117-31.521c-7.865-3.02-11.793-11.842-8.774-19.707s11.842-11.793 19.707-8.774l28.477 10.931-.002-.007.006.002c7.865 3.02 16.688-.909 19.706-8.774 3.02-7.865-.908-16.688-8.773-19.707l-12.817-4.92v-.001z" fill="currentColor" id="path1" style="clip-rule:evenodd;fill:#000;fill-rule:evenodd;stroke-width:1.52532;image-rendering:optimizeQuality;shape-rendering:geometricPrecision;text-rendering:geometricPrecision"/>
+</g>
+</svg>

BTCPayServer/wwwroot/img/readme/supporter_tether.svg

@@ -0,0 +1,3 @@
+<svg width="150" height="100" viewBox="0 0 150 100" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M24.4825 0.862305H88.0496C89.5663 0.862305 90.9675 1.64827 91.7239 2.92338L110.244 34.1419C111.204 35.7609 110.919 37.8043 109.549 39.1171L58.5729 87.9703C56.9216 89.5528 54.2652 89.5528 52.6139 87.9703L1.70699 39.1831C0.305262 37.8398 0.0427812 35.7367 1.07354 34.1077L20.8696 2.82322C21.6406 1.60483 23.0087 0.862305 24.4825 0.862305ZM79.8419 14.8003V23.5597H61.7343V29.6329C74.4518 30.2819 83.9934 32.9475 84.0642 36.1425L84.0638 42.803C83.993 45.998 74.4518 48.6635 61.7343 49.3125V64.2168H49.7105V49.3125C36.9929 48.6635 27.4513 45.998 27.3805 42.803L27.381 36.1425C27.4517 32.9475 36.9929 30.2819 49.7105 29.6329V23.5597H31.6028V14.8003H79.8419ZM55.7224 44.7367C69.2943 44.7367 80.6382 42.4827 83.4143 39.4727C81.0601 36.9202 72.5448 34.9114 61.7343 34.3597V40.7183C59.7966 40.8172 57.7852 40.8693 55.7224 40.8693C53.6595 40.8693 51.6481 40.8172 49.7105 40.7183V34.3597C38.8999 34.9114 30.3846 36.9202 28.0304 39.4727C30.8066 42.4827 42.1504 44.7367 55.7224 44.7367Z" fill="#009393" transform="translate(20, 5)"/>
+</svg>

BTCPayServer/wwwroot/js/store-reports.js

@@ -185,7 +185,7 @@ function downloadCSV() {
 
     // Convert ISO8601 dates to YYYY-MM-DD HH:mm:ss so the CSV easily integrate with Excel
     modifyFields(srv.result.fields, data, 'amount', displayValue)
-    modifyFields(srv.result.fields, data, 'datetime', v => v? moment(v).format('YYYY-MM-DD hh:mm:ss'): v);
+    modifyFields(srv.result.fields, data, 'datetime', v => v ? moment(v).format('YYYY-MM-DD HH:mm:ss') : v);
     const csv = Papa.unparse({ fields: srv.result.fields.map(f => f.name), data });
     const blob = new Blob([csv], { type: 'text/csv;charset=utf-8;' });
     saveAs(blob, "export.csv");

BTCPayServer/wwwroot/main/site.css

@@ -473,7 +473,7 @@ svg.icon-note {
     font-weight: var(--btcpay-font-weight-bold);
 }
 
-.widget .table {
+.widget *:not([class*='table-responsive']) > .table {
     margin-left: -.5rem;
     margin-right: -.5rem;
     width: calc(100% + 1rem);

BTCPayServer/wwwroot/main/site.js

@@ -2,19 +2,6 @@ const baseUrl = Object.values(document.scripts).find(s => s.src.includes('/main/
 
 const flatpickrInstances = [];
 
-const formatDateTimes = format => {
-    // select only elements which haven't been initialized before, those without data-localized
-    document.querySelectorAll("time[datetime]:not([data-localized])").forEach($el => {
-        const date = new Date($el.getAttribute("datetime"));
-        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat
-        const { dateStyle = 'short', timeStyle = 'short' } = $el.dataset;
-        // initialize and set localized attribute
-        $el.dataset.localized = new Intl.DateTimeFormat('default', { dateStyle, timeStyle }).format(date);
-        // set text to chosen mode
-        const mode = format || $el.dataset.initial;
-        if ($el.dataset[mode]) $el.innerText = $el.dataset[mode];
-    });
-};
 
 const switchTimeFormat = event => {
     const curr = event.target.dataset.mode || 'localized';
@@ -166,8 +153,9 @@ document.addEventListener("DOMContentLoaded", () => {
     }
     
     // initialize timezone offset value if field is present in page
-    var timezoneOffset = new Date().getTimezoneOffset();
-    $("#TimezoneOffset").val(timezoneOffset);
+    const $timezoneOffset = document.getElementById("TimezoneOffset");
+    const timezoneOffset = new Date().getTimezoneOffset();
+    if ($timezoneOffset) $timezoneOffset.value = timezoneOffset;
 
     // localize all elements that have localizeDate class
     formatDateTimes();

BTCPayServer/wwwroot/main/utils.js

@@ -15,3 +15,17 @@ function debounce(key, fn, delay = 250) {
     clearTimeout(DEBOUNCE_TIMERS[key])
     DEBOUNCE_TIMERS[key] = setTimeout(fn, delay)
 }
+
+function formatDateTimes(format) {
+    // select only elements which haven't been initialized before, those without data-localized
+    document.querySelectorAll("time[datetime]:not([data-localized])").forEach($el => {
+        const date = new Date($el.getAttribute("datetime"));
+        // https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Intl/DateTimeFormat/DateTimeFormat
+        const { dateStyle = 'short', timeStyle = 'short' } = $el.dataset;
+        // initialize and set localized attribute
+        $el.dataset.localized = new Intl.DateTimeFormat('default', { dateStyle, timeStyle }).format(date);
+        // set text to chosen mode
+        const mode = format || $el.dataset.initial;
+        if ($el.dataset[mode]) $el.innerText = $el.dataset[mode];
+    });
+}

BTCPayServer/wwwroot/swagger/v1/swagger.template.users.json

@@ -92,7 +92,7 @@
                     "Users"
                 ],
                 "summary": "Create user",
-                "description": "Create a new user.\n\nThis operation can be called without authentication in any of this cases:\n* There is not any administrator yet on the server,\n* The subscriptions are not disabled in the server's policies.\n\nIf the first administrator is created by this call, subscriptions are automatically disabled.",
+                "description": "Create a new user.\n\nThis operation can be called without authentication in any of this cases:\n* There is not any administrator yet on the server,\n* User registrations are not disabled in the server's policies.\n\nIf the first administrator is created by this call, user registrations are automatically disabled.",
                 "requestBody": {
                     "x-name": "request",
                     "content": {
@@ -149,7 +149,7 @@
                         "description": "If you need to authenticate for this endpoint (ie. the server settings policies lock subscriptions and that an admin already exists)"
                     },
                     "403": {
-                        "description": "If you are authenticated but forbidden to create a new user (ie. you don't have the `unrestricted` permission on a server administrator or if you are not administrator and registrations are disabled in the server's policies)"
+                        "description": "If you are authenticated but forbidden to create a new user (ie. you don't have the `unrestricted` permission on a server administrator or if you are not administrator and user registrations are disabled in the server's policies)"
                     },
                     "429": {
                         "description": "DDoS protection if you are creating more than 2 accounts every minutes (non-admin only)"

Build/Version.csproj

@@ -1,5 +1,5 @@
 <Project>
   <PropertyGroup>
-		<Version>1.13.0</Version>
+		<Version>1.13.2</Version>
   </PropertyGroup>
 </Project>

Changelog.md

@@ -1,5 +1,45 @@
 # Changelog
 
+## 1.13.2
+
+### New features
+
+* Add refund reports (#5791) @NicolasDorier
+* Allow `lightning:` in html hyperlinks (#6002 #6001) @dennisreimann
+
+### Bug fixes
+
+* If you specified a 0 amount bolt 11 invoice for a payout, it would be incorrectly validated and not accepted. (#5943 #5819) @Kukks
+* Domain mapping constraint: Fix .onion case (#5948 #5917) @dennisreimann
+* Pull payment QR scan fixes (#5950) @dennisreimann
+* Server email settings: Fix missing password field (#5952 #5949) @dennisreimann
+* Fix: Some valid taproot PSBT couldn't parsed and show better error message (#5715 #5993) @NicolasDorier
+* Fix: Adding a label to a base58 addresses in the `Send Wallet` screen wasn't working (#6011) @NicolasDorier
+* Fix: When an invoice expires, the corresponding Shopify order remains pending instead of canceling (#6021 #6027) @Kukks
+
+### Improvements
+
+* Search: Display text filters in search input (#5986 #5984) @dennisreimann
+* POS: Allow overpay for articles with minimum price (#5997 #5995) @dennisreimann
+* Improve data display on receipt (#5896 #5882) @dennisreimann
+* Greenfield API clarifications (#5955) @ndeet
+* Improvements to receipts display for PoS @rockstardev
+* Fix layout on mobile on the dashboard (#5721 #6006) @dennisreimann
+
+## 1.13.1
+
+### Bug fixes
+
+* Fix: CSV exports from the Reports were exporting dates in 12-hour format instead of 24-hour format. (#5915, #5922) @TChukwuleta
+* Fix: Crash when configuring BTCPay Server with a non-default Postgres schema (Fix #5901) @NicolasDorier
+* Fix: A payment request with an amount of 0 no longer causes the payment request's page to crash (#5926) @Kukks
+
+### Improvements
+
+* Prevent unintentional double payouts (#5931, #5913) @dennisreimann
+* The `buyerEmail` field in a Payment Request's form will now set the email for the payment request (#5926) @Kukks
+* Added Tether as a supporter to the BTCPay Server Foundation (#5891) @rockstardev
+
 ## 1.13.0
 
 ### New feature

Dockerfile

@@ -1,4 +1,4 @@
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.101-bookworm-slim AS builder
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0.203-bookworm-slim AS builder
 ENV DOTNET_CLI_TELEMETRY_OPTOUT=1
 WORKDIR /source
 COPY nuget.config nuget.config
@@ -21,7 +21,7 @@ ARG CONFIGURATION_NAME=Release
 ARG GIT_COMMIT
 RUN cd BTCPayServer && dotnet publish -p:GitCommit=${GIT_COMMIT} --output /app/ --configuration ${CONFIGURATION_NAME}
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0.1-bookworm-slim
+FROM mcr.microsoft.com/dotnet/aspnet:8.0.3-bookworm-slim
 
 RUN apt-get update && apt-get install -y --no-install-recommends iproute2 openssh-client \
     && rm -rf /var/lib/apt/lists/* 

README.md

@@ -213,13 +213,15 @@ BTCPay Server software, logo and designs are provided under [MIT License](https:
 
 The BTCPay Server Project is proudly supported by these entities through the [BTCPay Server Foundation](https://foundation.btcpayserver.org/).
 
-[![Spiral](BTCPayServer/wwwroot/img/readme/supporter_spiral.svg)](https://spiral.xyz)
-[![Baillie Gifford](BTCPayServer/wwwroot/img/readme/supporter_bailliegifford.svg)](https://www.bailliegifford.com)
-[![Strike](BTCPayServer/wwwroot/img/readme/supporter_strike.svg)](https://strike.me)
-[![Human Rights Foundation](BTCPayServer/wwwroot/img/readme/supporter_hrf.svg)](https://hrf.org)
-[![LunaNode](BTCPayServer/wwwroot/img/readme/supporter_lunanode.svg)](https://lunanode.com)
-[![Wallet of Satoshi](BTCPayServer/wwwroot/img/readme/supporter_walletofsatoshi.svg)](https://walletofsatoshi.com/)
-[![Coincards](BTCPayServer/wwwroot/img/readme/supporter_coincards.svg)](https://coincards.com/)
-[![IVPN](BTCPayServer/wwwroot/img/readme/supporter_ivpn.svg)](https://ivpn.net/)
+[![Spiral](https://raw.githubusercontent.com/btcpayserver/btcpayserver/master/BTCPayServer/wwwroot/img/readme/supporter_spiral.svg)](https://spiral.xyz)
+[![OpenSats](https://raw.githubusercontent.com/btcpayserver/btcpayserver/master/BTCPayServer/wwwroot/img/readme/supporter_opensats.svg)](https://opensats.org)
+[![Baillie Gifford](https://raw.githubusercontent.com/btcpayserver/btcpayserver/master/BTCPayServer/wwwroot/img/readme/supporter_bailliegifford.svg)](https://www.bailliegifford.com)
+[![Tether](https://raw.githubusercontent.com/btcpayserver/btcpayserver/master/BTCPayServer/wwwroot/img/readme/supporter_tether.svg)](https://tether.to)
+[![Human Rights Foundation](https://raw.githubusercontent.com/btcpayserver/btcpayserver/master/BTCPayServer/wwwroot/img/readme/supporter_hrf.svg)](https://hrf.org)
+[![Strike](https://raw.githubusercontent.com/btcpayserver/btcpayserver/master/BTCPayServer/wwwroot/img/readme/supporter_strike.svg)](https://strike.me)
+[![LunaNode](https://raw.githubusercontent.com/btcpayserver/btcpayserver/master/BTCPayServer/wwwroot/img/readme/supporter_lunanode.svg)](https://lunanode.com)
+[![Wallet of Satoshi](https://raw.githubusercontent.com/btcpayserver/btcpayserver/master/BTCPayServer/wwwroot/img/readme/supporter_walletofsatoshi.svg)](https://walletofsatoshi.com/)
+[![Coincards](https://raw.githubusercontent.com/btcpayserver/btcpayserver/master/BTCPayServer/wwwroot/img/readme/supporter_coincards.svg)](https://coincards.com/)
+[![IVPN](https://raw.githubusercontent.com/btcpayserver/btcpayserver/master/BTCPayServer/wwwroot/img/readme/supporter_ivpn.svg)](https://ivpn.net/)
 
 If you'd like to support the project, please visit the [donation page](https://btcpayserver.org/donate/).

docs/greenfield-authorization.md

@@ -1,24 +1,33 @@
 
 # GreenField API Authorization Flow
 
-The GreenField API allows two modes of authentication to its endpoints: Basic auth and API Keys. 
+The GreenField API allows two modes of authentication to its endpoints: Basic Auth and API keys.
 
 ## Basic auth
 Basic auth allows you to seamlessly integrate with BTCPay Server's user system using only a traditional user/password login form. This is however a security risk if the application is a third party as they will receive your credentials in plain text and will be able to access your full account.
 
 ## API Keys
-BTCPay Server's GreenField API also allows users to generate API keys with [specific permissions](https://docs.btcpayserver.org/API/Greenfield/v1/#section/Authentication/API%20Key). **If you are integrating BTCPay Server into your third-party application, this is the recommended way.**
+BTCPay Server's Greenfield API also allows users to generate API keys with [specific permissions](https://docs.btcpayserver.org/API/Greenfield/v1/#section/Authentication/API_Key). **If you are integrating BTCPay Server into your third-party application, this is the recommended way.**
 
-Asking a user to generate a dedicated API key, with a specific set of permissions can be a bad UX experience. For this scenario, we have the [Authorize User UI](https://docs.btcpayserver.org/API/Greenfield/v1/#tag/Authorization). This allows external applications to request the user to generate an API key with a specific set of permissions by simply generating a URL to BTCPay Server and redirecting the user to it.
+### Manually create an API key
+Users can create a new API key in the BTCPay Server UI under `Account` -> `Manage account` -> `API keys`
+
+### Create API keys over the API itself
+
+A user can create an API key for themselves using the [Create API Key endpoint](https://docs.btcpayserver.org/API/Greenfield/v1/#operation/APIKeys_CreateAPIKey) via Basic Auth or an unrestricted API key. Server administrators can create API keys for any user using the [Create API key for user endpoint](https://docs.btcpayserver.org/API/Greenfield/v1/#operation/ApiKeys_CreateUserApiKey).
+
+### Interactive API key setup flow
+
+Asking a user to generate a dedicated API key, with a specific set of permissions manually can be a bad UX experience. For this scenario, we have the [Authorize User UI](https://docs.btcpayserver.org/API/Greenfield/v1/#tag/Authorization). This allows external applications to request the user to generate an API key with a specific set of permissions by simply generating a URL to BTCPay Server and redirecting the user to it.
 Additionally, there are 2 optional parameters to the endpoint which allow a more seamless integration:
 * if `redirect` is specified, once the API key is created, BTCPay Server redirects the user via a POST submission to the specified `redirect` URL, with a json body containing the API key, user id, and permissions granted.
 * if `applicationIdentifier` is specified (along with `redirect`), BTCPay Server will check if there is an existing API key associated with the user that also has this application identifier, redirect host AND the permissions required match. `applicationIdentifier` is ignored if `redirect` is not specified.
 
 Some examples of a generated Authorize URL:
-* `https://mainnet.demo.btcpayserver.org/api-keys/authorize` - A simplistic request, where no permission is requested. Useful to prove that a user exists on a specific BTCPay Server instance. 
+* `https://mainnet.demo.btcpayserver.org/api-keys/authorize` - A simplistic request, where no permission is requested. Useful to prove that a user exists on a specific BTCPay Server instance.
 * `https://mainnet.demo.btcpayserver.org/api-keys/authorize?applicationName=Your%20Application` - Indicates that the API key is being generated for `Your Application`
 * `https://mainnet.demo.btcpayserver.org/api-keys/authorize?applicationName=Your%20Application&redirect=http://gozo.com` - Redirects the user via a POST to `http://gozo.com` with a JSON body containing the API key and its info.
 * `https://mainnet.demo.btcpayserver.org/api-keys/authorize?applicationName=Your%20Application&redirect=http://gozo.com&applicationIdentifier=gozo` - Attempts to match a previously created API key based on the app identifier, domain and permissions and is prompted.
 * `https://mainnet.demo.btcpayserver.org/api-keys/authorize?permissions=btcpay.store.cancreateinvoice&permissions=btcpay.store.canviewinvoices` - A request asking for permissions to create and view invoices on all stores available to the user
 * `https://mainnet.demo.btcpayserver.org/api-keys/authorize?permissions=btcpay.store.cancreateinvoice&permissions=btcpay.store.canviewinvoices&selectiveStores=true` - A request asking for permissions to create and view invoices on stores but also allows the user to choose which stores the application will have the permission to.
-* `https://mainnet.demo.btcpayserver.org/api-keys/authorize?permissions=btcpay.store.cancreateinvoice&permissions=btcpay.store.canviewinvoices&strict=false` - A request asking for permissions but allows the user to remove or add to the requested permission list. 
+* `https://mainnet.demo.btcpayserver.org/api-keys/authorize?permissions=btcpay.store.cancreateinvoice&permissions=btcpay.store.canviewinvoices&strict=false` - A request asking for permissions but allows the user to remove or add to the requested permission list.