Bump, changelog

* BUmp LNURL

* Show app view link in nav when not enoguh permission to modify

* FIx permission misalignment on create pull payments

We have explicit permissions for pull payment creation, even allow them to be created through the invoices, but the create ui and cta were blocked behind  canmodify store permission.

* Make Ln address pass an invoiceId in the context to resolve breaking change

BTCPayServer.Abstractions/Contracts/IPluginHookService.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Threading.Tasks;
 
 namespace BTCPayServer.Abstractions.Contracts
@@ -6,5 +7,8 @@ namespace BTCPayServer.Abstractions.Contracts
     {
         Task ApplyAction(string hook, object args);
         Task<object> ApplyFilter(string hook, object args);
+
+        event EventHandler<(string hook, object args)> ActionInvoked;
+        event EventHandler<(string hook, object args)> FilterInvoked;
     }
 }

BTCPayServer.Abstractions/Services/Safe.cs

@@ -1,3 +1,4 @@
+using System.Web;
 using Ganss.XSS;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Rendering;
@@ -21,6 +22,11 @@ namespace BTCPayServer.Abstractions.Services
         {
             return _htmlHelper.Raw(_htmlSanitizer.Sanitize(value));
         }
+        
+        public IHtmlContent RawEncode(string value)
+        {
+            return _htmlHelper.Raw(HttpUtility.HtmlEncode(_htmlSanitizer.Sanitize(value)));
+        }
 
         public IHtmlContent Json(object model)
         {

BTCPayServer.Abstractions/TagHelpers/PermissionTagHelper.cs

@@ -12,13 +12,11 @@ public class PermissionTagHelper : TagHelper
 {
     private readonly IAuthorizationService _authorizationService;
     private readonly IHttpContextAccessor _httpContextAccessor;
-    private readonly ILogger<PermissionTagHelper> _logger;
 
-    public PermissionTagHelper(IAuthorizationService authorizationService, IHttpContextAccessor httpContextAccessor, ILogger<PermissionTagHelper> logger)
+    public PermissionTagHelper(IAuthorizationService authorizationService, IHttpContextAccessor httpContextAccessor)
     {
         _authorizationService = authorizationService;
         _httpContextAccessor = httpContextAccessor;
-        _logger = logger;
     }
 
     public string Permission { get; set; }

BTCPayServer.Client/BTCPayServerClient.OnChainWallet.cs

@@ -55,7 +55,7 @@ namespace BTCPayServer.Client
         }
 
         public virtual async Task<IEnumerable<OnChainWalletTransactionData>> ShowOnChainWalletTransactions(
-            string storeId, string cryptoCode, TransactionStatus[] statusFilter = null, string labelFilter = null,
+            string storeId, string cryptoCode, TransactionStatus[] statusFilter = null, string labelFilter = null, int skip = 0,
             CancellationToken token = default)
         {
             var query = new Dictionary<string, object>();
@@ -67,6 +67,10 @@ namespace BTCPayServer.Client
             {
                 query.Add(nameof(labelFilter), labelFilter);
             }
+            if (skip != 0)
+            {
+                query.Add(nameof(skip), skip);
+            }
             var response =
                 await _httpClient.SendAsync(
                     CreateHttpRequest($"api/v1/stores/{storeId}/payment-methods/onchain/{cryptoCode}/wallet/transactions", query), token);

BTCPayServer.Client/Models/CreatePayoutThroughStoreRequest.cs

@@ -1,8 +1,11 @@
 #nullable enable
+using Newtonsoft.Json.Linq;
+
 namespace BTCPayServer.Client.Models;
 
 public class CreatePayoutThroughStoreRequest : CreatePayoutRequest
 {
     public string? PullPaymentId { get; set; }
     public bool? Approved { get; set; }
+    public JObject? Metadata { get; set; }
 }

BTCPayServer.Client/Models/InvoiceData.cs

@@ -87,7 +87,6 @@ namespace BTCPayServer.Client.Models
             public string DefaultLanguage { get; set; }
             public CheckoutType? CheckoutType { get; set; }
             public bool? LazyPaymentMethods { get; set; }
-            public string ExplicitRateScript { get; set; }
         }
     }
     public class InvoiceData : InvoiceDataBase

BTCPayServer.Client/Models/LightningAutomatedPayoutSettings.cs

@@ -10,4 +10,9 @@ public class LightningAutomatedPayoutSettings
 
     [JsonConverter(typeof(TimeSpanJsonConverter.Seconds))]
     public TimeSpan IntervalSeconds { get; set; }
+
+    public int? CancelPayoutAfterFailures { get; set; }
+    [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+    public bool  ProcessNewPayoutsInstantly { get; set; }
+    
 }

BTCPayServer.Client/Models/OnChainAutomatedPayoutSettings.cs

@@ -12,4 +12,8 @@ public class OnChainAutomatedPayoutSettings
     public TimeSpan IntervalSeconds { get; set; }
 
     public int? FeeBlockTarget { get; set; }
+    [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+    public decimal Threshold { get; set; }
+    [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+    public bool  ProcessNewPayoutsInstantly { get; set; }
 }

BTCPayServer.Client/Models/PayoutData.cs

@@ -31,5 +31,6 @@ namespace BTCPayServer.Client.Models
         public PayoutState State { get; set; }
         public int Revision { get; set; }
         public JObject PaymentProof { get; set; }
+        public JObject Metadata { get; set; }
     }
 }

BTCPayServer.Client/Models/StoreReportRequest.cs

@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using BTCPayServer.JsonConverters;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
+
+namespace BTCPayServer.Client.Models;
+
+public class StoreReportRequest
+{
+    public string ViewName { get; set; }
+    public TimePeriod TimePeriod { get; set; }
+}
+public class StoreReportResponse
+{
+    public class Field
+    {
+        public Field()
+        {
+
+        }
+        public Field(string name, string type)
+        {
+            Name = name;
+            Type = type;
+        }
+        public string Name { get; set; }
+        public string Type { get; set; }
+    }
+    public IList<Field> Fields { get; set; } = new List<Field>();
+    public List<JArray> Data { get; set; }
+    public DateTimeOffset From { get; set; }
+    public DateTimeOffset To { get; set; }
+    public List<ChartDefinition> Charts { get; set; }
+
+    public int GetIndex(string fieldName)
+    {
+        return Fields.ToList().FindIndex(f => f.Name == fieldName);
+    }
+}
+
+public class ChartDefinition
+{
+    public string Name { get; set; }
+
+    public List<string> Groups { get; set; } = new List<string>();
+    public List<string> Totals { get; set; } = new List<string>();
+    public bool HasGrandTotal { get; set; }
+    public List<string> Aggregates { get; set; } = new List<string>();
+    public List<string> Filters { get; set; } = new List<string>();
+}
+
+public class TimePeriod
+{
+    [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
+    public DateTimeOffset? From { get; set; }
+    [JsonConverter(typeof(NBitcoin.JsonConverters.DateTimeToUnixTimeConverter))]
+    public DateTimeOffset? To { get; set; }
+}

BTCPayServer.Client/Models/StoreReportsResponse.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace BTCPayServer.Client.Models
+{
+    public class StoreReportsResponse
+    {
+        public string ViewName { get; set; }
+        public StoreReportResponse.Field[] Fields
+        {
+            get;
+            set;
+        }
+    }
+}

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.BGold.cs

@@ -16,7 +16,7 @@ namespace BTCPayServer
                 DefaultRateRules = new[]
                 {
                     "BTG_X = BTG_BTC * BTC_X",
-                    "BTG_BTC = bitfinex(BTG_BTC)",
+                    "BTG_BTC = gate(BTG_BTC)",
                 },
                 CryptoImagePath = "imlegacy/btg.svg",
                 LightningImagePath = "imlegacy/btg-lightning.svg",

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Bitcore.cs

@@ -17,7 +17,7 @@ namespace BTCPayServer
                 DefaultRateRules = new[]
                 {
                                 "BTX_X = BTX_BTC * BTC_X",
-                                "BTX_BTC = hitbtc(BTX_BTC)"
+                                "BTX_BTC = graviex(BTX_BTC)"
                 },
                 CryptoImagePath = "imlegacy/bitcore.svg",
                 LightningImagePath = "imlegacy/bitcore-lightning.svg",

BTCPayServer.Common/Altcoins/BTCPayNetworkProvider.Chaincoin.cs

@@ -1,32 +0,0 @@
-using NBitcoin;
-
-namespace BTCPayServer
-{
-    public partial class BTCPayNetworkProvider
-    {
-        public void InitChaincoin()
-        {
-            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("CHC");
-            Add(new BTCPayNetwork()
-            {
-                CryptoCode = nbxplorerNetwork.CryptoCode,
-                DisplayName = "Chaincoin",
-                BlockExplorerLink = NetworkType == ChainName.Mainnet
-                    ? "https://explorer.chaincoin.org/Explorer/Transaction/{0}"
-                    : "https://test.explorer.chaincoin.org/Explorer/Transaction/tx/{0}",
-                NBXplorerNetwork = nbxplorerNetwork,
-                DefaultRateRules = new[]
-                    {
-                        "CHC_X = CHC_BTC * BTC_X",
-                        "CHC_BTC = txbit(CHC_X)"
-                    },
-                CryptoImagePath = "imlegacy/chaincoin.png",
-                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
-                //https://github.com/satoshilabs/slips/blob/master/slip-0044.md
-                CoinType = NetworkType == ChainName.Mainnet ? new KeyPath("711'")
-                    : new KeyPath("1'")
-            });
-        }
-    }
-}
-

BTCPayServer.Common/Altcoins/Liquid/BTCPayNetworkProvider.LiquidAssets.cs

@@ -63,6 +63,7 @@ namespace BTCPayServer
                     "LCAD_CAD = 1",
                     "LCAD_X = CAD_BTC * BTC_X",
                     "LCAD_BTC = bylls(CAD_BTC)",
+                    "CAD_BTC = LCAD_BTC"
                 },
                 AssetId = new uint256("0e99c1a6da379d1f4151fb9df90449d40d0608f6cb33a5bcbfc8c265f42bab0a"),
                 DisplayName = "Liquid CAD",

BTCPayServer.Common/Altcoins/Liquid/ElementsLikeBtcPayNetwork.cs

@@ -1,4 +1,5 @@
 #if ALTCOINS
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using BTCPayServer.Common;
@@ -34,12 +35,12 @@ namespace BTCPayServer
                     output.Value is AssetMoney assetMoney && assetMoney.AssetId == AssetId));
         }
 
-        public override PaymentUrlBuilder GenerateBIP21(string cryptoInfoAddress, Money cryptoInfoDue)
+        public override PaymentUrlBuilder GenerateBIP21(string cryptoInfoAddress, decimal? cryptoInfoDue)
         {
             //precision 0: 10 = 0.00000010
             //precision 2: 10 = 0.00001000
             //precision 8: 10 = 10
-            var money = cryptoInfoDue is null ? null : new Money(cryptoInfoDue.ToDecimal(MoneyUnit.BTC) / decimal.Parse("1".PadRight(1 + 8 - Divisibility, '0')), MoneyUnit.BTC);
+            var money = cryptoInfoDue / (decimal)Math.Pow(10, 8 - Divisibility);
             var builder = base.GenerateBIP21(cryptoInfoAddress, money);
             builder.QueryParams.Add("assetid", AssetId.ToString());
             return builder;

BTCPayServer.Common/Altcoins/Monero/RPC/JsonRpcClient.cs

@@ -45,10 +45,10 @@ namespace BTCPayServer.Services.Altcoins.Monero.RPC
             httpRequest.Headers.Authorization = new AuthenticationHeaderValue("Basic",
                 Convert.ToBase64String(Encoding.Default.GetBytes($"{_username}:{_password}")));
 
-            var rawResult = await _httpClient.SendAsync(httpRequest, cts);
-
-            var rawJson = await rawResult.Content.ReadAsStringAsync();
+            HttpResponseMessage rawResult = await _httpClient.SendAsync(httpRequest, cts);
             rawResult.EnsureSuccessStatusCode();
+            var rawJson = await rawResult.Content.ReadAsStringAsync();
+            
             JsonRpcResult<TResponse> response;
             try
             {

BTCPayServer.Common/BTCPayNetwork.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.Linq;
 using BTCPayServer.Common;
@@ -87,13 +88,13 @@ namespace BTCPayServer
             });
         }
 
-        public virtual PaymentUrlBuilder GenerateBIP21(string cryptoInfoAddress, Money cryptoInfoDue)
+        public virtual PaymentUrlBuilder GenerateBIP21(string cryptoInfoAddress, decimal? cryptoInfoDue)
         {
             var builder = new PaymentUrlBuilder(this.NBitcoinNetwork.UriScheme);
             builder.Host = cryptoInfoAddress;
-            if (cryptoInfoDue != null && cryptoInfoDue != Money.Zero)
+            if (cryptoInfoDue is not null && cryptoInfoDue.Value != 0.0m)
             {
-                builder.QueryParams.Add("amount", cryptoInfoDue.ToString(false, true));
+                builder.QueryParams.Add("amount", cryptoInfoDue.Value.ToString(CultureInfo.InvariantCulture));
             }
             return builder;
         }

BTCPayServer.Common/BTCPayNetworkProvider.cs

@@ -56,7 +56,6 @@ namespace BTCPayServer
             InitViacoin();
             InitMonero();
             InitZcash();
-            InitChaincoin();
             // InitArgoneum();//their rate source is down 9/15/20.
             // InitMonetaryUnit(); Not supported from Bittrex from 11/23/2022, dead shitcoin
 

BTCPayServer.Data/ApplicationDbContextFactory.cs

@@ -1,3 +1,6 @@
+using System;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Contracts;
 using BTCPayServer.Abstractions.Models;
 using Microsoft.EntityFrameworkCore;

BTCPayServer.Data/Data/PayoutProcessorData.cs

@@ -8,6 +8,7 @@ namespace BTCPayServer.Data;
 public class AutomatedPayoutBlob
 {
     public TimeSpan Interval { get; set; } = TimeSpan.FromHours(1);
+    public bool ProcessNewPayoutsInstantly { get; set; }
 }
 public class PayoutProcessorData : IHasBlobUntyped
 {

BTCPayServer.Rating/Providers/ExchangeRateHostRateProvider.cs

@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using BTCPayServer.Rating;
+using Newtonsoft.Json.Linq;
+
+namespace BTCPayServer.Services.Rates;
+
+
+public class ExchangeRateHostRateProvider : IRateProvider
+{
+    public RateSourceInfo RateSourceInfo => new("exchangeratehost", "Yadio", "https://api.exchangerate.host/latest?base=BTC");
+    private readonly HttpClient _httpClient;
+    public ExchangeRateHostRateProvider(HttpClient httpClient)
+    {
+        _httpClient = httpClient ?? new HttpClient();
+    }
+
+    public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
+    {
+        var response = await _httpClient.GetAsync(RateSourceInfo.Url, cancellationToken);
+        response.EnsureSuccessStatusCode();
+        var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
+        if(jobj["success"].Value<bool>() is not true || !jobj["base"].Value<string>().Equals("BTC", StringComparison.InvariantCulture))
+            throw new Exception("exchangerate.host returned a non success response or the base currency was not the requested one (BTC)");
+        var results = (JObject) jobj["rates"] ;
+        //key value is currency code to rate value
+        var list = new List<PairRate>();
+        foreach (var item in results)
+        {
+            string name = item.Key;
+            var value = item.Value.Value<decimal>();
+            list.Add(new PairRate(new CurrencyPair("BTC", name), new BidAsk(value)));
+        }
+
+        return list.ToArray();
+    }
+}

BTCPayServer.Rating/Providers/FreeCurrencyRatesRateProvider.cs

@@ -0,0 +1,36 @@
+using System.Collections.Generic;
+using System.Net.Http;
+using System.Threading;
+using System.Threading.Tasks;
+using BTCPayServer.Rating;
+using Newtonsoft.Json.Linq;
+
+namespace BTCPayServer.Services.Rates;
+
+public class FreeCurrencyRatesRateProvider : IRateProvider
+{
+    public RateSourceInfo RateSourceInfo => new("free-currency-rates", "Free Currency Rates", "https://cdn.jsdelivr.net/gh/fawazahmed0/currency-api@1/latest/currencies/btc.min.json");
+    private readonly HttpClient _httpClient;
+    public FreeCurrencyRatesRateProvider(HttpClient httpClient)
+    {
+        _httpClient = httpClient ?? new HttpClient();
+    }
+
+    public async Task<PairRate[]> GetRatesAsync(CancellationToken cancellationToken)
+    {
+        var response = await _httpClient.GetAsync(RateSourceInfo.Url, cancellationToken);
+        response.EnsureSuccessStatusCode();
+        var jobj = await response.Content.ReadAsAsync<JObject>(cancellationToken);
+        var results = (JObject) jobj["btc"] ;
+        //key value is currency code to rate value
+        var list = new List<PairRate>();
+        foreach (var item in results)
+        {
+            string name = item.Key;
+            var value = item.Value.Value<decimal>();
+            list.Add(new PairRate(new CurrencyPair("BTC", name), new BidAsk(value)));
+        }
+
+        return list.ToArray();
+    }
+}

BTCPayServer.Tests/AltcoinTests/AltcoinTests.cs

@@ -663,7 +663,7 @@ donation:
                 Assert.Equal(3, vmview.Items.Length);
                 Assert.Equal("good apple", vmview.Items[0].Title);
                 Assert.Equal("orange", vmview.Items[1].Title);
-                Assert.Equal(10.0m, vmview.Items[1].Price.Value);
+                Assert.Equal(10.0m, vmview.Items[1].Price);
                 Assert.Equal("{0} Purchase", vmview.ButtonText);
                 Assert.Equal("Nicolas Sexy Hair", vmview.CustomButtonText);
                 Assert.Equal("Wanna tip?", vmview.CustomTipText);
@@ -680,7 +680,7 @@ donation:
                 Assert.IsType<RedirectToActionResult>(publicApps
                     .ViewPointOfSale(app.Id, PosViewType.Cart, 0, choiceKey: "apple").Result);
 
-                invoices = user.BitPay.GetInvoices();
+                invoices = await user.BitPay.GetInvoicesAsync();
                 var appleInvoice = invoices.SingleOrDefault(invoice => invoice.ItemCode.Equals("apple"));
                 Assert.NotNull(appleInvoice);
                 Assert.Equal("good apple", appleInvoice.ItemDesc);
@@ -689,7 +689,7 @@ donation:
                 var action = Assert.IsType<RedirectToActionResult>(publicApps
                     .ViewPointOfSale(app.Id, PosViewType.Cart, 6.6m, choiceKey: "donation").Result);
                 Assert.Equal(nameof(UIInvoiceController.Checkout), action.ActionName);
-                invoices = user.BitPay.GetInvoices();
+                invoices = await user.BitPay.GetInvoicesAsync();
                 var donationInvoice = invoices.Single(i => i.Price == 6.6m);
                 Assert.NotNull(donationInvoice);
                 Assert.Equal("CAD", donationInvoice.Currency);

BTCPayServer.Tests/BTCPayServer.Tests.csproj

@@ -23,7 +23,7 @@
     <PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.14" />
     <PackageReference Include="Selenium.Support" Version="4.1.1" />
     <PackageReference Include="Selenium.WebDriver" Version="4.1.1" />
-    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="112.0.5615.4900" />
+    <PackageReference Include="Selenium.WebDriver.ChromeDriver" Version="114.0.5735.9000" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>

BTCPayServer.Tests/Extensions.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
@@ -196,6 +197,7 @@ retry:
             driver.FindElement(selector).Click();
         }
 
+        [DebuggerHidden]
         public static bool ElementDoesNotExist(this IWebDriver driver, By selector)
         {
             Assert.Throws<NoSuchElementException>(() =>

BTCPayServer.Tests/FastTests.cs

@@ -346,165 +346,213 @@ namespace BTCPayServer.Tests
             Assert.True(Torrc.TryParse(input, out torrc));
             Assert.Equal(expected, torrc.ToString());
         }
+        [Fact]
+        public void CanCalculateDust()
+        {
+            var entity = new InvoiceEntity() { Currency = "USD" };
+            entity.Networks = new BTCPayNetworkProvider(ChainName.Regtest);
+#pragma warning disable CS0618
+            entity.Payments = new System.Collections.Generic.List<PaymentEntity>();
+            entity.SetPaymentMethod(new PaymentMethod()
+            {
+                Currency = "BTC",
+                Rate = 34_000m
+            });
+            entity.Price = 4000;
+            entity.UpdateTotals();
+            var accounting = entity.GetPaymentMethods().First().Calculate();
+            // Exact price should be 0.117647059..., but the payment method round up to one sat
+            Assert.Equal(0.11764706m, accounting.Due);
+            entity.Payments.Add(new PaymentEntity()
+            {
+                Currency = "BTC",
+                Output = new TxOut(Money.Coins(0.11764706m), new Key()),
+                Accounted = true
+            });
+            entity.UpdateTotals();
+            Assert.Equal(0.0m, entity.NetDue);
+            // The dust's value is below 1 sat
+            Assert.True(entity.Dust > 0.0m);
+            Assert.True(Money.Satoshis(1.0m).ToDecimal(MoneyUnit.BTC) * entity.Rates["BTC"] > entity.Dust);
+            Assert.True(!entity.IsOverPaid);
+            Assert.True(!entity.IsUnderPaid);
+
+            // Now, imagine there is litecoin. It might seem from its
+            // perspecitve that there has been a slight over payment.
+            // However, Calculate() should just cap it to 0.0m
+            entity.SetPaymentMethod(new PaymentMethod()
+            {
+                Currency = "LTC",
+                Rate = 3400m
+            });
+            entity.UpdateTotals();
+            var method = entity.GetPaymentMethods().First(p => p.Currency == "LTC");
+            accounting = method.Calculate();
+            Assert.Equal(0.0m, accounting.DueUncapped);
+
+#pragma warning restore CS0618
+        }
 #if ALTCOINS
         [Fact]
         public void CanCalculateCryptoDue()
         {
             var networkProvider = new BTCPayNetworkProvider(ChainName.Regtest);
-            var paymentMethodHandlerDictionary = new PaymentMethodHandlerDictionary(new IPaymentMethodHandler[]
-            {
-                new BitcoinLikePaymentHandler(null, networkProvider, null, null, null, null),
-                new LightningLikePaymentHandler(null, null, networkProvider, null, null, null),
-            });
-            var entity = new InvoiceEntity();
+            var entity = new InvoiceEntity() { Currency = "USD" };
             entity.Networks = networkProvider;
 #pragma warning disable CS0618
             entity.Payments = new System.Collections.Generic.List<PaymentEntity>();
             entity.SetPaymentMethod(new PaymentMethod()
             {
-                CryptoCode = "BTC",
+                Currency = "BTC",
                 Rate = 5000,
                 NextNetworkFee = Money.Coins(0.1m)
             });
             entity.Price = 5000;
+            entity.UpdateTotals();
 
             var paymentMethod = entity.GetPaymentMethods().TryGet("BTC", PaymentTypes.BTCLike);
             var accounting = paymentMethod.Calculate();
-            Assert.Equal(Money.Coins(1.1m), accounting.Due);
-            Assert.Equal(Money.Coins(1.1m), accounting.TotalDue);
+            Assert.Equal(1.0m, accounting.ToSmallestUnit(Money.Satoshis(1.0m).ToDecimal(MoneyUnit.BTC)));
+            Assert.Equal(1.1m, accounting.Due);
+            Assert.Equal(1.1m, accounting.TotalDue);
 
             entity.Payments.Add(new PaymentEntity()
             {
+                Currency = "BTC",
                 Output = new TxOut(Money.Coins(0.5m), new Key()),
+                Rate = 5000,
                 Accounted = true,
                 NetworkFee = 0.1m
             });
-
+            entity.UpdateTotals();
             accounting = paymentMethod.Calculate();
             //Since we need to spend one more txout, it should be 1.1 - 0,5 + 0.1
-            Assert.Equal(Money.Coins(0.7m), accounting.Due);
-            Assert.Equal(Money.Coins(1.2m), accounting.TotalDue);
+            Assert.Equal(0.7m, accounting.Due);
+            Assert.Equal(1.2m, accounting.TotalDue);
 
             entity.Payments.Add(new PaymentEntity()
             {
+                Currency = "BTC",
                 Output = new TxOut(Money.Coins(0.2m), new Key()),
                 Accounted = true,
                 NetworkFee = 0.1m
             });
-
+            entity.UpdateTotals();
             accounting = paymentMethod.Calculate();
-            Assert.Equal(Money.Coins(0.6m), accounting.Due);
-            Assert.Equal(Money.Coins(1.3m), accounting.TotalDue);
+            Assert.Equal(0.6m, accounting.Due);
+            Assert.Equal(1.3m, accounting.TotalDue);
 
             entity.Payments.Add(new PaymentEntity()
             {
+                Currency = "BTC",
                 Output = new TxOut(Money.Coins(0.6m), new Key()),
                 Accounted = true,
                 NetworkFee = 0.1m
             });
-
+            entity.UpdateTotals();
             accounting = paymentMethod.Calculate();
-            Assert.Equal(Money.Zero, accounting.Due);
-            Assert.Equal(Money.Coins(1.3m), accounting.TotalDue);
+            Assert.Equal(0.0m, accounting.Due);
+            Assert.Equal(1.3m, accounting.TotalDue);
 
             entity.Payments.Add(
-                new PaymentEntity() { Output = new TxOut(Money.Coins(0.2m), new Key()), Accounted = true });
-
+                new PaymentEntity() { Currency = "BTC", Output = new TxOut(Money.Coins(0.2m), new Key()), Accounted = true });
+            entity.UpdateTotals();
             accounting = paymentMethod.Calculate();
-            Assert.Equal(Money.Zero, accounting.Due);
-            Assert.Equal(Money.Coins(1.3m), accounting.TotalDue);
+            Assert.Equal(0.0m, accounting.Due);
+            Assert.Equal(1.3m, accounting.TotalDue);
 
             entity = new InvoiceEntity();
             entity.Networks = networkProvider;
             entity.Price = 5000;
             PaymentMethodDictionary paymentMethods = new PaymentMethodDictionary();
             paymentMethods.Add(
-                new PaymentMethod() { CryptoCode = "BTC", Rate = 1000, NextNetworkFee = Money.Coins(0.1m) });
+                new PaymentMethod() { Currency = "BTC", Rate = 1000, NextNetworkFee = Money.Coins(0.1m) });
             paymentMethods.Add(
-                new PaymentMethod() { CryptoCode = "LTC", Rate = 500, NextNetworkFee = Money.Coins(0.01m) });
+                new PaymentMethod() { Currency = "LTC", Rate = 500, NextNetworkFee = Money.Coins(0.01m) });
             entity.SetPaymentMethods(paymentMethods);
             entity.Payments = new List<PaymentEntity>();
+            entity.UpdateTotals();
             paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("BTC", PaymentTypes.BTCLike));
             accounting = paymentMethod.Calculate();
-            Assert.Equal(Money.Coins(5.1m), accounting.Due);
+            Assert.Equal(5.1m, accounting.Due);
 
             paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("LTC", PaymentTypes.BTCLike));
             accounting = paymentMethod.Calculate();
 
-            Assert.Equal(Money.Coins(10.01m), accounting.TotalDue);
+            Assert.Equal(10.01m, accounting.TotalDue);
 
             entity.Payments.Add(new PaymentEntity()
             {
-                CryptoCode = "BTC",
+                Currency = "BTC",
                 Output = new TxOut(Money.Coins(1.0m), new Key()),
                 Accounted = true,
                 NetworkFee = 0.1m
             });
-
+            entity.UpdateTotals();
             paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("BTC", PaymentTypes.BTCLike));
             accounting = paymentMethod.Calculate();
-            Assert.Equal(Money.Coins(4.2m), accounting.Due);
-            Assert.Equal(Money.Coins(1.0m), accounting.CryptoPaid);
-            Assert.Equal(Money.Coins(1.0m), accounting.Paid);
-            Assert.Equal(Money.Coins(5.2m), accounting.TotalDue);
+            Assert.Equal(4.2m, accounting.Due);
+            Assert.Equal(1.0m, accounting.CryptoPaid);
+            Assert.Equal(1.0m, accounting.Paid);
+            Assert.Equal(5.2m, accounting.TotalDue);
             Assert.Equal(2, accounting.TxRequired);
 
             paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("LTC", PaymentTypes.BTCLike));
             accounting = paymentMethod.Calculate();
-            Assert.Equal(Money.Coins(10.01m + 0.1m * 2 - 2.0m /* 8.21m */), accounting.Due);
-            Assert.Equal(Money.Coins(0.0m), accounting.CryptoPaid);
-            Assert.Equal(Money.Coins(2.0m), accounting.Paid);
-            Assert.Equal(Money.Coins(10.01m + 0.1m * 2), accounting.TotalDue);
+            Assert.Equal(10.01m + 0.1m * 2 - 2.0m /* 8.21m */, accounting.Due);
+            Assert.Equal(0.0m, accounting.CryptoPaid);
+            Assert.Equal(2.0m, accounting.Paid);
+            Assert.Equal(10.01m + 0.1m * 2, accounting.TotalDue);
 
             entity.Payments.Add(new PaymentEntity()
             {
-                CryptoCode = "LTC",
+                Currency = "LTC",
                 Output = new TxOut(Money.Coins(1.0m), new Key()),
                 Accounted = true,
                 NetworkFee = 0.01m
             });
-
+            entity.UpdateTotals();
             paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("BTC", PaymentTypes.BTCLike));
             accounting = paymentMethod.Calculate();
-            Assert.Equal(Money.Coins(4.2m - 0.5m + 0.01m / 2), accounting.Due);
-            Assert.Equal(Money.Coins(1.0m), accounting.CryptoPaid);
-            Assert.Equal(Money.Coins(1.5m), accounting.Paid);
-            Assert.Equal(Money.Coins(5.2m + 0.01m / 2), accounting.TotalDue); // The fee for LTC added
+            Assert.Equal(4.2m - 0.5m + 0.01m / 2, accounting.Due);
+            Assert.Equal(1.0m, accounting.CryptoPaid);
+            Assert.Equal(1.5m, accounting.Paid);
+            Assert.Equal(5.2m + 0.01m / 2, accounting.TotalDue); // The fee for LTC added
             Assert.Equal(2, accounting.TxRequired);
 
             paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("LTC", PaymentTypes.BTCLike));
             accounting = paymentMethod.Calculate();
-            Assert.Equal(Money.Coins(8.21m - 1.0m + 0.01m), accounting.Due);
-            Assert.Equal(Money.Coins(1.0m), accounting.CryptoPaid);
-            Assert.Equal(Money.Coins(3.0m), accounting.Paid);
-            Assert.Equal(Money.Coins(10.01m + 0.1m * 2 + 0.01m), accounting.TotalDue);
+            Assert.Equal(8.21m - 1.0m + 0.01m, accounting.Due);
+            Assert.Equal(1.0m, accounting.CryptoPaid);
+            Assert.Equal(3.0m, accounting.Paid);
+            Assert.Equal(10.01m + 0.1m * 2 + 0.01m, accounting.TotalDue);
             Assert.Equal(2, accounting.TxRequired);
 
-            var remaining = Money.Coins(4.2m - 0.5m + 0.01m / 2);
+            var remaining = Money.Coins(4.2m - 0.5m + 0.01m / 2.0m).ToDecimal(MoneyUnit.BTC);
             entity.Payments.Add(new PaymentEntity()
             {
-                CryptoCode = "BTC",
-                Output = new TxOut(remaining, new Key()),
+                Currency = "BTC",
+                Output = new TxOut(Money.Coins(remaining), new Key()),
                 Accounted = true,
                 NetworkFee = 0.1m
             });
-
+            entity.UpdateTotals();
             paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("BTC", PaymentTypes.BTCLike));
             accounting = paymentMethod.Calculate();
-            Assert.Equal(Money.Zero, accounting.Due);
-            Assert.Equal(Money.Coins(1.0m) + remaining, accounting.CryptoPaid);
-            Assert.Equal(Money.Coins(1.5m) + remaining, accounting.Paid);
-            Assert.Equal(Money.Coins(5.2m + 0.01m / 2), accounting.TotalDue);
+            Assert.Equal(0.0m, accounting.Due);
+            Assert.Equal(1.0m + remaining, accounting.CryptoPaid);
+            Assert.Equal(1.5m + remaining, accounting.Paid);
+            Assert.Equal(5.2m + 0.01m / 2, accounting.TotalDue);
             Assert.Equal(accounting.Paid, accounting.TotalDue);
             Assert.Equal(2, accounting.TxRequired);
 
             paymentMethod = entity.GetPaymentMethod(new PaymentMethodId("LTC", PaymentTypes.BTCLike));
             accounting = paymentMethod.Calculate();
-            Assert.Equal(Money.Zero, accounting.Due);
-            Assert.Equal(Money.Coins(1.0m), accounting.CryptoPaid);
-            Assert.Equal(Money.Coins(3.0m) + remaining * 2, accounting.Paid);
+            Assert.Equal(0.0m, accounting.Due);
+            Assert.Equal(1.0m, accounting.CryptoPaid);
+            Assert.Equal(3.0m + remaining * 2, accounting.Paid);
             // Paying 2 BTC fee, LTC fee removed because fully paid
-            Assert.Equal(Money.Coins(10.01m + 0.1m * 2 + 0.1m * 2 /* + 0.01m no need to pay this fee anymore */),
+            Assert.Equal(10.01m + 0.1m * 2 + 0.1m * 2 /* + 0.01m no need to pay this fee anymore */,
                 accounting.TotalDue);
             Assert.Equal(1, accounting.TxRequired);
             Assert.Equal(accounting.Paid, accounting.TotalDue);
@@ -548,27 +596,29 @@ namespace BTCPayServer.Tests
             entity.Payments = new List<PaymentEntity>();
             entity.SetPaymentMethod(new PaymentMethod()
             {
-                CryptoCode = "BTC",
+                Currency = "BTC",
                 Rate = 5000,
                 NextNetworkFee = Money.Coins(0.1m)
             });
             entity.Price = 5000;
             entity.PaymentTolerance = 0;
-
+            entity.UpdateTotals();
 
             var paymentMethod = entity.GetPaymentMethods().TryGet("BTC", PaymentTypes.BTCLike);
             var accounting = paymentMethod.Calculate();
-            Assert.Equal(Money.Coins(1.1m), accounting.Due);
-            Assert.Equal(Money.Coins(1.1m), accounting.TotalDue);
-            Assert.Equal(Money.Coins(1.1m), accounting.MinimumTotalDue);
+            Assert.Equal(1.1m, accounting.Due);
+            Assert.Equal(1.1m, accounting.TotalDue);
+            Assert.Equal(1.1m, accounting.MinimumTotalDue);
 
             entity.PaymentTolerance = 10;
+            entity.UpdateTotals();
             accounting = paymentMethod.Calculate();
-            Assert.Equal(Money.Coins(0.99m), accounting.MinimumTotalDue);
+            Assert.Equal(0.99m, accounting.MinimumTotalDue);
 
             entity.PaymentTolerance = 100;
+            entity.UpdateTotals();
             accounting = paymentMethod.Calculate();
-            Assert.Equal(Money.Satoshis(1), accounting.MinimumTotalDue);
+            Assert.Equal(0.0000_0001m, accounting.MinimumTotalDue);
         }
 
         [Fact]
@@ -609,7 +659,7 @@ namespace BTCPayServer.Tests
         }
 
         [Fact]
-        public void CanDetectImage()
+        public void CanDetectFileType()
         {
             Assert.True(FileTypeDetector.IsPicture(new byte[] { 0x42, 0x4D }, "test.bmp"));
             Assert.False(FileTypeDetector.IsPicture(new byte[] { 0x42, 0x4D }, ".bmp"));
@@ -622,6 +672,15 @@ namespace BTCPayServer.Tests
             Assert.False(FileTypeDetector.IsPicture(new byte[] { 0x3C, 0x73, 0x76, 0x67 }, "test.jpg"));
             Assert.False(FileTypeDetector.IsPicture(new byte[] { 0xFF }, "e.jpg"));
             Assert.False(FileTypeDetector.IsPicture(new byte[] { }, "empty.jpg"));
+
+            Assert.False(FileTypeDetector.IsPicture(new byte[] { 0x49, 0x44, 0x33, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23 }, "music.mp3"));
+            Assert.True(FileTypeDetector.IsAudio(new byte[] { 0x49, 0x44, 0x33, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x23 }, "music.mp3"));
+            Assert.True(FileTypeDetector.IsAudio(new byte[] { 0x52, 0x49, 0x46, 0x46, 0x24, 0x9A, 0x08, 0x00, 0x57, 0x41 }, "music.wav"));
+            Assert.True(FileTypeDetector.IsAudio(new byte[] { 0xFF, 0xF1, 0x50, 0x80, 0x1C, 0x3F, 0xFC, 0xDA, 0x00, 0x4C }, "music.aac"));
+            Assert.True(FileTypeDetector.IsAudio(new byte[] { 0x66, 0x4C, 0x61, 0x43, 0x00, 0x00, 0x00, 0x22, 0x04, 0x80 }, "music.flac"));
+            Assert.True(FileTypeDetector.IsAudio(new byte[] { 0x4F, 0x67, 0x67, 0x53, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00 }, "music.ogg"));
+            Assert.True(FileTypeDetector.IsAudio(new byte[] { 0x1A, 0x45, 0xDF, 0xA3, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00 }, "music.weba"));
+            Assert.True(FileTypeDetector.IsAudio(new byte[] { 0xFF, 0xF3, 0xE4, 0x64, 0x00, 0x20, 0xAD, 0xBD, 0x04, 0x00 }, "music.mp3"));
         }
 
         [Fact]
@@ -1064,7 +1123,7 @@ namespace BTCPayServer.Tests
             search = new SearchString(filter);
             Assert.Equal("2019-04-25 01:00 AM", search.Filters["startdate"].First());
             Assert.Equal("hekki", search.TextSearch);
-            
+
             // modify search
             filter = $"status:settled,exceptionstatus:paidLate,unusual:true, fulltext searchterm, storeid:{storeId},startdate:2019-04-25 01:00:00";
             search = new SearchString(filter);
@@ -1074,33 +1133,33 @@ namespace BTCPayServer.Tests
             Assert.Single(search.Filters["status"], "settled");
             Assert.Single(search.Filters["exceptionstatus"], "paidLate");
             Assert.Single(search.Filters["unusual"], "true");
-            
+
             // toggle off bool with same value
             var modified = new SearchString(search.Toggle("unusual", "true"));
             Assert.Null(modified.GetFilterBool("unusual"));
-            
+
             // add to array
             modified = new SearchString(modified.Toggle("status", "processing"));
             var statusArray = modified.GetFilterArray("status");
             Assert.Equal(2, statusArray.Length);
             Assert.Contains("processing", statusArray);
             Assert.Contains("settled", statusArray);
-            
+
             // toggle off array with same value
             modified = new SearchString(modified.Toggle("status", "settled"));
             statusArray = modified.GetFilterArray("status");
             Assert.Single(statusArray, "processing");
-            
+
             // toggle off array with null value
             modified = new SearchString(modified.Toggle("status", null));
             Assert.Null(modified.GetFilterArray("status"));
-            
+
             // toggle off date with null value
             modified = new SearchString(modified.Toggle("startdate", "-7d"));
             Assert.Single(modified.GetFilterArray("startdate"), "-7d");
             modified = new SearchString(modified.Toggle("startdate", null));
             Assert.Null(modified.GetFilterArray("startdate"));
-            
+
             // toggle off date with same value
             modified = new SearchString(modified.Toggle("enddate", "-7d"));
             Assert.Single(modified.GetFilterArray("enddate"), "-7d");
@@ -1145,6 +1204,45 @@ namespace BTCPayServer.Tests
             Assert.Equal("000000161", m.OrderId);
         }
 
+        [Fact]
+        public void CanParseOldPosAppData()
+        {
+            var data = new JObject()
+            {
+                ["price"] = 1.64m
+            }.ToString();
+            Assert.Equal(1.64m, JsonConvert.DeserializeObject<PosAppCartItem>(data).Price);
+
+            data = new JObject()
+            {
+                ["price"] = new JObject()
+                {
+                    ["value"] = 1.65m
+                }
+            }.ToString();
+            Assert.Equal(1.65m, JsonConvert.DeserializeObject<PosAppCartItem>(data).Price);
+            data = new JObject()
+            {
+                ["price"] = new JObject()
+                {
+                    ["value"] = "1.6305"
+                }
+            }.ToString();
+            Assert.Equal(1.6305m, JsonConvert.DeserializeObject<PosAppCartItem>(data).Price);
+
+            data = new JObject()
+            {
+                ["price"] = new JObject()
+                {
+                    ["value"] = null
+                }
+            }.ToString();
+            Assert.Equal(0.0m, JsonConvert.DeserializeObject<PosAppCartItem>(data).Price);
+
+            var o = JObject.Parse(JsonConvert.SerializeObject(new PosAppCartItem() { Price = 1.356m }));
+            Assert.Equal(1.356m, o["price"].Value<decimal>());
+        }
+
         [Fact]
         public void CanParseCurrencyValue()
         {
@@ -1845,11 +1943,6 @@ namespace BTCPayServer.Tests
 #pragma warning disable CS0618
             var dummy = new Key().PubKey.GetAddress(ScriptPubKeyType.Legacy, Network.RegTest).ToString();
             var networkProvider = new BTCPayNetworkProvider(ChainName.Regtest);
-            var paymentMethodHandlerDictionary = new PaymentMethodHandlerDictionary(new IPaymentMethodHandler[]
-            {
-                new BitcoinLikePaymentHandler(null, networkProvider, null, null, null, null),
-                new LightningLikePaymentHandler(null, null, networkProvider, null, null, null),
-            });
             var networkBTC = networkProvider.GetNetwork("BTC");
             var networkLTC = networkProvider.GetNetwork("LTC");
             InvoiceEntity invoiceEntity = new InvoiceEntity();
@@ -1857,14 +1950,14 @@ namespace BTCPayServer.Tests
             invoiceEntity.Payments = new System.Collections.Generic.List<PaymentEntity>();
             invoiceEntity.Price = 100;
             PaymentMethodDictionary paymentMethods = new PaymentMethodDictionary();
-            paymentMethods.Add(new PaymentMethod() { Network = networkBTC, CryptoCode = "BTC", Rate = 10513.44m, }
+            paymentMethods.Add(new PaymentMethod() { Network = networkBTC, Currency = "BTC", Rate = 10513.44m, }
                 .SetPaymentMethodDetails(
                     new BTCPayServer.Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod()
                     {
                         NextNetworkFee = Money.Coins(0.00000100m),
                         DepositAddress = dummy
                     }));
-            paymentMethods.Add(new PaymentMethod() { Network = networkLTC, CryptoCode = "LTC", Rate = 216.79m }
+            paymentMethods.Add(new PaymentMethod() { Network = networkLTC, Currency = "LTC", Rate = 216.79m }
                 .SetPaymentMethodDetails(
                     new BTCPayServer.Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod()
                     {
@@ -1880,7 +1973,7 @@ namespace BTCPayServer.Tests
                 new PaymentEntity()
                 {
                     Accounted = true,
-                    CryptoCode = "BTC",
+                    Currency = "BTC",
                     NetworkFee = 0.00000100m,
                     Network = networkProvider.GetNetwork("BTC"),
                 }
@@ -1889,34 +1982,33 @@ namespace BTCPayServer.Tests
                         Network = networkProvider.GetNetwork("BTC"),
                         Output = new TxOut() { Value = Money.Coins(0.00151263m) }
                     }));
+            invoiceEntity.UpdateTotals();
             accounting = btc.Calculate();
             invoiceEntity.Payments.Add(
                 new PaymentEntity()
                 {
                     Accounted = true,
-                    CryptoCode = "BTC",
+                    Currency = "BTC",
                     NetworkFee = 0.00000100m,
                     Network = networkProvider.GetNetwork("BTC")
                 }
                     .SetCryptoPaymentData(new BitcoinLikePaymentData()
                     {
                         Network = networkProvider.GetNetwork("BTC"),
-                        Output = new TxOut() { Value = accounting.Due }
+                        Output = new TxOut() { Value = Money.Coins(accounting.Due) }
                     }));
+            invoiceEntity.UpdateTotals();
             accounting = btc.Calculate();
-            Assert.Equal(Money.Zero, accounting.Due);
-            Assert.Equal(Money.Zero, accounting.DueUncapped);
+            Assert.Equal(0.0m, accounting.Due);
+            Assert.Equal(0.0m, accounting.DueUncapped);
 
             var ltc = invoiceEntity.GetPaymentMethod(new PaymentMethodId("LTC", PaymentTypes.BTCLike));
             accounting = ltc.Calculate();
 
-            Assert.Equal(Money.Zero, accounting.Due);
-            // LTC might have over paid due to BTC paying above what it should (round 1 satoshi up)
-            Assert.True(accounting.DueUncapped < Money.Zero);
-
-            var paymentMethod = InvoiceWatcher.GetNearestClearedPayment(paymentMethods, out var accounting2);
-            Assert.Equal(btc.CryptoCode, paymentMethod.CryptoCode);
-#pragma warning restore CS0618
+            Assert.Equal(0.0m, accounting.Due);
+            // LTC might should be over paid due to BTC paying above what it should (round 1 satoshi up), but we handle this case
+            // and set DueUncapped to zero.
+            Assert.Equal(0.0m, accounting.DueUncapped);
         }
 
         [Fact]

BTCPayServer.Tests/GreenfieldAPITests.cs

@@ -17,6 +17,7 @@ using BTCPayServer.Payments;
 using BTCPayServer.Payments.Lightning;
 using BTCPayServer.PayoutProcessors;
 using BTCPayServer.PayoutProcessors.OnChain;
+using BTCPayServer.Plugins;
 using BTCPayServer.Services;
 using BTCPayServer.Services.Custodian.Client.MockCustodian;
 using BTCPayServer.Services.Notifications;
@@ -1151,7 +1152,8 @@ namespace BTCPayServer.Tests
                 Approved = false,
                 PaymentMethod = "BTC",
                 Amount = 0.0001m,
-                Destination = address.ToString()
+                Destination = address.ToString(),
+                
             });
             await AssertAPIError("invalid-state", async () =>
             {
@@ -3210,6 +3212,9 @@ namespace BTCPayServer.Tests
             });
             var transaction = await client.GetOnChainWalletTransaction(walletId.StoreId, walletId.CryptoCode, txdata.TransactionHash.ToString());
 
+            // Check skip doesn't crash
+            await client.ShowOnChainWalletTransactions(walletId.StoreId, walletId.CryptoCode, skip: 1);
+
             Assert.Equal(transaction.TransactionHash, txdata.TransactionHash);
             Assert.Equal(String.Empty, transaction.Comment);
 #pragma warning disable CS0612 // Type or member is obsolete
@@ -3544,6 +3549,7 @@ namespace BTCPayServer.Tests
                     PaymentMethod = "BTC_LightningNetwork",
                     Destination = customerInvoice.BOLT11
                 });
+            Assert.Equal(payout.Metadata.ToString(), new JObject().ToString()); //empty
             Assert.Empty(await adminClient.GetStoreLightningAutomatedPayoutProcessors(admin.StoreId, "BTC_LightningNetwork"));
             await adminClient.UpdateStoreLightningAutomatedPayoutProcessors(admin.StoreId, "BTC_LightningNetwork",
                 new LightningAutomatedPayoutSettings() { IntervalSeconds = TimeSpan.FromSeconds(600) });
@@ -3554,6 +3560,46 @@ namespace BTCPayServer.Tests
                     (await adminClient.GetStorePayouts(admin.StoreId, false)).Single(data => data.Id == payout.Id);
                 Assert.Equal(PayoutState.Completed, payoutC.State);
             });
+
+            payout = await adminClient.CreatePayout(admin.StoreId,
+                new CreatePayoutThroughStoreRequest()
+                {
+                    Approved = true,
+                    PaymentMethod = "BTC",
+                    Destination = (await tester.ExplorerNode.GetNewAddressAsync()).ToString(),
+                    Amount = 0.0001m,
+                    Metadata = JObject.FromObject(new
+                    {
+                        source ="apitest",
+                        sourceLink = "https://chocolate.com"
+                    })
+                });
+            Assert.Equal(payout.Metadata.ToString(), JObject.FromObject(new
+            {
+                source = "apitest",
+                sourceLink = "https://chocolate.com"
+            }).ToString());
+            
+            payout =
+                (await adminClient.GetStorePayouts(admin.StoreId, false)).Single(data => data.Id == payout.Id);
+            
+            Assert.Equal(payout.Metadata.ToString(), JObject.FromObject(new
+            {
+                source = "apitest",
+                sourceLink = "https://chocolate.com"
+            }).ToString());
+            
+            customerInvoice = await tester.CustomerLightningD.CreateInvoice(LightMoney.FromUnit(10, LightMoneyUnit.Satoshi),
+                Guid.NewGuid().ToString(), TimeSpan.FromDays(40));
+            var payout2 = await adminClient.CreatePayout(admin.StoreId,
+                new CreatePayoutThroughStoreRequest()
+                {
+                    Approved = true,
+                    Amount = new Money(100, MoneyUnit.Satoshi).ToDecimal(MoneyUnit.BTC),
+                    PaymentMethod = "BTC_LightningNetwork",
+                    Destination = customerInvoice.BOLT11
+                });
+            Assert.Equal(payout2.Amount, new Money(100, MoneyUnit.Satoshi).ToDecimal(MoneyUnit.BTC));
         }
 
         [Fact(Timeout = 60 * 2 * 1000)]
@@ -3669,9 +3715,12 @@ namespace BTCPayServer.Tests
                 Assert.Single(payouts.Where(data => data.State == PayoutState.InProgress));
             });
 
-            var txid = await tester.ExplorerNode.SendToAddressAsync(BitcoinAddress.Create((await adminClient.GetOnChainWalletReceiveAddress(admin.StoreId, "BTC", true)).Address,
-                tester.ExplorerClient.Network.NBitcoinNetwork), Money.Coins(0.01m) + fee);
-            await tester.WaitForEvent<NewOnChainTransactionEvent>(null, correctEvent: ev => ev.NewTransactionEvent.TransactionData.TransactionHash == txid);
+            uint256 txid = null;
+            await tester.WaitForEvent<NewOnChainTransactionEvent>(async () =>
+            {
+                txid  = await tester.ExplorerNode.SendToAddressAsync(BitcoinAddress.Create((await adminClient.GetOnChainWalletReceiveAddress(admin.StoreId, "BTC", true)).Address,
+                    tester.ExplorerClient.Network.NBitcoinNetwork), Money.Coins(0.01m) + fee);
+            }, correctEvent: ev => ev.NewTransactionEvent.TransactionData.TransactionHash == txid);
             await tester.PayTester.GetService<PayoutProcessorService>().Restart(new PayoutProcessorService.PayoutProcessorQuery(admin.StoreId, "BTC"));
             await TestUtils.EventuallyAsync(async () =>
             {
@@ -3679,6 +3728,122 @@ namespace BTCPayServer.Tests
                 payouts = await adminClient.GetStorePayouts(admin.StoreId);
                 Assert.Empty(payouts.Where(data => data.State != PayoutState.InProgress));
             });
+
+            // settings that were added later
+            var settings =
+                Assert.Single(await adminClient.GetStoreOnChainAutomatedPayoutProcessors(admin.StoreId, "BTC"));
+            Assert.False( settings.ProcessNewPayoutsInstantly);
+            Assert.Equal(0m, settings.Threshold);
+            
+            //let's use the ProcessNewPayoutsInstantly so that it will trigger instantly
+            
+            settings.IntervalSeconds = TimeSpan.FromDays(1);
+            settings.ProcessNewPayoutsInstantly = true;
+            
+            await tester.WaitForEvent<NewOnChainTransactionEvent>(async () =>
+            {
+                txid  = await tester.ExplorerNode.SendToAddressAsync(BitcoinAddress.Create((await adminClient.GetOnChainWalletReceiveAddress(admin.StoreId, "BTC", true)).Address,
+                    tester.ExplorerClient.Network.NBitcoinNetwork), Money.Coins(1m) + fee);
+            }, correctEvent: ev => ev.NewTransactionEvent.TransactionData.TransactionHash == txid);
+
+            await adminClient.UpdateStoreOnChainAutomatedPayoutProcessors(admin.StoreId, "BTC", settings);
+            settings =
+                Assert.Single(await adminClient.GetStoreOnChainAutomatedPayoutProcessors(admin.StoreId, "BTC"));
+            Assert.True( settings.ProcessNewPayoutsInstantly);
+
+            var pluginHookService = tester.PayTester.GetService<IPluginHookService>();
+            var beforeHookTcs = new TaskCompletionSource();
+            var afterHookTcs = new TaskCompletionSource();
+            pluginHookService.ActionInvoked += (sender, tuple) =>
+            {
+                switch (tuple.hook)
+                {
+                    case "before-automated-payout-processing":
+                        beforeHookTcs.TrySetResult();
+                        break;
+                    case "after-automated-payout-processing":
+                        afterHookTcs.TrySetResult();
+                        break;
+                }
+            };
+            var payoutThatShouldBeProcessedStraightAway = await adminClient.CreatePayout(admin.StoreId, new CreatePayoutThroughStoreRequest()
+            {
+                PullPaymentId = pullPayment.Id,
+                Amount = 0.5m,
+                Approved = true,
+                PaymentMethod = "BTC",
+                Destination = (await adminClient.GetOnChainWalletReceiveAddress(admin.StoreId, "BTC", true)).Address,
+            });
+            await beforeHookTcs.Task.WaitAsync(TimeSpan.FromSeconds(5));
+            await afterHookTcs.Task.WaitAsync(TimeSpan.FromSeconds(5));
+            payouts = await adminClient.GetStorePayouts(admin.StoreId);
+            Assert.Single(payouts.Where(data => data.State == PayoutState.InProgress && data.Id == payoutThatShouldBeProcessedStraightAway.Id));
+            
+            beforeHookTcs = new TaskCompletionSource();
+            afterHookTcs = new TaskCompletionSource();
+            //let's test the threshold limiter
+            settings.Threshold = 0.5m;
+            await adminClient.UpdateStoreOnChainAutomatedPayoutProcessors(admin.StoreId, "BTC", settings);
+            
+            //quick test: when updating processor, it processes instantly
+            await beforeHookTcs.Task.WaitAsync(TimeSpan.FromSeconds(5));
+            await afterHookTcs.Task.WaitAsync(TimeSpan.FromSeconds(5));
+            
+            settings =
+                Assert.Single(await adminClient.GetStoreOnChainAutomatedPayoutProcessors(admin.StoreId, "BTC"));
+            Assert.Equal(0.5m, settings.Threshold);
+            
+            //create a payout that should not be processed straight away due to threshold
+            
+            beforeHookTcs = new TaskCompletionSource();
+            afterHookTcs = new TaskCompletionSource();
+            var payoutThatShouldNotBeProcessedStraightAway = await adminClient.CreatePayout(admin.StoreId, new CreatePayoutThroughStoreRequest()
+            {
+                Amount = 0.1m,
+                Approved = true,
+                PaymentMethod = "BTC",
+                Destination = (await adminClient.GetOnChainWalletReceiveAddress(admin.StoreId, "BTC", true)).Address,
+            });
+            
+            await beforeHookTcs.Task.WaitAsync(TimeSpan.FromSeconds(5));
+            await afterHookTcs.Task.WaitAsync(TimeSpan.FromSeconds(5));
+            
+            payouts = await adminClient.GetStorePayouts(admin.StoreId);
+            Assert.Single(payouts.Where(data => data.State == PayoutState.AwaitingPayment && data.Id == payoutThatShouldNotBeProcessedStraightAway.Id));
+            
+            beforeHookTcs = new TaskCompletionSource();
+            afterHookTcs = new TaskCompletionSource();
+            var payoutThatShouldNotBeProcessedStraightAway2 = await adminClient.CreatePayout(admin.StoreId, new CreatePayoutThroughStoreRequest()
+            {
+                Amount = 0.3m,
+                Approved = true,
+                PaymentMethod = "BTC",
+                Destination = (await adminClient.GetOnChainWalletReceiveAddress(admin.StoreId, "BTC", true)).Address,
+            });
+            
+            await beforeHookTcs.Task.WaitAsync(TimeSpan.FromSeconds(5));
+            await afterHookTcs.Task.WaitAsync(TimeSpan.FromSeconds(5));
+            
+            payouts = await adminClient.GetStorePayouts(admin.StoreId);
+            Assert.Equal(2, payouts.Count(data => data.State == PayoutState.AwaitingPayment &&
+                                                  (data.Id == payoutThatShouldNotBeProcessedStraightAway.Id || data.Id == payoutThatShouldNotBeProcessedStraightAway2.Id)));
+            
+            beforeHookTcs = new TaskCompletionSource();
+            afterHookTcs = new TaskCompletionSource();
+            var payoutThatShouldNotBeProcessedStraightAway3 = await adminClient.CreatePayout(admin.StoreId, new CreatePayoutThroughStoreRequest()
+            {
+                Amount = 0.3m,
+                Approved = true,
+                PaymentMethod = "BTC",
+                Destination = (await adminClient.GetOnChainWalletReceiveAddress(admin.StoreId, "BTC", true)).Address,
+            });
+
+            await beforeHookTcs.Task.WaitAsync(TimeSpan.FromSeconds(5));
+            await afterHookTcs.Task.WaitAsync(TimeSpan.FromSeconds(5));
+            
+            payouts = await adminClient.GetStorePayouts(admin.StoreId);
+            Assert.Empty(payouts.Where(data => data.State != PayoutState.InProgress));
+
         }
 
         [Fact(Timeout = 60 * 2 * 1000)]

BTCPayServer.Tests/SeleniumTester.cs

@@ -393,6 +393,10 @@ namespace BTCPayServer.Tests
         public void GoToHome()
         {
             Driver.Navigate().GoToUrl(ServerUri);
+            if (Driver.PageSource.Contains("id=\"SkipWizard\""))
+            {
+                Driver.FindElement(By.Id("SkipWizard")).Click();
+            }
         }
 
         public void Logout()

BTCPayServer.Tests/SeleniumTests.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Buffers;
+using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Globalization;
 using System.Linq;
@@ -56,10 +57,11 @@ namespace BTCPayServer.Tests
             using var s = CreateSeleniumTester();
             await s.StartAsync();
             s.RegisterNewUser(true);
-            s.Driver.FindElement(By.Id("Nav-ServerSettings")).Click();
+            s.GoToHome();
+            s.GoToServer();
             s.Driver.AssertNoError();
             s.ClickOnAllSectionLinks();
-            s.Driver.FindElement(By.Id("Nav-ServerSettings")).Click();
+            s.GoToServer();
             s.Driver.FindElement(By.LinkText("Services")).Click();
 
             TestLogs.LogInformation("Let's check if we can access the logs");
@@ -246,7 +248,8 @@ namespace BTCPayServer.Tests
             s.Server.ActivateLightning();
             await s.StartAsync();
             s.RegisterNewUser(true);
-            s.Driver.FindElement(By.Id("Nav-ServerSettings")).Click();
+            s.GoToHome();
+            s.GoToServer();
             s.Driver.AssertNoError();
             s.Driver.FindElement(By.LinkText("Services")).Click();
 
@@ -313,6 +316,7 @@ namespace BTCPayServer.Tests
             await s.StartAsync();
             //Register & Log Out
             var email = s.RegisterNewUser();
+            s.GoToHome();
             s.Logout();
             s.Driver.AssertNoError();
             Assert.Contains("/login", s.Driver.Url);
@@ -348,6 +352,7 @@ namespace BTCPayServer.Tests
             s.Driver.FindElement(By.Id("Password")).SendKeys("abc???");
             s.Driver.FindElement(By.Id("LoginButton")).Click();
 
+            s.GoToHome();
             s.GoToProfile();
             s.ClickOnAllSectionLinks();
 
@@ -355,6 +360,7 @@ namespace BTCPayServer.Tests
             s.Logout();
             s.GoToRegister();
             s.RegisterNewUser(true);
+            s.GoToHome();
             s.GoToServer(ServerNavPages.Users);
             s.Driver.FindElement(By.Id("CreateUser")).Click();
 
@@ -377,6 +383,7 @@ namespace BTCPayServer.Tests
             s.Driver.FindElement(By.Id("LoginButton")).Click();
 
             // We should be logged in now
+            s.GoToHome();
             s.Driver.FindElement(By.Id("mainNav"));
 
             //let's test delete user quickly while we're at it 
@@ -641,7 +648,7 @@ namespace BTCPayServer.Tests
             // verify redirected to create store page
             Assert.EndsWith("/stores/create", s.Driver.Url);
             Assert.Contains("Create your first store", s.Driver.PageSource);
-            Assert.Contains("To start accepting payments, set up a store.", s.Driver.PageSource);
+            Assert.Contains("Create a store to begin accepting payments", s.Driver.PageSource);
             Assert.False(s.Driver.PageSource.Contains("id=\"StoreSelectorDropdown\""), "Store selector dropdown should not be present");
 
             (_, string storeId) = s.CreateNewStore();
@@ -961,11 +968,13 @@ namespace BTCPayServer.Tests
             s.Driver.FindElement(By.CssSelector("label[for='DefaultView_Cart']")).Click();
             s.Driver.FindElement(By.CssSelector(".template-item:nth-of-type(1) .btn-primary")).Click();
             s.Driver.FindElement(By.Id("BuyButtonText")).SendKeys("Take my money");
+            s.Driver.FindElement(By.Id("EditorCategories-ts-control")).SendKeys("Drinks");
             s.Driver.FindElement(By.Id("SaveItemChanges")).Click();
             s.Driver.FindElement(By.Id("ToggleRawEditor")).Click();
 
             var template = s.Driver.FindElement(By.Id("Template")).GetAttribute("value");
             Assert.Contains("\"buyButtonText\": \"Take my money\"", template);
+            Assert.Matches("\"categories\": \\[\n\\s+\"Drinks\"\n\\s+\\]", template);
 
             s.Driver.FindElement(By.Id("SaveSettings")).Click();
             Assert.Contains("App updated", s.FindAlertMessage().Text);
@@ -979,6 +988,14 @@ namespace BTCPayServer.Tests
             Assert.True(s.Driver.PageSource.Contains("Tea shop"), "Unable to create PoS");
             Assert.True(s.Driver.PageSource.Contains("Cart"), "PoS not showing correct default view");
             Assert.True(s.Driver.PageSource.Contains("Take my money"), "PoS not showing correct default view");
+            Assert.Equal(6, s.Driver.FindElements(By.CssSelector(".posItem.posItem--displayed")).Count);
+
+            var drinks = s.Driver.FindElement(By.CssSelector("label[for='Category-Drinks']"));
+            Assert.Equal("Drinks", drinks.Text);
+            drinks.Click();
+            Assert.Single(s.Driver.FindElements(By.CssSelector(".posItem.posItem--displayed")));
+            s.Driver.FindElement(By.CssSelector("label[for='Category-*']")).Click();
+            Assert.Equal(6, s.Driver.FindElements(By.CssSelector(".posItem.posItem--displayed")).Count);
 
             s.Driver.Url = posBaseUrl + "/static";
             Assert.False(s.Driver.PageSource.Contains("Cart"), "Static PoS not showing correct view");
@@ -1145,12 +1162,13 @@ namespace BTCPayServer.Tests
             s.Driver.FindElement(By.Id("ArchivePaymentRequest")).Click();
             Assert.Contains("The payment request has been archived", s.FindAlertMessage().Text);
             Assert.DoesNotContain("Pay123", s.Driver.PageSource);
-            s.Driver.FindElement(By.Id("SearchDropdownToggle")).Click();
-            s.Driver.FindElement(By.Id("SearchIncludeArchived")).Click();
+            s.Driver.FindElement(By.Id("StatusOptionsToggle")).Click();
+            s.Driver.WaitForElement(By.Id("StatusOptionsIncludeArchived")).Click();
             Assert.Contains("Pay123", s.Driver.PageSource);
 
             // unarchive (from list)
-            s.Driver.FindElement(By.Id($"ToggleArchival-{payReqId}")).Click();
+            s.Driver.FindElement(By.Id($"ToggleActions-{payReqId}")).Click();
+            s.Driver.WaitForElement(By.Id($"ToggleArchival-{payReqId}")).Click();
             Assert.Contains("The payment request has been unarchived", s.FindAlertMessage().Text);
             Assert.Contains("Pay123", s.Driver.PageSource);
         }
@@ -2046,7 +2064,6 @@ namespace BTCPayServer.Tests
             using var s = CreateSeleniumTester();
             s.Server.ActivateLightning();
             await s.StartAsync();
-
             await s.Server.EnsureChannelsSetup();
 
             s.RegisterNewUser(true);
@@ -2083,7 +2100,6 @@ namespace BTCPayServer.Tests
             using var s = CreateSeleniumTester();
             s.Server.ActivateLightning();
             await s.StartAsync();
-
             await s.Server.EnsureChannelsSetup();
 
             s.RegisterNewUser(true);
@@ -2150,6 +2166,122 @@ namespace BTCPayServer.Tests
             Assert.Contains("1 222,21 €", s.Driver.FindElement(By.Id("PaymentDetails-TotalFiat")).Text);
         }
 
+        [Fact]
+        [Trait("Selenium", "Selenium")]
+        [Trait("Lightning", "Lightning")]
+        public async Task CanUsePOSCart()
+        {
+            using var s = CreateSeleniumTester();
+            s.Server.ActivateLightning();
+            await s.StartAsync();
+            await s.Server.EnsureChannelsSetup();
+
+            s.RegisterNewUser(true);
+            s.CreateNewStore();
+            s.GoToStore();
+            s.AddLightningNode(LightningConnectionType.CLightning, false);
+            s.Driver.FindElement(By.Id("StoreNav-CreatePointOfSale")).Click();
+            s.Driver.FindElement(By.Id("AppName")).SendKeys(Guid.NewGuid().ToString());
+            s.Driver.FindElement(By.Id("Create")).Click();
+            Assert.Contains("App successfully created", s.FindAlertMessage().Text);
+            s.Driver.FindElement(By.CssSelector("label[for='DefaultView_Cart']")).Click();
+            s.Driver.FindElement(By.Id("Currency")).SendKeys("EUR");
+            s.Driver.FindElement(By.Id("CustomTipPercentages")).Clear();
+            s.Driver.FindElement(By.Id("CustomTipPercentages")).SendKeys("10,21");
+            s.Driver.FindElement(By.Id("SaveSettings")).Click();
+            Assert.Contains("App updated", s.FindAlertMessage().Text);
+            s.Driver.FindElement(By.Id("ViewApp")).Click();
+            var windows = s.Driver.WindowHandles;
+            Assert.Equal(2, windows.Count);
+            s.Driver.SwitchTo().Window(windows[1]);
+            s.Driver.WaitForElement(By.Id("PosItems"));
+            Assert.Empty(s.Driver.FindElements(By.CssSelector("#CartItems tr")));
+            var posUrl = s.Driver.Url;
+            
+            // Select and clear
+            s.Driver.FindElement(By.CssSelector(".posItem:nth-child(1) .btn-primary")).Click();
+            Assert.Single(s.Driver.FindElements(By.CssSelector("#CartItems tr")));
+            s.Driver.FindElement(By.Id("CartClear")).Click();
+            Thread.Sleep(250);
+            Assert.Empty(s.Driver.FindElements(By.CssSelector("#CartItems tr")));
+            
+            // Select simple items
+            s.Driver.FindElement(By.CssSelector(".posItem:nth-child(1) .btn-primary")).Click();
+            Thread.Sleep(250);
+            Assert.Single(s.Driver.FindElements(By.CssSelector("#CartItems tr")));
+            s.Driver.FindElement(By.CssSelector(".posItem:nth-child(2) .btn-primary")).Click();
+            Thread.Sleep(250);
+            s.Driver.FindElement(By.CssSelector(".posItem:nth-child(2) .btn-primary")).Click();
+            Thread.Sleep(250);
+            Assert.Equal(2, s.Driver.FindElements(By.CssSelector("#CartItems tr")).Count);
+            Assert.Equal("3,00 €", s.Driver.FindElement(By.Id("CartTotal")).Text);
+            
+            // Select item with inventory - two of it
+            Assert.Equal("5 left", s.Driver.FindElement(By.CssSelector(".posItem:nth-child(3) .badge.inventory")).Text);
+            s.Driver.FindElement(By.CssSelector(".posItem:nth-child(3) .btn-primary")).Click();
+            Thread.Sleep(250);
+            s.Driver.FindElement(By.CssSelector(".posItem:nth-child(3) .btn-primary")).Click();
+            Thread.Sleep(250);
+            Assert.Equal(3, s.Driver.FindElements(By.CssSelector("#CartItems tr")).Count);
+            Assert.Equal("5,40 €", s.Driver.FindElement(By.Id("CartTotal")).Text);
+            
+            // Select items with minimum amount
+            s.Driver.FindElement(By.CssSelector(".posItem:nth-child(5) .btn-primary")).Click();
+            Thread.Sleep(250);
+            Assert.Equal(4, s.Driver.FindElements(By.CssSelector("#CartItems tr")).Count);
+            Assert.Equal("7,20 €", s.Driver.FindElement(By.Id("CartTotal")).Text);
+            
+            // Select items with adjusted minimum amount
+            s.Driver.FindElement(By.CssSelector(".posItem:nth-child(5) input[name='amount']")).Clear();
+            s.Driver.FindElement(By.CssSelector(".posItem:nth-child(5) input[name='amount']")).SendKeys("2.3");
+            s.Driver.FindElement(By.CssSelector(".posItem:nth-child(5) .btn-primary")).Click();
+            Thread.Sleep(250);
+            Assert.Equal(5, s.Driver.FindElements(By.CssSelector("#CartItems tr")).Count);
+            Assert.Equal("9,50 €", s.Driver.FindElement(By.Id("CartTotal")).Text);
+            
+            // Select items with custom amount
+            s.Driver.FindElement(By.CssSelector(".posItem:nth-child(6) input[name='amount']")).Clear();
+            s.Driver.FindElement(By.CssSelector(".posItem:nth-child(6) input[name='amount']")).SendKeys(".2");
+            s.Driver.FindElement(By.CssSelector(".posItem:nth-child(6) .btn-primary")).Click();
+            Thread.Sleep(250);
+            Assert.Equal(6, s.Driver.FindElements(By.CssSelector("#CartItems tr")).Count);
+            Assert.Equal("9,70 €", s.Driver.FindElement(By.Id("CartTotal")).Text);
+            
+            // Select items with another custom amount
+            s.Driver.FindElement(By.CssSelector(".posItem:nth-child(6) input[name='amount']")).Clear();
+            s.Driver.FindElement(By.CssSelector(".posItem:nth-child(6) input[name='amount']")).SendKeys(".3");
+            s.Driver.FindElement(By.CssSelector(".posItem:nth-child(6) .btn-primary")).Click();
+            Thread.Sleep(250);
+            Assert.Equal(7, s.Driver.FindElements(By.CssSelector("#CartItems tr")).Count);
+            Assert.Equal("10,00 €", s.Driver.FindElement(By.Id("CartTotal")).Text);
+            
+            // Discount: 10%
+            s.Driver.ElementDoesNotExist(By.Id("CartDiscount"));
+            s.Driver.FindElement(By.Id("Discount")).SendKeys("10");
+            Assert.Contains("10% = 1,00 €", s.Driver.FindElement(By.Id("CartDiscount")).Text);
+            Assert.Equal("9,00 €", s.Driver.FindElement(By.Id("CartTotal")).Text);
+            
+            // Tip: 10%
+            s.Driver.ElementDoesNotExist(By.Id("CartTip"));
+            s.Driver.FindElement(By.Id("Tip-10")).Click();
+            Assert.Contains("10% = 0,90 €", s.Driver.FindElement(By.Id("CartTip")).Text);
+            Assert.Equal("9,90 €", s.Driver.FindElement(By.Id("CartTotal")).Text);
+            
+            // Check values on checkout page
+            s.Driver.FindElement(By.Id("CartSubmit")).Click();
+            s.Driver.WaitUntilAvailable(By.Id("Checkout-v2"));
+            s.Driver.FindElement(By.Id("DetailsToggle")).Click();
+            s.Driver.WaitForElement(By.Id("PaymentDetails-TotalFiat"));
+            Assert.Contains("9,90 €", s.Driver.FindElement(By.Id("PaymentDetails-TotalFiat")).Text);
+
+            // Pay
+            s.PayInvoice();
+            
+            // Check inventory got updated and is now 3 instead of 5
+            s.Driver.Navigate().GoToUrl(posUrl);
+            Assert.Equal("3 left", s.Driver.FindElement(By.CssSelector(".posItem:nth-child(3) .badge.inventory")).Text);
+        }
+
         [Fact]
         [Trait("Selenium", "Selenium")]
         [Trait("Lightning", "Lightning")]
@@ -2361,11 +2493,11 @@ namespace BTCPayServer.Tests
             var lnaddress1 = Guid.NewGuid().ToString();
             s.Driver.FindElement(By.Id("Add_Username")).SendKeys(lnaddress1);
             s.Driver.FindElement(By.CssSelector("button[value='add']")).Click();
-            s.FindAlertMessage();
+            s.FindAlertMessage(StatusMessageModel.StatusSeverity.Success);
 
             s.Driver.ToggleCollapse("AddAddress");
 
-            var lnaddress2 = "EUR" + Guid.NewGuid();
+            var lnaddress2 = "EUR" + Guid.NewGuid().ToString();
             s.Driver.FindElement(By.Id("Add_Username")).SendKeys(lnaddress2);
             lnaddress2 = lnaddress2.ToLowerInvariant();
 
@@ -2375,22 +2507,20 @@ namespace BTCPayServer.Tests
             s.Driver.FindElement(By.Id("Add_Max")).SendKeys("10");
             s.Driver.FindElement(By.Id("Add_InvoiceMetadata")).SendKeys("{\"test\":\"lol\"}");
             s.Driver.FindElement(By.CssSelector("button[value='add']")).Click();
-            s.FindAlertMessage();
+            s.FindAlertMessage(StatusMessageModel.StatusSeverity.Success);
 
             var addresses = s.Driver.FindElements(By.ClassName("lightning-address-value"));
-            var emailSuffix = $"@{s.Server.PayTester.HostName}:{s.Server.PayTester.Port}";
             Assert.Equal(2, addresses.Count);
-
-            LNURLPayRequest.LNURLPayRequestCallbackResponse lnAddressOneResponse = null;
-            LNURLPayRequest.LNURLPayRequestCallbackResponse lnAddressTwoResponse = null;
+            var callbacks = new List<Uri>();
             foreach (IWebElement webElement in addresses)
             {
                 var value = webElement.GetAttribute("value");
                 //cannot test this directly as https is not supported on our e2e tests
                 // var request = await LNURL.LNURL.FetchPayRequestViaInternetIdentifier(value, new HttpClient());
 
-                var lnurl = new Uri(LNURL.LNURL.ExtractUriFromInternetIdentifier(value).ToString().Replace("https", "http"));
-                var request = (LNURLPayRequest)await LNURL.LNURL.FetchInformation(lnurl, new HttpClient());
+                var lnurl = new Uri(LNURL.LNURL.ExtractUriFromInternetIdentifier(value).ToString()
+                    .Replace("https", "http"));
+                var request = (LNURL.LNURLPayRequest)await LNURL.LNURL.FetchInformation(lnurl, new HttpClient());
                 var m = request.ParsedMetadata.ToDictionary(o => o.Key, o => o.Value);
                 switch (value)
                 {
@@ -2399,8 +2529,7 @@ namespace BTCPayServer.Tests
                         lnaddress2 = m["text/identifier"];
                         Assert.Equal(2, request.MinSendable.ToDecimal(LightMoneyUnit.Satoshi));
                         Assert.Equal(10, request.MaxSendable.ToDecimal(LightMoneyUnit.Satoshi));
-                        lnAddressTwoResponse = await request.SendRequest(request.MinSendable, ((BTCPayNetwork)s.Server.DefaultNetwork).NBitcoinNetwork,
-                            new HttpClient());
+                        callbacks.Add(request.Callback);
                         break;
 
                     case { } v when v.StartsWith(lnaddress1):
@@ -2408,29 +2537,47 @@ namespace BTCPayServer.Tests
                         lnaddress1 = m["text/identifier"];
                         Assert.Equal(1, request.MinSendable.ToDecimal(LightMoneyUnit.Satoshi));
                         Assert.Equal(6.12m, request.MaxSendable.ToDecimal(LightMoneyUnit.BTC));
-                        lnAddressOneResponse = await request.SendRequest(request.MinSendable, ((BTCPayNetwork)s.Server.DefaultNetwork).NBitcoinNetwork,
-                            new HttpClient());
+                        callbacks.Add(request.Callback);
                         break;
-                    
-                    case not null when value.Equals($"{lnaddress2}{emailSuffix}"):
-                        lnaddress2 = m["text/identifier"];
-                        Assert.Equal(2, request.MinSendable.ToDecimal(LightMoneyUnit.Satoshi));
-                        Assert.Equal(10, request.MaxSendable.ToDecimal(LightMoneyUnit.Satoshi));
-                        break;
-                    
                     default:
-                        Assert.False(true, "Should have matched one of the Lightning addresses");
+                        Assert.False(true, "Should have matched");
                         break;
                 }
             }
-            
-            // Check that no BTCPay invoice got generated on initial LNURL request
             var repo = s.Server.PayTester.GetService<InvoiceRepository>();
-            var invoices = await repo.GetInvoices(new InvoiceQuery { StoreId = new[] { s.StoreId } });
+
+            var invoices = await repo.GetInvoices(new InvoiceQuery() { StoreId = new[] { s.StoreId } });
+            // Resolving a ln address shouldn't create any btcpay invoice.
+            // This must be done because some NOST clients resolve ln addresses preemptively without user interaction
             Assert.Empty(invoices);
 
+            // Calling the callbacks should create the invoices
+            foreach (var callback in callbacks)
+            {
+                using var r = await s.Server.PayTester.HttpClient.GetAsync(callback);
+                await r.Content.ReadAsStringAsync();
+            }
+            invoices = await repo.GetInvoices(new InvoiceQuery() { StoreId = new[] { s.StoreId } });
+            Assert.Equal(2, invoices.Length);
+            var emailSuffix = $"@{s.Server.PayTester.HostName}:{s.Server.PayTester.Port}";
+            foreach (var i in invoices)
+            {
+                var lightningPaymentMethod = i.GetPaymentMethod(new PaymentMethodId("BTC", PaymentTypes.LNURLPay));
+                var paymentMethodDetails =
+                    lightningPaymentMethod.GetPaymentMethodDetails() as LNURLPayPaymentMethodDetails;
+                Assert.Contains(
+                    paymentMethodDetails.ConsumedLightningAddress,
+                    new[] { lnaddress1, lnaddress2 });
+
+                if (paymentMethodDetails.ConsumedLightningAddress == lnaddress2)
+                {
+                    Assert.Equal("lol", i.Metadata.AdditionalData["test"].Value<string>());
+                }
+            }
+
             var lnUsername = lnaddress1.Split('@')[0];
 
+
             LNURLPayRequest req;
             using (var resp = await s.Server.PayTester.HttpClient.GetAsync($"/.well-known/lnurlp/{lnUsername}"))
             {
@@ -2483,25 +2630,6 @@ namespace BTCPayServer.Tests
                 Assert.NotNull(succ.Pr);
                 Assert.Equal(new LightMoney(2001), BOLT11PaymentRequest.Parse(succ.Pr, Network.RegTest).MinimumAmount);
             }
-            
-            // Again, check the invoices
-            invoices = await repo.GetInvoices(new InvoiceQuery { StoreId = new[] { s.StoreId } });
-            Assert.Equal(2, invoices.Length);
-            
-            foreach (var i in invoices)
-            {
-                var lightningPaymentMethod = i.GetPaymentMethod(new PaymentMethodId("BTC", PaymentTypes.LNURLPay));
-                var paymentMethodDetails =
-                    lightningPaymentMethod.GetPaymentMethodDetails() as LNURLPayPaymentMethodDetails;
-                Assert.Contains(
-                    paymentMethodDetails.ConsumedLightningAddress,
-                    new[] { lnaddress1, lnaddress2 });
-
-                if (paymentMethodDetails.ConsumedLightningAddress == lnaddress2)
-                {
-                    Assert.Equal("lol", i.Metadata.AdditionalData["test"].Value<string>());
-                }
-            }
         }
 
         [Fact]
@@ -2511,6 +2639,7 @@ namespace BTCPayServer.Tests
             using var s = CreateSeleniumTester();
             await s.StartAsync();
             var user = s.RegisterNewUser();
+            s.GoToHome();
             s.GoToProfile(ManageNavPages.LoginCodes);
             var code = s.Driver.FindElement(By.Id("logincode")).GetAttribute("value");
             s.Driver.FindElement(By.Id("regeneratecode")).Click();
@@ -2522,14 +2651,12 @@ namespace BTCPayServer.Tests
             s.Driver.SetAttribute("LoginCode", "value", "bad code");
             s.Driver.InvokeJSFunction("logincode-form", "submit");
 
-
             s.Driver.SetAttribute("LoginCode", "value", code);
             s.Driver.InvokeJSFunction("logincode-form", "submit");
-            s.GoToProfile();
+            s.GoToHome();
             Assert.Contains(user, s.Driver.PageSource);
         }
 
-
         // For god know why, selenium have problems clicking on the save button, resulting in ultimate hacks
         // to make it works.
         private void SudoForceSaveLightningSettingsRightNowAndFast(SeleniumTester s, string cryptoCode)
@@ -2548,7 +2675,6 @@ retry:
             }
         }
 
-
         [Fact]
         [Trait("Selenium", "Selenium")]
         public async Task CanUseLNURLAuth()
@@ -2556,6 +2682,7 @@ retry:
             using var s = CreateSeleniumTester();
             await s.StartAsync();
             var user = s.RegisterNewUser(true);
+            s.GoToHome();
             s.GoToProfile(ManageNavPages.TwoFactorAuthentication);
             s.Driver.FindElement(By.Name("Name")).SendKeys("ln wallet");
             s.Driver.FindElement(By.Name("type"))
@@ -2604,7 +2731,8 @@ retry:
         {
             using var s = CreateSeleniumTester(newDb: true);
             await s.StartAsync();
-            var user = s.RegisterNewUser(true);
+            s.RegisterNewUser(true);
+            s.GoToHome();
             s.GoToServer(ServerNavPages.Roles);
             var existingServerRoles = s.Driver.FindElement(By.CssSelector("table")).FindElements(By.CssSelector("tr"));
             Assert.Equal(3, existingServerRoles.Count);

BTCPayServer.Tests/TestAccount.cs

@@ -40,6 +40,7 @@ namespace BTCPayServer.Tests
     public class TestAccount
     {
         readonly ServerTester parent;
+        public string LNAddress;
 
         public TestAccount(ServerTester parent)
         {
@@ -242,7 +243,7 @@ namespace BTCPayServer.Tests
                 policies.LockSubscription = false;
                 await account.Register(RegisterDetails);
             }
-
+            TestLogs.LogInformation($"UserId: {account.RegisteredUserId} Password: {Password}");
             UserId = account.RegisteredUserId;
             Email = RegisterDetails.Email;
             IsAdmin = account.RegisteredAdmin;
@@ -309,8 +310,9 @@ namespace BTCPayServer.Tests
                 Assert.False(true, storeController.ModelState.FirstOrDefault().Value.Errors[0].ErrorMessage);
         }
 
-        public async Task<Coin> ReceiveUTXO(Money value, BTCPayNetwork network)
+        public async Task<Coin> ReceiveUTXO(Money value, BTCPayNetwork network = null)
         {
+            network ??= SupportedNetwork;
             var cashCow = parent.ExplorerNode;
             var btcPayWallet = parent.PayTester.GetService<BTCPayWalletProvider>().GetWallet(network);
             var address = (await btcPayWallet.ReserveAddressAsync(this.DerivationScheme)).Address;
@@ -553,5 +555,94 @@ retry:
             var repo = this.parent.PayTester.GetService<StoreRepository>();
             await repo.AddStoreUser(StoreId, userId, StoreRoleId.Owner);
         }
+
+        public async Task<uint256> PayOnChain(string invoiceId)
+        {
+            var cryptoCode = "BTC";
+            var client = await CreateClient();
+            var methods = await client.GetInvoicePaymentMethods(StoreId, invoiceId);
+            var method = methods.First(m => m.PaymentMethod == cryptoCode);
+            var address = method.Destination;
+            var tx = await client.CreateOnChainTransaction(StoreId, cryptoCode, new CreateOnChainTransactionRequest()
+            {
+                Destinations = new List<CreateOnChainTransactionRequest.CreateOnChainTransactionRequestDestination>()
+                {
+                 new ()
+                 {
+                     Destination = address,
+                     Amount = method.Due
+                 }
+                },
+                FeeRate = new FeeRate(1.0m)
+            });
+            await WaitInvoicePaid(invoiceId);
+            return tx.TransactionHash;
+        }
+
+        public async Task PayOnBOLT11(string invoiceId)
+        {
+            var cryptoCode = "BTC";
+            var client = await CreateClient();
+            var methods = await client.GetInvoicePaymentMethods(StoreId, invoiceId);
+            var method = methods.First(m => m.PaymentMethod == $"{cryptoCode}-LightningNetwork");
+            var bolt11 = method.Destination;
+            TestLogs.LogInformation("PAYING");
+            await parent.CustomerLightningD.Pay(bolt11);
+            TestLogs.LogInformation("PAID");
+            await WaitInvoicePaid(invoiceId);
+        }
+
+        public async Task PayOnLNUrl(string invoiceId)
+        {
+            var cryptoCode = "BTC";
+            var network = SupportedNetwork.NBitcoinNetwork;
+            var client = await CreateClient();
+            var methods = await client.GetInvoicePaymentMethods(StoreId, invoiceId);
+            var method = methods.First(m => m.PaymentMethod == $"{cryptoCode}-LNURLPAY");
+            var lnurL = LNURL.LNURL.Parse(method.PaymentLink, out var tag);
+            var http = new HttpClient();
+            var payreq = (LNURL.LNURLPayRequest)await LNURL.LNURL.FetchInformation(lnurL, tag, http);
+            var resp = await payreq.SendRequest(payreq.MinSendable, network, http);
+            var bolt11 = resp.Pr;
+            await parent.CustomerLightningD.Pay(bolt11);
+            await WaitInvoicePaid(invoiceId);
+        }
+
+        public Task WaitInvoicePaid(string invoiceId)
+        {
+            return TestUtils.EventuallyAsync(async () =>
+            {
+                var client = await CreateClient();
+                var invoice = await client.GetInvoice(StoreId, invoiceId);
+                if (invoice.Status == InvoiceStatus.Settled)
+                    return;
+                Assert.Equal(InvoiceStatus.Processing, invoice.Status);
+            });
+        }
+
+        public async Task PayOnLNAddress(string lnAddrUser = null)
+        {
+            lnAddrUser ??= LNAddress;
+            var network = SupportedNetwork.NBitcoinNetwork;
+            var payReqStr = await (await parent.PayTester.HttpClient.GetAsync($".well-known/lnurlp/{lnAddrUser}")).Content.ReadAsStringAsync();
+            var payreq = JsonConvert.DeserializeObject<LNURL.LNURLPayRequest>(payReqStr);
+            var resp = await payreq.SendRequest(payreq.MinSendable, network, parent.PayTester.HttpClient);
+            var bolt11 = resp.Pr;
+            await parent.CustomerLightningD.Pay(bolt11);
+        }
+
+        public async Task<string> CreateLNAddress()
+        {
+            var lnAddrUser = Guid.NewGuid().ToString();
+            var ctx = parent.PayTester.GetService<ApplicationDbContextFactory>().CreateContext();
+            ctx.LightningAddresses.Add(new()
+            {
+                StoreDataId = StoreId,
+                Username = lnAddrUser
+            });
+            await ctx.SaveChangesAsync();
+            LNAddress = lnAddrUser;
+            return lnAddrUser;
+        }
     }
 }

BTCPayServer.Tests/ThirdPartyTests.cs

@@ -290,9 +290,9 @@ retry:
         }
 
         [Fact]
-        public void CanGetRateCryptoCurrenciesByDefault()
+        public async Task CanGetRateCryptoCurrenciesByDefault()
         {
-            string[] brokenShitcoins = { "BTX_USD", "CHC_USD" };
+            string[] brokenShitcoins = { "BTG", "BTX" };
             var provider = new BTCPayNetworkProvider(ChainName.Mainnet);
             var factory = FastTests.CreateBTCPayRateFactory();
             var fetcher = new RateFetcher(factory);
@@ -305,17 +305,44 @@ retry:
             var result = fetcher.FetchRates(pairs, rules, default);
             foreach ((CurrencyPair key, Task<RateResult> value) in result)
             {
-                var rateResult = value.GetAwaiter().GetResult();
-                if (key.ToString() == "BTG_USD")
-                    continue; // shitcoin not supported by bitfinex anymore
-                TestLogs.LogInformation($"Testing {key}");
-                if (brokenShitcoins.Contains(key.ToString()))
+                var rateResult = await value;
+                if (brokenShitcoins.Contains(key.Left))
+                {
+                    TestLogs.LogInformation($"Skipping {key} because it is marked as broken");
                     continue;
+                }
+                    
+                TestLogs.LogInformation($"Testing {key}");
                 Assert.True(rateResult.BidAsk != null, $"Impossible to get the rate {rateResult.EvaluatedRule}");
             }
+
+            var b = new StoreBlob();
+            foreach (var k in StoreBlob.RecommendedExchanges)
+            {
+                b.DefaultCurrency = k.Key;
+                rules = b.GetDefaultRateRules(provider);
+                pairs =
+                    provider.GetAll()
+                        .Select(c => new CurrencyPair(c.CryptoCode, k.Key))
+                        .ToHashSet();
+                result = fetcher.FetchRates(pairs, rules, default);
+                foreach ((CurrencyPair key, Task<RateResult> value) in result)
+                {
+                    var rateResult = await value;
+                    if (brokenShitcoins.Contains(key.Left))
+                    {
+                        TestLogs.LogInformation($"Skipping {key} because it is marked as broken");
+                        continue;
+                    }
+                    TestLogs.LogInformation($"Testing {key} when default currency is {k.Key}");
+                    Assert.True(rateResult.BidAsk != null, $"Impossible to get the rate {rateResult.EvaluatedRule}");
+                }
+            }
+
         }
 
         [Fact]
+        [Trait("Fast", "Fast")]
         public async Task CheckJsContent()
         {
             // This test verify that no malicious js is added in the minified files.
@@ -324,52 +351,71 @@ retry:
             var actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "bootstrap", "bootstrap.bundle.min.js").Trim();
             var version = Regex.Match(actual, "Bootstrap v([0-9]+.[0-9]+.[0-9]+)").Groups[1].Value;
             var expected = (await (await client.GetAsync($"https://cdn.jsdelivr.net/npm/bootstrap@{version}/dist/js/bootstrap.bundle.min.js")).Content.ReadAsStringAsync()).Trim();
-            Assert.Equal(expected, actual);
+            EqualJsContent(expected, actual);
 
             actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "clipboard.js", "clipboard.js");
             expected = (await (await client.GetAsync("https://cdnjs.cloudflare.com/ajax/libs/clipboard.js/2.0.8/clipboard.js")).Content.ReadAsStringAsync()).Trim();
-            Assert.Equal(expected, actual);
+            EqualJsContent(expected, actual);
 
             actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "vuejs", "vue.min.js").Trim();
             version = Regex.Match(actual, "Vue\\.js v([0-9]+.[0-9]+.[0-9]+)").Groups[1].Value;
             expected = (await (await client.GetAsync($"https://cdnjs.cloudflare.com/ajax/libs/vue/{version}/vue.min.js")).Content.ReadAsStringAsync()).Trim();
-            Assert.Equal(expected, actual);
+            EqualJsContent(expected, actual);
 
             actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "i18next", "i18next.min.js").Trim();
             expected = (await (await client.GetAsync("https://cdnjs.cloudflare.com/ajax/libs/i18next/22.0.6/i18next.min.js")).Content.ReadAsStringAsync()).Trim();
-            Assert.Equal(expected, actual);
+            EqualJsContent(expected, actual);
 
             actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "i18next", "i18nextHttpBackend.min.js").Trim();
             expected = (await (await client.GetAsync("https://cdnjs.cloudflare.com/ajax/libs/i18next-http-backend/2.0.1/i18nextHttpBackend.min.js")).Content.ReadAsStringAsync()).Trim();
-            Assert.Equal(expected, actual);
+            EqualJsContent(expected, actual);
 
             actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "i18next", "vue-i18next.js").Trim();
             expected = (await (await client.GetAsync("https://unpkg.com/@panter/vue-i18next@0.15.2/dist/vue-i18next.js")).Content.ReadAsStringAsync()).Trim();
-            Assert.Equal(expected, actual);
+            EqualJsContent(expected, actual);
 
             actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "vue-qrcode", "vue-qrcode.min.js").Trim();
             version = Regex.Match(actual, "vue-qrcode v([0-9]+.[0-9]+.[0-9]+)").Groups[1].Value;
             expected = (await (await client.GetAsync($"https://unpkg.com/@chenfengyuan/vue-qrcode@{version}/dist/vue-qrcode.min.js")).Content.ReadAsStringAsync()).Trim();
-            Assert.Equal(expected, actual);
+            EqualJsContent(expected, actual);
 
             actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "tom-select", "tom-select.complete.min.js").Trim();
             expected = (await (await client.GetAsync($"https://cdn.jsdelivr.net/npm/tom-select@2.2.2/dist/js/tom-select.complete.min.js")).Content.ReadAsStringAsync()).Trim();
-            Assert.Equal(expected, actual);
+            EqualJsContent(expected, actual);
 
             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();
-            Assert.Equal(expected, actual);
+            EqualJsContent(expected, actual);
 
             actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "vue-sortable", "sortable.min.js").Trim();
             version = Regex.Match(actual, "Sortable ([0-9]+.[0-9]+.[0-9]+) ").Groups[1].Value;
             expected = (await (await client.GetAsync($"https://unpkg.com/sortablejs@{version}/Sortable.min.js")).Content.ReadAsStringAsync()).Trim();
-            Assert.Equal(expected, actual);
+            EqualJsContent(expected, actual);
 
             actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "bootstrap-vue", "bootstrap-vue.min.js").Trim();
             version = Regex.Match(actual, "BootstrapVue ([0-9]+.[0-9]+.[0-9]+)").Groups[1].Value;
             expected = (await (await client.GetAsync($"https://cdnjs.cloudflare.com/ajax/libs/bootstrap-vue/{version}/bootstrap-vue.min.js")).Content.ReadAsStringAsync()).Trim();
-            Assert.Equal(expected, actual);
+            EqualJsContent(expected, actual);
+
+            actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "FileSaver", "FileSaver.min.js").Trim();
+            expected = (await (await client.GetAsync($"https://raw.githubusercontent.com/eligrey/FileSaver.js/43bbd2f0ae6794f8d452cd360e9d33aef6071234/dist/FileSaver.min.js")).Content.ReadAsStringAsync()).Trim();
+            EqualJsContent(expected, actual);
+
+            actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "papaparse", "papaparse.min.js").Trim();
+            expected = (await (await client.GetAsync($"https://raw.githubusercontent.com/mholt/PapaParse/5.4.1/papaparse.min.js")).Content.ReadAsStringAsync()).Trim();
+            EqualJsContent(expected, actual);
+
+            actual = GetFileContent("BTCPayServer", "wwwroot", "vendor", "vue-sanitize-directive", "vue-sanitize-directive.umd.min.js").Trim();
+            version = Regex.Match(actual, "Original file: /npm/vue-sanitize-directive@([0-9]+.[0-9]+.[0-9]+)").Groups[1].Value;
+            expected = (await (await client.GetAsync($"https://cdn.jsdelivr.net/npm/vue-sanitize-directive@{version}/dist/vue-sanitize-directive.umd.min.js")).Content.ReadAsStringAsync()).Trim();
+            EqualJsContent(expected, actual);
+        }
+
+        private void EqualJsContent(string expected, string actual)
+        {
+            if (expected != actual)
+                 Assert.Equal(expected, actual.ReplaceLineEndings("\n"));
         }
 
         string GetFileContent(params string[] path)

BTCPayServer.Tests/UnitTest1.cs

@@ -1761,7 +1761,7 @@ namespace BTCPayServer.Tests
                 var parsedJson = await GetExport(user);
                 Assert.Equal(3, parsedJson.Length);
 
-                var invoiceDueAfterFirstPayment = (3 * networkFee).ToDecimal(MoneyUnit.BTC) * invoice.Rate;
+                var invoiceDueAfterFirstPayment = 3 * networkFee.ToDecimal(MoneyUnit.BTC) * invoice.Rate;
                 var pay1str = parsedJson[0].ToString();
                 Assert.Contains("\"InvoiceItemDesc\": \"Some \\\", description\"", pay1str);
                 Assert.Equal(invoiceDueAfterFirstPayment, GetFieldValue(pay1str, "InvoiceDue"));
@@ -2859,7 +2859,7 @@ namespace BTCPayServer.Tests
             using var tester = CreateServerTester();
             await tester.StartAsync();
             var user = tester.NewAccount();
-            user.GrantAccess();
+            await user.GrantAccessAsync();
             var controller = tester.PayTester.GetController<UIServerController>(user.UserId, user.StoreId);
 
             var fileSystemStorageConfiguration = Assert.IsType<FileSystemStorageConfiguration>(Assert
@@ -2874,7 +2874,6 @@ namespace BTCPayServer.Tests
             Assert.Equal(StorageProvider.FileSystem,
                 shouldBeRedirectingToLocalStorageConfigPage.RouteValues["provider"]);
 
-
             await CanUploadRemoveFiles(controller);
         }
 
@@ -2906,7 +2905,7 @@ namespace BTCPayServer.Tests
 
             //create a temporary link to file
             var tmpLinkGenerate = Assert.IsType<RedirectToActionResult>(await controller.CreateTemporaryFileUrl(fileId,
-                new UIServerController.CreateTemporaryFileUrlViewModel()
+                new UIServerController.CreateTemporaryFileUrlViewModel
                 {
                     IsDownload = true,
                     TimeAmount = 1,
@@ -2936,5 +2935,124 @@ namespace BTCPayServer.Tests
                 Assert.IsType<ViewFilesViewModel>(Assert.IsType<ViewResult>(await controller.Files(new string[] { fileId })).Model);
             Assert.Null(viewFilesViewModel.DirectUrlByFiles);
         }
+
+        [Fact]
+        [Trait("Selenium", "Selenium")]
+        public async Task CanCreateReports()
+        {
+            using var tester = CreateServerTester();
+            tester.ActivateLightning();
+            tester.DeleteStore = false;
+            await tester.StartAsync();
+            await tester.EnsureChannelsSetup();
+            var acc = tester.NewAccount();
+            await acc.GrantAccessAsync();
+            await acc.MakeAdmin();
+            acc.RegisterDerivationScheme("BTC", importKeysToNBX: true);
+            acc.RegisterLightningNode("BTC");
+            await acc.ReceiveUTXO(Money.Coins(1.0m));
+
+            var client = await acc.CreateClient();
+            var posController = acc.GetController<UIPointOfSaleController>();
+
+            var app = await client.CreatePointOfSaleApp(acc.StoreId, new CreatePointOfSaleAppRequest()
+            {
+                AppName = "Static",
+                DefaultView =  Client.Models.PosViewType.Static,
+                Template = new PointOfSaleSettings().Template
+            });
+            var resp = await posController.ViewPointOfSale(app.Id, choiceKey: "green-tea");
+            var invoiceId = GetInvoiceId(resp);
+            await acc.PayOnChain(invoiceId);
+
+            app = await client.CreatePointOfSaleApp(acc.StoreId, new CreatePointOfSaleAppRequest()
+            {
+                AppName = "Cart",
+                DefaultView =  Client.Models.PosViewType.Cart,
+                Template = new PointOfSaleSettings().Template
+            });
+            resp = await posController.ViewPointOfSale(app.Id, posData: new JObject()
+            {
+                ["cart"] = new JArray()
+                {
+                    new JObject()
+                    {
+                        ["id"] = "green-tea",
+                        ["count"] = 2
+                    },
+                    new JObject()
+                    {
+                        ["id"] = "black-tea",
+                        ["count"] = 1
+                    },
+                }
+            }.ToString());
+            invoiceId = GetInvoiceId(resp);
+            await acc.PayOnBOLT11(invoiceId);
+
+            resp = await posController.ViewPointOfSale(app.Id, posData: new JObject()
+            {
+                ["cart"] = new JArray()
+                {
+                    new JObject()
+                    {
+                        ["id"] = "green-tea",
+                        ["count"] = 5
+                    }
+                }
+            }.ToString());
+            invoiceId = GetInvoiceId(resp);
+            await acc.PayOnLNUrl(invoiceId);
+
+            await acc.CreateLNAddress();
+            await acc.PayOnLNAddress();
+
+            var report = await GetReport(acc, new() { ViewName = "Payments" });
+            // 1 payment on LN Address
+            // 1 payment on LNURL
+            // 1 payment on BOLT11
+            // 1 payment on chain
+            Assert.Equal(4, report.Data.Count);
+            var lnAddressIndex = report.GetIndex("LightningAddress");
+            var paymentTypeIndex = report.GetIndex("PaymentType");
+            Assert.Contains(report.Data, d => d[lnAddressIndex]?.Value<string>()?.Contains(acc.LNAddress) is true);
+            var paymentTypes = report.Data
+                .GroupBy(d => d[paymentTypeIndex].Value<string>())
+                .ToDictionary(d => d.Key);
+            Assert.Equal(3, paymentTypes["Lightning"].Count());
+            Assert.Single(paymentTypes["On-Chain"]);
+
+            // 2 on-chain transactions: It received from the cashcow, then paid its own invoice
+            report = await GetReport(acc, new() { ViewName = "On-Chain Wallets" });
+            var txIdIndex = report.GetIndex("TransactionId");
+            var balanceIndex = report.GetIndex("BalanceChange");
+            Assert.Equal(2, report.Data.Count);
+            Assert.Equal(64, report.Data[0][txIdIndex].Value<string>().Length);
+            Assert.Contains(report.Data, d => d[balanceIndex].Value<decimal>() == 1.0m);
+
+            // Items sold
+            report = await GetReport(acc, new() { ViewName = "Products sold" });
+            var itemIndex = report.GetIndex("Product");
+            var countIndex = report.GetIndex("Quantity");
+            var itemsCount = report.Data.GroupBy(d => d[itemIndex].Value<string>())
+                .ToDictionary(d => d.Key, r => r.Sum(d => d[countIndex].Value<int>()));
+            Assert.Equal(8, itemsCount["green-tea"]);
+            Assert.Equal(1, itemsCount["black-tea"]);
+        }
+
+        private async Task<StoreReportResponse> GetReport(TestAccount acc, StoreReportRequest req)
+        {
+            var controller = acc.GetController<UIReportsController>();
+            return (await controller.StoreReportsJson(acc.StoreId, req)).AssertType<JsonResult>()
+                .Value
+                .AssertType<StoreReportResponse>();
+        }
+
+        private static string GetInvoiceId(IActionResult resp)
+        {
+            var redirect = resp.AssertType<RedirectToActionResult>();
+            Assert.Equal("Checkout", redirect.ActionName);
+            return (string)redirect.RouteValues["invoiceId"];
+        }
     }
 }

BTCPayServer.Tests/docker-compose.altcoins.yml

@@ -163,7 +163,7 @@ services:
       - "bitcoin_datadir:/data"
 
   customer_lightningd:
-    image: btcpayserver/lightning:v23.05-dev
+    image: btcpayserver/lightning:v23.08-dev
     stop_signal: SIGKILL
     restart: unless-stopped
     environment:
@@ -190,7 +190,7 @@ services:
       - bitcoind
 
   merchant_lightningd:
-    image: btcpayserver/lightning:v23.05-dev
+    image: btcpayserver/lightning:v23.08-dev
     stop_signal: SIGKILL
     environment:
       EXPOSE_TCP: "true"
@@ -224,7 +224,7 @@ services:
       - "5432"
 
   merchant_lnd:
-    image: btcpayserver/lnd:v0.16.2-beta
+    image: btcpayserver/lnd:v0.16.4-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
@@ -259,7 +259,7 @@ services:
       - bitcoind
 
   customer_lnd:
-    image: btcpayserver/lnd:v0.16.2-beta
+    image: btcpayserver/lnd:v0.16.4-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"

BTCPayServer.Tests/docker-compose.yml

@@ -149,7 +149,7 @@ services:
       - "bitcoin_datadir:/data"
 
   customer_lightningd:
-    image: btcpayserver/lightning:v23.05-dev
+    image: btcpayserver/lightning:v23.08-dev
     stop_signal: SIGKILL
     restart: unless-stopped
     environment:
@@ -176,7 +176,7 @@ services:
       - bitcoind
 
   merchant_lightningd:
-    image: btcpayserver/lightning:v23.05-dev
+    image: btcpayserver/lightning:v23.08-dev
     stop_signal: SIGKILL
     environment:
       EXPOSE_TCP: "true"
@@ -211,7 +211,7 @@ services:
       - "5432"
 
   merchant_lnd:
-    image: btcpayserver/lnd:v0.16.2-beta
+    image: btcpayserver/lnd:v0.16.4-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"
@@ -248,7 +248,7 @@ services:
       - bitcoind
 
   customer_lnd:
-    image: btcpayserver/lnd:v0.16.2-beta
+    image: btcpayserver/lnd:v0.16.4-beta
     restart: unless-stopped
     environment:
       LND_CHAIN: "btc"

BTCPayServer/BTCPayServer.csproj

@@ -48,13 +48,13 @@
     <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.4.28" />
+    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.4.31" />
     <PackageReference Include="CsvHelper" Version="15.0.5" />
     <PackageReference Include="Dapper" Version="2.0.123" />
     <PackageReference Include="Fido2" Version="2.0.2" />
     <PackageReference Include="Fido2.AspNet" Version="2.0.2" />
     <PackageReference Include="HtmlSanitizer" Version="5.0.372" />
-    <PackageReference Include="LNURL" Version="0.0.29" />
+    <PackageReference Include="LNURL" Version="0.0.30" />
     <PackageReference Include="MailKit" Version="3.3.0" />
     <PackageReference Include="BTCPayServer.NETCore.Plugins.Mvc" Version="1.4.4" />
     <PackageReference Include="QRCoder" Version="1.4.3" />
@@ -81,6 +81,7 @@
   </ItemGroup>
 
 	<ItemGroup>
+	  <None Include="Views\UIReports\StoreReports.cshtml" />
 	  <None Include="wwwroot\vendor\font-awesome\fonts\fontawesome-webfont.svg" />
 	  <None Include="wwwroot\vendor\font-awesome\fonts\fontawesome-webfont.woff2" />
 	  <None Include="wwwroot\vendor\font-awesome\less\animated.less" />
@@ -119,6 +120,7 @@
 	  <Folder Include="wwwroot\vendor\bootstrap" />
 	  <Folder Include="wwwroot\vendor\clipboard.js\" />
 	  <Folder Include="wwwroot\vendor\highlightjs\" />
+	  <Folder Include="wwwroot\vendor\pivottable\" />
 	  <Folder Include="wwwroot\vendor\summernote" />
 	  <Folder Include="wwwroot\vendor\tom-select" />
 	  <Folder Include="wwwroot\vendor\ur-registry" />
@@ -136,6 +138,7 @@
 	<ItemGroup>
     <Watch Include="Views\**\*.*"></Watch>
     <Watch Remove="Views\UIAccount\CheatPermissions.cshtml" />
+    <Watch Remove="Views\UIReports\StoreReports.cshtml" />
     <Content Update="Views\UIApps\_ViewImports.cshtml">
       <CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
       <Pack>$(IncludeRazorContentInPack)</Pack>

BTCPayServer/Components/AppTopItems/AppTopItems.cs

@@ -24,7 +24,7 @@ public class AppTopItems : ViewComponent
     public async Task<IViewComponentResult> InvokeAsync(string appId, string appType)
     {
         var type = _appService.GetAppType(appType);
-        if (type is not IHasItemStatsAppType salesAppType || type is not AppBaseType appBaseType)
+        if (type is not (IHasItemStatsAppType and AppBaseType appBaseType))
             return new HtmlContentViewComponentResult(new StringHtmlContent(string.Empty));
 
         var vm = new AppTopItemsViewModel

BTCPayServer/Components/MainNav/Default.cshtml

@@ -131,6 +131,12 @@
                                             <span>Invoices</span>
                                         </a>
                                     </li>
+									<li class="nav-item" permission="@Policies.CanViewInvoices">
+										<a asp-area="" asp-controller="UIReports" asp-action="StoreReports" asp-route-storeId="@Model.Store.Id" class="nav-link @ViewData.IsActivePage(StoreNavPages.Reporting)" id="SectionNav-Reporting">
+											<vc:icon symbol="invoice" />
+											<span>Reporting</span>
+										</a>
+									</li>
                                     <li class="nav-item" permission="@Policies.CanModifyStoreSettings">
                                         <a asp-area="" asp-controller="UIPaymentRequest" asp-action="GetPaymentRequests" asp-route-storeId="@Model.Store.Id" class="nav-link @ViewData.IsActiveCategory(typeof(PaymentRequestsNavPages))" id="StoreNav-PaymentRequests">
                                             <vc:icon symbol="payment-requests"/>

BTCPayServer/Components/StoreRecentInvoices/Default.cshtml

@@ -3,6 +3,7 @@
 @using BTCPayServer.Services
 @using BTCPayServer.Services.Invoices
 @inject DisplayFormatter DisplayFormatter
+@inject PaymentMethodHandlerDictionary PaymentMethodHandlerDictionary
 @model BTCPayServer.Components.StoreRecentInvoices.StoreRecentInvoicesViewModel
 
 <div class="widget store-recent-invoices" id="StoreRecentInvoices-@Model.Store.Id">
@@ -51,27 +52,41 @@
                         <a asp-controller="UIInvoice" asp-action="Invoice" asp-route-invoiceId="@invoice.InvoiceId" class="text-break">@invoice.InvoiceId</a>
                     </td>
                     <td>
-                        @if (invoice.Details.Archived)
-                        {
-                            <span class="badge bg-warning">archived</span>
-                        }
-                        <span class="badge badge-@invoice.Status.Status.ToModernStatus().ToString().ToLower()">
-                            @invoice.Status.Status.ToModernStatus().ToString()
-                            @if (invoice.Status.ExceptionStatus != InvoiceExceptionStatus.None)
+                        <div class="d-flex align-items-center gap-2">
+                            @if (invoice.Details.Archived)
                             {
-                                @($"({invoice.Status.ExceptionStatus.ToString()})")
+                                <span class="badge bg-warning">archived</span>
                             }
-                        </span>
-                        @foreach (var paymentType in invoice.Details.Payments.Select(payment => payment.GetPaymentMethodId()?.PaymentType).Distinct().Where(type => type != null && !string.IsNullOrEmpty(type.GetBadge())))
-                        {
-                            <span class="badge">@paymentType.GetBadge()</span>
-                        }
-                        @if (invoice.HasRefund)
-                        {
-                            <span class="badge bg-warning">
-                                Refund
+                            <span class="badge badge-@invoice.Status.Status.ToModernStatus().ToString().ToLower()">
+                                @invoice.Status.Status.ToModernStatus().ToString()
+                                @if (invoice.Status.ExceptionStatus != InvoiceExceptionStatus.None)
+                                {
+                                    @($"({invoice.Status.ExceptionStatus.ToString()})")
+                                }
                             </span>
-                        }
+                            @foreach (var paymentMethodId in invoice.Details.Payments.Select(payment => payment.GetPaymentMethodId()).Distinct())
+                            {
+                                var image = PaymentMethodHandlerDictionary[paymentMethodId]?.GetCryptoImage(paymentMethodId);
+                                var badge = paymentMethodId.PaymentType.GetBadge();
+                                if (!string.IsNullOrEmpty(image) || !string.IsNullOrEmpty(badge))
+                                {
+                                    <span class="d-inline-flex align-items-center gap-1">
+                                        @if (!string.IsNullOrEmpty(image))
+                                        {
+                                            <img src="@Context.Request.GetRelativePathOrAbsolute(image)" alt="@paymentMethodId.PaymentType.ToString()" style="height:1.5em" />
+                                        }
+                                        @if (!string.IsNullOrEmpty(badge))
+                                        {
+                                            @badge
+                                        }
+                                    </span>
+                                }
+                            }
+                            @if (invoice.HasRefund)
+                            {
+                                <span class="badge bg-warning">Refund</span>
+                            }
+                        </div>
                     </td>
                     <td class="text-end">
                         <span data-sensitive>@DisplayFormatter.Currency(invoice.Amount, invoice.Currency)</span>

BTCPayServer/Components/TruncateCenter/Default.cshtml

@@ -1,6 +1,7 @@
 @model BTCPayServer.Components.TruncateCenter.TruncateCenterViewModel
 @{
     var classes = string.IsNullOrEmpty(Model.Classes) ? string.Empty : Model.Classes.Trim();
+    var isTruncated = !string.IsNullOrEmpty(Model.Start) && !string.IsNullOrEmpty(Model.End);
     @if (Model.Copy) classes += " truncate-center--copy";
     @if (Model.Elastic) classes += " truncate-center--elastic";
 }
@@ -15,9 +16,12 @@
     }
     else
     {
-        <span class="truncate-center-truncated" @(!string.IsNullOrEmpty(Model.Start) ? $"data-bs-toggle=tooltip title={Model.Text}" : "")>
-            <span class="truncate-center-start">@(Model.Elastic ? Model.Text : $"{Model.Start}…")</span>
-            <span class="truncate-center-end">@Model.End</span>
+        <span class="truncate-center-truncated" @(isTruncated ? $"data-bs-toggle=tooltip title={Model.Text}" : "")>
+            <span class="truncate-center-start">@(Model.Elastic || !isTruncated ? Model.Text : $"{Model.Start}…")</span>
+            @if (isTruncated)
+            {
+                <span class="truncate-center-end">@Model.End</span>
+            }
         </span>
         <span class="truncate-center-text">@Model.Text</span>
     }

BTCPayServer/Controllers/BitpayInvoiceController.cs

@@ -1,17 +1,23 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Constants;
 using BTCPayServer.Abstractions.Extensions;
 using BTCPayServer.Client;
+using BTCPayServer.Client.Models;
+using BTCPayServer.Data;
 using BTCPayServer.Filters;
 using BTCPayServer.ModelBinders;
 using BTCPayServer.Models;
-using BTCPayServer.Security;
+using BTCPayServer.Payments;
+using BTCPayServer.Security.Greenfield;
 using BTCPayServer.Services.Invoices;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using NBitpayClient;
+using StoreData = BTCPayServer.Data.StoreData;
 
 namespace BTCPayServer.Controllers
 {
@@ -36,7 +42,7 @@ namespace BTCPayServer.Controllers
         {
             if (invoice == null)
                 throw new BitpayHttpException(400, "Invalid invoice");
-            return await _InvoiceController.CreateInvoiceCore(invoice, HttpContext.GetStoreData(), HttpContext.Request.GetAbsoluteRoot(), cancellationToken: cancellationToken);
+            return await CreateInvoiceCore(invoice, HttpContext.GetStoreData(), HttpContext.Request.GetAbsoluteRoot(), cancellationToken: cancellationToken);
         }
 
         [HttpGet]
@@ -66,7 +72,7 @@ namespace BTCPayServer.Controllers
             int? limit = null,
             int? offset = null)
         {
-            if (User.Identity.AuthenticationType == Security.Bitpay.BitpayAuthenticationTypes.Anonymous)
+            if (User.Identity?.AuthenticationType == Security.Bitpay.BitpayAuthenticationTypes.Anonymous)
                 return Forbid(Security.Bitpay.BitpayAuthenticationTypes.Anonymous);
             if (dateEnd != null)
                 dateEnd = dateEnd.Value + TimeSpan.FromDays(1); //Should include the end day
@@ -88,5 +94,133 @@ namespace BTCPayServer.Controllers
 
             return Json(DataWrapper.Create(entities));
         }
+
+         internal async Task<DataWrapper<InvoiceResponse>> CreateInvoiceCore(BitpayCreateInvoiceRequest invoice,
+            StoreData store, string serverUrl, List<string> additionalTags = null,
+            CancellationToken cancellationToken = default, Action<InvoiceEntity> entityManipulator = null)
+        {
+            var entity = await CreateInvoiceCoreRaw(invoice, store, serverUrl, additionalTags, cancellationToken, entityManipulator);
+            var resp = entity.EntityToDTO();
+            return new DataWrapper<InvoiceResponse>(resp) { Facade = "pos/invoice" };
+        }
+
+        internal async Task<InvoiceEntity> CreateInvoiceCoreRaw(BitpayCreateInvoiceRequest invoice, StoreData store, string serverUrl, List<string> additionalTags = null, CancellationToken cancellationToken = default, Action<InvoiceEntity> entityManipulator = null)
+        {
+            var storeBlob = store.GetStoreBlob();
+            var entity = _InvoiceRepository.CreateNewInvoice(store.Id);
+            entity.ExpirationTime = invoice.ExpirationTime is { } v ? v : entity.InvoiceTime + storeBlob.InvoiceExpiration;
+            entity.MonitoringExpiration = entity.ExpirationTime + storeBlob.MonitoringExpiration;
+            if (entity.ExpirationTime - TimeSpan.FromSeconds(30.0) < entity.InvoiceTime)
+            {
+                throw new BitpayHttpException(400, "The expirationTime is set too soon");
+            }
+            if (entity.Price < 0.0m)
+            {
+                throw new BitpayHttpException(400, "The price should be 0 or more.");
+            }
+            if (entity.Price > GreenfieldConstants.MaxAmount)
+            {
+                throw new BitpayHttpException(400, $"The price should less than {GreenfieldConstants.MaxAmount}.");
+            }
+            entity.Metadata.OrderId = invoice.OrderId;
+            entity.Metadata.PosDataLegacy = invoice.PosData;
+            entity.ServerUrl = serverUrl;
+            entity.FullNotifications = invoice.FullNotifications || invoice.ExtendedNotifications;
+            entity.ExtendedNotifications = invoice.ExtendedNotifications;
+            entity.NotificationURLTemplate = invoice.NotificationURL;
+            entity.NotificationEmail = invoice.NotificationEmail;
+            if (additionalTags != null)
+                entity.InternalTags.AddRange(additionalTags);
+            FillBuyerInfo(invoice, entity);
+            
+            var price = invoice.Price;
+            entity.Metadata.ItemCode = invoice.ItemCode;
+            entity.Metadata.ItemDesc = invoice.ItemDesc;
+            entity.Metadata.Physical = invoice.Physical;
+            entity.Metadata.TaxIncluded = invoice.TaxIncluded;
+            entity.Currency = invoice.Currency;
+            if (price is { } vv)
+            {
+                entity.Price = vv;
+                entity.Type = InvoiceType.Standard;
+            }
+            else
+            {
+                entity.Price = 0m;
+                entity.Type = InvoiceType.TopUp;
+            }
+
+            entity.StoreSupportUrl = storeBlob.StoreSupportUrl;
+            entity.RedirectURLTemplate = invoice.RedirectURL ?? store.StoreWebsite;
+            entity.RedirectAutomatically =
+                invoice.RedirectAutomatically.GetValueOrDefault(storeBlob.RedirectAutomatically);
+            entity.RequiresRefundEmail = invoice.RequiresRefundEmail;
+            entity.SpeedPolicy = ParseSpeedPolicy(invoice.TransactionSpeed, store.SpeedPolicy);
+
+            IPaymentFilter excludeFilter = null;
+            if (invoice.PaymentCurrencies?.Any() is true)
+            {
+                invoice.SupportedTransactionCurrencies ??=
+                    new Dictionary<string, InvoiceSupportedTransactionCurrency>();
+                foreach (string paymentCurrency in invoice.PaymentCurrencies)
+                {
+                    invoice.SupportedTransactionCurrencies.TryAdd(paymentCurrency,
+                        new InvoiceSupportedTransactionCurrency() { Enabled = true });
+                }
+            }
+            if (invoice.SupportedTransactionCurrencies != null && invoice.SupportedTransactionCurrencies.Count != 0)
+            {
+                var supportedTransactionCurrencies = invoice.SupportedTransactionCurrencies
+                                                            .Where(c => c.Value.Enabled)
+                                                            .Select(c => PaymentMethodId.TryParse(c.Key, out var p) ? p : null)
+                                                            .Where(c => c != null)
+                                                            .ToHashSet();
+                excludeFilter = PaymentFilter.Where(p => !supportedTransactionCurrencies.Contains(p));
+            }
+            entity.PaymentTolerance = storeBlob.PaymentTolerance;
+            entity.DefaultPaymentMethod = invoice.DefaultPaymentMethod;
+            entity.RequiresRefundEmail = invoice.RequiresRefundEmail;
+
+            return await _InvoiceController.CreateInvoiceCoreRaw(entity, store, excludeFilter, null, cancellationToken, entityManipulator);
+        }
+
+        private void FillBuyerInfo(BitpayCreateInvoiceRequest req, InvoiceEntity invoiceEntity)
+        {
+            var buyerInformation = invoiceEntity.Metadata;
+            buyerInformation.BuyerAddress1 = req.BuyerAddress1;
+            buyerInformation.BuyerAddress2 = req.BuyerAddress2;
+            buyerInformation.BuyerCity = req.BuyerCity;
+            buyerInformation.BuyerCountry = req.BuyerCountry;
+            buyerInformation.BuyerEmail = req.BuyerEmail;
+            buyerInformation.BuyerName = req.BuyerName;
+            buyerInformation.BuyerPhone = req.BuyerPhone;
+            buyerInformation.BuyerState = req.BuyerState;
+            buyerInformation.BuyerZip = req.BuyerZip;
+            var buyer = req.Buyer;
+            if (buyer == null)
+                return;
+            buyerInformation.BuyerAddress1 ??= buyer.Address1;
+            buyerInformation.BuyerAddress2 ??= buyer.Address2;
+            buyerInformation.BuyerCity ??= buyer.City;
+            buyerInformation.BuyerCountry ??= buyer.country;
+            buyerInformation.BuyerEmail ??= buyer.email;
+            buyerInformation.BuyerName ??= buyer.Name;
+            buyerInformation.BuyerPhone ??= buyer.phone;
+            buyerInformation.BuyerState ??= buyer.State;
+            buyerInformation.BuyerZip ??= buyer.zip;
+        }
+        private SpeedPolicy ParseSpeedPolicy(string transactionSpeed, SpeedPolicy defaultPolicy)
+        {
+            if (transactionSpeed == null)
+                return defaultPolicy;
+            var mappings = new Dictionary<string, SpeedPolicy>();
+            mappings.Add("low", SpeedPolicy.LowSpeed);
+            mappings.Add("low-medium", SpeedPolicy.LowMediumSpeed);
+            mappings.Add("medium", SpeedPolicy.MediumSpeed);
+            mappings.Add("high", SpeedPolicy.HighSpeed);
+            if (!mappings.TryGetValue(transactionSpeed, out SpeedPolicy policy))
+                policy = defaultPolicy;
+            return policy;
+        }
     }
 }

BTCPayServer/Controllers/GreenField/GreenfieldInvoiceController.cs

@@ -41,7 +41,6 @@ namespace BTCPayServer.Controllers.Greenfield
         private readonly RateFetcher _rateProvider;
         private readonly InvoiceActivator _invoiceActivator;
         private readonly ApplicationDbContextFactory _dbContextFactory;
-        private readonly IAuthorizationService _authorizationService;
 
         public LanguageService LanguageService { get; }
 
@@ -49,7 +48,7 @@ namespace BTCPayServer.Controllers.Greenfield
             LinkGenerator linkGenerator, LanguageService languageService, BTCPayNetworkProvider btcPayNetworkProvider,
             CurrencyNameTable currencyNameTable, RateFetcher rateProvider,
             InvoiceActivator invoiceActivator,
-            PullPaymentHostedService pullPaymentService, ApplicationDbContextFactory dbContextFactory, IAuthorizationService authorizationService)
+            PullPaymentHostedService pullPaymentService, ApplicationDbContextFactory dbContextFactory)
         {
             _invoiceController = invoiceController;
             _invoiceRepository = invoiceRepository;
@@ -60,7 +59,6 @@ namespace BTCPayServer.Controllers.Greenfield
             _invoiceActivator = invoiceActivator;
             _pullPaymentService = pullPaymentService;
             _dbContextFactory = dbContextFactory;
-            _authorizationService = authorizationService;
             LanguageService = languageService;
         }
 
@@ -190,12 +188,6 @@ namespace BTCPayServer.Controllers.Greenfield
             {
                 ModelState.AddModelError(nameof(request.Amount), $"The amount should less than {GreenfieldConstants.MaxAmount}.");
             }
-            if (!string.IsNullOrEmpty(request.Checkout.ExplicitRateScript) && 
-                !(await _authorizationService.AuthorizeAsync(User, Policies.CanModifyInvoices)).Succeeded)
-            {
-                request.AddModelError(invoiceRequest => invoiceRequest.Checkout.ExplicitRateScript,
-                    $"You are not authorized to use explicit rate script (missing {Policies.CanModifyInvoices} permission)", this);
-            }
             request.Checkout ??= new CreateInvoiceRequest.CheckoutOptions();
             if (request.Checkout.PaymentMethods?.Any() is true)
             {
@@ -404,7 +396,7 @@ namespace BTCPayServer.Controllers.Greenfield
                 return this.CreateValidationError(ModelState);
 
             var accounting = invoicePaymentMethod.Calculate();
-            var cryptoPaid = accounting.Paid.ToDecimal(MoneyUnit.BTC);
+            var cryptoPaid = accounting.Paid;
             var cdCurrency = _currencyNameTable.GetCurrencyData(invoice.Currency, true);
             var paidCurrency = Math.Round(cryptoPaid * invoicePaymentMethod.Rate, cdCurrency.Divisibility);
             var rateResult = await _rateProvider.FetchRate(
@@ -472,7 +464,7 @@ namespace BTCPayServer.Controllers.Greenfield
                         return this.CreateValidationError(ModelState);
                     }
                     
-                    var dueAmount = accounting.TotalDue.ToDecimal(MoneyUnit.BTC);
+                    var dueAmount = accounting.TotalDue;
                     createPullPayment.Currency = cryptoCode;
                     createPullPayment.Amount = Math.Round(paidAmount - dueAmount, appliedDivisibility);
                     createPullPayment.AutoApproveClaims = true;
@@ -588,11 +580,11 @@ namespace BTCPayServer.Controllers.Greenfield
                         CryptoCode = method.GetId().CryptoCode,
                         Destination = details.GetPaymentDestination(),
                         Rate = method.Rate,
-                        Due = accounting.DueUncapped.ToDecimal(MoneyUnit.BTC),
-                        TotalPaid = accounting.Paid.ToDecimal(MoneyUnit.BTC),
-                        PaymentMethodPaid = accounting.CryptoPaid.ToDecimal(MoneyUnit.BTC),
-                        Amount = accounting.TotalDue.ToDecimal(MoneyUnit.BTC),
-                        NetworkFee = accounting.NetworkFee.ToDecimal(MoneyUnit.BTC),
+                        Due = accounting.DueUncapped,
+                        TotalPaid = accounting.Paid,
+                        PaymentMethodPaid = accounting.CryptoPaid,
+                        Amount = accounting.TotalDue,
+                        NetworkFee = accounting.NetworkFee,
                         PaymentLink =
                             method.GetId().PaymentType.GetPaymentLink(method.Network, entity, details, accounting.Due,
                                 Request.GetAbsoluteRoot()),

BTCPayServer/Controllers/GreenField/GreenfieldPullPaymentController.cs

@@ -19,6 +19,7 @@ using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json.Linq;
 using MarkPayoutRequest = BTCPayServer.HostedServices.MarkPayoutRequest;
 
 namespace BTCPayServer.Controllers.Greenfield
@@ -284,7 +285,8 @@ namespace BTCPayServer.Controllers.Greenfield
                 Amount = blob.Amount,
                 PaymentMethodAmount = blob.CryptoAmount,
                 Revision = blob.Revision,
-                State = p.State
+                State = p.State,
+                Metadata = blob.Metadata?? new JObject(),
             };
             model.Destination = blob.Destination;
             model.PaymentMethod = p.PaymentMethodId;
@@ -321,27 +323,20 @@ namespace BTCPayServer.Controllers.Greenfield
                 ModelState.AddModelError(nameof(request.Destination), destination.error ?? "The destination is invalid for the payment specified");
                 return this.CreateValidationError(ModelState);
             }
-
-            if (request.Amount is null && destination.destination.Amount != null)
+            
+            var amtError = ClaimRequest.IsPayoutAmountOk(destination.destination, request.Amount, paymentMethodId.CryptoCode, ppBlob.Currency);
+            if (amtError.error is not null)
             {
-                request.Amount = destination.destination.Amount;
-            }
-            else if (request.Amount != null && destination.destination.Amount != null && request.Amount != destination.destination.Amount)
-            {
-                ModelState.AddModelError(nameof(request.Amount), $"Amount is implied in destination ({destination.destination.Amount}) that does not match the payout amount provided {request.Amount})");
-                return this.CreateValidationError(ModelState);
-            }
-            if (request.Amount is { } v && (v < ppBlob.MinimumClaim || v == 0.0m))
-            {
-                ModelState.AddModelError(nameof(request.Amount), $"Amount too small (should be at least {ppBlob.MinimumClaim})");
+                ModelState.AddModelError(nameof(request.Amount), amtError.error );
                 return this.CreateValidationError(ModelState);
             }
+            request.Amount = amtError.amount;
             var result = await _pullPaymentService.Claim(new ClaimRequest()
             {
                 Destination = destination.destination,
                 PullPaymentId = pullPaymentId,
                 Value = request.Amount,
-                PaymentMethodId = paymentMethodId,
+                PaymentMethodId = paymentMethodId
             });
 
             return HandleClaimResult(result);
@@ -393,15 +388,13 @@ namespace BTCPayServer.Controllers.Greenfield
                 return this.CreateValidationError(ModelState);
             }
 
-            if (request.Amount is null && destination.destination.Amount != null)
+            var amtError = ClaimRequest.IsPayoutAmountOk(destination.destination, request.Amount);
+            if (amtError.error is not null)
             {
-                request.Amount = destination.destination.Amount;
-            }
-            else if (request.Amount != null && destination.destination.Amount != null && request.Amount != destination.destination.Amount)
-            {
-                ModelState.AddModelError(nameof(request.Amount), $"Amount is implied in destination ({destination.destination.Amount}) that does not match the payout amount provided {request.Amount})");
+                ModelState.AddModelError(nameof(request.Amount), amtError.error );
                 return this.CreateValidationError(ModelState);
             }
+            request.Amount = amtError.amount;
             if (request.Amount is { } v && (v < ppBlob?.MinimumClaim || v == 0.0m))
             {
                 var minimumClaim = ppBlob?.MinimumClaim is decimal val ? val : 0.0m;
@@ -415,7 +408,8 @@ namespace BTCPayServer.Controllers.Greenfield
                 PreApprove = request.Approved,
                 Value = request.Amount,
                 PaymentMethodId = paymentMethodId,
-                StoreId = storeId
+                StoreId = storeId,
+                Metadata = request.Metadata
             });
             return HandleClaimResult(result);
         }

BTCPayServer/Controllers/GreenField/GreenfieldReportsController.cs

@@ -0,0 +1,80 @@
+#nullable enable
+using BTCPayServer.Lightning;
+using BTCPayServer.Models.StoreViewModels;
+using BTCPayServer.Services.Invoices;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using System;
+using Microsoft.AspNetCore.Cors;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore.Internal;
+using NBitcoin;
+using Newtonsoft.Json.Linq;
+using BTCPayServer.Data;
+using Microsoft.EntityFrameworkCore;
+using Dapper;
+using Microsoft.AspNetCore.Authorization;
+using BTCPayServer.Abstractions.Constants;
+using BTCPayServer.Client;
+using BTCPayServer.Abstractions.Extensions;
+using BTCPayServer.Client.Models;
+using BTCPayServer.Services;
+using System.Linq;
+using System.Threading;
+
+namespace BTCPayServer.Controllers.GreenField;
+
+[ApiController]
+[Authorize(AuthenticationSchemes = AuthenticationSchemes.Greenfield)]
+[EnableCors(CorsPolicies.All)]
+public class GreenfieldReportsController : Controller
+{
+    public GreenfieldReportsController(
+        ApplicationDbContextFactory dbContextFactory,
+        ReportService reportService)
+    {
+        DBContextFactory = dbContextFactory;
+        ReportService = reportService;
+    }
+    public ApplicationDbContextFactory DBContextFactory { get; }
+    public ReportService ReportService { get; }
+
+
+    [Authorize(Policy = Policies.CanViewStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Greenfield)]
+    [HttpPost("~/api/v1/stores/{storeId}/reports")]
+    [NonAction] // Disabling this endpoint as we still need to figure out the request/response model
+    public async Task<IActionResult> StoreReports(string storeId, [FromBody] StoreReportRequest? vm = null, CancellationToken cancellationToken = default)
+    {
+        vm ??= new StoreReportRequest();
+        vm.ViewName ??= "Payments";
+        vm.TimePeriod ??= new TimePeriod();
+        vm.TimePeriod.To ??= DateTime.UtcNow;
+        vm.TimePeriod.From ??= vm.TimePeriod.To.Value.AddMonths(-1);
+        var from = vm.TimePeriod.From.Value;
+        var to = vm.TimePeriod.To.Value;
+
+        if (ReportService.ReportProviders.TryGetValue(vm.ViewName, out var report))
+        {
+            if (!report.IsAvailable())
+                return this.CreateAPIError(503, "view-unavailable", $"This view is unavailable at this moment");
+
+            var ctx = new Services.Reporting.QueryContext(storeId, from, to);
+            await report.Query(ctx, cancellationToken);
+            var result = new StoreReportResponse()
+            {
+                Fields = ctx.ViewDefinition?.Fields ?? new List<StoreReportResponse.Field>(),
+                Charts = ctx.ViewDefinition?.Charts ?? new List<ChartDefinition>(),
+                Data = ctx.Data.Select(d => new JArray(d)).ToList(),
+                From = from,
+                To = to
+            };
+            return Json(result);
+        }
+        else
+        {
+            ModelState.AddModelError(nameof(vm.ViewName), "View doesn't exist");
+            return this.CreateValidationError(ModelState);
+        }
+    }
+}
+

BTCPayServer/Controllers/GreenField/GreenfieldStoreAutomatedLightningPayoutProcessorsController.cs

@@ -53,16 +53,23 @@ namespace BTCPayServer.Controllers.Greenfield
 
         private static LightningAutomatedPayoutSettings ToModel(PayoutProcessorData data)
         {
+            var blob = data.HasTypedBlob<LightningAutomatedPayoutBlob>().GetBlob() ?? new LightningAutomatedPayoutBlob();
             return new LightningAutomatedPayoutSettings()
             {
                 PaymentMethod = data.PaymentMethod,
-                IntervalSeconds = data.HasTypedBlob<AutomatedPayoutBlob>().GetBlob()!.Interval
+                IntervalSeconds = blob.Interval,
+                CancelPayoutAfterFailures = blob.CancelPayoutAfterFailures,
+                ProcessNewPayoutsInstantly = blob.ProcessNewPayoutsInstantly
             };
         }
 
-        private static AutomatedPayoutBlob FromModel(LightningAutomatedPayoutSettings data)
+        private static LightningAutomatedPayoutBlob FromModel(LightningAutomatedPayoutSettings data)
         {
-            return new AutomatedPayoutBlob() { Interval = data.IntervalSeconds };
+            return new LightningAutomatedPayoutBlob() { 
+                Interval = data.IntervalSeconds, 
+                CancelPayoutAfterFailures = data.CancelPayoutAfterFailures,
+                ProcessNewPayoutsInstantly = data.ProcessNewPayoutsInstantly
+            };
         }
 
         [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Greenfield)]
@@ -84,7 +91,7 @@ namespace BTCPayServer.Controllers.Greenfield
                     }))
                 .FirstOrDefault();
             activeProcessor ??= new PayoutProcessorData();
-            activeProcessor.HasTypedBlob<AutomatedPayoutBlob>().SetBlob(FromModel(request));
+            activeProcessor.HasTypedBlob<LightningAutomatedPayoutBlob>().SetBlob(FromModel(request));
             activeProcessor.StoreId = storeId;
             activeProcessor.PaymentMethod = paymentMethod;
             activeProcessor.Processor = LightningAutomatedPayoutSenderFactory.ProcessorName;

BTCPayServer/Controllers/GreenField/GreenfieldStoreAutomatedOnChainPayoutProcessorsController.cs

@@ -59,7 +59,9 @@ namespace BTCPayServer.Controllers.Greenfield
             {
                 FeeBlockTarget = blob.FeeTargetBlock,
                 PaymentMethod = data.PaymentMethod,
-                IntervalSeconds = blob.Interval
+                IntervalSeconds = blob.Interval,
+                Threshold = blob.Threshold,
+                ProcessNewPayoutsInstantly = blob.ProcessNewPayoutsInstantly
             };
         }
 
@@ -68,7 +70,9 @@ namespace BTCPayServer.Controllers.Greenfield
             return new OnChainAutomatedPayoutBlob()
             {
                 FeeTargetBlock = data.FeeBlockTarget ?? 1,
-                Interval = data.IntervalSeconds
+                Interval = data.IntervalSeconds,
+                Threshold = data.Threshold,
+                ProcessNewPayoutsInstantly = data.ProcessNewPayoutsInstantly
             };
         }
 

BTCPayServer/Controllers/GreenField/GreenfieldStoresController.cs

@@ -129,6 +129,7 @@ namespace BTCPayServer.Controllers.Greenfield
                 //we do not include EmailSettings in this model and instead opt to set it in stores/storeid/email endpoints
                 //we do not include PaymentMethodCriteria because moving the CurrencyValueJsonConverter to the Client csproj is hard and requires a refactor (#1571 & #1572)
                 NetworkFeeMode = storeBlob.NetworkFeeMode,
+                DefaultCurrency = storeBlob.DefaultCurrency,
                 RequiresRefundEmail = storeBlob.RequiresRefundEmail,
                 CheckoutType = storeBlob.CheckoutType,
                 Receipt = InvoiceDataBase.ReceiptOptions.Merge(storeBlob.ReceiptOptions, null),

BTCPayServer/Controllers/GreenField/LocalBTCPayServerClient.cs

@@ -759,7 +759,7 @@ namespace BTCPayServer.Controllers.Greenfield
         }
 
         public override async Task<IEnumerable<OnChainWalletTransactionData>> ShowOnChainWalletTransactions(
-            string storeId, string cryptoCode, TransactionStatus[] statusFilter = null, string labelFilter = null,
+            string storeId, string cryptoCode, TransactionStatus[] statusFilter = null, string labelFilter = null, int skip = 0,
             CancellationToken token = default)
         {
             return GetFromActionResult<IEnumerable<OnChainWalletTransactionData>>(

BTCPayServer/Controllers/UIAppsController.cs

@@ -1,6 +1,9 @@
+using System;
 using System.Linq;
 using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Constants;
+using BTCPayServer.Abstractions.Contracts;
+using BTCPayServer.Abstractions.Extensions;
 using BTCPayServer.Abstractions.Models;
 using BTCPayServer.Client;
 using BTCPayServer.Data;
@@ -8,6 +11,7 @@ using BTCPayServer.Models.AppViewModels;
 using BTCPayServer.Services.Apps;
 using BTCPayServer.Services.Stores;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
@@ -21,17 +25,20 @@ namespace BTCPayServer.Controllers
         public UIAppsController(
             UserManager<ApplicationUser> userManager,
             StoreRepository storeRepository,
+            IFileService fileService,
             AppService appService,
             IHtmlHelper html)
         {
             _userManager = userManager;
             _storeRepository = storeRepository;
+            _fileService = fileService;
             _appService = appService;
             Html = html;
         }
 
         private readonly UserManager<ApplicationUser> _userManager;
         private readonly StoreRepository _storeRepository;
+        private readonly IFileService _fileService;
         private readonly AppService _appService;
 
         public string CreatedAppId { get; set; }
@@ -184,13 +191,50 @@ namespace BTCPayServer.Controllers
             return RedirectToAction(nameof(UIStoresController.Dashboard), "UIStores", new { storeId = app.StoreDataId });
         }
 
+        [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)]
+        [HttpPost("{appId}/upload-file")]
+        [IgnoreAntiforgeryToken]
+        public async Task<IActionResult> FileUpload(IFormFile file)
+        {
+            var app = GetCurrentApp();
+            var userId = GetUserId();
+            if (app is null || userId is null)
+                return NotFound();
+
+            if (!file.ContentType.StartsWith("image/", StringComparison.InvariantCulture))
+            {
+                return Json(new { error = "The file needs to be an image" });
+            }
+            if (file.Length > 500_000)
+            {
+                return Json(new { error = "The image file size should be less than 0.5MB" });
+            }
+            var formFile = await file.Bufferize();
+            if (!FileTypeDetector.IsPicture(formFile.Buffer, formFile.FileName))
+            {
+                return Json(new { error = "The file needs to be an image" });
+            }
+            try
+            {
+                var storedFile = await _fileService.AddFile(file, userId);
+                var fileId = storedFile.Id;
+                var fileUrl = await _fileService.GetFileUrl(Request.GetAbsoluteRootUri(), fileId);
+                return Json(new { fileId, fileUrl });
+            }
+            catch (Exception e)
+            {
+                return Json(new { error = $"Could not save file: {e.Message}" });
+            }
+        }
+
         async Task<string> GetStoreDefaultCurrentIfEmpty(string storeId, string currency)
         {
             if (string.IsNullOrWhiteSpace(currency))
             {
-                currency = (await _storeRepository.FindStore(storeId)).GetStoreBlob().DefaultCurrency;
+                var store = await _storeRepository.FindStore(storeId);
+                currency = store?.GetStoreBlob().DefaultCurrency;
             }
-            return currency.Trim().ToUpperInvariant();
+            return currency?.Trim().ToUpperInvariant();
         }
 
         private string GetUserId() => _userManager.GetUserId(User);

BTCPayServer/Controllers/UIInvoiceController.Testing.cs

@@ -55,7 +55,7 @@ namespace BTCPayServer.Controllers
                         return Ok(new
                         {
                             Txid = txid,
-                            AmountRemaining = (paymentMethod.Calculate().Due - amount).ToUnit(MoneyUnit.BTC),
+                            AmountRemaining = paymentMethod.Calculate().Due - amount.ToDecimal(MoneyUnit.BTC),
                             SuccessMessage = $"Created transaction {txid}"
                         });
 
@@ -70,11 +70,11 @@ namespace BTCPayServer.Controllers
                         {
                             var bolt11 = BOLT11PaymentRequest.Parse(destination, network);
                             var paymentHash = bolt11.PaymentHash?.ToString();
-                            var paid = new Money(response.Details.TotalAmount.ToUnit(LightMoneyUnit.Satoshi), MoneyUnit.Satoshi);
+                            var paid = response.Details.TotalAmount.ToDecimal(LightMoneyUnit.BTC);
                             return Ok(new
                             {
                                 Txid = paymentHash,
-                                AmountRemaining = (paymentMethod.Calculate().TotalDue - paid).ToUnit(MoneyUnit.BTC),
+                                AmountRemaining = paymentMethod.Calculate().TotalDue - paid,
                                 SuccessMessage = $"Sent payment {paymentHash}"
                             });
                         }

BTCPayServer/Controllers/UIInvoiceController.UI.cs

@@ -16,11 +16,10 @@ using BTCPayServer.Data;
 using BTCPayServer.Filters;
 using BTCPayServer.HostedServices;
 using BTCPayServer.Models;
+using BTCPayServer.Models.AppViewModels;
 using BTCPayServer.Models.InvoicingModels;
 using BTCPayServer.Models.PaymentRequestViewModels;
 using BTCPayServer.Payments;
-using BTCPayServer.Payments.Bitcoin;
-using BTCPayServer.Payments.Lightning;
 using BTCPayServer.Rating;
 using BTCPayServer.Services;
 using BTCPayServer.Services.Apps;
@@ -124,6 +123,7 @@ namespace BTCPayServer.Controllers
             var additionalData = metaData
                 .Where(dict => !InvoiceAdditionalDataExclude.Contains(dict.Key))
                 .ToDictionary(dict => dict.Key, dict => dict.Value);
+            
             var model = new InvoiceDetailsModel
             {
                 StoreId = store.Id,
@@ -150,7 +150,6 @@ namespace BTCPayServer.Controllers
                 StatusException = invoice.ExceptionStatus,
                 Events = invoice.Events,
                 Metadata = metaData,
-                AdditionalData = additionalData,
                 Archived = invoice.Archived,
                 CanRefund = invoiceState.CanRefund(),
                 Refunds = invoice.Refunds,
@@ -167,6 +166,27 @@ namespace BTCPayServer.Controllers
             model.CryptoPayments = details.CryptoPayments;
             model.Payments = details.Payments;
             model.Overpaid = details.Overpaid;
+            
+            if (additionalData.ContainsKey("receiptData"))
+            {
+                model.ReceiptData = (Dictionary<string, object>)additionalData["receiptData"];
+                additionalData.Remove("receiptData");
+            }
+            
+            if (additionalData.ContainsKey("posData") && additionalData["posData"] is string posData)
+            {
+                // overwrite with parsed JSON if possible
+                try
+                {
+                    additionalData["posData"] = PosDataParser.ParsePosData(JObject.Parse(posData));
+                }
+                catch (Exception)
+                {
+                    additionalData["posData"] = posData;
+                }
+            }
+            
+            model.AdditionalData = additionalData;
 
             return View(model);
         }
@@ -228,18 +248,14 @@ namespace BTCPayServer.Controllers
 
                     string txId = paymentData.GetPaymentId();
                     string? link = GetTransactionLink(paymentMethodId, txId);
-                    var paymentMethod = i.GetPaymentMethod(paymentMethodId);
-                    var amount = paymentData.GetValue();
-                    var rate = paymentMethod.Rate;
-                    var paid = (amount - paymentEntity.NetworkFee) * rate;
 
                     return new ViewPaymentRequestViewModel.PaymentRequestInvoicePayment
                     {
-                        Amount = amount,
-                        Paid = paid,
+                        Amount = paymentEntity.PaidAmount.Gross,
+                        Paid = paymentEntity.InvoicePaidAmount.Net,
                         ReceivedDate = paymentEntity.ReceivedTime.DateTime,
-                        PaidFormatted = _displayFormatter.Currency(paid, i.Currency, DisplayFormatter.CurrencyFormat.Symbol),
-                        RateFormatted = _displayFormatter.Currency(rate, i.Currency, DisplayFormatter.CurrencyFormat.Symbol),
+                        PaidFormatted = _displayFormatter.Currency(paymentEntity.InvoicePaidAmount.Net, i.Currency, DisplayFormatter.CurrencyFormat.Symbol),
+                        RateFormatted = _displayFormatter.Currency(paymentEntity.Rate, i.Currency, DisplayFormatter.CurrencyFormat.Symbol),
                         PaymentMethod = paymentMethodId.ToPrettyString(),
                         Link = link,
                         Id = txId,
@@ -251,7 +267,7 @@ namespace BTCPayServer.Controllers
                 .Where(payment => payment != null)
                 .ToList();
 
-            vm.Amount = payments.Sum(p => p!.Paid);
+            vm.Amount = i.PaidAmount.Net;
             vm.Payments = receipt.ShowPayments is false ? null : payments;
             vm.AdditionalData = PosDataParser.ParsePosData(receiptData);
 
@@ -364,8 +380,8 @@ namespace BTCPayServer.Controllers
             if (paymentMethod != null)
             {
                 accounting = paymentMethod.Calculate();
-                cryptoPaid = accounting.Paid.ToDecimal(MoneyUnit.BTC);
-                dueAmount = accounting.TotalDue.ToDecimal(MoneyUnit.BTC);
+                cryptoPaid = accounting.Paid;
+                dueAmount = accounting.TotalDue;
                 paidAmount = cryptoPaid.RoundToSignificant(appliedDivisibility);
             }
 
@@ -560,7 +576,7 @@ namespace BTCPayServer.Controllers
                     {
                         var accounting = data.Calculate();
                         var paymentMethodId = data.GetId();
-                        var overpaidAmount = accounting.OverpaidHelper.ToDecimal(MoneyUnit.BTC);
+                        var overpaidAmount = accounting.OverpaidHelper;
 
                         if (overpaidAmount > 0)
                         {
@@ -571,8 +587,8 @@ namespace BTCPayServer.Controllers
                         {
                             PaymentMethodId = paymentMethodId,
                             PaymentMethod = paymentMethodId.ToPrettyString(),
-                            Due = _displayFormatter.Currency(accounting.Due.ToDecimal(MoneyUnit.BTC), paymentMethodId.CryptoCode),
-                            Paid = _displayFormatter.Currency(accounting.CryptoPaid.ToDecimal(MoneyUnit.BTC), paymentMethodId.CryptoCode),
+                            Due = _displayFormatter.Currency(accounting.Due, paymentMethodId.CryptoCode),
+                            Paid = _displayFormatter.Currency(accounting.CryptoPaid, paymentMethodId.CryptoCode),
                             Overpaid = _displayFormatter.Currency(overpaidAmount, paymentMethodId.CryptoCode),
                             Address = data.GetPaymentMethodDetails().GetPaymentDestination(),
                             Rate = ExchangeRate(data.GetId().CryptoCode, data),
@@ -827,7 +843,6 @@ namespace BTCPayServer.Controllers
             var dto = invoice.EntityToDTO();
             var accounting = paymentMethod.Calculate();
             var paymentMethodHandler = _paymentMethodHandlerDictionary[paymentMethodId];
-            var divisibility = _CurrencyNameTable.GetNumberFormatInfo(paymentMethod.GetId().CryptoCode, false)?.CurrencyDecimalDigits;
 
             switch (lang?.ToLowerInvariant())
             {
@@ -885,10 +900,10 @@ namespace BTCPayServer.Controllers
                 OnChainWithLnInvoiceFallback = storeBlob.OnChainWithLnInvoiceFallback,
                 CryptoImage = Request.GetRelativePathOrAbsolute(paymentMethodHandler.GetCryptoImage(paymentMethodId)),
                 BtcAddress = paymentMethodDetails.GetPaymentDestination(),
-                BtcDue = accounting.Due.ShowMoney(divisibility),
-                BtcPaid = accounting.Paid.ShowMoney(divisibility),
+                BtcDue = accounting.ShowMoney(accounting.Due),
+                BtcPaid = accounting.ShowMoney(accounting.Paid),
                 InvoiceCurrency = invoice.Currency,
-                OrderAmount = (accounting.TotalDue - accounting.NetworkFee).ShowMoney(divisibility),
+                OrderAmount = accounting.ShowMoney(accounting.TotalDue - accounting.NetworkFee),
                 IsUnsetTopUp = invoice.IsUnsetTopUp(),
                 CustomerEmail = invoice.RefundMail,
                 RequiresRefundEmail = invoice.RequiresRefundEmail ?? storeBlob.RequiresRefundEmail,
@@ -960,6 +975,16 @@ namespace BTCPayServer.Controllers
             model.PaymentMethodId = paymentMethodId.ToString();
             model.PaymentType = paymentMethodId.PaymentType.ToString();
             model.OrderAmountFiat = OrderAmountFromInvoice(model.CryptoCode, invoice, DisplayFormatter.CurrencyFormat.Symbol);
+
+            if (storeBlob.PlaySoundOnPayment)
+            {
+                model.PaymentSoundUrl = string.IsNullOrEmpty(storeBlob.SoundFileId)
+                    ? string.Concat(Request.GetAbsoluteRootUri().ToString(), "checkout-v2/payment.mp3")
+                    : await _fileService.GetFileUrl(Request.GetAbsoluteRootUri(), storeBlob.SoundFileId);
+                model.ErrorSoundUrl = string.Concat(Request.GetAbsoluteRootUri().ToString(), "checkout-v2/error.mp3");
+                model.NfcReadSoundUrl = string.Concat(Request.GetAbsoluteRootUri().ToString(), "checkout-v2/nfcread.mp3");
+            }
+            
             var expiration = TimeSpan.FromSeconds(model.ExpirationSeconds);
             model.TimeLeft = expiration.PrettyPrint();
             return model;
@@ -1089,22 +1114,22 @@ namespace BTCPayServer.Controllers
             }
             model.Search = fs;
             model.SearchText = fs.TextSearch;
-            
-            InvoiceQuery invoiceQuery = GetInvoiceQuery(fs, timezoneOffset);
+
+            var apps = await _appService.GetAllApps(GetUserId(), false, storeId);
+            InvoiceQuery invoiceQuery = GetInvoiceQuery(fs, apps, timezoneOffset);
             invoiceQuery.StoreId = storeIds.ToArray();
             invoiceQuery.Take = model.Count;
             invoiceQuery.Skip = model.Skip;
             invoiceQuery.IncludeRefunds = true;
+            
             var list = await _InvoiceRepository.GetInvoices(invoiceQuery);
 
             // Apps
-            var apps = await _appService.GetAllApps(GetUserId(), false, storeId);
             model.Apps = apps.Select(a => new InvoiceAppModel
             {
                 Id = a.Id,
                 AppName = a.AppName,
-                AppType = a.AppType,
-                AppOrderId = AppService.GetAppOrderId(a.AppType, a.Id)
+                AppType = a.AppType
             }).ToList();
 
             foreach (var invoice in list)
@@ -1129,11 +1154,21 @@ namespace BTCPayServer.Controllers
             return View(model);
         }
 
-        private InvoiceQuery GetInvoiceQuery(SearchString fs, int timezoneOffset = 0)
+        private InvoiceQuery GetInvoiceQuery(SearchString fs, ListAppsViewModel.ListAppViewModel[] apps, int timezoneOffset = 0)
         {
+            var textSearch = fs.TextSearch;
+            if (fs.GetFilterArray("appid") is { } appIds)
+            {
+                var appsById = apps.ToDictionary(a => a.Id);
+                var searchTexts = appIds.Select(a => appsById.TryGet(a)).Where(a => a != null)
+                    .Select(a => AppService.GetAppSearchTerm(a.AppType, a.Id))
+                    .ToList();
+                searchTexts.Add(fs.TextSearch);
+                textSearch = string.Join(' ', searchTexts.Where(t => !string.IsNullOrEmpty(t)).ToList());
+            }
             return new InvoiceQuery
             {
-                TextSearch = fs.TextSearch,
+                TextSearch = textSearch,
                 UserId = GetUserId(),
                 Unusual = fs.GetFilterBool("unusual"),
                 IncludeArchived = fs.GetFilterBool("includearchived") ?? false,
@@ -1165,7 +1200,8 @@ namespace BTCPayServer.Controllers
                     storeIds.Add(i);
             }
 
-            InvoiceQuery invoiceQuery = GetInvoiceQuery(fs, timezoneOffset);
+            var apps = await _appService.GetAllApps(GetUserId(), false, storeId);
+            InvoiceQuery invoiceQuery = GetInvoiceQuery(fs, apps, timezoneOffset);
             invoiceQuery.StoreId = storeIds.ToArray();
             invoiceQuery.Skip = 0;
             invoiceQuery.Take = int.MaxValue;
@@ -1273,32 +1309,40 @@ namespace BTCPayServer.Controllers
 
             try
             {
-                var result = await CreateInvoiceCore(new BitpayCreateInvoiceRequest
+                var result = await CreateInvoiceCoreRaw(new CreateInvoiceRequest()
                 {
-                    Price = model.Amount,
+                    Amount = model.Amount,
                     Currency = model.Currency,
-                    PosData = model.PosData,
-                    OrderId = model.OrderId,
-                    NotificationURL = model.NotificationUrl,
-                    ItemDesc = model.ItemDesc,
-                    FullNotifications = true,
-                    BuyerEmail = model.BuyerEmail,
-                    SupportedTransactionCurrencies = model.SupportedTransactionCurrencies?.ToDictionary(s => s, s => new InvoiceSupportedTransactionCurrency
+                    Metadata = new InvoiceMetadata()
                     {
-                        Enabled = true
-                    }),
-                    DefaultPaymentMethod = model.DefaultPaymentMethod,
-                    NotificationEmail = model.NotificationEmail,
-                    ExtendedNotifications = model.NotificationEmail != null,
-                    RequiresRefundEmail = model.RequiresRefundEmail == RequiresRefundEmail.InheritFromStore
-                        ? storeBlob.RequiresRefundEmail
-                        : model.RequiresRefundEmail == RequiresRefundEmail.On,
-                }, store, HttpContext.Request.GetAbsoluteRoot(), cancellationToken: cancellationToken);
+                        PosDataLegacy = model.PosData,
+                        OrderId = model.OrderId,
+                        ItemDesc = model.ItemDesc,
+                        BuyerEmail = model.BuyerEmail,
+                    }.ToJObject(),
+                    Checkout = new ()
+                    {
+                        RedirectURL = store.StoreWebsite,
+                        DefaultPaymentMethod = model.DefaultPaymentMethod,
+                        RequiresRefundEmail = model.RequiresRefundEmail == RequiresRefundEmail.InheritFromStore
+                            ? storeBlob.RequiresRefundEmail
+                            : model.RequiresRefundEmail == RequiresRefundEmail.On,
+                        PaymentMethods = model.SupportedTransactionCurrencies?.ToArray()
+                    },
+                }, store, HttpContext.Request.GetAbsoluteRoot(),
+                    entityManipulator: (entity) =>
+                    {
+                        entity.NotificationURLTemplate = model.NotificationUrl;
+                        entity.FullNotifications = true;
+                        entity.NotificationEmail = model.NotificationEmail;
+                        entity.ExtendedNotifications = model.NotificationEmail != null;
+                    },
+                    cancellationToken: cancellationToken);
 
-                TempData[WellKnownTempData.SuccessMessage] = $"Invoice {result.Data.Id} just created!";
-                CreatedInvoiceId = result.Data.Id;
+                TempData[WellKnownTempData.SuccessMessage] = $"Invoice {result.Id} just created!";
+                CreatedInvoiceId = result.Id;
 
-                return RedirectToAction(nameof(Invoice), new { storeId = result.Data.StoreId, invoiceId = result.Data.Id });
+                return RedirectToAction(nameof(Invoice), new { storeId = result.StoreId, invoiceId = result.Id });
             }
             catch (BitpayHttpException ex)
             {

BTCPayServer/Controllers/UIInvoiceController.cs

@@ -5,14 +5,13 @@ using System.Linq;
 using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
+using BTCPayServer.Abstractions.Contracts;
 using BTCPayServer.Abstractions.Extensions;
 using BTCPayServer.Client.Models;
 using BTCPayServer.Data;
 using BTCPayServer.Events;
 using BTCPayServer.HostedServices;
 using BTCPayServer.Logging;
-using BTCPayServer.Models;
-using BTCPayServer.Models.PaymentRequestViewModels;
 using BTCPayServer.Payments;
 using BTCPayServer.Payments.Bitcoin;
 using BTCPayServer.Rating;
@@ -24,16 +23,13 @@ using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.PaymentRequests;
 using BTCPayServer.Services.Rates;
 using BTCPayServer.Services.Stores;
-using BTCPayServer.Validation;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
 using NBitcoin;
-using NBitpayClient;
 using Newtonsoft.Json.Linq;
-using BitpayCreateInvoiceRequest = BTCPayServer.Models.BitpayCreateInvoiceRequest;
 using StoreData = BTCPayServer.Data.StoreData;
 
 namespace BTCPayServer.Controllers
@@ -60,6 +56,7 @@ namespace BTCPayServer.Controllers
         private readonly LinkGenerator _linkGenerator;
         private readonly IAuthorizationService _authorizationService;
         private readonly AppService _appService;
+        private readonly IFileService _fileService;
 
         public WebhookSender WebhookNotificationManager { get; }
 
@@ -84,6 +81,7 @@ namespace BTCPayServer.Controllers
             InvoiceActivator invoiceActivator,
             LinkGenerator linkGenerator,
             AppService appService,
+            IFileService fileService,
             IAuthorizationService authorizationService)
         {
             _displayFormatter = displayFormatter;
@@ -105,101 +103,10 @@ namespace BTCPayServer.Controllers
             _invoiceActivator = invoiceActivator;
             _linkGenerator = linkGenerator;
             _authorizationService = authorizationService;
+            _fileService = fileService;
             _appService = appService;
         }
 
-
-        internal async Task<DataWrapper<InvoiceResponse>> CreateInvoiceCore(BitpayCreateInvoiceRequest invoice,
-            StoreData store, string serverUrl, List<string>? additionalTags = null,
-            CancellationToken cancellationToken = default, Action<InvoiceEntity>? entityManipulator = null)
-        {
-            var entity = await CreateInvoiceCoreRaw(invoice, store, serverUrl, additionalTags, cancellationToken, entityManipulator);
-            var resp = entity.EntityToDTO();
-            return new DataWrapper<InvoiceResponse>(resp) { Facade = "pos/invoice" };
-        }
-
-        internal async Task<InvoiceEntity> CreateInvoiceCoreRaw(BitpayCreateInvoiceRequest invoice, StoreData store, string serverUrl, List<string>? additionalTags = null, CancellationToken cancellationToken = default, Action<InvoiceEntity>? entityManipulator = null)
-        {
-            var storeBlob = store.GetStoreBlob();
-            var entity = _InvoiceRepository.CreateNewInvoice();
-            entity.ExpirationTime = invoice.ExpirationTime is DateTimeOffset v ? v : entity.InvoiceTime + storeBlob.InvoiceExpiration;
-            entity.MonitoringExpiration = entity.ExpirationTime + storeBlob.MonitoringExpiration;
-            if (entity.ExpirationTime - TimeSpan.FromSeconds(30.0) < entity.InvoiceTime)
-            {
-                throw new BitpayHttpException(400, "The expirationTime is set too soon");
-            }
-            if (entity.Price < 0.0m)
-            {
-                throw new BitpayHttpException(400, "The price should be 0 or more.");
-            }
-            if (entity.Price > GreenfieldConstants.MaxAmount)
-            {
-                throw new BitpayHttpException(400, $"The price should less than {GreenfieldConstants.MaxAmount}.");
-            }
-            entity.Metadata.OrderId = invoice.OrderId;
-            entity.Metadata.PosDataLegacy = invoice.PosData;
-            entity.ServerUrl = serverUrl;
-            entity.FullNotifications = invoice.FullNotifications || invoice.ExtendedNotifications;
-            entity.ExtendedNotifications = invoice.ExtendedNotifications;
-            entity.NotificationURLTemplate = invoice.NotificationURL;
-            entity.NotificationEmail = invoice.NotificationEmail;
-            if (additionalTags != null)
-                entity.InternalTags.AddRange(additionalTags);
-            FillBuyerInfo(invoice, entity);
-
-            var taxIncluded = invoice.TaxIncluded.HasValue ? invoice.TaxIncluded.Value : 0m;
-            var price = invoice.Price;
-
-            entity.Metadata.ItemCode = invoice.ItemCode;
-            entity.Metadata.ItemDesc = invoice.ItemDesc;
-            entity.Metadata.Physical = invoice.Physical;
-            entity.Metadata.TaxIncluded = invoice.TaxIncluded;
-            entity.Currency = invoice.Currency;
-            if (price is decimal vv)
-            {
-                entity.Price = vv;
-                entity.Type = InvoiceType.Standard;
-            }
-            else
-            {
-                entity.Price = 0m;
-                entity.Type = InvoiceType.TopUp;
-            }
-
-            entity.StoreSupportUrl = storeBlob.StoreSupportUrl;
-            entity.RedirectURLTemplate = invoice.RedirectURL ?? store.StoreWebsite;
-            entity.RedirectAutomatically =
-                invoice.RedirectAutomatically.GetValueOrDefault(storeBlob.RedirectAutomatically);
-            entity.RequiresRefundEmail = invoice.RequiresRefundEmail;
-            entity.SpeedPolicy = ParseSpeedPolicy(invoice.TransactionSpeed, store.SpeedPolicy);
-
-            IPaymentFilter? excludeFilter = null;
-            if (invoice.PaymentCurrencies?.Any() is true)
-            {
-                invoice.SupportedTransactionCurrencies ??=
-                    new Dictionary<string, InvoiceSupportedTransactionCurrency>();
-                foreach (string paymentCurrency in invoice.PaymentCurrencies)
-                {
-                    invoice.SupportedTransactionCurrencies.TryAdd(paymentCurrency,
-                        new InvoiceSupportedTransactionCurrency() { Enabled = true });
-                }
-            }
-            if (invoice.SupportedTransactionCurrencies != null && invoice.SupportedTransactionCurrencies.Count != 0)
-            {
-                var supportedTransactionCurrencies = invoice.SupportedTransactionCurrencies
-                                                            .Where(c => c.Value.Enabled)
-                                                            .Select(c => PaymentMethodId.TryParse(c.Key, out var p) ? p : null)
-                                                            .Where(c => c != null)
-                                                            .ToHashSet();
-                excludeFilter = PaymentFilter.Where(p => !supportedTransactionCurrencies.Contains(p));
-            }
-            entity.PaymentTolerance = storeBlob.PaymentTolerance;
-            entity.DefaultPaymentMethod = invoice.DefaultPaymentMethod;
-            entity.RequiresRefundEmail = invoice.RequiresRefundEmail;
-
-            return await CreateInvoiceCoreRaw(entity, store, excludeFilter, null, cancellationToken, entityManipulator);
-        }
-
         internal async Task<InvoiceEntity> CreatePaymentRequestInvoice(Data.PaymentRequestData prData, decimal? amount, decimal amountDue, StoreData storeData, HttpRequest request, CancellationToken cancellationToken)
         {
             var id = prData.Id;
@@ -237,11 +144,7 @@ namespace BTCPayServer.Controllers
         public async Task<InvoiceEntity> CreateInvoiceCoreRaw(CreateInvoiceRequest invoice, StoreData store, string serverUrl, List<string>? additionalTags = null, CancellationToken cancellationToken = default, Action<InvoiceEntity>? entityManipulator = null)
         {
             var storeBlob = store.GetStoreBlob();
-            var entity = _InvoiceRepository.CreateNewInvoice();
-            if (!string.IsNullOrEmpty(invoice.Checkout.ExplicitRateScript) && RateRules.TryParse(invoice.Checkout.ExplicitRateScript, out var explicitRateRule) && explicitRateRule is not null)
-            {
-                entity.ExplicitRateRules = explicitRateRule;
-            }
+            var entity = _InvoiceRepository.CreateNewInvoice(store.Id);
             entity.ServerUrl = serverUrl;
             entity.ExpirationTime = entity.InvoiceTime + (invoice.Checkout.Expiration ?? storeBlob.InvoiceExpiration);
             entity.MonitoringExpiration = entity.ExpirationTime + (invoice.Checkout.Monitoring ?? storeBlob.MonitoringExpiration);
@@ -318,7 +221,9 @@ namespace BTCPayServer.Controllers
                 entity.RefundMail = entity.Metadata.BuyerEmail;
             }
             entity.Status = InvoiceStatusLegacy.New;
+            entity.UpdateTotals();
             HashSet<CurrencyPair> currencyPairsToFetch = new HashSet<CurrencyPair>();
+            var rules = storeBlob.GetRateRules(_NetworkProvider);
             var excludeFilter = storeBlob.GetExcludedPaymentMethods(); // Here we can compose filters from other origin with PaymentFilter.Any()
             if (invoicePaymentMethodFilter != null)
             {
@@ -340,7 +245,7 @@ namespace BTCPayServer.Controllers
                 }
             }
 
-            var rateRules =  entity.ExplicitRateRules?? storeBlob.GetRateRules(_NetworkProvider);
+            var rateRules = storeBlob.GetRateRules(_NetworkProvider);
             var fetchingByCurrencyPair = _RateProvider.FetchRates(currencyPairsToFetch, rateRules, cancellationToken);
             var fetchingAll = WhenAllFetched(logs, fetchingByCurrencyPair);
 
@@ -405,7 +310,7 @@ namespace BTCPayServer.Controllers
             }
             using (logs.Measure("Saving invoice"))
             {
-                entity = await _InvoiceRepository.CreateInvoiceAsync(store.Id, entity, additionalSearchTerms);
+                await _InvoiceRepository.CreateInvoiceAsync(entity, additionalSearchTerms);
                 foreach (var method in paymentMethods)
                 {
                     if (method.GetPaymentMethodDetails() is BitcoinLikeOnChainPaymentMethod bp)
@@ -509,7 +414,7 @@ namespace BTCPayServer.Controllers
                         await fetchingByCurrencyPair[new CurrencyPair(supportedPaymentMethod.PaymentId.CryptoCode, criteria.Value.Currency)];
                     if (currentRateToCrypto?.BidAsk != null)
                     {
-                        var amount = paymentMethod.Calculate().Due.GetValue(network as BTCPayNetwork);
+                        var amount = paymentMethod.Calculate().Due;
                         var limitValueCrypto = criteria.Value.Value / currentRateToCrypto.BidAsk.Bid;
 
                         if (amount < limitValueCrypto && criteria.Above)
@@ -550,45 +455,5 @@ namespace BTCPayServer.Controllers
             }
             return null;
         }
-
-        private SpeedPolicy ParseSpeedPolicy(string transactionSpeed, SpeedPolicy defaultPolicy)
-        {
-            if (transactionSpeed == null)
-                return defaultPolicy;
-            var mappings = new Dictionary<string, SpeedPolicy>();
-            mappings.Add("low", SpeedPolicy.LowSpeed);
-            mappings.Add("low-medium", SpeedPolicy.LowMediumSpeed);
-            mappings.Add("medium", SpeedPolicy.MediumSpeed);
-            mappings.Add("high", SpeedPolicy.HighSpeed);
-            if (!mappings.TryGetValue(transactionSpeed, out SpeedPolicy policy))
-                policy = defaultPolicy;
-            return policy;
-        }
-
-        private void FillBuyerInfo(BitpayCreateInvoiceRequest req, InvoiceEntity invoiceEntity)
-        {
-            var buyerInformation = invoiceEntity.Metadata;
-            buyerInformation.BuyerAddress1 = req.BuyerAddress1;
-            buyerInformation.BuyerAddress2 = req.BuyerAddress2;
-            buyerInformation.BuyerCity = req.BuyerCity;
-            buyerInformation.BuyerCountry = req.BuyerCountry;
-            buyerInformation.BuyerEmail = req.BuyerEmail;
-            buyerInformation.BuyerName = req.BuyerName;
-            buyerInformation.BuyerPhone = req.BuyerPhone;
-            buyerInformation.BuyerState = req.BuyerState;
-            buyerInformation.BuyerZip = req.BuyerZip;
-            var buyer = req.Buyer;
-            if (buyer == null)
-                return;
-            buyerInformation.BuyerAddress1 ??= buyer.Address1;
-            buyerInformation.BuyerAddress2 ??= buyer.Address2;
-            buyerInformation.BuyerCity ??= buyer.City;
-            buyerInformation.BuyerCountry ??= buyer.country;
-            buyerInformation.BuyerEmail ??= buyer.email;
-            buyerInformation.BuyerName ??= buyer.Name;
-            buyerInformation.BuyerPhone ??= buyer.phone;
-            buyerInformation.BuyerState ??= buyer.State;
-            buyerInformation.BuyerZip ??= buyer.zip;
-        }
     }
 }

BTCPayServer/Controllers/UILNURLController.cs

@@ -3,6 +3,7 @@ using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
+using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using BTCPayServer.Abstractions.Constants;
@@ -23,7 +24,6 @@ using BTCPayServer.Payments.Lightning;
 using BTCPayServer.Plugins.Crowdfund;
 using BTCPayServer.Plugins.PointOfSale;
 using BTCPayServer.Plugins.PointOfSale.Models;
-using BTCPayServer.Rating;
 using BTCPayServer.Services;
 using BTCPayServer.Services.Apps;
 using BTCPayServer.Services.Invoices;
@@ -35,13 +35,11 @@ using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Routing;
-using Microsoft.Extensions.Caching.Memory;
 using NBitcoin;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using LightningAddressData = BTCPayServer.Data.LightningAddressData;
 using MarkPayoutRequest = BTCPayServer.HostedServices.MarkPayoutRequest;
-using StoreData = BTCPayServer.Data.StoreData;
 
 namespace BTCPayServer
 {
@@ -63,8 +61,6 @@ namespace BTCPayServer
         private readonly BTCPayNetworkJsonSerializerSettings _btcPayNetworkJsonSerializerSettings;
         private readonly IPluginHookService _pluginHookService;
         private readonly InvoiceActivator _invoiceActivator;
-        private readonly IMemoryCache _memoryCache;
-        private readonly RateFetcher _rateFetcher;
 
         public UILNURLController(InvoiceRepository invoiceRepository,
             EventAggregator eventAggregator,
@@ -79,9 +75,7 @@ namespace BTCPayServer
             PullPaymentHostedService pullPaymentHostedService,
             BTCPayNetworkJsonSerializerSettings btcPayNetworkJsonSerializerSettings,
             IPluginHookService pluginHookService,
-            InvoiceActivator invoiceActivator,
-            IMemoryCache memoryCache,
-            RateFetcher rateFetcher)
+            InvoiceActivator invoiceActivator)
         {
             _invoiceRepository = invoiceRepository;
             _eventAggregator = eventAggregator;
@@ -97,8 +91,6 @@ namespace BTCPayServer
             _btcPayNetworkJsonSerializerSettings = btcPayNetworkJsonSerializerSettings;
             _pluginHookService = pluginHookService;
             _invoiceActivator = invoiceActivator;
-            _memoryCache = memoryCache;
-            _rateFetcher = rateFetcher;
         }
 
         [HttpGet("withdraw/pp/{pullPaymentId}")]
@@ -235,8 +227,12 @@ namespace BTCPayServer
         [HttpGet("pay/app/{appId}/{itemCode}")]
         public async Task<IActionResult> GetLNURLForApp(string cryptoCode, string appId, string itemCode = null)
         {
-            if (!NetworkSupportsLightning(cryptoCode, out _))
-                return null;
+            var network = _btcPayNetworkProvider.GetNetwork<BTCPayNetwork>(cryptoCode);
+            if (network is null || !network.SupportLightning)
+            {
+                return NotFound();
+            }
+
             var app = await _appService.GetApp(appId, null, true);
             if (app is null)
             {
@@ -253,10 +249,6 @@ namespace BTCPayServer
             {
                 return NotFound();
             }
-            
-            var pmi = GetLNUrlPaymentMethodId(cryptoCode, store, out var lnurlPM);
-            if (pmi is null)
-                return NotFound("LNUrl or LN is disabled");
 
             ViewPointOfSaleViewModel.Item[] items;
             string currencyCode;
@@ -281,6 +273,9 @@ namespace BTCPayServer
             ViewPointOfSaleViewModel.Item item = null;
             if (!string.IsNullOrEmpty(itemCode))
             {
+                var pmi = GetLNUrlPaymentMethodId(cryptoCode, store, out _);
+                if (pmi is null)
+                    return NotFound("LNUrl or LN is disabled");
                 var escapedItemId = Extensions.UnescapeBackSlashUriString(itemCode);
                 item = items.FirstOrDefault(item1 =>
                     item1.Id.Equals(itemCode, StringComparison.InvariantCultureIgnoreCase) ||
@@ -301,7 +296,7 @@ namespace BTCPayServer
 
             var createInvoice = new CreateInvoiceRequest()
             {
-                Amount = item?.Price.Value,
+                Amount =  item?.PriceType == ViewPointOfSaleViewModel.ItemPriceType.Topup? null:  item?.Price,
                 Currency = currencyCode,
                 Checkout = new InvoiceDataBase.CheckoutOptions()
                 {
@@ -311,11 +306,11 @@ namespace BTCPayServer
                                                        HttpContext.Request.GetAbsoluteUri($"/apps/{app.Id}/pos"),
                         _ => null
                     }
-                }
+                },
+                AdditionalSearchTerms = new[] { AppService.GetAppSearchTerm(app) }
             };
 
-            var invoiceMetadata = new InvoiceMetadata();
-            invoiceMetadata.OrderId = AppService.GetAppOrderId(app);
+            var invoiceMetadata = new InvoiceMetadata { OrderId = AppService.GetRandomOrderId() };
             if (item != null)
             {
                 invoiceMetadata.ItemCode = item.Id;
@@ -323,13 +318,13 @@ namespace BTCPayServer
             }
             createInvoice.Metadata = invoiceMetadata.ToJObject();
 
-
-            return await CreateLNURLRequestWithoutInvoice( new LNURLRequestParams(
-                store.Id,
-                pmi,
+            return await GetLNURLRequest(
+                cryptoCode,
+                store,
+                store.GetStoreBlob(),
                 createInvoice,
                 additionalTags: new List<string> { AppService.GetAppInternalTag(appId) },
-                allowOverpay: false), store, store.GetStoreBlob(), lnurlPM);
+                allowOverpay: false);
         }
 
         public class EditLightningAddressVM
@@ -378,156 +373,139 @@ namespace BTCPayServer
                 return NotFound("Unknown username");
 
             var store = await _storeRepository.FindStore(lightningAddressSettings.StoreDataId);
+            var cryptoCode = "BTC";
             if (store is null)
                 return NotFound("Unknown username");
+            if (GetLNUrlPaymentMethodId(cryptoCode, store, out var lnUrlMethod) is null)
+                return NotFound("LNUrl not available for store");
 
-            var pmi = GetLNUrlPaymentMethodId("BTC", store, out var lnurlPaymentMethod);
-            if (pmi is null)
-                return NotFound("LNUrl or LN is disabled");
-            
             var blob = lightningAddressSettings.GetBlob();
-            return await CreateLNURLRequestWithoutInvoice(new LNURLRequestParams(
-                store.Id,
-                pmi,
-                new CreateInvoiceRequest {Currency = blob?.CurrencyCode, Metadata = blob?.InvoiceMetadata},
-                new LNURLPayRequest
-                {
-                    MinSendable = blob?.Min is decimal min ? new LightMoney(min, LightMoneyUnit.Satoshi) : null,
-                    MaxSendable = blob?.Max is decimal max ? new LightMoney(max, LightMoneyUnit.Satoshi) : null,
-                },
-                new Dictionary<string, string> {{"text/identifier", $"{username}@{Request.Host}"}}), store,store.GetStoreBlob(), lnurlPaymentMethod);
+
+            var lnurlRequest = new LNURLPayRequest()
+            {
+                Tag = "payRequest",
+                MinSendable = blob?.Min is decimal min ? new LightMoney(min, LightMoneyUnit.Satoshi) : null,
+                MaxSendable = blob?.Max is decimal max ? new LightMoney(max, LightMoneyUnit.Satoshi) : null,
+                CommentAllowed = lnUrlMethod.LUD12Enabled ? 2000 : 0
+            };
+            NormalizeSendable(lnurlRequest);
+
+            var lnUrlMetadata = new Dictionary<string, string>()
+            {
+                ["text/identifier"] = $"{username}@{Request.Host}"
+            };
+            SetLNUrlDescriptionMetadata(lnUrlMetadata, store, store.GetStoreBlob(), null);
+            lnurlRequest.Metadata =
+                JsonConvert.SerializeObject(lnUrlMetadata.Select(kv => new[] { kv.Key, kv.Value }));
+
+            lnurlRequest.Callback = new Uri(_linkGenerator.GetUriByAction(
+                        action: nameof(GetLNURLForLightningAddress),
+                        controller: "UILNURL",
+                        values: new { cryptoCode, username }, Request.Scheme, Request.Host, Request.PathBase));
+
+            lnurlRequest = await _pluginHookService.ApplyFilter("modify-lnurlp-request", lnurlRequest) as LNURLPayRequest;
+            return Ok(lnurlRequest);
         }
 
-        [HttpGet("pay")]
+        [HttpGet("pay/lnaddress/{username}")]
+        [EnableCors(CorsPolicies.All)]
+        [IgnoreAntiforgeryToken]
+        public async Task<IActionResult> GetLNURLForLightningAddress(string cryptoCode, string username, [FromQuery] long? amount = null, string comment = null)
+        {
+            var lightningAddressSettings = await _lightningAddressService.ResolveByAddress(username);
+            if (lightningAddressSettings is null || username is null)
+                return NotFound("Unknown username");
+            var blob = lightningAddressSettings.GetBlob();
+            var store = await _storeRepository.FindStore(lightningAddressSettings.StoreDataId);
+            var result = await GetLNURLRequest(
+               cryptoCode,
+               store,
+               store.GetStoreBlob(),
+               new CreateInvoiceRequest()
+               {
+                   Currency = blob?.CurrencyCode,
+                   Metadata = blob?.InvoiceMetadata
+               },
+               new LNURLPayRequest()
+               {
+                   MinSendable = blob?.Min is decimal min ? new LightMoney(min, LightMoneyUnit.Satoshi) : null,
+                   MaxSendable = blob?.Max is decimal max ? new LightMoney(max, LightMoneyUnit.Satoshi) : null,
+               },
+               new Dictionary<string, string>()
+               {
+                   { "text/identifier", $"{username}@{Request.Host}" }
+               });
+            if (result is not OkObjectResult ok || ok.Value is not LNURLPayRequest payRequest)
+                return result;
+            var invoiceId = payRequest.Callback.AbsoluteUri.Split('/').Last();
+            return await GetLNURLForInvoice(invoiceId, cryptoCode, amount, comment);
+        }
+
+
+        [HttpGet("{storeId}/pay")]
         [EnableCors(CorsPolicies.All)]
         [IgnoreAntiforgeryToken]
         public async Task<IActionResult> GetLNUrlForStore(
             string cryptoCode,
             string storeId,
-            string currencyCode = null)
+            string currency = null, 
+            string orderId = null, 
+            decimal? amount = null)
         {
-            var store = this.HttpContext.GetStoreData();
+            var store = await _storeRepository.FindStore(storeId);
             if (store is null)
                 return NotFound();
 
-            var pmi = GetLNUrlPaymentMethodId("BTC", store, out var lnurlPaymentMethod);
-            if (pmi is null)
-                return NotFound("LNUrl or LN is disabled");
-            var blob = store.GetStoreBlob();
+			var blob = store.GetStoreBlob();
             if (!blob.AnyoneCanInvoice)
                 return NotFound("'Anyone can invoice' is turned off");
-            return await CreateLNURLRequestWithoutInvoice(new LNURLRequestParams(
-                storeId,
-                pmi,
+            var metadata = new InvoiceMetadata();
+            if (!string.IsNullOrEmpty(orderId))
+            {
+                metadata.OrderId = orderId;
+            }
+            return await GetLNURLRequest(
+                cryptoCode,
+                store,
+                blob,
                 new CreateInvoiceRequest
                 {
-                    Currency = currencyCode
-                }), store, blob, lnurlPaymentMethod);
+                    Amount = amount,
+                    Metadata = metadata.ToJObject(),
+                    Currency = currency
+                });
         }
-        class LNURLRequestParams
+
+        private async Task<IActionResult> GetLNURLRequest(
+            string cryptoCode,
+            Data.StoreData store,
+            Data.StoreBlob blob,
+            CreateInvoiceRequest createInvoice,
+            LNURLPayRequest lnurlRequest = null,
+            Dictionary<string, string> lnUrlMetadata = null,
+            List<string> additionalTags = null,
+            bool allowOverpay = true)
         {
-            public LNURLRequestParams(
-                string storeId,
-                PaymentMethodId paymentMethodId,
-                CreateInvoiceRequest createInvoice,
-                LNURLPayRequest lnurlRequest = null,
-                Dictionary<string, string> lnUrlMetadata = null,
-                List<string> additionalTags = null,
-                bool allowOverpay = true)
-            {
-                StoreId = storeId;
-                PaymentMethodId = paymentMethodId;
-                CreateInvoice = createInvoice;
-                LNURLRequest = lnurlRequest;
-                LNURLMetadata = lnUrlMetadata;
-                AdditionalTags = additionalTags;
-                AllowOverpay = allowOverpay;
-            }
+            var pmi = GetLNUrlPaymentMethodId(cryptoCode, store, out _);
+            if (pmi is null)
+                return NotFound("LNUrl or LN is disabled");
 
-            public string StoreId { get; }
-            public PaymentMethodId PaymentMethodId { get; set; }
-            public CreateInvoiceRequest CreateInvoice { get; set; }
-            public LNURLPayRequest LNURLRequest { get; set; }
-            public Dictionary<string, string> LNURLMetadata { get; set; }
-            public List<string> AdditionalTags { get; set; }
-            public bool AllowOverpay { get; set; }
+            InvoiceEntity i;
+            try
+            {
+                createInvoice.Checkout ??= new InvoiceDataBase.CheckoutOptions();
+                createInvoice.Checkout.LazyPaymentMethods = false;
+                createInvoice.Checkout.PaymentMethods = new[] { pmi.ToStringNormalized() };
+                i = await _invoiceController.CreateInvoiceCoreRaw(createInvoice, store, Request.GetAbsoluteRoot(), additionalTags);
+            }
+            catch (Exception e)
+            {
+                return this.CreateAPIError(null, e.Message);
+            }
+            lnurlRequest = await CreateLNUrlRequestFromInvoice(cryptoCode, i, store, blob, lnurlRequest, lnUrlMetadata, allowOverpay);
+            return lnurlRequest is null ? NotFound() : Ok(lnurlRequest);
         }
-        private async Task<IActionResult> CreateLNURLRequestWithoutInvoice(LNURLRequestParams requestParams,
-            StoreData store, StoreBlob storeBlob, LNURLPaySupportedPaymentMethod lnurlPaySupportedPaymentMethod)
-        {
-            var k = Guid.NewGuid();
-            
-            requestParams.LNURLRequest ??= new LNURLPayRequest();
-            requestParams.LNURLMetadata ??= new Dictionary<string, string>();
-            requestParams.CreateInvoice.Currency ??= storeBlob.DefaultCurrency;
-            // Set the callback endpoint to trigger invoice generation
-            requestParams.LNURLRequest.Tag = "payRequest";
-            requestParams.LNURLRequest.Callback = new Uri(_linkGenerator.GetUriByAction(
-                action: nameof(LNURLCallback),
-                controller: "UILNURL",
-                values: new {requestParams.PaymentMethodId.CryptoCode, k },
-                Request.Scheme, Request.Host, Request.PathBase));
-            
-            
-            if (!requestParams.LNURLMetadata.ContainsKey("text/plain"))
-            {
-                var invMetadata = InvoiceMetadata.FromJObject(requestParams.CreateInvoice.Metadata?? new JObject());
-                var invoiceDescription = storeBlob.LightningDescriptionTemplate
-                        .Replace("{StoreName}", store.StoreName ?? "", StringComparison.OrdinalIgnoreCase)
-                        .Replace("{ItemDescription}", invMetadata.ItemDesc ?? "", StringComparison.OrdinalIgnoreCase)
-                        .Replace("{OrderId}", invMetadata.OrderId ?? "", StringComparison.OrdinalIgnoreCase);
-                requestParams.LNURLMetadata.Add("text/plain", invoiceDescription);
-            }
 
-            requestParams.LNURLRequest.CommentAllowed = lnurlPaySupportedPaymentMethod.LUD12Enabled ? 2000 : 0;
-            requestParams.LNURLRequest.Metadata = JsonConvert.SerializeObject(requestParams.LNURLMetadata.Select(kv => new[] { kv.Key, kv.Value }));
-            // We don't think BTCPay handle well 0 sats payments, just in case make it minimum one sat.
-            if (requestParams.LNURLRequest.MinSendable is null || requestParams.LNURLRequest.MinSendable < LightMoney.Satoshis(1.0m))
-                requestParams.LNURLRequest.MinSendable = LightMoney.Satoshis(1.0m);
-
-            if (requestParams.LNURLRequest.MaxSendable is null)
-                requestParams.LNURLRequest.MaxSendable = LightMoney.FromUnit(6.12m, LightMoneyUnit.BTC);
-
-            if (requestParams.CreateInvoice.Type != InvoiceType.TopUp && requestParams.CreateInvoice.Amount is not null)
-            {
-                LightMoney cAmount;
-                if (requestParams.CreateInvoice.Currency !=  requestParams.PaymentMethodId.CryptoCode)
-                {
-                    var rr = storeBlob.GetRateRules(_btcPayNetworkProvider);
-                    var rate = _rateFetcher.FetchRates(
-                        new HashSet<CurrencyPair>()
-                        {
-                            new CurrencyPair( requestParams.PaymentMethodId.CryptoCode, requestParams.CreateInvoice.Currency)
-                        }, rr, CancellationToken.None).First();
-                    var rateResult = await rate.Value;
-                    cAmount = LightMoney.FromUnit(rateResult.BidAsk.Bid, LightMoneyUnit.BTC);
-                    requestParams.CreateInvoice.Checkout.ExplicitRateScript =
-                        $"{ requestParams.PaymentMethodId.CryptoCode}_{requestParams.CreateInvoice.Currency}={rateResult.BidAsk.Bid}";
-                }
-                else
-                {
-                    cAmount = LightMoney.FromUnit(requestParams.CreateInvoice.Amount.Value!, LightMoneyUnit.BTC);
-                    
-                }
-                requestParams.LNURLRequest.MinSendable = cAmount;
-                
-                if (!requestParams.AllowOverpay)
-                    requestParams.LNURLRequest.MaxSendable = requestParams.LNURLRequest.MinSendable;
-            }
-
-
-            requestParams.LNURLRequest = await _pluginHookService.ApplyFilter("modify-lnurlp-request", requestParams.LNURLRequest) as LNURLPayRequest;
-            
-            var invoiceParamsCacheEntryOptions = new MemoryCacheEntryOptions()
-                .SetAbsoluteExpiration(TimeSpan.FromMinutes(5)); // Set an appropriate expiration time
-
-            // Store the invoice parameters in the cache
-            _memoryCache.Set($"{nameof(UILNURLController)}:{k}", requestParams, invoiceParamsCacheEntryOptions);
-
-            return Ok(requestParams.LNURLRequest);
-        }
-        
-        
         private async Task<LNURLPayRequest> CreateLNUrlRequestFromInvoice(
             string cryptoCode,
             InvoiceEntity i,
@@ -548,7 +526,7 @@ namespace BTCPayServer
                 return null;
             var paymentMethodDetails = (LNURLPayPaymentMethodDetails)pm.GetPaymentMethodDetails();
             bool updatePaymentMethodDetails = false;
-            if (lnUrlMetadata.TryGetValue("text/identifier", out var lnAddress) && lnAddress is not null)
+            if (lnUrlMetadata?.TryGetValue("text/identifier", out var lnAddress) is true && lnAddress is not null)
             {
                 paymentMethodDetails.ConsumedLightningAddress = lnAddress;
                 updatePaymentMethodDetails = true;
@@ -556,11 +534,7 @@ namespace BTCPayServer
 
             if (!lnUrlMetadata.ContainsKey("text/plain"))
             {
-                var invoiceDescription = blob.LightningDescriptionTemplate
-                        .Replace("{StoreName}", store.StoreName ?? "", StringComparison.OrdinalIgnoreCase)
-                        .Replace("{ItemDescription}", i.Metadata.ItemDesc ?? "", StringComparison.OrdinalIgnoreCase)
-                        .Replace("{OrderId}", i.Metadata.OrderId ?? "", StringComparison.OrdinalIgnoreCase);
-                lnUrlMetadata.Add("text/plain", invoiceDescription);
+                SetLNUrlDescriptionMetadata(lnUrlMetadata, store, blob, i.Metadata);
             }
 
             lnurlRequest.Tag = "payRequest";
@@ -572,17 +546,12 @@ namespace BTCPayServer
             lnurlRequest.Metadata = JsonConvert.SerializeObject(lnUrlMetadata.Select(kv => new[] { kv.Key, kv.Value }));
             if (i.Type != InvoiceType.TopUp)
             {
-                lnurlRequest.MinSendable = new LightMoney(pm.Calculate().Due.ToDecimal(MoneyUnit.Satoshi), LightMoneyUnit.Satoshi);
+                lnurlRequest.MinSendable = LightMoney.Coins(pm.Calculate().Due);
                 if (!allowOverpay)
                     lnurlRequest.MaxSendable = lnurlRequest.MinSendable;
             }
 
-            // We don't think BTCPay handle well 0 sats payments, just in case make it minimum one sat.
-            if (lnurlRequest.MinSendable is null || lnurlRequest.MinSendable < LightMoney.Satoshis(1.0m))
-                lnurlRequest.MinSendable = LightMoney.Satoshis(1.0m);
-
-            if (lnurlRequest.MaxSendable is null)
-                lnurlRequest.MaxSendable = LightMoney.FromUnit(6.12m, LightMoneyUnit.BTC);
+            NormalizeSendable(lnurlRequest);
 
             lnurlRequest = await _pluginHookService.ApplyFilter("modify-lnurlp-request", lnurlRequest) as LNURLPayRequest;
             if (paymentMethodDetails.PayRequest is null)
@@ -594,15 +563,34 @@ namespace BTCPayServer
             {
                 pm.SetPaymentMethodDetails(paymentMethodDetails);
                 await _invoiceRepository.UpdateInvoicePaymentMethod(i.Id, pm);
-                i.SetPaymentMethod(pm);
             }
             return lnurlRequest;
         }
 
+        private void SetLNUrlDescriptionMetadata(Dictionary<string, string> lnUrlMetadata, Data.StoreData store, StoreBlob blob, InvoiceMetadata invoiceMetadata)
+        {
+            var invoiceDescription = blob.LightningDescriptionTemplate
+                        .Replace("{StoreName}", store.StoreName ?? "", StringComparison.OrdinalIgnoreCase)
+                        .Replace("{ItemDescription}", invoiceMetadata?.ItemDesc ?? "", StringComparison.OrdinalIgnoreCase)
+                        .Replace("{OrderId}", invoiceMetadata?.OrderId ?? "", StringComparison.OrdinalIgnoreCase);
+            lnUrlMetadata.Add("text/plain", invoiceDescription);
+        }
+
+        private static void NormalizeSendable(LNURLPayRequest lnurlRequest)
+        {
+            // We don't think BTCPay handle well 0 sats payments, just in case make it minimum one sat.
+            if (lnurlRequest.MinSendable is null || lnurlRequest.MinSendable < LightMoney.Satoshis(1.0m))
+                lnurlRequest.MinSendable = LightMoney.Satoshis(1.0m);
+
+            if (lnurlRequest.MaxSendable is null)
+                lnurlRequest.MaxSendable = LightMoney.FromUnit(6.12m, LightMoneyUnit.BTC);
+        }
+
         PaymentMethodId GetLNUrlPaymentMethodId(string cryptoCode, Data.StoreData store, out LNURLPaySupportedPaymentMethod lnUrlSettings)
         {
             lnUrlSettings = null;
-            if (!NetworkSupportsLightning(cryptoCode, out _))
+            var network = _btcPayNetworkProvider.GetNetwork<BTCPayNetwork>(cryptoCode);
+            if (network is null || !network.SupportLightning)
                 return null;
             var pmi = new PaymentMethodId(cryptoCode, PaymentTypes.LNURLPay);
             var lnpmi = new PaymentMethodId(cryptoCode, PaymentTypes.LightningLike);
@@ -619,58 +607,19 @@ namespace BTCPayServer
             return pmi;
         }
 
-
-        [HttpGet("pay/{k}")]
-        public async Task<IActionResult> LNURLCallback(string k, long? amount = null, string comment = null)
-        {
-            if (!_memoryCache.TryGetValue<LNURLRequestParams>($"{nameof(UILNURLController)}:{k}", out var lnurlReq) || lnurlReq is null)
-                return NotFound();
-            if (amount is null)
-            {
-                return Ok(lnurlReq.LNURLRequest);
-            }
-
-            var lnurlPayRequest = lnurlReq.LNURLRequest;
-            var amt = new LightMoney(amount.Value);
-            if (amt < lnurlPayRequest.MinSendable || amt > lnurlPayRequest.MaxSendable)
-                return BadRequest(new LNUrlStatusResponse { Status = "ERROR", Reason = "Amount is out of bounds." });
-            
-            InvoiceEntity i;
-            try
-            {
-               var store = await _storeRepository.FindStore(lnurlReq.StoreId);
-                
-                lnurlReq.CreateInvoice.Checkout ??= new InvoiceDataBase.CheckoutOptions();
-                lnurlReq.CreateInvoice.Checkout.LazyPaymentMethods = false;
-                lnurlReq.CreateInvoice.Checkout.PaymentMethods = new[] {  lnurlReq.PaymentMethodId.ToStringNormalized() };
-                i = await _invoiceController.CreateInvoiceCoreRaw(lnurlReq.CreateInvoice, store, Request.GetAbsoluteRoot(), lnurlReq.AdditionalTags);
-                await CreateLNUrlRequestFromInvoice(lnurlReq.PaymentMethodId.CryptoCode,i, store,store.GetStoreBlob(),lnurlReq.LNURLRequest, lnurlReq.LNURLMetadata, lnurlReq.AllowOverpay);
-                return await GetLNURLForInvoice(i, lnurlReq.PaymentMethodId.CryptoCode, amount, comment);
-            }
-            catch (Exception e)
-            {
-                return this.CreateAPIError(null, e.Message);
-            }
-        }
-        
         [HttpGet("pay/i/{invoiceId}")]
         [EnableCors(CorsPolicies.All)]
         [IgnoreAntiforgeryToken]
         public async Task<IActionResult> GetLNURLForInvoice(string invoiceId, string cryptoCode,
             [FromQuery] long? amount = null, string comment = null)
         {
-            
-            var i = await _invoiceRepository.GetInvoice(invoiceId, true);
-            return await GetLNURLForInvoice(i, cryptoCode, amount, comment);
-        }
-        
-        [NonAction]
-        private async Task<IActionResult> GetLNURLForInvoice(InvoiceEntity i, string cryptoCode,
-            [FromQuery] long? amount = null, string comment = null)
-        {
-            if (!NetworkSupportsLightning(cryptoCode, out var network))
-                return null;
+            var network = _btcPayNetworkProvider.GetNetwork<BTCPayNetwork>(cryptoCode);
+            if (network is null || !network.SupportLightning)
+            {
+                return NotFound();
+            }
 
+            var i = await _invoiceRepository.GetInvoice(invoiceId, true);
             if (i is null)
                 return NotFound();
 
@@ -691,7 +640,7 @@ namespace BTCPayServer
                 {
                     if (!await _invoiceActivator.ActivateInvoicePaymentMethod(pmi, i, store))
                         return NotFound();
-                    i = await _invoiceRepository.GetInvoice(i.Id, true);
+                    i = await _invoiceRepository.GetInvoice(invoiceId, true);
                     lightningPaymentMethod = i.GetPaymentMethod(pmi);
                     paymentMethodDetails = lightningPaymentMethod.GetPaymentMethodDetails() as LNURLPayPaymentMethodDetails;
                 }
@@ -712,7 +661,7 @@ namespace BTCPayServer
                     return Ok(lnurlPayRequest);
 
                 var amt = new LightMoney(amount.Value);
-                if (amt < lnurlPayRequest.MinSendable || amt > lnurlPayRequest.MaxSendable)
+                if (amt < lnurlPayRequest.MinSendable || amount > lnurlPayRequest.MaxSendable)
                     return BadRequest(new LNUrlStatusResponse { Status = "ERROR", Reason = "Amount is out of bounds." });
 
                 LNURLPayRequest.LNURLPayRequestCallbackResponse.ILNURLPayRequestSuccessAction successAction = null;
@@ -726,7 +675,7 @@ namespace BTCPayServer
                             Url = _linkGenerator.GetUriByAction(
                                 nameof(UIInvoiceController.InvoiceReceipt),
                                 "UIInvoice",
-                                new { i.Id },
+                                new { invoiceId },
                                 Request.Scheme,
                                 Request.Host,
                                 Request.PathBase)
@@ -765,6 +714,7 @@ namespace BTCPayServer
                     try
                     {
                         var expiry = i.ExpirationTime.ToUniversalTime() - DateTimeOffset.UtcNow;
+                        HttpContext.Items.Add(nameof(invoiceId), invoiceId);
                         var description = (await _pluginHookService.ApplyFilter("modify-lnurlp-description", lnurlPayRequest.Metadata)) as string;
                         if (description is null)
                             return NotFound();
@@ -794,7 +744,7 @@ namespace BTCPayServer
                                 string.IsNullOrEmpty(ex.Message) ? "" : $": {ex.Message}")
                         });
                     }
-                    
+
                     paymentMethodDetails.BOLT11 = invoice.BOLT11;
                     paymentMethodDetails.PaymentHash = string.IsNullOrEmpty(invoice.PaymentHash) ? null : uint256.Parse(invoice.PaymentHash);
                     paymentMethodDetails.Preimage = string.IsNullOrEmpty(invoice.Preimage) ? null : uint256.Parse(invoice.Preimage);
@@ -806,8 +756,8 @@ namespace BTCPayServer
                 if (updatePaymentMethod)
                 {
                     lightningPaymentMethod.SetPaymentMethodDetails(paymentMethodDetails);
-                    await _invoiceRepository.UpdateInvoicePaymentMethod(i.Id, lightningPaymentMethod);
-                    _eventAggregator.Publish(new InvoiceNewPaymentDetailsEvent(i.Id, paymentMethodDetails, pmi));
+                    await _invoiceRepository.UpdateInvoicePaymentMethod(invoiceId, lightningPaymentMethod);
+                    _eventAggregator.Publish(new InvoiceNewPaymentDetailsEvent(invoiceId, paymentMethodDetails, pmi));
                 }
 
                 return Ok(new LNURLPayRequest.LNURLPayRequestCallbackResponse
@@ -826,12 +776,6 @@ namespace BTCPayServer
             });
         }
 
-        private bool NetworkSupportsLightning(string cryptoCode, out BTCPayNetwork network)
-        {
-            network = _btcPayNetworkProvider.GetNetwork<BTCPayNetwork>(cryptoCode);
-            return !(network is null || !network.SupportLightning);
-        }
-        
         [Authorize(AuthenticationSchemes = AuthenticationSchemes.Cookie)]
         [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)]
         [HttpGet("~/stores/{storeId}/plugins/lightning-address")]

BTCPayServer/Controllers/UIPaymentRequestController.cs

@@ -78,16 +78,20 @@ namespace BTCPayServer.Controllers
             model = this.ParseListQuery(model ?? new ListPaymentRequestsViewModel());
 
             var store = GetCurrentStore();
-            var includeArchived = new SearchString(model.SearchTerm, model.TimezoneOffset ?? 0).GetFilterBool("includearchived") == true;
+            var fs = new SearchString(model.SearchTerm, model.TimezoneOffset ?? 0);
             var result = await _PaymentRequestRepository.FindPaymentRequests(new PaymentRequestQuery
             {
                 UserId = GetUserId(),
                 StoreId = store.Id,
                 Skip = model.Skip,
                 Count = model.Count,
-                IncludeArchived = includeArchived
+                Status = fs.GetFilterArray("status")?.Select(s => Enum.Parse<Client.Models.PaymentRequestData.PaymentRequestStatus>(s, true)).ToArray(),
+                IncludeArchived = fs.GetFilterBool("includearchived") ?? false
             });
-
+            
+            model.Search = fs;
+            model.SearchText = fs.TextSearch;
+            
             model.Items = result.Select(data =>
             {
                 var blob = data.GetBlob();

BTCPayServer/Controllers/UIPublicController.cs

@@ -3,12 +3,16 @@ using System.Threading;
 using System.Threading.Tasks;
 using System.Web;
 using BTCPayServer.Abstractions.Extensions;
+using BTCPayServer.Client.Models;
+using BTCPayServer.Controllers.Greenfield;
 using BTCPayServer.Data;
 using BTCPayServer.Models;
 using BTCPayServer.Plugins.PayButton.Models;
+using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Stores;
 using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Routing;
 using NicolasDorier.RateLimits;
 
 namespace BTCPayServer.Controllers
@@ -16,14 +20,17 @@ namespace BTCPayServer.Controllers
     public class UIPublicController : Controller
     {
         public UIPublicController(UIInvoiceController invoiceController,
-            StoreRepository storeRepository)
+            StoreRepository storeRepository,
+            LinkGenerator linkGenerator)
         {
             _InvoiceController = invoiceController;
             _StoreRepository = storeRepository;
+            _linkGenerator = linkGenerator;
         }
 
         private readonly UIInvoiceController _InvoiceController;
         private readonly StoreRepository _StoreRepository;
+        private readonly LinkGenerator _linkGenerator;
 
         [HttpGet]
         [IgnoreAntiforgeryToken]
@@ -57,21 +64,31 @@ namespace BTCPayServer.Controllers
             if (!ModelState.IsValid)
                 return View();
 
-            DataWrapper<InvoiceResponse> invoice = null;
+            InvoiceEntity invoice = null;
             try
             {
-                invoice = await _InvoiceController.CreateInvoiceCore(new BitpayCreateInvoiceRequest()
+                invoice = await _InvoiceController.CreateInvoiceCoreRaw(new CreateInvoiceRequest()
                 {
-                    Price = model.Price,
+                    Amount = model.Price,
                     Currency = model.Currency,
-                    ItemDesc = model.CheckoutDesc,
-                    OrderId = model.OrderId,
-                    NotificationEmail = model.NotifyEmail,
-                    NotificationURL = model.ServerIpn,
-                    RedirectURL = model.BrowserRedirect,
-                    FullNotifications = true,
-                    DefaultPaymentMethod = model.DefaultPaymentMethod
-                }, store, HttpContext.Request.GetAbsoluteRoot(), cancellationToken: cancellationToken);
+                    Metadata = new InvoiceMetadata()
+                    {
+                        ItemDesc = model.CheckoutDesc,
+                        OrderId = model.OrderId
+                    }.ToJObject(),
+                    Checkout = new ()
+                    {
+                        RedirectURL = model.BrowserRedirect ?? store?.StoreWebsite,
+                        DefaultPaymentMethod = model.DefaultPaymentMethod
+                    }
+                }, store, HttpContext.Request.GetAbsoluteRoot(),
+                entityManipulator: (entity) =>
+                {
+                    entity.NotificationEmail = model.NotifyEmail;
+                    entity.NotificationURLTemplate = model.ServerIpn;
+                    entity.FullNotifications = true;
+                },
+                cancellationToken: cancellationToken);
             }
             catch (BitpayHttpException e)
             {
@@ -84,26 +101,25 @@ namespace BTCPayServer.Controllers
                 return View();
             }
 
+            var url = GreenfieldInvoiceController.ToModel(invoice, _linkGenerator, HttpContext.Request).CheckoutLink;
+            if (!string.IsNullOrEmpty(model.CheckoutQueryString))
+            {
+                var additionalParamValues = HttpUtility.ParseQueryString(model.CheckoutQueryString);
+                var uriBuilder = new UriBuilder(url);
+                var paramValues = HttpUtility.ParseQueryString(uriBuilder.Query);
+                paramValues.Add(additionalParamValues);
+                uriBuilder.Query = paramValues.ToString()!;
+                url = uriBuilder.Uri.AbsoluteUri;
+            }
             if (model.JsonResponse)
             {
                 return Json(new
                 {
-                    InvoiceId = invoice.Data.Id,
-                    InvoiceUrl = invoice.Data.Url
+                    InvoiceId = invoice.Id,
+                    InvoiceUrl = url
                 });
             }
-
-            if (string.IsNullOrEmpty(model.CheckoutQueryString))
-            {
-                return Redirect(invoice.Data.Url);
-            }
-
-            var additionalParamValues = HttpUtility.ParseQueryString(model.CheckoutQueryString);
-            var uriBuilder = new UriBuilder(invoice.Data.Url);
-            var paramValues = HttpUtility.ParseQueryString(uriBuilder.Query);
-            paramValues.Add(additionalParamValues);
-            uriBuilder.Query = paramValues.ToString();
-            return Redirect(uriBuilder.Uri.AbsoluteUri);
+            return Redirect(url);
         }
     }
 }

BTCPayServer/Controllers/UIPullPaymentController.cs

@@ -199,21 +199,15 @@ namespace BTCPayServer.Controllers
                 ModelState.AddModelError(nameof(vm.Destination), destination.error ?? "Invalid destination with selected payment method");
                 return await ViewPullPayment(pullPaymentId);
             }
-
-            if (vm.ClaimedAmount == 0)
+            
+            var amtError = ClaimRequest.IsPayoutAmountOk(destination.destination, vm.ClaimedAmount == 0? null: vm.ClaimedAmount, paymentMethodId.CryptoCode, ppBlob.Currency);
+            if (amtError.error is not null)
             {
-                ModelState.AddModelError(nameof(vm.ClaimedAmount), "Amount is required");
+                ModelState.AddModelError(nameof(vm.ClaimedAmount), amtError.error );
             }
-            else
+            else if (amtError.amount is not null)
             {
-                var amount = ppBlob.Currency == "SATS" ? new Money(vm.ClaimedAmount, MoneyUnit.Satoshi).ToUnit(MoneyUnit.BTC) : vm.ClaimedAmount;
-                if (destination.destination.Amount != null && amount != destination.destination.Amount)
-                {
-                    var implied = _displayFormatter.Currency(destination.destination.Amount.Value, paymentMethodId.CryptoCode, DisplayFormatter.CurrencyFormat.Symbol);
-                    var provided = _displayFormatter.Currency(vm.ClaimedAmount, ppBlob.Currency, DisplayFormatter.CurrencyFormat.Symbol);
-                    ModelState.AddModelError(nameof(vm.ClaimedAmount),
-                        $"Amount implied in destination ({implied}) does not match the payout amount provided ({provided}).");
-                }
+                vm.ClaimedAmount = amtError.amount.Value;
             }
 
             if (!ModelState.IsValid)

BTCPayServer/Controllers/UIReportsController.CheatMode.cs

@@ -0,0 +1,122 @@
+#nullable enable
+using System;
+using Dapper;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Abstractions.Constants;
+using BTCPayServer.Client;
+using BTCPayServer.Client.Models;
+using BTCPayServer.Controllers.GreenField;
+using BTCPayServer.Data;
+using BTCPayServer.Filters;
+using BTCPayServer.Models.StoreReportsViewModels;
+using BTCPayServer.Models.StoreViewModels;
+using BTCPayServer.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Internal;
+using System.Text.Json.Nodes;
+using Org.BouncyCastle.Ocsp;
+using System.Threading;
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+using NBitcoin.DataEncoders;
+using System.Net;
+
+namespace BTCPayServer.Controllers;
+
+public partial class UIReportsController
+{
+    private IList<IList<object?>> Generate(IList<StoreReportResponse.Field> fields)
+    {
+        var rand = new Random();
+        int rowCount = 1_000;
+        List<object?> row = new List<object?>();
+        List<IList<object?>> result = new List<IList<object?>>();
+        for (int i = 0; i < rowCount; i++)
+        {
+            int fi = 0;
+            foreach (var f in fields)
+            {
+                row.Add(GenerateData(fields, f, fi, row, rand));
+                fi++;
+            }
+            result.Add(row);
+            row = new List<object?>();
+        }
+        return result;
+    }
+
+    private object? GenerateData(IList<StoreReportResponse.Field> fields, StoreReportResponse.Field f, int fi, List<object?> row, Random rand)
+    {
+        byte[] GenerateBytes(int count)
+        {
+            var bytes = new byte[count];
+            rand.NextBytes(bytes);
+            return bytes;
+        }
+        T TakeOne<T>(params T[] v)
+        {
+            return v[rand.NextInt64(0, v.Length)];
+        }
+        decimal GenerateDecimal(decimal from, decimal to, int precision)
+        {
+            decimal range = to - from;
+            decimal randomValue = ((decimal)rand.NextDouble() * range) + from;
+            return decimal.Round(randomValue, precision);
+        }
+        if (f.Type == "invoice_id")
+            return Encoders.Base58.EncodeData(GenerateBytes(20));
+        if (f.Type == "boolean")
+            return GenerateBytes(1)[0] % 2 == 0;
+        if (f.Name == "PaymentType")
+            return TakeOne("On-Chain", "Lightning");
+        if (f.Name == "PaymentId")
+            if (row[fi -1] is "On-Chain")
+                return Encoders.Hex.EncodeData(GenerateBytes(32)) + "-" + rand.NextInt64(0, 4);
+            else
+                return Encoders.Hex.EncodeData(GenerateBytes(32));
+        if (f.Name == "Address")
+            return Encoders.Bech32("bc1").Encode(0, GenerateBytes(20));
+        if (f.Name == "Crypto")
+            return rand.NextSingle() > 0.2 ? "BTC" : TakeOne("LTC", "DOGE", "DASH");
+        if (f.Name == "CryptoAmount")
+            return GenerateDecimal(0.1m, 5m, 8);
+        if (f.Name == "LightningAddress")
+            return TakeOne("satoshi", "satosan", "satoichi") + "@bitcoin.org";
+        if (f.Name == "BalanceChange")
+            return GenerateDecimal(-5.0m, 5.0m, 8);
+        if (f.Type == "datetime")
+            return DateTimeOffset.UtcNow - TimeSpan.FromHours(rand.Next(0, 24 * 30 * 6)) - TimeSpan.FromMinutes(rand.Next(0, 60));
+        if (f.Name == "Product")
+            return TakeOne("green-tea", "black-tea", "oolong-tea", "coca-cola");
+        if (f.Name == "State")
+            return TakeOne("Settled", "Processing");
+        if (f.Name == "AppId")
+            return TakeOne("AppA", "AppB");
+        if (f.Name == "Quantity")
+            return TakeOne(1, 2, 3, 4, 5);
+        if (f.Name == "Currency")
+            return rand.NextSingle() > 0.2 ? "USD" : TakeOne("JPY", "EUR", "CHF");
+        if (f.Name == "CurrencyAmount")
+            return row[fi - 1] switch
+            {
+                "USD" or "EUR" or "CHF" => GenerateDecimal(100.0m, 10_000m, 2),
+                "JPY" => GenerateDecimal(10_000m, 1000_0000, 0),
+                _ => GenerateDecimal(100.0m, 10_000m, 2)
+            };
+        if (f.Type == "tx_id")
+            return Encoders.Hex.EncodeData(GenerateBytes(32));
+        if (f.Name == "Rate")
+        {
+            return row[fi - 1] 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 null;
+    }
+}

BTCPayServer/Controllers/UIReportsController.cs

@@ -0,0 +1,91 @@
+#nullable enable
+using System;
+using Dapper;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Abstractions.Constants;
+using BTCPayServer.Client;
+using BTCPayServer.Client.Models;
+using BTCPayServer.Controllers.GreenField;
+using BTCPayServer.Data;
+using BTCPayServer.Filters;
+using BTCPayServer.Models.StoreReportsViewModels;
+using BTCPayServer.Models.StoreViewModels;
+using BTCPayServer.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Internal;
+using System.Text.Json.Nodes;
+using Org.BouncyCastle.Ocsp;
+using System.Threading;
+using System.Collections.Generic;
+using Newtonsoft.Json.Linq;
+using NBitcoin.DataEncoders;
+
+
+namespace BTCPayServer.Controllers;
+
+[Authorize(Policy = Policies.CanViewStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)]
+[AutoValidateAntiforgeryToken]
+public partial class UIReportsController : Controller
+{
+    public UIReportsController(
+        BTCPayNetworkProvider networkProvider,
+        ApplicationDbContextFactory dbContextFactory,
+        GreenfieldReportsController api,
+        ReportService reportService,
+        BTCPayServerEnvironment env
+        )
+    {
+        Api = api;
+        ReportService = reportService;
+        Env = env;
+        DBContextFactory = dbContextFactory;
+        NetworkProvider = networkProvider;
+    }
+    private BTCPayNetworkProvider NetworkProvider { get; }
+    public GreenfieldReportsController Api { get; }
+    public ReportService ReportService { get; }
+    public BTCPayServerEnvironment Env { get; }
+    public ApplicationDbContextFactory DBContextFactory { get; }
+
+    [HttpPost("stores/{storeId}/reports")]
+    [AcceptMediaTypeConstraint("application/json")]
+    [Authorize(Policy = Policies.CanViewStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)]
+    [IgnoreAntiforgeryToken]
+    public async Task<IActionResult> StoreReportsJson(string storeId, [FromBody] StoreReportRequest? request = null, bool fakeData = false, CancellationToken cancellation = default)
+    {
+        var result = await Api.StoreReports(storeId, request, cancellation);
+        if (fakeData && Env.CheatMode)
+        {
+            var r = (StoreReportResponse)((JsonResult)result!).Value!;
+            r.Data = Generate(r.Fields).Select(r => new JArray(r)).ToList();
+        }
+        return result;
+    }
+
+    [HttpGet("stores/{storeId}/reports")]
+    [AcceptMediaTypeConstraint("text/html")]
+    [Authorize(Policy = Policies.CanViewStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)]
+    public IActionResult StoreReports(
+        string storeId,
+        string ? viewName = null)
+    {
+        var vm = new StoreReportsViewModel()
+        {
+            InvoiceTemplateUrl = this.Url.Action(nameof(UIInvoiceController.Invoice), "UIInvoice", new { invoiceId = "INVOICE_ID" }),
+            ExplorerTemplateUrls = NetworkProvider.GetAll().ToDictionary(network => network.CryptoCode, network => network.BlockExplorerLink?.Replace("{0}", "TX_ID")),
+            Request = new StoreReportRequest()
+            {
+                ViewName = viewName ?? "Payments"
+            }
+        };
+        vm.AvailableViews = ReportService.ReportProviders
+                                         .Values
+                                         .Where(r => r.IsAvailable())
+                                         .Select(k => k.Name)
+                                         .OrderBy(k => k).ToList();
+        return View(vm);
+    }
+}

BTCPayServer/Controllers/UIServerController.cs

@@ -29,6 +29,7 @@ using BTCPayServer.Storage.Services;
 using BTCPayServer.Storage.Services.Providers;
 using BTCPayServer.Validation;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Cors;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
@@ -664,6 +665,8 @@ namespace BTCPayServer.Controllers
 
         [Route("lnd-config/{configKey}/lnd.config")]
         [AllowAnonymous]
+        [EnableCors(CorsPolicies.All)]
+        [IgnoreAntiforgeryToken]
         public IActionResult GetLNDConfig(ulong configKey)
         {
             var conf = _LnConfigProvider.GetConfig(configKey);
@@ -1047,29 +1050,28 @@ namespace BTCPayServer.Controllers
             {
                 if (model.LogoFile.Length > 1_000_000)
                 {
-                    TempData[WellKnownTempData.ErrorMessage] = "The uploaded logo file should be less than 1MB";
+                    ModelState.AddModelError(nameof(model.LogoFile), "The uploaded logo file should be less than 1MB");
                 }
                 else if (!model.LogoFile.ContentType.StartsWith("image/", StringComparison.InvariantCulture))
                 {
-                    TempData[WellKnownTempData.ErrorMessage] = "The uploaded logo file needs to be an image";
+                    ModelState.AddModelError(nameof(model.LogoFile), "The uploaded logo file needs to be an image");
                 }
                 else
                 {
                     var formFile = await model.LogoFile.Bufferize();
                     if (!FileTypeDetector.IsPicture(formFile.Buffer, formFile.FileName))
                     {
-                        TempData[WellKnownTempData.ErrorMessage] = "The uploaded logo file needs to be an image";
+                        ModelState.AddModelError(nameof(model.LogoFile), "The uploaded logo file needs to be an image");
                     }
                     else
                     {
                         model.LogoFile = formFile;
-                        // delete existing image
+                        // delete existing file
                         if (!string.IsNullOrEmpty(settings.LogoFileId))
                         {
                             await _fileService.RemoveFile(settings.LogoFileId, userId);
                         }
-
-                        // add new image
+                        // add new file
                         try
                         {
                             var storedFile = await _fileService.AddFile(model.LogoFile, userId);

BTCPayServer/Controllers/UIStorePullPaymentsController.PullPayments.cs

@@ -20,6 +20,7 @@ using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json.Linq;
 using MarkPayoutRequest = BTCPayServer.HostedServices.MarkPayoutRequest;
 using PayoutData = BTCPayServer.Data.PayoutData;
 using PullPaymentData = BTCPayServer.Data.PullPaymentData;
@@ -38,6 +39,7 @@ namespace BTCPayServer.Controllers
         private readonly PullPaymentHostedService _pullPaymentService;
         private readonly ApplicationDbContextFactory _dbContextFactory;
         private readonly BTCPayNetworkJsonSerializerSettings _jsonSerializerSettings;
+        private readonly IAuthorizationService _authorizationService;
 
         public StoreData CurrentStore
         {
@@ -53,7 +55,8 @@ namespace BTCPayServer.Controllers
             DisplayFormatter displayFormatter,
             PullPaymentHostedService pullPaymentHostedService,
             ApplicationDbContextFactory dbContextFactory,
-            BTCPayNetworkJsonSerializerSettings jsonSerializerSettings)
+            BTCPayNetworkJsonSerializerSettings jsonSerializerSettings,
+            IAuthorizationService authorizationService)
         {
             _btcPayNetworkProvider = btcPayNetworkProvider;
             _payoutHandlers = payoutHandlers;
@@ -62,10 +65,11 @@ namespace BTCPayServer.Controllers
             _pullPaymentService = pullPaymentHostedService;
             _dbContextFactory = dbContextFactory;
             _jsonSerializerSettings = jsonSerializerSettings;
+            _authorizationService = authorizationService;
         }
 
         [HttpGet("stores/{storeId}/pull-payments/new")]
-        [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)]
+        [Authorize(Policy = Policies.CanCreateNonApprovedPullPayments, AuthenticationSchemes = AuthenticationSchemes.Cookie)]
         public async Task<IActionResult> NewPullPayment(string storeId)
         {
             if (CurrentStore is null)
@@ -94,7 +98,7 @@ namespace BTCPayServer.Controllers
         }
 
         [HttpPost("stores/{storeId}/pull-payments/new")]
-        [Authorize(Policy = Policies.CanModifyStoreSettings, AuthenticationSchemes = AuthenticationSchemes.Cookie)]
+        [Authorize(Policy = Policies.CanCreateNonApprovedPullPayments, AuthenticationSchemes = AuthenticationSchemes.Cookie)]
         public async Task<IActionResult> NewPullPayment(string storeId, NewPullPaymentModel model)
         {
             if (CurrentStore is null)
@@ -134,6 +138,11 @@ namespace BTCPayServer.Controllers
             }
             if (!ModelState.IsValid)
                 return View(model);
+            if (model.AutoApproveClaims)
+            {
+                model.AutoApproveClaims = (await
+                    _authorizationService.AuthorizeAsync(User, storeId, Policies.CanCreatePullPayments)).Succeeded;
+            }
             await _pullPaymentService.CreatePullPayment(new HostedServices.CreatePullPayment()
             {
                 Name = model.Name,
@@ -529,10 +538,32 @@ namespace BTCPayServer.Controllers
             {
                 var ppBlob = item.PullPayment?.GetBlob();
                 var payoutBlob = item.Payout.GetBlob(_jsonSerializerSettings);
+                string payoutSource;
+                if (payoutBlob.Metadata?.TryGetValue("source", StringComparison.InvariantCultureIgnoreCase,
+                        out var source) is true)
+                {
+                    payoutSource = source.Value<string>();
+                }
+                else
+                {
+                    payoutSource = ppBlob?.Name ?? item.PullPayment?.Id;
+                }
+
+                string payoutSourceLink = null;
+                if (payoutBlob.Metadata?.TryGetValue("sourceLink", StringComparison.InvariantCultureIgnoreCase,
+                        out var sourceLink) is true)
+                {
+                    payoutSourceLink = sourceLink.Value<string>();
+                }
+                else if(item.PullPayment?.Id is not null)
+                {
+                    payoutSourceLink = Url.Action("ViewPullPayment", "UIPullPayment", new { pullPaymentId = item.PullPayment?.Id });
+                }
                 var m = new PayoutsModel.PayoutModel
                 {
                     PullPaymentId = item.PullPayment?.Id,
-                    PullPaymentName = ppBlob?.Name ?? item.PullPayment?.Id,
+                    Source = payoutSource,
+                    SourceLink = payoutSourceLink,
                     Date = item.Payout.Date,
                     PayoutId = item.Payout.Id,
                     Amount = _displayFormatter.Currency(payoutBlob.Amount, ppBlob?.Currency ?? PaymentMethodId.Parse(item.Payout.PaymentMethodId).CryptoCode),

BTCPayServer/Controllers/UIStoresController.Email.cs

@@ -10,6 +10,7 @@ using BTCPayServer.Client.Models;
 using BTCPayServer.Data;
 using BTCPayServer.Models.ServerViewModels;
 using BTCPayServer.Services.Mails;
+using BTCPayServer.Validation;
 using Microsoft.AspNetCore.Mvc;
 using MimeKit;
 
@@ -75,33 +76,22 @@ namespace BTCPayServer.Controllers
             if (command.StartsWith("test", StringComparison.InvariantCultureIgnoreCase))
             {
                 var rule = vm.Rules[index];
-                if (string.IsNullOrEmpty(rule.Subject) || string.IsNullOrEmpty(rule.Body) || string.IsNullOrEmpty(rule.To))
+                try
                 {
-                    TempData.SetStatusMessageModel(new StatusMessageModel
-                    {
-                        Severity = StatusMessageModel.StatusSeverity.Warning,
-                        Message = "Please fill all required fields before testing"
-                    });
-                }
-                else
-                {
-                    try
-                    {
-                        var emailSettings = blob.EmailSettings;
-                        using var client = await emailSettings.CreateSmtpClient();
-                        var message = emailSettings.CreateMailMessage(MailboxAddress.Parse(rule.To), "(test) " + rule.Subject, rule.Body, true);
-                        await client.SendAsync(message);
-                        await client.DisconnectAsync(true);
-                        TempData[WellKnownTempData.SuccessMessage] = $"Rule email saved and sent to {rule.To}. Please verify you received it.";
+                    var emailSettings = blob.EmailSettings;
+                    using var client = await emailSettings.CreateSmtpClient();
+                    var message = emailSettings.CreateMailMessage(MailboxAddress.Parse(rule.To), "(test) " + rule.Subject, rule.Body, true);
+                    await client.SendAsync(message);
+                    await client.DisconnectAsync(true);
+                    TempData[WellKnownTempData.SuccessMessage] = $"Rule email saved and sent to {rule.To}. Please verify you received it.";
 
-                        blob.EmailRules = vm.Rules;
-                        store.SetStoreBlob(blob);
-                        await _Repo.UpdateStore(store);
-                    }
-                    catch (Exception ex)
-                    {
-                        TempData[WellKnownTempData.ErrorMessage] = "Error: " + ex.Message;
-                    }
+                    blob.EmailRules = vm.Rules;
+                    store.SetStoreBlob(blob);
+                    await _Repo.UpdateStore(store);
+                }
+                catch (Exception ex)
+                {
+                    TempData[WellKnownTempData.ErrorMessage] = "Error: " + ex.Message;
                 }
             }
             else
@@ -128,10 +118,18 @@ namespace BTCPayServer.Controllers
         {
             [Required]
             public WebhookEventType Trigger { get; set; }
+            
             public bool CustomerEmail { get; set; }
+            
+            [Required]
+            [MailboxAddress]
             public string To { get; set; }
-            public string Body { get; set; }
+            
+            [Required]
             public string Subject { get; set; }
+            
+            [Required]
+            public string Body { get; set; }
         }
 
         [HttpGet("{storeId}/email-settings")]

BTCPayServer/Controllers/UIStoresController.cs

@@ -392,6 +392,7 @@ namespace BTCPayServer.Controllers
 
             vm.UseClassicCheckout = storeBlob.CheckoutType == Client.Models.CheckoutType.V1;
             vm.CelebratePayment = storeBlob.CelebratePayment;
+            vm.PlaySoundOnPayment = storeBlob.PlaySoundOnPayment;
             vm.OnChainWithLnInvoiceFallback = storeBlob.OnChainWithLnInvoiceFallback;
             vm.ShowPayInWalletButton = storeBlob.ShowPayInWalletButton;
             vm.ShowStoreHeader = storeBlob.ShowStoreHeader;
@@ -401,6 +402,7 @@ namespace BTCPayServer.Controllers
             vm.RedirectAutomatically = storeBlob.RedirectAutomatically;
             vm.CustomCSS = storeBlob.CustomCSS;
             vm.CustomLogo = storeBlob.CustomLogo;
+            vm.SoundFileId = storeBlob.SoundFileId;
             vm.HtmlTitle = storeBlob.HtmlTitle;
             vm.DisplayExpirationTimer = (int)storeBlob.DisplayExpirationTimer.TotalMinutes;
             vm.ReceiptOptions = CheckoutAppearanceViewModel.ReceiptOptionsViewModel.Create(storeBlob.ReceiptOptions);
@@ -450,7 +452,7 @@ namespace BTCPayServer.Controllers
         }
 
         [HttpPost("{storeId}/checkout")]
-        public async Task<IActionResult> CheckoutAppearance(CheckoutAppearanceViewModel model)
+        public async Task<IActionResult> CheckoutAppearance(CheckoutAppearanceViewModel model, [FromForm] bool RemoveSoundFile = false)
         {
             bool needUpdate = false;
             var blob = CurrentStore.GetStoreBlob();
@@ -475,6 +477,57 @@ namespace BTCPayServer.Controllers
                     }
                 }
             }
+            
+            var userId = GetUserId();
+            if (userId is null)
+                return NotFound();
+
+            if (model.SoundFile != null)
+            {
+                if (model.SoundFile.Length > 1_000_000)
+                {
+                    ModelState.AddModelError(nameof(model.SoundFile), "The uploaded sound file should be less than 1MB");
+                }
+                else if (!model.SoundFile.ContentType.StartsWith("audio/", StringComparison.InvariantCulture))
+                {
+                    ModelState.AddModelError(nameof(model.SoundFile), "The uploaded sound file needs to be an audio file");
+                }
+                else
+                {
+                    var formFile = await model.SoundFile.Bufferize();
+                    if (!FileTypeDetector.IsAudio(formFile.Buffer, formFile.FileName))
+                    {
+                        ModelState.AddModelError(nameof(model.SoundFile), "The uploaded sound file needs to be an audio file");
+                    }
+                    else
+                    {
+                        model.SoundFile = formFile;
+                        // delete existing file
+                        if (!string.IsNullOrEmpty(blob.SoundFileId))
+                        {
+                            await _fileService.RemoveFile(blob.SoundFileId, userId);
+                        }
+
+                        // add new file
+                        try
+                        {
+                            var storedFile = await _fileService.AddFile(model.SoundFile, userId);
+                            blob.SoundFileId = storedFile.Id;
+                            needUpdate = true;
+                        }
+                        catch (Exception e)
+                        {
+                            ModelState.AddModelError(nameof(model.SoundFile), $"Could not save sound: {e.Message}");
+                        }
+                    }
+                }
+            }
+            else if (RemoveSoundFile && !string.IsNullOrEmpty(blob.SoundFileId))
+            {
+                await _fileService.RemoveFile(blob.SoundFileId, userId);
+                blob.SoundFileId = null;
+                needUpdate = true;
+            }
 
             if (!ModelState.IsValid)
             {
@@ -516,6 +569,7 @@ namespace BTCPayServer.Controllers
             blob.ShowStoreHeader = model.ShowStoreHeader;
             blob.CheckoutType = model.UseClassicCheckout ? Client.Models.CheckoutType.V1 : Client.Models.CheckoutType.V2;
             blob.CelebratePayment = model.CelebratePayment;
+            blob.PlaySoundOnPayment = model.PlaySoundOnPayment;
             blob.OnChainWithLnInvoiceFallback = model.OnChainWithLnInvoiceFallback;
             blob.LightningAmountInSatoshi = model.LightningAmountInSatoshi;
             blob.RequiresRefundEmail = model.RequiresRefundEmail;
@@ -674,28 +728,27 @@ namespace BTCPayServer.Controllers
             {
                 if (model.LogoFile.Length > 1_000_000)
                 {
-                    TempData[WellKnownTempData.ErrorMessage] = "The uploaded logo file should be less than 1MB";
+                    ModelState.AddModelError(nameof(model.LogoFile), "The uploaded logo file should be less than 1MB");
                 }
                 else if (!model.LogoFile.ContentType.StartsWith("image/", StringComparison.InvariantCulture))
                 {
-                    TempData[WellKnownTempData.ErrorMessage] = "The uploaded logo file needs to be an image";
+                    ModelState.AddModelError(nameof(model.LogoFile), "The uploaded logo file needs to be an image");
                 }
                 else
                 {
                     var formFile = await model.LogoFile.Bufferize();
                     if (!FileTypeDetector.IsPicture(formFile.Buffer, formFile.FileName))
                     {
-                        TempData[WellKnownTempData.ErrorMessage] = "The uploaded logo file needs to be an image";
+                        ModelState.AddModelError(nameof(model.LogoFile), "The uploaded logo file needs to be an image");
                     }
                     else
                     {
                         model.LogoFile = formFile;
-                        // delete existing image
+                        // delete existing file
                         if (!string.IsNullOrEmpty(blob.LogoFileId))
                         {
                             await _fileService.RemoveFile(blob.LogoFileId, userId);
                         }
-
                         // add new image
                         try
                         {
@@ -704,7 +757,7 @@ namespace BTCPayServer.Controllers
                         }
                         catch (Exception e)
                         {
-                            TempData[WellKnownTempData.ErrorMessage] = $"Could not save logo: {e.Message}";
+                            ModelState.AddModelError(nameof(model.LogoFile), $"Could not save logo: {e.Message}");
                         }
                     }
                 }
@@ -720,25 +773,24 @@ namespace BTCPayServer.Controllers
             {
                 if (model.CssFile.Length > 1_000_000)
                 {
-                    TempData[WellKnownTempData.ErrorMessage] = "The uploaded file should be less than 1MB";
+                    ModelState.AddModelError(nameof(model.CssFile), "The uploaded file should be less than 1MB");
                 }
                 else if (!model.CssFile.ContentType.Equals("text/css", StringComparison.InvariantCulture))
                 {
-                    TempData[WellKnownTempData.ErrorMessage] = "The uploaded file needs to be a CSS file";
+                    ModelState.AddModelError(nameof(model.CssFile), "The uploaded file needs to be a CSS file");
                 }
                 else if (!model.CssFile.FileName.EndsWith(".css", StringComparison.OrdinalIgnoreCase))
                 {
-                    TempData[WellKnownTempData.ErrorMessage] = "The uploaded file needs to be a CSS file";
+                    ModelState.AddModelError(nameof(model.CssFile), "The uploaded file needs to be a CSS file");
                 }
                 else
                 {
-                    // delete existing CSS file
+                    // delete existing file
                     if (!string.IsNullOrEmpty(blob.CssFileId))
                     {
                         await _fileService.RemoveFile(blob.CssFileId, userId);
                     }
-
-                    // add new CSS file
+                    // add new file
                     try
                     {
                         var storedFile = await _fileService.AddFile(model.CssFile, userId);
@@ -746,7 +798,7 @@ namespace BTCPayServer.Controllers
                     }
                     catch (Exception e)
                     {
-                        TempData[WellKnownTempData.ErrorMessage] = $"Could not save CSS file: {e.Message}";
+                        ModelState.AddModelError(nameof(model.CssFile), $"Could not save CSS file: {e.Message}");
                     }
                 }
             }

BTCPayServer/Controllers/UIUserStoresController.cs

@@ -39,12 +39,12 @@ namespace BTCPayServer.Controllers
 
         [HttpGet("create")]
         [Authorize(AuthenticationSchemes = AuthenticationSchemes.Cookie, Policy = Policies.CanModifyStoreSettingsUnscoped)]
-        public async Task<IActionResult> CreateStore()
+        public async Task<IActionResult> CreateStore(bool skipWizard)
         {
             var stores = await _repo.GetStoresByUserId(GetUserId());
             var vm = new CreateStoreViewModel
             {
-                IsFirstStore = !stores.Any(),
+                IsFirstStore = !(stores.Any() || skipWizard),
                 DefaultCurrency = StoreBlob.StandardDefaultCurrency,
                 Exchanges = GetExchangesSelectList(null)
             };

BTCPayServer/Data/Payouts/BitcoinLike/BitcoinLikePayoutHandler.cs

@@ -303,7 +303,7 @@ public class BitcoinLikePayoutHandler : IPayoutHandler
                     bip21.Add(newUri.Uri.ToString());
                     break;
                 case AddressClaimDestination addressClaimDestination:
-                    var bip21New = network.GenerateBIP21(addressClaimDestination.Address.ToString(), new Money(blob.CryptoAmount.Value, MoneyUnit.BTC));
+                    var bip21New = network.GenerateBIP21(addressClaimDestination.Address.ToString(), blob.CryptoAmount.Value);
                     bip21New.QueryParams.Add("payout", payout.Id);
                     bip21.Add(bip21New.ToString());
                     break;

BTCPayServer/Data/Payouts/IClaimDestination.cs

@@ -6,5 +6,6 @@ namespace BTCPayServer.Data
     {
         public string? Id { get; }
         decimal? Amount { get; }
+        bool IsExplicitAmountMinimum => false;
     }
 }

BTCPayServer/Data/Payouts/LightningLike/BoltInvoiceClaimDestination.cs

@@ -23,5 +23,6 @@ namespace BTCPayServer.Data.Payouts.LightningLike
         public uint256 PaymentHash { get; }
         public string Id => PaymentHash.ToString();
         public decimal? Amount { get; }
+        public bool IsExplicitAmountMinimum => true;
     }
 }

BTCPayServer/Data/Payouts/LightningLike/UILightningLikePayoutController.cs

@@ -72,7 +72,7 @@ namespace BTCPayServer.Data.Payouts.LightningLike
 
             return (await dbContext.Payouts
                     .Include(data => data.PullPaymentData)
-                    .ThenInclude(data => data.StoreData)
+                    .Include(data => data.StoreData)
                     .ThenInclude(data => data.UserStores)
                     .ThenInclude(data => data.StoreRole)
                     .Where(data =>
@@ -82,11 +82,11 @@ namespace BTCPayServer.Data.Payouts.LightningLike
                     .ToListAsync())
                 .Where(payout =>
                 {
-                    if (approvedStores.TryGetValue(payout.PullPaymentData.StoreId, out var value))
+                    if (approvedStores.TryGetValue(payout.StoreDataId, out var value))
                         return value;
-                    value = payout.PullPaymentData.StoreData.UserStores
+                    value = payout.StoreData.UserStores
                         .Any(store => store.ApplicationUserId == userId && store.StoreRole.Permissions.Contains(Policies.CanModifyStoreSettings));
-                    approvedStores.Add(payout.PullPaymentData.StoreId, value);
+                    approvedStores.Add(payout.StoreDataId, value);
                     return value;
                 }).ToList();
         }
@@ -125,7 +125,7 @@ namespace BTCPayServer.Data.Payouts.LightningLike
 
             await using var ctx = _applicationDbContextFactory.CreateContext();
 
-            var payouts = (await GetPayouts(ctx, pmi, payoutIds)).GroupBy(data => data.PullPaymentData.StoreId);
+            var payouts = (await GetPayouts(ctx, pmi, payoutIds)).GroupBy(data => data.StoreDataId);
             var results = new List<ResultVM>();
             var network = _btcPayNetworkProvider.GetNetwork<BTCPayNetwork>(pmi.CryptoCode);
 
@@ -134,7 +134,7 @@ namespace BTCPayServer.Data.Payouts.LightningLike
             var authorizedForInternalNode = (await _authorizationService.AuthorizeAsync(User, null, new PolicyRequirement(Policies.CanModifyServerSettings))).Succeeded;
             foreach (var payoutDatas in payouts)
             {
-                var store = payoutDatas.First().PullPaymentData.StoreData;
+                var store = payoutDatas.First().StoreData;
 
                 var lightningSupportedPaymentMethod = store.GetSupportedPaymentMethods(_btcPayNetworkProvider)
                     .OfType<LightningSupportedPaymentMethod>()
@@ -264,7 +264,7 @@ namespace BTCPayServer.Data.Payouts.LightningLike
             PaymentMethodId pmi, CancellationToken cancellationToken)
         {
             var boltAmount = bolt11PaymentRequest.MinimumAmount.ToDecimal(LightMoneyUnit.BTC);
-            if (boltAmount != payoutBlob.CryptoAmount)
+            if (boltAmount > payoutBlob.CryptoAmount)
             {
 
                 payoutData.State = PayoutState.Cancelled;
@@ -277,15 +277,26 @@ namespace BTCPayServer.Data.Payouts.LightningLike
                 };
             }
 
+            if (bolt11PaymentRequest.ExpiryDate < DateTimeOffset.Now)
+            {
+                payoutData.State = PayoutState.Cancelled;
+                return new ResultVM
+                {
+                    PayoutId = payoutData.Id,
+                    Result = PayResult.Error,
+                    Message = $"The BOLT11 invoice expiry date ({bolt11PaymentRequest.ExpiryDate}) has expired",
+                    Destination = payoutBlob.Destination
+                };
+            }
+
             var proofBlob = new PayoutLightningBlob() { PaymentHash = bolt11PaymentRequest.PaymentHash.ToString() };
             try
             {
                 var result = await lightningClient.Pay(bolt11PaymentRequest.ToString(),
                     new PayInvoiceParams()
                     {
-                        Amount = bolt11PaymentRequest.MinimumAmount == LightMoney.Zero
-                            ? new LightMoney((decimal)payoutBlob.CryptoAmount, LightMoneyUnit.BTC)
-                            : null
+                        // CLN does not support explicit amount param if it is the same as the invoice amount
+                        Amount = payoutBlob.CryptoAmount == bolt11PaymentRequest.MinimumAmount.ToDecimal(LightMoneyUnit.BTC)? null: new LightMoney((decimal)payoutBlob.CryptoAmount, LightMoneyUnit.BTC)
                     }, cancellationToken);
                 string message = null;
                 if (result.Result == PayResult.Ok)

BTCPayServer/Data/Payouts/PayoutBlob.cs

@@ -1,5 +1,7 @@
+using System.Collections.Generic;
 using BTCPayServer.JsonConverters;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Data
 {
@@ -12,5 +14,10 @@ namespace BTCPayServer.Data
         public int MinimumConfirmation { get; set; } = 1;
         public string Destination { get; set; }
         public int Revision { get; set; }
+        
+        [JsonExtensionData]
+        public Dictionary<string, JToken> AdditionalData { get; set; } = new();
+
+        public JObject Metadata { get; set; }
     }
 }

BTCPayServer/Data/Payouts/PayoutExtensions.cs

@@ -35,7 +35,9 @@ namespace BTCPayServer.Data
 
         public static PayoutBlob GetBlob(this PayoutData data, BTCPayNetworkJsonSerializerSettings serializers)
         {
-            return JsonConvert.DeserializeObject<PayoutBlob>(Encoding.UTF8.GetString(data.Blob), serializers.GetSerializer(data.GetPaymentMethodId().CryptoCode));
+            var result =  JsonConvert.DeserializeObject<PayoutBlob>(Encoding.UTF8.GetString(data.Blob), serializers.GetSerializer(data.GetPaymentMethodId().CryptoCode));
+            result.Metadata ??= new JObject();
+            return result;
         }
         public static void SetBlob(this PayoutData data, PayoutBlob blob, BTCPayNetworkJsonSerializerSettings serializers)
         {

BTCPayServer/Data/StoreBlob.cs

@@ -199,7 +199,9 @@ namespace BTCPayServer.Data
             { "GTQ", "bitpay" },
             { "COP", "yadio" },
             { "JPY", "bitbank" },
-            { "TRY", "btcturk" }
+            { "TRY", "btcturk" },
+            { "UGX", "exchangeratehost"},
+            { "RSD", "bitpay"}
         };
 
         public string GetRecommendedExchange() =>
@@ -235,6 +237,12 @@ namespace BTCPayServer.Data
         [DefaultValue(true)]
         [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
         public bool CelebratePayment { get; set; } = true;
+        
+        [DefaultValue(false)]
+        [JsonProperty(DefaultValueHandling = DefaultValueHandling.Populate)]
+        public bool PlaySoundOnPayment { get; set; } = false;
+
+        public string SoundFileId { get; set; }
 
         public IPaymentFilter GetExcludedPaymentMethods()
         {

BTCPayServer/Extensions.cs

@@ -22,6 +22,7 @@ using BTCPayServer.Payments;
 using BTCPayServer.Payments.Bitcoin;
 using BTCPayServer.Security;
 using BTCPayServer.Services.Invoices;
+using BTCPayServer.Services.Reporting;
 using BTCPayServer.Services.Wallets;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -30,6 +31,7 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using NBitcoin;
 using NBitcoin.Payment;
+using NBitpayClient;
 using NBXplorer.Models;
 using Newtonsoft.Json;
 using InvoiceCryptoInfo = BTCPayServer.Services.Invoices.InvoiceCryptoInfo;
@@ -38,6 +40,15 @@ namespace BTCPayServer
 {
     public static class Extensions
     {
+        public static DateTimeOffset TruncateMilliSeconds(this DateTimeOffset dt) => new (dt.Year, dt.Month, dt.Day, dt.Hour, dt.Minute, dt.Second, 0, dt.Offset);
+        public static decimal? GetDue(this InvoiceCryptoInfo invoiceCryptoInfo)
+        {
+            if (invoiceCryptoInfo is null)
+                return null;
+            if (decimal.TryParse(invoiceCryptoInfo.Due, NumberStyles.Any, CultureInfo.InvariantCulture, out var v))
+                return v;
+            return null;
+        }
         public static Task<BufferizedFormFile> Bufferize(this IFormFile formFile)
         {
             return BufferizedFormFile.Bufferize(formFile);
@@ -124,6 +135,14 @@ namespace BTCPayServer
             }
         }
 
+        public static IServiceCollection AddReportProvider<T>(this IServiceCollection services)
+    where T : ReportProvider
+        {
+            services.AddSingleton<T>();
+            services.AddSingleton<ReportProvider, T>();
+            return services;
+        }
+
         public static IServiceCollection AddScheduledTask<T>(this IServiceCollection services, TimeSpan every)
             where T : class, IPeriodicTask
         {
@@ -382,20 +401,6 @@ namespace BTCPayServer
             return controller.View("PostRedirect", redirectVm);
         }
 
-        public static string ToSql<TEntity>(this IQueryable<TEntity> query) where TEntity : class
-        {
-            var enumerator = query.Provider.Execute<IEnumerable<TEntity>>(query.Expression).GetEnumerator();
-            var relationalCommandCache = enumerator.Private("_relationalCommandCache");
-            var selectExpression = relationalCommandCache.Private<Microsoft.EntityFrameworkCore.Query.SqlExpressions.SelectExpression>("_selectExpression");
-            var factory = relationalCommandCache.Private<Microsoft.EntityFrameworkCore.Query.IQuerySqlGeneratorFactory>("_querySqlGeneratorFactory");
-
-            var sqlGenerator = factory.Create();
-            var command = sqlGenerator.GetCommand(selectExpression);
-
-            string sql = command.CommandText;
-            return sql;
-        }
-
         public static BTCPayNetworkProvider ConfigureNetworkProvider(this IConfiguration configuration, Logs logs)
         {
             var _networkType = DefaultConfiguration.GetNetworkType(configuration);

BTCPayServer/Extensions/StoreExtensions.cs

@@ -1,4 +1,5 @@
 #nullable enable
+using System.Collections.Generic;
 using System.Linq;
 using BTCPayServer.Client;
 using BTCPayServer.Data;
@@ -43,5 +44,13 @@ namespace BTCPayServer
                 .FirstOrDefault(p => p.PaymentId.PaymentType == Payments.PaymentTypes.BTCLike && p.PaymentId.CryptoCode == cryptoCode);
             return paymentMethod;
         }
+        public static IEnumerable<DerivationSchemeSettings> GetDerivationSchemeSettings(this StoreData store, BTCPayNetworkProvider networkProvider)
+        {
+            var paymentMethod = store
+                .GetSupportedPaymentMethods(networkProvider)
+                .OfType<DerivationSchemeSettings>()
+                .Where(p => p.PaymentId.PaymentType == Payments.PaymentTypes.BTCLike);
+            return paymentMethod;
+        }
     }
 }

BTCPayServer/FileTypeDetector.cs

@@ -10,6 +10,7 @@ namespace BTCPayServer
     {
         // Thanks to https://www.garykessler.net/software/FileSigs_20220731.zip
 
+
         const string pictureSigs =
             "JPEG2000 image files,00 00 00 0C 6A 50 20 20,JP2,Picture,0,(null)\n" +
             "Bitmap image,42 4D,BMP|DIB,Picture,0,(null)\n" +
@@ -19,19 +20,30 @@ namespace BTCPayServer
             "JPEG-EXIF-SPIFF images,FF D8 FF,JFIF|JPE|JPEG|JPG,Picture,0,FF D9\n" +
             "SVG images, 3C 73 76 67,SVG,Picture,0,(null)\n" +
             "Google WebP image file, 52 49 46 46 XX XX XX XX 57 45 42 50,WEBP,Picture,0,(null)\n" +
-            "AVIF image file, XX XX XX XX 66 74 79 70,AVIF,Picture,0,(null)\n";
+            "AVIF image file, XX XX XX XX 66 74 79 70,AVIF,Picture,0,(null)\n" +
+            "MP3 audio file,49 44 33,MP3,Multimedia,0,(null)\n" +
+            "MP3 audio file,FF,MP3,Multimedia,0,(null)\n" +
+            "RIFF Windows Audio,57 41 56 45 66 6D 74 20,WAV,Multimedia,8,(null)\n" +
+            "Free Lossless Audio Codec file,66 4C 61 43 00 00 00 22,FLAC,Multimedia,0,(null)\n" +
+            "MPEG-4 AAC audio,FF F1,AAC,Audio,0,(null)\n" +
+            "Ogg Vorbis Codec compressed file,4F 67 67 53,OGA|OGG|OGV|OGX,Multimedia,0,(null)\n" +
+            "Apple Lossless Audio Codec file,66 74 79 70 4D 34 41 20,M4A,Multimedia,4,(null)\n" +
+            "WebM/WebA,66 74 79 70 4D 34 41 20,M4A,Multimedia,4,(null)\n" +
+            "WebM/WEBA video file,1A 45 DF A3,WEBM|WEBA,Multimedia,0,(null)\n" +
+            "Resource Interchange File Format,52 49 46 46,AVI|CDA|QCP|RMI|WAV|WEBP,Multimedia,0,(null)\n";
 
-        readonly static (int[] Header, int[]? Trailer, string[] Extensions)[] headerTrailers;
+        readonly static (int[] Header, int[]? Trailer, string Type, string[] Extensions)[] headerTrailers;
         static FileTypeDetector()
         {
             var lines = pictureSigs.Split('\n', StringSplitOptions.RemoveEmptyEntries);
-            headerTrailers = new (int[] Header, int[]? Trailer, string[] Extensions)[lines.Length];
+            headerTrailers = new (int[] Header, int[]? Trailer, string Type, string[] Extensions)[lines.Length];
             for (int i = 0; i < lines.Length; i++)
             {
                 var cells = lines[i].Split(',');
                 headerTrailers[i] = (
                     DecodeData(cells[1]),
                     cells[^1] == "(null)" ? null : DecodeData(cells[^1]),
+                    cells[3],
                     cells[2].Split('|').Select(p => $".{p}").ToArray()
                     );
             }
@@ -51,11 +63,21 @@ namespace BTCPayServer
             }
             return res;
         }
-
         public static bool IsPicture(byte[] bytes, string? filename)
+        {
+            return IsFileType(bytes, filename, new[] { "Picture" });
+        }
+        public static bool IsAudio(byte[] bytes, string? filename)
+        {
+            return IsFileType(bytes, filename, new[] { "Multimedia", "Audio" });
+        }
+
+        static bool IsFileType(byte[] bytes, string? filename, string[] types)
         {
             for (int i = 0; i < headerTrailers.Length; i++)
             {
+                if (!types.Contains(headerTrailers[i].Type))
+                    goto next;
                 if (headerTrailers[i].Header is int[] header)
                 {
                     if (header.Length > bytes.Length)
@@ -80,7 +102,7 @@ namespace BTCPayServer
                 if (filename is not null)
                 {
                     if (!headerTrailers[i].Extensions.Any(ext => filename.Length > ext.Length && filename.EndsWith(ext, StringComparison.OrdinalIgnoreCase)))
-                        return false;
+                        goto next;
                 }
                 return true;
 next:

BTCPayServer/Forms/FieldValueMirror.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using BTCPayServer.Abstractions.Form;
+using Newtonsoft.Json.Linq;
 
 namespace BTCPayServer.Forms;
 
@@ -10,7 +11,7 @@ public class FieldValueMirror : IFormComponentProvider
     {
         if (form.GetFieldByFullName(field.Value) is null)
         {
-            field.ValidationErrors = new List<string> { $"{field.Name} requires {field.Value} to be present" };
+            field.ValidationErrors = new List<string> {$"{field.Name} requires {field.Value} to be present"};
         }
     }
 
@@ -21,6 +22,13 @@ public class FieldValueMirror : IFormComponentProvider
 
     public string GetValue(Form form, Field field)
     {
-        return form.GetFieldByFullName(field.Value)?.Value;
+        var rawValue = form.GetFieldByFullName(field.Value)?.Value;
+        if (rawValue is not null && field.AdditionalData?.TryGetValue("valuemap", out var valueMap) is true &&
+            valueMap is JObject map && map.TryGetValue(rawValue, out var mappedValue))
+        {
+            return mappedValue.Value<string>();
+        }
+
+        return rawValue;
     }
 }

BTCPayServer/Forms/FormDataService.cs

@@ -151,11 +151,32 @@ public class FormDataService
 
     public CreateInvoiceRequest GenerateInvoiceParametersFromForm(Form form)
     {
-        var amt = GetValue(form, $"{InvoiceParameterPrefix}amount");
+        var amtRaw = GetValue(form, $"{InvoiceParameterPrefix}amount");
+        var amt = string.IsNullOrEmpty(amtRaw) ? (decimal?) null : decimal.Parse(amtRaw, CultureInfo.InvariantCulture);
+        var adjustmentAmount = 0m;
+        foreach (var adjustmentField in form.GetAllFields().Where(f => f.FullName.StartsWith($"{InvoiceParameterPrefix}amount_adjustment")))
+        {
+            if (!decimal.TryParse(GetValue(form, adjustmentField.Field), out var adjustment))
+            {
+                continue;
+            }
+
+            adjustmentAmount += adjustment;
+        }
+
+        if (amt is null && adjustmentAmount > 0)
+        {
+            amt = adjustmentAmount;
+        }
+        else if(amt is not null)
+        {
+            amt += adjustmentAmount;
+            amt = Math.Max(0, amt!.Value);
+        }
         return new CreateInvoiceRequest
         {
             Currency = GetValue(form, $"{InvoiceParameterPrefix}currency"),
-            Amount = string.IsNullOrEmpty(amt) ? null : decimal.Parse(amt, CultureInfo.InvariantCulture),
+            Amount = amt,
             Metadata = GetValues(form),
         };
     }

BTCPayServer/Forms/UIFormsController.cs

@@ -203,9 +203,25 @@ public class UIFormsController : Controller
         if (store is null)
             return NotFound();
 
+        try
+        {
+
         var request = _formDataService.GenerateInvoiceParametersFromForm(form);
         var inv = await invoiceController.CreateInvoiceCoreRaw(request, store, Request.GetAbsoluteRoot());
-
+        if (inv.Price == 0 && inv.Type == InvoiceType.Standard && inv.ReceiptOptions?.Enabled is not false)
+        {
+            return RedirectToAction("InvoiceReceipt", "UIInvoice", new { invoiceId = inv.Id });
+        }
         return RedirectToAction("Checkout", "UIInvoice", new { invoiceId = inv.Id });
+        }
+        catch (Exception e)
+        {
+            TempData.SetStatusMessageModel(new StatusMessageModel()
+            {
+                Severity = StatusMessageModel.StatusSeverity.Error,
+                Message = "Could not generate invoice: "+ e.Message
+            });
+            return await GetFormView(formData, form);
+        }
     }
 }

BTCPayServer/HostedServices/AppInventoryUpdaterHostedService.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
@@ -50,45 +51,47 @@ namespace BTCPayServer.HostedServices
                         }
                     }).Where(tuple => tuple.Data != null && tuple.Items.Any(item =>
                                           item.Inventory.HasValue &&
-                                          updateAppInventory.Items.ContainsKey(item.Id)));
-                foreach (var valueTuple in apps)
+                                          updateAppInventory.Items.FirstOrDefault(i => i.Id == item.Id) != null));
+                foreach (var app in apps)
                 {
-                    foreach (var item1 in valueTuple.Items.Where(item =>
-                        updateAppInventory.Items.ContainsKey(item.Id)))
+                    foreach (var cartItem in updateAppInventory.Items)
                     {
+                        var item = app.Items.FirstOrDefault(item => item.Id == cartItem.Id);
+                        if (item == null) continue;
+                        
                         if (updateAppInventory.Deduct)
                         {
-                            item1.Inventory -= updateAppInventory.Items[item1.Id];
+                            item.Inventory -= cartItem.Count;
                         }
                         else
                         {
-                            item1.Inventory += updateAppInventory.Items[item1.Id];
+                            item.Inventory += cartItem.Count;
                         }
                     }
 
-                    switch (valueTuple.Data.AppType)
+                    switch (app.Data.AppType)
                     {
                         case PointOfSaleAppType.AppType:
-                            ((PointOfSaleSettings)valueTuple.Settings).Template =
-                                AppService.SerializeTemplate(valueTuple.Items);
+                            ((PointOfSaleSettings)app.Settings).Template =
+                                AppService.SerializeTemplate(app.Items);
                             break;
                         case CrowdfundAppType.AppType:
-                            ((CrowdfundSettings)valueTuple.Settings).PerksTemplate =
-                                AppService.SerializeTemplate(valueTuple.Items);
+                            ((CrowdfundSettings)app.Settings).PerksTemplate =
+                                AppService.SerializeTemplate(app.Items);
                             break;
                         default:
                             throw new InvalidOperationException();
                     }
 
-                    valueTuple.Data.SetSettings(valueTuple.Settings);
-                    await _appService.UpdateOrCreateApp(valueTuple.Data);
+                    app.Data.SetSettings(app.Settings);
+                    await _appService.UpdateOrCreateApp(app.Data);
                 }
 
 
             }
             else if (evt is InvoiceEvent invoiceEvent)
             {
-                Dictionary<string, int> cartItems = null;
+                List<PosCartItem> cartItems = null;
                 bool deduct;
                 switch (invoiceEvent.Name)
                 {
@@ -104,8 +107,8 @@ namespace BTCPayServer.HostedServices
                         return;
                 }
 
-                if ((!string.IsNullOrEmpty(invoiceEvent.Invoice.Metadata.ItemCode) ||
-                     AppService.TryParsePosCartItems(invoiceEvent.Invoice.Metadata.PosData, out cartItems)))
+                if (!string.IsNullOrEmpty(invoiceEvent.Invoice.Metadata.ItemCode) ||
+                    AppService.TryParsePosCartItems(invoiceEvent.Invoice.Metadata.PosData, out cartItems))
                 {
                     var appIds = AppService.GetAppInternalTags(invoiceEvent.Invoice);
 
@@ -114,13 +117,18 @@ namespace BTCPayServer.HostedServices
                         return;
                     }
 
-                    var items = cartItems ?? new Dictionary<string, int>();
+                    var items = cartItems?.ToList() ?? new List<PosCartItem>();
                     if (!string.IsNullOrEmpty(invoiceEvent.Invoice.Metadata.ItemCode))
                     {
-                        items.TryAdd(invoiceEvent.Invoice.Metadata.ItemCode, 1);
+                        items.Add(new PosCartItem
+                        {
+                            Id = invoiceEvent.Invoice.Metadata.ItemCode,
+                            Count = 1,
+                            Price = invoiceEvent.Invoice.Price
+                        });
                     }
 
-                    _eventAggregator.Publish(new UpdateAppInventory()
+                    _eventAggregator.Publish(new UpdateAppInventory
                     {
                         Deduct = deduct,
                         Items = items,
@@ -134,7 +142,7 @@ namespace BTCPayServer.HostedServices
         public class UpdateAppInventory
         {
             public string[] AppId { get; set; }
-            public Dictionary<string, int> Items { get; set; }
+            public List<PosCartItem> Items { get; set; }
             public bool Deduct { get; set; }
 
             public override string ToString()

BTCPayServer/HostedServices/InvoiceWatcher.cs

@@ -7,6 +7,7 @@ using System.Threading.Tasks;
 using BTCPayServer.Client.Models;
 using BTCPayServer.Events;
 using BTCPayServer.Logging;
+using BTCPayServer.Payments;
 using BTCPayServer.Services.Invoices;
 using BTCPayServer.Services.Notifications;
 using BTCPayServer.Services.Notifications.Blobs;
@@ -83,31 +84,13 @@ namespace BTCPayServer.HostedServices
                 if (invoice.ExceptionStatus == InvoiceExceptionStatus.PaidPartial)
                     context.Events.Add(new InvoiceEvent(invoice, InvoiceEvent.ExpiredPaidPartial) { PaidPartial = paidPartial });
             }
-            var allPaymentMethods = invoice.GetPaymentMethods();
-            var paymentMethod = GetNearestClearedPayment(allPaymentMethods, out var accounting);
-            if (allPaymentMethods.Any() && paymentMethod == null)
-                return;
-            if (accounting is null && invoice.Price is 0m)
-            {
-                accounting = new PaymentMethodAccounting()
-                {
-                    Due = Money.Zero,
-                    Paid = Money.Zero,
-                    CryptoPaid = Money.Zero,
-                    DueUncapped = Money.Zero,
-                    NetworkFee = Money.Zero,
-                    TotalDue = Money.Zero,
-                    TxCount = 0,
-                    TxRequired = 0,
-                    MinimumTotalDue = Money.Zero,
-                    NetworkFeeAlreadyPaid = Money.Zero
-                };
-            }
+
+            var hasPayment = invoice.GetPayments(true).Any();
             if (invoice.Status == InvoiceStatusLegacy.New || invoice.Status == InvoiceStatusLegacy.Expired)
             {
                 var isPaid = invoice.IsUnsetTopUp() ?
-                    accounting.Paid > Money.Zero :
-                    accounting.Paid >= accounting.MinimumTotalDue;
+                    hasPayment :
+                    !invoice.IsUnderPaid;
                 if (isPaid)
                 {
                     if (invoice.Status == InvoiceStatusLegacy.New)
@@ -117,13 +100,15 @@ namespace BTCPayServer.HostedServices
                         if (invoice.IsUnsetTopUp())
                         {
                             invoice.ExceptionStatus = InvoiceExceptionStatus.None;
-                            invoice.Price = (accounting.Paid - accounting.NetworkFeeAlreadyPaid).ToDecimal(MoneyUnit.BTC) * paymentMethod.Rate;
-                            accounting = paymentMethod.Calculate();
+                            // We know there is at least one payment because hasPayment is true
+                            var payment = invoice.GetPayments(true).First();
+                            invoice.Price = payment.InvoicePaidAmount.Net;
+                            invoice.UpdateTotals();
                             context.BlobUpdated();
                         }
                         else
                         {
-                            invoice.ExceptionStatus = accounting.Paid > accounting.TotalDue ? InvoiceExceptionStatus.PaidOver : InvoiceExceptionStatus.None;
+                            invoice.ExceptionStatus = invoice.IsOverPaid ? InvoiceExceptionStatus.PaidOver : InvoiceExceptionStatus.None;
                         }
                         context.MarkDirty();
                     }
@@ -135,7 +120,7 @@ namespace BTCPayServer.HostedServices
                     }
                 }
 
-                if (accounting.Paid < accounting.MinimumTotalDue && invoice.GetPayments(true).Count != 0 && invoice.ExceptionStatus != InvoiceExceptionStatus.PaidPartial)
+                if (hasPayment && invoice.IsUnderPaid && invoice.ExceptionStatus != InvoiceExceptionStatus.PaidPartial)
                 {
                     invoice.ExceptionStatus = InvoiceExceptionStatus.PaidPartial;
                     context.MarkDirty();
@@ -145,43 +130,43 @@ namespace BTCPayServer.HostedServices
             // Just make sure RBF did not cancelled a payment
             if (invoice.Status == InvoiceStatusLegacy.Paid)
             {
-                if (accounting.MinimumTotalDue <= accounting.Paid && accounting.Paid <= accounting.TotalDue && invoice.ExceptionStatus == InvoiceExceptionStatus.PaidOver)
+                if (!invoice.IsUnderPaid && !invoice.IsOverPaid && invoice.ExceptionStatus == InvoiceExceptionStatus.PaidOver)
                 {
                     invoice.ExceptionStatus = InvoiceExceptionStatus.None;
                     context.MarkDirty();
                 }
 
-                if (accounting.Paid > accounting.TotalDue && invoice.ExceptionStatus != InvoiceExceptionStatus.PaidOver)
+                if (invoice.IsOverPaid && invoice.ExceptionStatus != InvoiceExceptionStatus.PaidOver)
                 {
                     invoice.ExceptionStatus = InvoiceExceptionStatus.PaidOver;
                     context.MarkDirty();
                 }
 
-                if (accounting.Paid < accounting.MinimumTotalDue)
+                if (invoice.IsUnderPaid)
                 {
                     invoice.Status = InvoiceStatusLegacy.New;
-                    invoice.ExceptionStatus = accounting.Paid == Money.Zero ? InvoiceExceptionStatus.None : InvoiceExceptionStatus.PaidPartial;
+                    invoice.ExceptionStatus = hasPayment ? InvoiceExceptionStatus.PaidPartial : InvoiceExceptionStatus.None;
                     context.MarkDirty();
                 }
             }
 
             if (invoice.Status == InvoiceStatusLegacy.Paid)
             {
-                var confirmedAccounting =
-                    paymentMethod?.Calculate(p => p.GetCryptoPaymentData().PaymentConfirmed(p, invoice.SpeedPolicy)) ??
-                    accounting;
+                var unconfPayments = invoice.GetPayments(true).Where(p => !p.GetCryptoPaymentData().PaymentConfirmed(p, invoice.SpeedPolicy)).ToList();
+                var unconfirmedPaid = unconfPayments.Select(p => p.InvoicePaidAmount.Net).Sum();
+                var minimumDue = invoice.MinimumNetDue + unconfirmedPaid;
 
                 if (// Is after the monitoring deadline
                    (invoice.MonitoringExpiration < DateTimeOffset.UtcNow)
                    &&
                    // And not enough amount confirmed
-                   (confirmedAccounting.Paid < accounting.MinimumTotalDue))
+                   (minimumDue > 0.0m))
                 {
                     context.Events.Add(new InvoiceEvent(invoice, InvoiceEvent.FailedToConfirm));
                     invoice.Status = InvoiceStatusLegacy.Invalid;
                     context.MarkDirty();
                 }
-                else if (confirmedAccounting.Paid >= accounting.MinimumTotalDue)
+                else if (minimumDue <= 0.0m)
                 {
                     invoice.Status = InvoiceStatusLegacy.Confirmed;
                     context.Events.Add(new InvoiceEvent(invoice, InvoiceEvent.Confirmed));
@@ -191,9 +176,11 @@ namespace BTCPayServer.HostedServices
 
             if (invoice.Status == InvoiceStatusLegacy.Confirmed)
             {
-                var completedAccounting = paymentMethod?.Calculate(p => p.GetCryptoPaymentData().PaymentCompleted(p)) ??
-                                          accounting;
-                if (completedAccounting.Paid >= accounting.MinimumTotalDue)
+                var unconfPayments = invoice.GetPayments(true).Where(p => !p.GetCryptoPaymentData().PaymentCompleted(p)).ToList();
+                var unconfirmedPaid = unconfPayments.Select(p => p.InvoicePaidAmount.Net).Sum();
+                var minimumDue = invoice.MinimumNetDue + unconfirmedPaid;
+
+                if (minimumDue <= 0.0m)
                 {
                     context.Events.Add(new InvoiceEvent(invoice, InvoiceEvent.Completed));
                     invoice.Status = InvoiceStatusLegacy.Complete;
@@ -203,25 +190,6 @@ namespace BTCPayServer.HostedServices
 
         }
 
-        public static PaymentMethod GetNearestClearedPayment(PaymentMethodDictionary allPaymentMethods, out PaymentMethodAccounting accounting)
-        {
-            PaymentMethod result = null;
-            accounting = null;
-            decimal nearestToZero = 0.0m;
-            foreach (var paymentMethod in allPaymentMethods)
-            {
-                var currentAccounting = paymentMethod.Calculate();
-                var distanceFromZero = Math.Abs(currentAccounting.DueUncapped.ToDecimal(MoneyUnit.BTC));
-                if (result == null || distanceFromZero < nearestToZero)
-                {
-                    result = paymentMethod;
-                    nearestToZero = distanceFromZero;
-                    accounting = currentAccounting;
-                }
-            }
-            return result;
-        }
-
         private void Watch(string invoiceId)
         {
             ArgumentNullException.ThrowIfNull(invoiceId);
@@ -380,7 +348,7 @@ namespace BTCPayServer.HostedServices
                         if ((onChainPaymentData.ConfirmationCount < network.MaxTrackedConfirmation && payment.Accounted)
                             && (onChainPaymentData.Legacy || invoice.MonitoringExpiration < DateTimeOffset.UtcNow))
                         {
-                            var client = _explorerClientProvider.GetExplorerClient(payment.GetCryptoCode());
+                            var client = _explorerClientProvider.GetExplorerClient(payment.Currency);
                             var transactionResult = client is null ? null : await client.GetTransactionAsync(onChainPaymentData.Outpoint.Hash);
                             var confirmationCount = transactionResult?.Confirmations ?? 0;
                             onChainPaymentData.ConfirmationCount = confirmationCount;

BTCPayServer/HostedServices/PullPaymentHostedService.cs

@@ -389,7 +389,7 @@ namespace BTCPayServer.HostedServices
         {
             try
             {
-                using var ctx = _dbContextFactory.CreateContext();
+                await using var ctx = _dbContextFactory.CreateContext();
                 var payout = await ctx.Payouts.Include(p => p.PullPaymentData).Where(p => p.Id == req.PayoutId)
                     .FirstOrDefaultAsync();
                 if (payout is null)
@@ -440,6 +440,7 @@ namespace BTCPayServer.HostedServices
                 payout.SetBlob(payoutBlob, _jsonSerializerSettings);
                 await ctx.SaveChangesAsync();
 
+                _eventAggregator.Publish(new PayoutEvent(PayoutEvent.PayoutEventType.Approved, payout));
                 req.Completion.SetResult(new PayoutApproval.ApprovalResult(PayoutApproval.Result.Ok, payoutBlob.CryptoAmount));
             }
             catch (Exception ex)
@@ -596,7 +597,8 @@ namespace BTCPayServer.HostedServices
                 var payoutBlob = new PayoutBlob()
                 {
                     Amount = claimed,
-                    Destination = req.ClaimRequest.Destination.ToString()
+                    Destination = req.ClaimRequest.Destination.ToString(),
+                    Metadata = req.ClaimRequest.Metadata?? new JObject(),
                 };
                 payout.SetBlob(payoutBlob, _jsonSerializerSettings);
                 await ctx.Payouts.AddAsync(payout);
@@ -604,6 +606,8 @@ namespace BTCPayServer.HostedServices
                 {
                     await payoutHandler.TrackClaim(req.ClaimRequest, payout);
                     await ctx.SaveChangesAsync();
+                    var response = new ClaimRequest.ClaimResponse(ClaimRequest.ClaimResult.Ok, payout);
+                    _eventAggregator.Publish(new PayoutEvent(PayoutEvent.PayoutEventType.Created, payout));
                     if (req.ClaimRequest.PreApprove.GetValueOrDefault(ppBlob?.AutoApproveClaims is true))
                     {
                         payout.StoreData = await ctx.Stores.FindAsync(payout.StoreDataId);
@@ -628,7 +632,7 @@ namespace BTCPayServer.HostedServices
                         }
                     }
 
-                    req.Completion.TrySetResult(new ClaimRequest.ClaimResponse(ClaimRequest.ClaimResult.Ok, payout));
+                    req.Completion.TrySetResult(response);
                     await _notificationSender.SendNotification(new StoreScope(payout.StoreDataId),
                         new PayoutNotification()
                         {
@@ -830,6 +834,31 @@ namespace BTCPayServer.HostedServices
 
     public class ClaimRequest
     {
+        public static (string error, decimal? amount) IsPayoutAmountOk(IClaimDestination destination, decimal? amount, string payoutCurrency = null, string ppCurrency = null)
+        {
+            return amount switch
+            {
+                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),
+                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),
+                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),
+                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)
@@ -887,5 +916,16 @@ namespace BTCPayServer.HostedServices
         public IClaimDestination Destination { get; set; }
         public string StoreId { get; set; }
         public bool? PreApprove { get; set; }
+        public JObject Metadata { get; set; }
+    }
+
+    public record PayoutEvent(PayoutEvent.PayoutEventType Type,PayoutData Payout)
+    {
+        public enum PayoutEventType
+        {
+            Created,
+            Approved
+        }
+
     }
 }

BTCPayServer/HostedServices/TransactionLabelMarkerHostedService.cs

@@ -103,7 +103,7 @@ namespace BTCPayServer.HostedServices
                     invoiceEvent.Payment.GetPaymentMethodId()?.PaymentType == BitcoinPaymentType.Instance &&
                     invoiceEvent.Payment.GetCryptoPaymentData() is BitcoinLikePaymentData bitcoinLikePaymentData:
                     {
-                        var walletId = new WalletId(invoiceEvent.Invoice.StoreId, invoiceEvent.Payment.GetCryptoCode());
+                        var walletId = new WalletId(invoiceEvent.Invoice.StoreId, invoiceEvent.Payment.Currency);
                         var transactionId = bitcoinLikePaymentData.Outpoint.Hash;
                         var labels = new List<Attachment>
                     {

BTCPayServer/Hosting/BTCPayServerServices.cs

@@ -65,6 +65,7 @@ using NBXplorer.DerivationStrategy;
 using Newtonsoft.Json;
 using NicolasDorier.RateLimits;
 using Serilog;
+using BTCPayServer.Services.Reporting;
 #if ALTCOINS
 using BTCPayServer.Services.Altcoins.Monero;
 using BTCPayServer.Services.Altcoins.Zcash;
@@ -278,7 +279,8 @@ namespace BTCPayServer.Hosting
 
             services.TryAddSingleton<AppService>();
             services.AddTransient<PluginService>();
-            services.AddSingleton<IPluginHookService, PluginHookService>();
+            services.AddSingleton<PluginHookService>();
+            services.AddSingleton<IPluginHookService, PluginHookService>(provider => provider.GetService<PluginHookService>());
             services.TryAddTransient<Safe>();
             services.TryAddTransient<DisplayFormatter>();
             services.TryAddSingleton<Ganss.XSS.HtmlSanitizer>(o =>
@@ -324,6 +326,7 @@ namespace BTCPayServer.Hosting
 
             services.TryAddSingleton<LightningConfigurationProvider>();
             services.TryAddSingleton<LanguageService>();
+            services.TryAddSingleton<ReportService>();
             services.TryAddSingleton<NBXplorerDashboard>();
             services.AddSingleton<ISyncSummaryProvider, NBXSyncSummaryProvider>();
             services.TryAddSingleton<StoreRepository>();
@@ -353,6 +356,10 @@ namespace BTCPayServer.Hosting
             services.AddSingleton<IHostedService, PeriodicTaskLauncherHostedService>();
             services.AddScheduledTask<CleanupWebhookDeliveriesTask>(TimeSpan.FromHours(6.0));
 
+            services.AddReportProvider<PaymentsReportProvider>();
+            services.AddReportProvider<OnChainWalletReportProvider>();
+            services.AddReportProvider<ProductsReportProvider>();
+
             services.AddHttpClient(WebhookSender.OnionNamedClient)
                 .ConfigurePrimaryHttpMessageHandler<Socks5HttpClientHandler>();
             services.AddHttpClient(WebhookSender.LoopbackNamedClient)
@@ -520,6 +527,8 @@ namespace BTCPayServer.Hosting
             services.AddRateProvider<BitflyerRateProvider>();
             services.AddRateProvider<YadioRateProvider>();
             services.AddRateProvider<BtcTurkRateProvider>();
+            services.AddRateProvider<FreeCurrencyRatesRateProvider>();
+            services.AddRateProvider<ExchangeRateHostRateProvider>();
 
             // Broken
             // Providers.Add("argoneum", new ArgoneumRateProvider(_httpClientFactory?.CreateClient("EXCHANGE_ARGONEUM")));

BTCPayServer/Hosting/MigrationStartupTask.cs

@@ -341,9 +341,13 @@ namespace BTCPayServer.Hosting
         {
             var items = new List<ViewPointOfSaleViewModel.Item>();
             var stream = new YamlStream();
+            if (string.IsNullOrEmpty(yaml))
+                return items.ToArray();
+            
             stream.Load(new StringReader(yaml));
 
-            var root = stream.Documents.First().RootNode as YamlMappingNode;
+            if(stream.Documents.FirstOrDefault()?.RootNode is not YamlMappingNode root)
+                return items.ToArray();
             foreach (var posItem in root.Children)
             {
                 var trimmedKey = ((YamlScalarNode)posItem.Key).Value?.Trim();

BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs

@@ -127,6 +127,7 @@ namespace BTCPayServer.Models.InvoicingModels
         public List<Data.InvoiceEventData> Events { get; internal set; }
         public string NotificationEmail { get; internal set; }
         public Dictionary<string, object> Metadata { get; set; }
+        public Dictionary<string, object> ReceiptData { get; set; }
         public Dictionary<string, object> AdditionalData { get; set; }
         public List<PaymentEntity> Payments { get; set; }
         public bool Archived { get; set; }

BTCPayServer/Models/InvoicingModels/InvoicesModel.cs

@@ -41,6 +41,5 @@ namespace BTCPayServer.Models.InvoicingModels
         public string Id { get; set; }
         public string AppName { get; set; }
         public string AppType { get; set; }
-        public string AppOrderId { get; set; }
     }
 }

BTCPayServer/Models/InvoicingModels/PaymentModel.cs

@@ -27,6 +27,9 @@ namespace BTCPayServer.Models.InvoicingModels
         public string CustomLogoLink { get; set; }
         public string CssFileId { get; set; }
         public string LogoFileId { get; set; }
+        public string PaymentSoundUrl { get; set; }
+        public string NfcReadSoundUrl { get; set; }
+        public string ErrorSoundUrl { get; set; }
         public string BrandColor { get; set; }
         public string HtmlTitle { get; set; }
         public string DefaultLang { get; set; }

BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs

@@ -18,6 +18,9 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
     {
         public List<ViewPaymentRequestViewModel> Items { get; set; }
         public override int CurrentPageCount => Items.Count;
+        
+        public SearchString Search { get; set; }
+        public string SearchText { get; set; }
     }
 
     public class UpdatePaymentRequestViewModel

BTCPayServer/Models/StoreReportsViewModels/StoreReportsViewModel.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using BTCPayServer.Client.Models;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace BTCPayServer.Models.StoreReportsViewModels;
+
+public class StoreReportsViewModel
+{
+    public string InvoiceTemplateUrl { get; set; }
+    public Dictionary<string,string> ExplorerTemplateUrls { get; set; }
+    public StoreReportRequest Request { get; set; }
+    public List<string> AvailableViews { get; set; }
+    public StoreReportResponse Result { get; set; }
+}

BTCPayServer/Models/StoreViewModels/CheckoutAppearanceViewModel.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using BTCPayServer.Services;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Rendering;
 using Newtonsoft.Json.Linq;
 
@@ -44,6 +45,9 @@ namespace BTCPayServer.Models.StoreViewModels
         [Display(Name = "Celebrate payment with confetti")]
         public bool CelebratePayment { get; set; }
 
+        [Display(Name = "Enable sounds on checkout page")]
+        public bool PlaySoundOnPayment { get; set; }
+
         [Display(Name = "Requires a refund email")]
         public bool RequiresRefundEmail { get; set; }
 
@@ -61,9 +65,14 @@ namespace BTCPayServer.Models.StoreViewModels
 
         [Display(Name = "Link to a custom CSS stylesheet")]
         public string CustomCSS { get; set; }
+        
         [Display(Name = "Link to a custom logo")]
         public string CustomLogo { get; set; }
 
+        [Display(Name = "Custom sound file for successful payment")]
+        public IFormFile SoundFile { get; set; }
+        public string SoundFileId { get; set; }
+
         [Display(Name = "Custom HTML title to display on Checkout page")]
         public string HtmlTitle { get; set; }
 

BTCPayServer/Models/WalletViewModels/PayoutsModel.cs

@@ -26,7 +26,8 @@ namespace BTCPayServer.Models.WalletViewModels
             public bool Selected { get; set; }
             public DateTimeOffset Date { get; set; }
             public string PullPaymentId { get; set; }
-            public string PullPaymentName { get; set; }
+            public string Source { get; set; }
+            public string SourceLink { get; set; }
             public string Destination { get; set; }
             public string Amount { get; set; }
             public string ProofLink { get; set; }

BTCPayServer/PaymentRequest/PaymentRequestHub.cs

@@ -167,7 +167,7 @@ namespace BTCPayServer.PaymentRequest
                                 new object[]
                                 {
                                     data.GetValue(),
-                                    invoiceEvent.Payment.GetCryptoCode(),
+                                    invoiceEvent.Payment.Currency,
                                     invoiceEvent.Payment.GetPaymentMethodId()?.PaymentType?.ToString()
                                 }, cancellationToken);
                         }

BTCPayServer/PaymentRequest/PaymentRequestService.cs

@@ -123,18 +123,14 @@ namespace BTCPayServer.PaymentRequest
 
                             string txId = paymentData.GetPaymentId();
                             string link = GetTransactionLink(paymentMethodId, txId);
-                            var paymentMethod = entity.GetPaymentMethod(paymentMethodId);
-                            var amount = paymentData.GetValue();
-                            var rate = paymentMethod.Rate;
-                            var paid = (amount - paymentEntity.NetworkFee) * rate;
 
                             return new ViewPaymentRequestViewModel.PaymentRequestInvoicePayment
                             {
-                                Amount = amount,
-                                Paid = paid,
+                                Amount = paymentEntity.PaidAmount.Gross,
+                                Paid = paymentEntity.InvoicePaidAmount.Net,
                                 ReceivedDate = paymentEntity.ReceivedTime.DateTime,
-                                PaidFormatted = _displayFormatter.Currency(paid, blob.Currency, DisplayFormatter.CurrencyFormat.Symbol),
-                                RateFormatted = _displayFormatter.Currency(rate, blob.Currency, DisplayFormatter.CurrencyFormat.Symbol),
+                                PaidFormatted = _displayFormatter.Currency(paymentEntity.InvoicePaidAmount.Net, blob.Currency, DisplayFormatter.CurrencyFormat.Symbol),
+                                RateFormatted = _displayFormatter.Currency(paymentEntity.Rate, blob.Currency, DisplayFormatter.CurrencyFormat.Symbol),
                                 PaymentMethod = paymentMethodId.ToPrettyString(),
                                 Link = link,
                                 Id = txId,

BTCPayServer/Payments/Bitcoin/BitcoinLikePaymentHandler.cs

@@ -211,7 +211,7 @@ namespace BTCPayServer.Payments.Bitcoin
                     new Key().GetScriptPubKey(supportedPaymentMethod.AccountDerivation.ScriptPubKeyType());
                 var dust = txOut.GetDustThreshold();
                 var amount = paymentMethod.Calculate().Due;
-                if (amount < dust)
+                if (amount < dust.ToDecimal(MoneyUnit.BTC))
                     throw new PaymentMethodUnavailableException("Amount below the dust threshold. For amounts of this size, it is recommended to enable an off-chain (Lightning) payment method");
             }
             if (preparePaymentObject is null)

BTCPayServer/Payments/LNURLPay/PaymentTypes.LNURL.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using BTCPayServer.Abstractions.Extensions;
 using BTCPayServer.Client.Models;
 using BTCPayServer.Payments.Lightning;
@@ -28,7 +29,7 @@ namespace BTCPayServer.Payments
         }
 
         public override string GetPaymentLink(BTCPayNetworkBase network, InvoiceEntity invoice, IPaymentMethodDetails paymentMethodDetails,
-            Money cryptoInfoDue, string serverUri)
+            decimal cryptoInfoDue, string serverUri)
         {
             if (!paymentMethodDetails.Activated)
             {
@@ -74,7 +75,7 @@ namespace BTCPayServer.Payments
             {
                 AdditionalData = new Dictionary<string, JToken>()
                 {
-                    {"LNURLP", JToken.FromObject(GetPaymentLink(details.Network, invoice, details.GetPaymentMethodDetails(), invoiceCryptoInfo.Due,
+                    {"LNURLP", JToken.FromObject(GetPaymentLink(details.Network, invoice, details.GetPaymentMethodDetails(), invoiceCryptoInfo.GetDue().Value,
                         serverUrl))}
                 }
             };

BTCPayServer/Payments/Lightning/LightningLikePaymentHandler.cs

@@ -73,7 +73,7 @@ namespace BTCPayServer.Payments.Lightning
             decimal due = Extensions.RoundUp(invoice.Price / paymentMethod.Rate, network.Divisibility);
             try
             {
-                due = paymentMethod.Calculate().Due.ToDecimal(MoneyUnit.BTC);
+                due = paymentMethod.Calculate().Due;
             }
             catch (Exception)
             {
@@ -121,9 +121,9 @@ namespace BTCPayServer.Payments.Lightning
 
         public async Task<NodeInfo[]> GetNodeInfo(LightningSupportedPaymentMethod supportedPaymentMethod, BTCPayNetwork network, InvoiceLogs invoiceLogs, bool? preferOnion = null, bool throws = false)
         {
-            if (!_Dashboard.IsFullySynched(network.CryptoCode, out var summary))
-                throw new PaymentMethodUnavailableException("Full node not available");
-            
+            var synced = _Dashboard.IsFullySynched(network.CryptoCode, out var summary);
+            if (supportedPaymentMethod.IsInternalNode && !synced)
+                throw new PaymentMethodUnavailableException("Full node not available");;
             try
             {
                 using var cts = new CancellationTokenSource(LightningTimeout);
@@ -156,13 +156,13 @@ namespace BTCPayServer.Payments.Lightning
                 var nodeInfo = preferOnion != null && info.NodeInfoList.Any(i => i.IsTor == preferOnion)
                     ? info.NodeInfoList.Where(i => i.IsTor == preferOnion.Value).ToArray()
                     : info.NodeInfoList.Select(i => i).ToArray();
-                
+
                 var blocksGap = summary.Status.ChainHeight - info.BlockHeight;
                 if (blocksGap > 10 && !(isLndHub && info.BlockHeight == 0))
                 {
-                    throw new PaymentMethodUnavailableException($"The lightning node is not synched ({blocksGap} blocks left)");
+                    throw new PaymentMethodUnavailableException(
+                        $"The lightning node is not synched ({blocksGap} blocks left)");
                 }
-
                 return nodeInfo;
             }
             catch (Exception e) when (!throws)

BTCPayServer/Payments/Lightning/LightningListener.cs

@@ -200,7 +200,7 @@ namespace BTCPayServer.Payments.Lightning
                 if (inv.Name == InvoiceEvent.ReceivedPayment && inv.Invoice.Status == InvoiceStatusLegacy.New && inv.Invoice.ExceptionStatus == InvoiceExceptionStatus.PaidPartial)
                 {
                     var pm = inv.Invoice.GetPaymentMethods().First();
-                    if (pm.Calculate().Due.GetValue(pm.Network as BTCPayNetwork) > 0m)
+                    if (pm.Calculate().Due > 0m)
                     {
                         await CreateNewLNInvoiceForBTCPayInvoice(inv.Invoice);
                     }

BTCPayServer/Payments/PayJoin/PayJoinEndpointController.cs

@@ -302,7 +302,7 @@ namespace BTCPayServer.Payments.PayJoin
                     var paymentDetails = paymentMethod?.GetPaymentMethodDetails() as Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod;
                     if (paymentMethod is null || paymentDetails is null || !paymentDetails.PayjoinEnabled)
                         continue;
-                    due = paymentMethod.Calculate().TotalDue - output.Value;
+                    due = Money.Coins(paymentMethod.Calculate().TotalDue) - output.Value;
                     if (due > Money.Zero)
                     {
                         break;

BTCPayServer/Payments/PaymentTypes.Bitcoin.cs

@@ -67,7 +67,7 @@ namespace BTCPayServer.Payments
         }
 
         public override string GetPaymentLink(BTCPayNetworkBase network, InvoiceEntity invoice, IPaymentMethodDetails paymentMethodDetails,
-            Money cryptoInfoDue, string serverUri)
+            decimal cryptoInfoDue, string serverUri)
         {
             if (!paymentMethodDetails.Activated)
             {
@@ -105,7 +105,7 @@ namespace BTCPayServer.Payments
         {
             cryptoInfo.PaymentUrls = new InvoiceCryptoInfo.InvoicePaymentUrls()
             {
-                BIP21 = GetPaymentLink(details.Network, invoice, details.GetPaymentMethodDetails(), cryptoInfo.Due, serverUrl),
+                BIP21 = GetPaymentLink(details.Network, invoice, details.GetPaymentMethodDetails(), cryptoInfo.GetDue().Value, serverUrl),
             };
         }
     }

BTCPayServer/Payments/PaymentTypes.Lightning.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Globalization;
 using BTCPayServer.Client.Models;
 using BTCPayServer.Controllers.Greenfield;
 using BTCPayServer.Payments.Lightning;
@@ -52,7 +53,7 @@ namespace BTCPayServer.Payments
         }
 
         public override string GetPaymentLink(BTCPayNetworkBase network, InvoiceEntity invoice, IPaymentMethodDetails paymentMethodDetails,
-            Money cryptoInfoDue, string serverUri)
+            decimal cryptoInfoDue, string serverUri)
         {
             if (!paymentMethodDetails.Activated)
             {
@@ -92,7 +93,7 @@ namespace BTCPayServer.Payments
         {
             invoiceCryptoInfo.PaymentUrls = new InvoiceCryptoInfo.InvoicePaymentUrls()
             {
-                BOLT11 = GetPaymentLink(details.Network, invoice, details.GetPaymentMethodDetails(), invoiceCryptoInfo.Due,
+                BOLT11 = GetPaymentLink(details.Network, invoice, details.GetPaymentMethodDetails(), invoiceCryptoInfo.GetDue().Value,
                     serverUrl)
             };
         }

BTCPayServer/Payments/PaymentTypes.cs

@@ -85,7 +85,7 @@ namespace BTCPayServer.Payments
         public abstract ISupportedPaymentMethod DeserializeSupportedPaymentMethod(BTCPayNetworkBase network, JToken value);
         public abstract string GetTransactionLink(BTCPayNetworkBase network, string txId);
         public abstract string GetPaymentLink(BTCPayNetworkBase network, InvoiceEntity invoice, IPaymentMethodDetails paymentMethodDetails,
-            Money cryptoInfoDue, string serverUri);
+            decimal cryptoInfoDue, string serverUri);
         public abstract string InvoiceViewPaymentPartialName { get; }
 
         public abstract object GetGreenfieldData(ISupportedPaymentMethod supportedPaymentMethod, bool canModifyStore);

BTCPayServer/PayoutProcessors/AfterPayoutActionData.cs

@@ -0,0 +1,7 @@
+using System.Collections.Generic;
+using BTCPayServer.Data;
+
+namespace BTCPayServer.PayoutProcessors;
+
+public record AfterPayoutActionData(StoreData Store, PayoutProcessorData ProcessorData,
+    IEnumerable<PayoutData> Payouts);