update translations

Fix close invoice button for modal invoices #555

BTCPayServer.Tests/UnitTest1.cs

@@ -1609,7 +1609,7 @@ donation:
             waitJobsFinish = client.WaitAllRunning(default);
             Assert.False(waitJobsFinish.Wait(100));
             cts.Cancel();
-            Assert.True(waitJobsFinish.Wait(100));
+            Assert.True(waitJobsFinish.Wait(1000));
             Assert.True(waitJobsFinish.IsCompletedSuccessfully);
             Assert.True(!waitJobsFinish.IsFaulted);
             Assert.False(jobExecuted);
@@ -1629,18 +1629,16 @@ donation:
         public void PosDataParser_ParsesCorrectly()
         {
             var testCases =
-                new List<(string input, Dictionary<string, string> expectedOutput)>()
+                new List<(string input, Dictionary<string, object> expectedOutput)>()
                 {
-                    { (null, new Dictionary<string, string>())},
-                    {("", new Dictionary<string, string>())},
-                    {("{}", new Dictionary<string, string>())},
-                    {("non-json-content", new Dictionary<string, string>(){ {string.Empty, "non-json-content"}})},
-                    {("[1,2,3]", new Dictionary<string, string>(){ {string.Empty, "[1,2,3]"}})},
-                    {("{ \"key\": \"value\"}", new Dictionary<string, string>(){ {"key", "value"}})},
-                    {("{ \"key\": true}", new Dictionary<string, string>(){ {"key", "True"}})},
-                    {("{ \"key\": \"value\", \"key2\": [\"value\", \"value2\"]}",
-                        new Dictionary<string, string>(){ {"key", "value"}, {"key2", "value,value2"}})},
-                    {("{ invalidjson file here}", new Dictionary<string, string>(){ {String.Empty, "{ invalidjson file here}"}})}
+                    { (null, new Dictionary<string, object>())},
+                    {("", new Dictionary<string, object>())},
+                    {("{}", new Dictionary<string, object>())},
+                    {("non-json-content", new Dictionary<string, object>(){ {string.Empty, "non-json-content"}})},
+                    {("[1,2,3]", new Dictionary<string, object>(){ {string.Empty, "[1,2,3]"}})},
+                    {("{ \"key\": \"value\"}", new Dictionary<string, object>(){ {"key", "value"}})},
+                    {("{ \"key\": true}", new Dictionary<string, object>(){ {"key", "True"}})},
+                    {("{ invalidjson file here}", new Dictionary<string, object>(){ {String.Empty, "{ invalidjson file here}"}})}
                 };
 
             testCases.ForEach(tuple =>
@@ -1663,18 +1661,16 @@ donation:
                 var controller = tester.PayTester.GetController<InvoiceController>(null);
 
                 var testCases =
-                    new List<(string input, Dictionary<string, string> expectedOutput)>()
+                    new List<(string input, Dictionary<string, object> expectedOutput)>()
                     {
-                        { (null, new Dictionary<string, string>())},
-                        {("", new Dictionary<string, string>())},
-                        {("{}", new Dictionary<string, string>())},
-                        {("non-json-content", new Dictionary<string, string>(){ {string.Empty, "non-json-content"}})},
-                        {("[1,2,3]", new Dictionary<string, string>(){ {string.Empty, "[1,2,3]"}})},
-                        {("{ \"key\": \"value\"}", new Dictionary<string, string>(){ {"key", "value"}})},
-                        {("{ \"key\": true}", new Dictionary<string, string>(){ {"key", "True"}})},
-                        {("{ \"key\": \"value\", \"key2\": [\"value\", \"value2\"]}",
-                        new Dictionary<string, string>(){ {"key", "value"}, {"key2", "value,value2"}})},
-                        {("{ invalidjson file here}", new Dictionary<string, string>(){ {String.Empty, "{ invalidjson file here}"}})}
+                        { (null, new Dictionary<string, object>())},
+                        {("", new Dictionary<string, object>())},
+                        {("{}", new Dictionary<string, object>())},
+                        {("non-json-content", new Dictionary<string, object>(){ {string.Empty, "non-json-content"}})},
+                        {("[1,2,3]", new Dictionary<string, object>(){ {string.Empty, "[1,2,3]"}})},
+                        {("{ \"key\": \"value\"}", new Dictionary<string, object>(){ {"key", "value"}})},
+                        {("{ \"key\": true}", new Dictionary<string, object>(){ {"key", "True"}})},
+                        {("{ invalidjson file here}", new Dictionary<string, object>(){ {String.Empty, "{ invalidjson file here}"}})}
                     };
 
                 var tasks = new List<Task>();
@@ -1988,6 +1984,7 @@ donation:
                 var invoice = user.BitPay.CreateInvoice(new Invoice()
                 {
                     Price = 5000.0m,
+                    TaxIncluded = 1000.0m,
                     Currency = "USD",
                     PosData = "posData",
                     OrderId = "orderId",
@@ -2017,6 +2014,8 @@ donation:
                 });
 
                 invoice = user.BitPay.GetInvoice(invoice.Id, Facade.Merchant);
+                Assert.Equal(1000.0m, invoice.TaxIncluded);
+                Assert.Equal(5000.0m, invoice.Price);
                 Assert.Equal(Money.Coins(0), invoice.BtcPaid);
                 Assert.Equal("new", invoice.Status);
                 Assert.False((bool)((JValue)invoice.ExceptionStatus).Value);

BTCPayServer/BTCPayNetworkProvider.Bitcoinplus.cs

@@ -0,0 +1,35 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Services.Rates;
+using NBitcoin;
+using NBXplorer;
+
+namespace BTCPayServer
+{
+    public partial class BTCPayNetworkProvider
+    {
+        public void InitBitcoinplus()
+        {
+            var nbxplorerNetwork = NBXplorerNetworkProvider.GetFromCryptoCode("XBC");
+            Add(new BTCPayNetwork()
+            {
+                CryptoCode = nbxplorerNetwork.CryptoCode,
+                DisplayName = "Bitcoinplus",
+                BlockExplorerLink = NetworkType == NetworkType.Mainnet ? "https://chainz.cryptoid.info/xbc/tx.dws?{0}" : "https://chainz.cryptoid.info/xbc/tx.dws?{0}",
+                NBitcoinNetwork = nbxplorerNetwork.NBitcoinNetwork,
+                NBXplorerNetwork = nbxplorerNetwork,
+                UriScheme = "bitcoinplus",
+                DefaultRateRules = new[] 
+                {
+                                "XBC_X = XBC_BTC * BTC_X",
+                                "XBC_BTC = cryptopia(XBC_BTC)"
+                },
+                CryptoImagePath = "imlegacy/bitcoinplus.png",
+                DefaultSettings = BTCPayDefaultSettings.GetDefaultSettings(NetworkType),
+                CoinType = NetworkType == NetworkType.Mainnet ? new KeyPath("65'") : new KeyPath("1'")
+            });
+        }
+    }
+}

BTCPayServer/BTCPayNetworkProvider.Bitcore.cs

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

BTCPayServer/BTCPayNetworkProvider.cs

@@ -47,17 +47,18 @@ namespace BTCPayServer
             NetworkType = networkType;
             InitBitcoin();
             InitLitecoin();
-            // Disabled because of https://twitter.com/Cryptopia_NZ/status/1085084168852291586
-            //InitBitcore();
+            InitBitcore();
             InitDogecoin();
             InitBitcoinGold();
             InitMonacoin();
             InitDash();
-            // Disabled because of https://twitter.com/Cryptopia_NZ/status/1085084168852291586
-            //InitPolis();
             InitFeathercoin();
             InitGroestlcoin();
             InitViacoin();
+
+            // Disabled because of https://twitter.com/Cryptopia_NZ/status/1085084168852291586
+            //InitPolis();
+            //InitBitcoinplus();
             //InitUfo();
         }
 

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>1.0.3.44</Version>
+		<Version>1.0.3.47</Version>
     <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
   </PropertyGroup>
   <PropertyGroup>
@@ -33,7 +33,7 @@
     <EmbeddedResource Include="Currencies.txt" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.4" />
+    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.5" />
     <PackageReference Include="BuildBundlerMinifier" Version="2.7.385" />
     <PackageReference Include="DigitalRuby.ExchangeSharp" Version="0.5.3" />
     <PackageReference Include="HtmlSanitizer" Version="4.0.199" />
@@ -45,8 +45,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NBitcoin" Version="4.1.1.77" />
-    <PackageReference Include="NBitpayClient" Version="1.0.0.30" />	  
+    <PackageReference Include="NBitcoin" Version="4.1.1.78" />
+    <PackageReference Include="NBitpayClient" Version="1.0.0.31" />	  
     <PackageReference Include="DBreeze" Version="1.92.0" />
     <PackageReference Include="NBXplorer.Client" Version="2.0.0.3" />
     <PackageReference Include="NicolasDorier.CommandLine" Version="1.0.0.2" />

BTCPayServer/Configuration/BTCPayServerOptions.cs

@@ -110,7 +110,7 @@ namespace BTCPayServer.Configuration
                         if (!LightningConnectionString.TryParse(lightning, true, out var connectionString, out var error))
                         {
                             throw new ConfigException($"Invalid setting {net.CryptoCode}.lightning, " + Environment.NewLine +
-                                $"If you have a lightning server use: 'type=clightning;server=/root/.lightning/lightning-rpc', " + Environment.NewLine +
+                                $"If you have a c-lightning server use: 'type=clightning;server=/root/.lightning/lightning-rpc', " + Environment.NewLine +
                                 $"If you have a lightning charge server: 'type=charge;server=https://charge.example.com;api-token=yourapitoken'" + Environment.NewLine +
                                 $"If you have a lnd server: 'type=lnd-rest;server=https://lnd:lnd@lnd.example.com;macaroon=abf239...;certthumbprint=2abdf302...'" + Environment.NewLine +
                                 $"              lnd server: 'type=lnd-rest;server=https://lnd:lnd@lnd.example.com;macaroonfilepath=/root/.lnd/admin.macaroon;certthumbprint=2abdf302...'" + Environment.NewLine +
@@ -118,7 +118,7 @@ namespace BTCPayServer.Configuration
                         }
                         if (connectionString.IsLegacy)
                         {
-                            Logs.Configuration.LogWarning($"Setting {net.CryptoCode}.lightning will work but use an deprecated format, please replace it by '{connectionString.ToString()}'");
+                            Logs.Configuration.LogWarning($"Setting {net.CryptoCode}.lightning is a deprecated format, it will work now, but please replace it for future versions with '{connectionString.ToString()}'");
                         }
                         InternalLightningByCryptoCode.Add(net.CryptoCode, connectionString);
                     }
@@ -177,10 +177,11 @@ namespace BTCPayServer.Configuration
             var services = conf.GetOrDefault<string>("externalservices", null);
             if (services != null)
             {
-                foreach (var service in services.Split(new[] { ';', ',' })
-                                                .Select(p => p.Split(':'))
-                                                .Where(p => p.Length == 2)
-                                                .Select(p => (Name: p[0], Link: p[1])))
+                foreach (var service in services.Split(new[] { ';', ',' }, StringSplitOptions.RemoveEmptyEntries)
+                                                .Select(p => (p, SeparatorIndex: p.IndexOf(':', StringComparison.OrdinalIgnoreCase)))
+                                                .Where(p => p.SeparatorIndex != -1)
+                                                .Select(p => (Name: p.p.Substring(0, p.SeparatorIndex), 
+                                                              Link: p.p.Substring(p.SeparatorIndex + 1))))
                 {
                     ExternalServices.AddOrReplace(service.Name, service.Link);
                 }
@@ -235,7 +236,7 @@ namespace BTCPayServer.Configuration
                 RootPath = "/" + RootPath;
             var old = conf.GetOrDefault<Uri>("internallightningnode", null);
             if (old != null)
-                throw new ConfigException($"internallightningnode should not be used anymore, use btclightning instead");
+                throw new ConfigException($"internallightningnode is deprecated and should not be used anymore, use btclightning instead");
 
             LogFile = GetDebugLog(conf);
             if (!string.IsNullOrEmpty(LogFile))

BTCPayServer/Controllers/AccountController.cs

@@ -28,7 +28,7 @@ namespace BTCPayServer.Controllers
     {
         private readonly UserManager<ApplicationUser> _userManager;
         private readonly SignInManager<ApplicationUser> _signInManager;
-        private readonly IEmailSender _emailSender;
+        private readonly EmailSenderFactory _EmailSenderFactory;
         StoreRepository storeRepository;
         RoleManager<IdentityRole> _RoleManager;
         SettingsRepository _SettingsRepository;
@@ -40,14 +40,14 @@ namespace BTCPayServer.Controllers
             RoleManager<IdentityRole> roleManager,
             StoreRepository storeRepository,
             SignInManager<ApplicationUser> signInManager,
-            IEmailSender emailSender,
+            EmailSenderFactory emailSenderFactory,
             SettingsRepository settingsRepository,
             Configuration.BTCPayServerOptions options)
         {
             this.storeRepository = storeRepository;
             _userManager = userManager;
             _signInManager = signInManager;
-            _emailSender = emailSender;
+            _EmailSenderFactory = emailSenderFactory;
             _RoleManager = roleManager;
             _SettingsRepository = settingsRepository;
             _Options = options;
@@ -286,7 +286,8 @@ namespace BTCPayServer.Controllers
                     var code = await _userManager.GenerateEmailConfirmationTokenAsync(user);
                     var callbackUrl = Url.EmailConfirmationLink(user.Id, code, Request.Scheme);
                     RegisteredUserId = user.Id;
-                    await _emailSender.SendEmailConfirmationAsync(model.Email, callbackUrl);
+
+                    _EmailSenderFactory.GetEmailSender().SendEmailConfirmation(model.Email, callbackUrl);
                     if (!policies.RequiresConfirmedEmail)
                     {
                         if(logon)
@@ -446,8 +447,9 @@ namespace BTCPayServer.Controllers
                 // visit https://go.microsoft.com/fwlink/?LinkID=532713
                 var code = await _userManager.GeneratePasswordResetTokenAsync(user);
                 var callbackUrl = Url.ResetPasswordCallbackLink(user.Id, code, Request.Scheme);
-                await _emailSender.SendEmailAsync(model.Email, "Reset Password",
-                   $"Please reset your password by clicking here: <a href='{callbackUrl}'>link</a>");
+                _EmailSenderFactory.GetEmailSender().SendEmail(model.Email, "Reset Password",
+                    $"Please reset your password by clicking here: <a href='{callbackUrl}'>link</a>");
+                
                 return RedirectToAction(nameof(ForgotPasswordConfirmation));
             }
 

BTCPayServer/Controllers/AppsPublicController.cs

@@ -25,6 +25,7 @@ using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using NBitpayClient;
+using Newtonsoft.Json.Linq;
 using YamlDotNet.RepresentationModel;
 using static BTCPayServer.Controllers.AppsController;
 
@@ -155,10 +156,11 @@ namespace BTCPayServer.Controllers
             var store = await _AppsHelper.GetStore(app);
             var title =  settings.Title;
             var price = request.Amount;
+            ViewPointOfSaleViewModel.Item choice = null;
             if (!string.IsNullOrEmpty(request.ChoiceKey))
             {
                 var choices = _AppsHelper.Parse(settings.PerksTemplate, settings.TargetCurrency);
-                var choice = choices.FirstOrDefault(c => c.Id == request.ChoiceKey);
+                choice = choices.FirstOrDefault(c => c.Id == request.ChoiceKey);
                 if (choice == null)
                     return NotFound("Incorrect option provided");
                 title = choice.Title;
@@ -211,7 +213,8 @@ namespace BTCPayServer.Controllers
                                                         string orderId,
                                                         string notificationUrl,
                                                         string redirectUrl,
-                                                        string choiceKey)
+                                                        string choiceKey,
+                                                        string posData = null)
         {
             var app = await _AppsHelper.GetApp(appId, AppType.PointOfSale);
             if (string.IsNullOrEmpty(choiceKey) && amount <= 0)
@@ -227,10 +230,11 @@ namespace BTCPayServer.Controllers
             }
             string title = null;
             var price = 0.0m;
+            ViewPointOfSaleViewModel.Item choice = null;
             if (!string.IsNullOrEmpty(choiceKey))
             {
                 var choices = _AppsHelper.Parse(settings.Template, settings.Currency);
-                var choice = choices.FirstOrDefault(c => c.Id == choiceKey);
+                choice = choices.FirstOrDefault(c => c.Id == choiceKey);
                 if (choice == null)
                     return NotFound();
                 title = choice.Title;
@@ -249,7 +253,7 @@ namespace BTCPayServer.Controllers
             store.AdditionalClaims.Add(new Claim(Policies.CanCreateInvoice.Key, store.Id));
             var invoice = await _InvoiceController.CreateInvoiceCore(new NBitpayClient.Invoice()
             {
-                ItemCode = choiceKey ?? string.Empty,
+                ItemCode = choice?.Id,
                 ItemDesc = title,
                 Currency = settings.Currency,
                 Price = price,
@@ -258,6 +262,7 @@ namespace BTCPayServer.Controllers
                 NotificationURL = notificationUrl,
                 RedirectURL = redirectUrl  ?? Request.GetDisplayUrl(),
                 FullNotifications = true,
+                PosData = string.IsNullOrEmpty(posData) ? null : posData
             }, store, HttpContext.Request.GetAbsoluteRoot());
             return RedirectToAction(nameof(InvoiceController.Checkout), "Invoice", new { invoiceId = invoice.Data.Id });
         }

BTCPayServer/Controllers/InvoiceController.UI.cs

@@ -21,6 +21,7 @@ using BTCPayServer.Services.Invoices.Export;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.EntityFrameworkCore.Internal;
 using NBitcoin;
 using NBitpayClient;
 using NBXplorer;
@@ -447,8 +448,11 @@ namespace BTCPayServer.Controllers
                 Count = count,
                 StatusMessage = StatusMessage
             };
-
-            var list = await ListInvoicesProcess(searchTerm, skip, count);
+            InvoiceQuery invoiceQuery = GetInvoiceQuery(searchTerm);
+            var counting = _InvoiceRepository.GetInvoicesTotal(invoiceQuery);
+            invoiceQuery.Count = count;
+            invoiceQuery.Skip = skip;
+            var list = await _InvoiceRepository.GetInvoices(invoiceQuery);
             foreach (var invoice in list)
             {
                 var state = invoice.GetInvoiceState();
@@ -465,17 +469,16 @@ namespace BTCPayServer.Controllers
                     CanMarkComplete = state.CanMarkComplete()
                 });
             }
+            model.Total = await counting;
             return View(model);
         }
 
-        private async Task<InvoiceEntity[]> ListInvoicesProcess(string searchTerm = null, int skip = 0, int count = 50)
+        private InvoiceQuery GetInvoiceQuery(string searchTerm = null)
         {
             var filterString = new SearchString(searchTerm);
-            var list = await _InvoiceRepository.GetInvoices(new InvoiceQuery()
+            var invoiceQuery = new InvoiceQuery()
             {
                 TextSearch = filterString.TextSearch,
-                Count = count,
-                Skip = skip,
                 UserId = GetUserId(),
                 Unusual = !filterString.Filters.ContainsKey("unusual") ? null
                           : !bool.TryParse(filterString.Filters["unusual"].First(), out var r) ? (bool?)null
@@ -485,9 +488,8 @@ namespace BTCPayServer.Controllers
                 StoreId = filterString.Filters.ContainsKey("storeid") ? filterString.Filters["storeid"].ToArray() : null,
                 ItemCode = filterString.Filters.ContainsKey("itemcode") ? filterString.Filters["itemcode"].ToArray() : null,
                 OrderId = filterString.Filters.ContainsKey("orderid") ? filterString.Filters["orderid"].ToArray() : null
-            });
-
-            return list;
+            };
+            return invoiceQuery;
         }
 
         [HttpGet]
@@ -497,7 +499,10 @@ namespace BTCPayServer.Controllers
         {
             var model = new InvoiceExport(_NetworkProvider, _CurrencyNameTable);
 
-            var invoices = await ListInvoicesProcess(searchTerm, 0, int.MaxValue);
+            InvoiceQuery invoiceQuery = GetInvoiceQuery(searchTerm);
+            invoiceQuery.Count = int.MaxValue;
+            invoiceQuery.Skip = 0;
+            var invoices = await _InvoiceRepository.GetInvoices(invoiceQuery);
             var res = model.Process(invoices, format);
 
             var cd = new ContentDisposition
@@ -675,9 +680,9 @@ namespace BTCPayServer.Controllers
 
         public class PosDataParser
         {
-            public static Dictionary<string, string> ParsePosData(string posData)
+            public static Dictionary<string, object> ParsePosData(string posData)
             {
-                var result = new Dictionary<string,string>();
+                var result = new Dictionary<string,object>();
                 if (string.IsNullOrEmpty(posData))
                 {
                     return result;
@@ -685,7 +690,6 @@ namespace BTCPayServer.Controllers
             
                 try
                 {
-                
                     var jObject =JObject.Parse(posData);
                     foreach (var item in jObject)
                     {
@@ -693,7 +697,14 @@ namespace BTCPayServer.Controllers
                         switch (item.Value.Type)
                         {
                             case JTokenType.Array:
-                                result.Add(item.Key, string.Join(',', item.Value.AsEnumerable()));
+                                var items = item.Value.AsEnumerable().ToList();
+                                for (var i = 0; i < items.Count(); i++)
+                                {
+                                    result.Add($"{item.Key}[{i}]", ParsePosData(items[i].ToString()));
+                                }
+                                break;
+                            case JTokenType.Object:
+                                result.Add(item.Key, ParsePosData(item.Value.ToString()));
                                 break;
                             default:
                                 result.Add(item.Key, item.Value.ToString());

BTCPayServer/Controllers/InvoiceController.cs

@@ -99,8 +99,12 @@ namespace BTCPayServer.Controllers
             if (currencyInfo != null)
             {
                 invoice.Price = Math.Round(invoice.Price, currencyInfo.CurrencyDecimalDigits);
+                invoice.TaxIncluded = Math.Round(invoice.TaxIncluded, currencyInfo.CurrencyDecimalDigits);
             }
             invoice.Price = Math.Max(0.0m, invoice.Price);
+            invoice.TaxIncluded = Math.Max(0.0m, invoice.TaxIncluded);
+            invoice.TaxIncluded = Math.Min(invoice.TaxIncluded, invoice.Price);
+
             entity.ProductInformation = Map<Invoice, ProductInformation>(invoice);
 
 
@@ -155,7 +159,7 @@ namespace BTCPayServer.Controllers
             if (supported.Count == 0)
             {
                 StringBuilder errors = new StringBuilder();
-                errors.AppendLine("No payment method available for this store");
+                errors.AppendLine("Warning: No wallet has been linked to your BTCPay Store. See the following link for more information on how to connect your store and wallet. (https://docs.btcpayserver.org/btcpay-basics/gettingstarted#connecting-btcpay-store-to-your-wallet)");
                 foreach (var error in logs.ToList())
                 {
                     errors.AppendLine(error.ToString());

BTCPayServer/Controllers/ManageController.cs

@@ -31,7 +31,7 @@ namespace BTCPayServer.Controllers
     {
         private readonly UserManager<ApplicationUser> _userManager;
         private readonly SignInManager<ApplicationUser> _signInManager;
-        private readonly IEmailSender _emailSender;
+        private readonly EmailSenderFactory _EmailSenderFactory;
         private readonly ILogger _logger;
         private readonly UrlEncoder _urlEncoder;
         TokenRepository _TokenRepository;
@@ -44,7 +44,7 @@ namespace BTCPayServer.Controllers
         public ManageController(
           UserManager<ApplicationUser> userManager,
           SignInManager<ApplicationUser> signInManager,
-          IEmailSender emailSender,
+          EmailSenderFactory emailSenderFactory,
           ILogger<ManageController> logger,
           UrlEncoder urlEncoder,
           TokenRepository tokenRepository,
@@ -54,7 +54,7 @@ namespace BTCPayServer.Controllers
         {
             _userManager = userManager;
             _signInManager = signInManager;
-            _emailSender = emailSender;
+            _EmailSenderFactory = emailSenderFactory;
             _logger = logger;
             _urlEncoder = urlEncoder;
             _TokenRepository = tokenRepository;
@@ -156,8 +156,7 @@ namespace BTCPayServer.Controllers
             var code = await _userManager.GenerateEmailConfirmationTokenAsync(user);
             var callbackUrl = Url.EmailConfirmationLink(user.Id, code, Request.Scheme);
             var email = user.Email;
-            await _emailSender.SendEmailConfirmationAsync(email, callbackUrl);
-
+            _EmailSenderFactory.GetEmailSender().SendEmailConfirmation(email, callbackUrl);
             StatusMessage = "Verification email sent. Please check your email.";
             return RedirectToAction(nameof(Index));
         }

BTCPayServer/Controllers/ServerController.cs

@@ -465,7 +465,7 @@ namespace BTCPayServer.Controllers
                 result.ExternalServices.Add(new ServicesViewModel.ExternalService()
                 {
                     Name = externalService.Key,
-                    Link = this.Request.GetRelativePath(externalService.Value)
+                    Link = this.Request.GetRelativePathOrAbsolute(externalService.Value)
                 });
             }
             if(_Options.SSHSettings != null)

BTCPayServer/Controllers/StoresController.Email.cs

@@ -0,0 +1,65 @@
+using System;
+using System.Threading.Tasks;
+using BTCPayServer.Data;
+using BTCPayServer.Models.ServerViewModels;
+using BTCPayServer.Models.StoreViewModels;
+using BTCPayServer.Payments.Changelly;
+using BTCPayServer.Services.Mails;
+using Microsoft.AspNetCore.Mvc;
+
+namespace BTCPayServer.Controllers
+{
+    public partial class StoresController
+    {
+        
+        [Route("{storeId}/emails")]
+        public IActionResult Emails()
+        {
+            var store = HttpContext.GetStoreData();
+            if (store == null)
+                return NotFound();
+            var data = store.GetStoreBlob().EmailSettings ?? new EmailSettings();
+            return View(new EmailsViewModel() { Settings = data });
+        }
+        
+        [Route("{storeId}/emails")]
+        [HttpPost]
+        public async Task<IActionResult> Emails(string storeId, EmailsViewModel model, string command)
+        {
+            var store = HttpContext.GetStoreData();
+            if (store == null)
+                return NotFound();
+            if (command == "Test")
+            {
+                try
+                {
+                    if (!model.Settings.IsComplete())
+                    {
+                        model.StatusMessage = "Error: Required fields missing";
+                        return View(model);
+                    }
+                    var client = model.Settings.CreateSmtpClient();
+                    await client.SendMailAsync(model.Settings.From, model.TestEmail, "BTCPay test", "BTCPay test");
+                    model.StatusMessage = "Email sent to " + model.TestEmail + ", please, verify you received it";
+                }
+                catch (Exception ex)
+                {
+                    model.StatusMessage = "Error: " + ex.Message;
+                }
+                return View(model);
+            }
+            else // if(command == "Save")
+            {
+                
+                var storeBlob = store.GetStoreBlob();
+                storeBlob.EmailSettings = model.Settings;
+                store.SetStoreBlob(storeBlob);
+                await _Repo.UpdateStore(store);
+                StatusMessage = "Email settings modified";
+                return RedirectToAction(nameof(UpdateStore), new {
+                    storeId});
+
+            }
+        }
+    }
+}

BTCPayServer/Controllers/StoresController.cs

@@ -96,6 +96,11 @@ namespace BTCPayServer.Controllers
         {
             get; set;
         }
+        [TempData]
+        public bool StoreNotConfigured
+        {
+            get; set;
+        }
 
         [HttpGet]
         [Route("{storeId}/users")]
@@ -167,7 +172,7 @@ namespace BTCPayServer.Controllers
             return View("Confirm", new ConfirmModel()
             {
                 Title = $"Remove store user",
-                Description = $"Are you sure to remove access to remove access to {user.Email}?",
+                Description = $"Are you sure you want to remove store access for {user.Email}?",
                 Action = "Delete"
             });
         }
@@ -567,6 +572,7 @@ namespace BTCPayServer.Controllers
             var model = new TokensViewModel();
             var tokens = await _TokenRepository.GetTokensByStoreIdAsync(StoreData.Id);
             model.StatusMessage = StatusMessage;
+            model.StoreNotConfigured = StoreNotConfigured;
             model.Tokens = tokens.Select(t => new TokenViewModel()
             {
                 Facade = t.Facade,
@@ -794,6 +800,10 @@ namespace BTCPayServer.Controllers
             var pairingResult = await _TokenRepository.PairWithStoreAsync(pairingCode, store.Id);
             if (pairingResult == PairingResult.Complete || pairingResult == PairingResult.Partial)
             {
+                var excludeFilter = store.GetStoreBlob().GetExcludedPaymentMethods();
+                StoreNotConfigured = store.GetSupportedPaymentMethods(_NetworkProvider)
+                                          .Where(p => !excludeFilter.Match(p.PaymentId))
+                                          .Count() == 0;
                 StatusMessage = "Pairing is successful";
                 if (pairingResult == PairingResult.Partial)
                     StatusMessage = "Server initiated pairing code: " + pairingCode;

BTCPayServer/Data/StoreData.cs

@@ -21,6 +21,7 @@ using BTCPayServer.Payments.Changelly;
 using BTCPayServer.Payments.CoinSwitch;
 using BTCPayServer.Security;
 using BTCPayServer.Rating;
+using BTCPayServer.Services.Mails;
 
 namespace BTCPayServer.Data
 {
@@ -403,6 +404,8 @@ namespace BTCPayServer.Data
         [Obsolete("Use SetWalletKeyPathRoot/GetWalletKeyPathRoot instead")]
         public Dictionary<string, string> WalletKeyPathRoots { get; set; } = new Dictionary<string, string>();
 
+        public EmailSettings EmailSettings { get; set; }
+
         public IPaymentFilter GetExcludedPaymentMethods()
         {
 #pragma warning disable CS0618 // Type or member is obsolete

BTCPayServer/Extensions/EmailSenderExtensions.cs

@@ -10,9 +10,9 @@ namespace BTCPayServer.Services
 {
     public static class EmailSenderExtensions
     {
-        public static Task SendEmailConfirmationAsync(this IEmailSender emailSender, string email, string link)
+        public static void SendEmailConfirmation(this IEmailSender emailSender, string email, string link)
         {
-            return emailSender.SendEmailAsync(email, "Confirm your email",
+            emailSender.SendEmail(email, "Confirm your email",
                 $"Please confirm your account by clicking this link: <a href='{HtmlEncoder.Default.Encode(link)}'>link</a>");
         }
     }

BTCPayServer/HostedServices/InvoiceNotificationManager.cs

@@ -46,20 +46,21 @@ namespace BTCPayServer.HostedServices
         EventAggregator _EventAggregator;
         InvoiceRepository _InvoiceRepository;
         BTCPayNetworkProvider _NetworkProvider;
-        IEmailSender _EmailSender;
+        private readonly EmailSenderFactory _EmailSenderFactory;
 
         public InvoiceNotificationManager(
             IBackgroundJobClient jobClient,
             EventAggregator eventAggregator,
             InvoiceRepository invoiceRepository,
             BTCPayNetworkProvider networkProvider,
-            IEmailSender emailSender)
+            ILogger<InvoiceNotificationManager> logger,
+            EmailSenderFactory emailSenderFactory)
         {
             _JobClient = jobClient;
             _EventAggregator = eventAggregator;
             _InvoiceRepository = invoiceRepository;
             _NetworkProvider = networkProvider;
-            _EmailSender = emailSender;
+            _EmailSenderFactory = emailSenderFactory;
         }
 
         void Notify(InvoiceEntity invoice, int? eventCode = null, string name = null)
@@ -76,11 +77,14 @@ namespace BTCPayServer.HostedServices
                     invoice.StoreId
                 };
                 // TODO: Consider adding info on ItemDesc and payment info (amount)
-
+                
                 var emailBody = NBitcoin.JsonConverters.Serializer.ToString(ipn);
-#pragma warning disable CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
-                _EmailSender.SendEmailAsync(invoice.NotificationEmail, $"BtcPayServer Invoice Notification - ${invoice.StoreId}", emailBody);
-#pragma warning restore CS4014 // Because this call is not awaited, execution of the current method continues before the call is completed
+
+                _EmailSenderFactory.GetEmailSender(invoice.StoreId).SendEmail(
+                    invoice.NotificationEmail,
+                    $"BtcPayServer Invoice Notification - ${invoice.StoreId}",
+                    emailBody);
+
             }
             if (string.IsNullOrEmpty(invoice.NotificationURL))
                 return;

BTCPayServer/Hosting/BTCPayServerServices.cs

@@ -165,7 +165,7 @@ namespace BTCPayServer.Hosting
             services.AddTransient<InvoiceController>();
             services.AddTransient<AppsPublicController>();
             // Add application services.
-            services.AddTransient<IEmailSender, EmailSender>();
+            services.AddSingleton<EmailSenderFactory>();
             // bundling
 
             services.AddAuthorization(o => Policies.AddBTCPayPolicies(o));

BTCPayServer/Models/InvoiceResponse.cs

@@ -90,6 +90,12 @@ namespace BTCPayServer.Models
             get; set;
         }
 
+        [JsonProperty("taxIncluded", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public decimal TaxIncluded
+        {
+            get; set;
+        }
+
         //"currency":"USD"
         [JsonProperty("currency")]
         public string Currency

BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs

@@ -143,6 +143,6 @@ namespace BTCPayServer.Models.InvoicingModels
         public DateTimeOffset MonitoringDate { get; internal set; }
         public List<Data.InvoiceEventData> Events { get; internal set; }
         public string NotificationEmail { get; internal set; }
-        public Dictionary<string, string> PosData { get; set; }
+        public Dictionary<string, object> PosData { get; set; }
     }
 }

BTCPayServer/Models/InvoicingModels/InvoicesModel.cs

@@ -15,6 +15,10 @@ namespace BTCPayServer.Models.InvoicingModels
         {
             get; set;
         }
+        public int Total
+        {
+            get; set;
+        }
         public string SearchTerm
         {
             get; set;

BTCPayServer/Models/StoreViewModels/TokensViewModel.cs

@@ -72,5 +72,6 @@ namespace BTCPayServer.Models.StoreViewModels
         [Display(Name = "API Key")]
         public string ApiKey { get; set; }
         public string EncodedApiKey { get; set; }
+        public bool StoreNotConfigured { get; set; }
     }
 }

BTCPayServer/Services/Invoices/InvoiceEntity.cs

@@ -91,6 +91,12 @@ namespace BTCPayServer.Services.Invoices
             get; set;
         }
 
+        [JsonProperty(PropertyName = "taxIncluded", DefaultValueHandling = DefaultValueHandling.Ignore)]
+        public decimal TaxIncluded
+        {
+            get; set;
+        }
+
         [JsonProperty(PropertyName = "currency")]
         public string Currency
         {

BTCPayServer/Services/Invoices/InvoiceRepository.cs

@@ -178,7 +178,6 @@ retry:
             textSearch.Add(invoice.StoreId);
 
             AddToTextSearch(invoice.Id, textSearch.ToArray());
-
             return invoice;
         }
 
@@ -420,91 +419,108 @@ retry:
             return entity;
         }
 
+        private IQueryable<Data.InvoiceData> GetInvoiceQuery(ApplicationDbContext context, InvoiceQuery queryObject)
+        {
+            IQueryable<Data.InvoiceData> query = context.Invoices;
+
+            if (!string.IsNullOrEmpty(queryObject.InvoiceId))
+            {
+                query = query.Where(i => i.Id == queryObject.InvoiceId);
+            }
+
+            if (queryObject.StoreId != null && queryObject.StoreId.Length > 0)
+            {
+                var stores = queryObject.StoreId.ToHashSet();
+                query = query.Where(i => stores.Contains(i.StoreDataId));
+            }
+
+            if (queryObject.UserId != null)
+            {
+                query = query.Where(i => i.StoreData.UserStores.Any(u => u.ApplicationUserId == queryObject.UserId));
+            }
+
+            if (!string.IsNullOrEmpty(queryObject.TextSearch))
+            {
+                var ids = new HashSet<string>(SearchInvoice(queryObject.TextSearch));
+                if (ids.Count == 0)
+                {
+                    // Hacky way to return an empty query object. The nice way is much too elaborate:
+                    // https://stackoverflow.com/questions/33305495/how-to-return-empty-iqueryable-in-an-async-repository-method
+                    return query.Where(x => false); 
+                }
+                query = query.Where(i => ids.Contains(i.Id));
+            }
+
+            if (queryObject.StartDate != null)
+                query = query.Where(i => queryObject.StartDate.Value <= i.Created);
+
+            if (queryObject.EndDate != null)
+                query = query.Where(i => i.Created <= queryObject.EndDate.Value);
+
+            if (queryObject.OrderId != null && queryObject.OrderId.Length > 0)
+            {
+                var statusSet = queryObject.OrderId.ToHashSet();
+                query = query.Where(i => statusSet.Contains(i.OrderId));
+            }
+            if (queryObject.ItemCode != null && queryObject.ItemCode.Length > 0)
+            {
+                var statusSet = queryObject.ItemCode.ToHashSet();
+                query = query.Where(i => statusSet.Contains(i.ItemCode));
+            }
+
+            if (queryObject.Status != null && queryObject.Status.Length > 0)
+            {
+                var statusSet = queryObject.Status.ToHashSet();
+                query = query.Where(i => statusSet.Contains(i.Status));
+            }
+
+            if (queryObject.Unusual != null)
+            {
+                var unused = queryObject.Unusual.Value;
+                query = query.Where(i => unused == (i.Status == "invalid" || i.ExceptionStatus != null));
+            }
+
+            if (queryObject.ExceptionStatus != null && queryObject.ExceptionStatus.Length > 0)
+            {
+                var exceptionStatusSet = queryObject.ExceptionStatus.Select(s => NormalizeExceptionStatus(s)).ToHashSet();
+                query = query.Where(i => exceptionStatusSet.Contains(i.ExceptionStatus));
+            }
+
+            query = query.OrderByDescending(q => q.Created);
+
+            if (queryObject.Skip != null)
+                query = query.Skip(queryObject.Skip.Value);
+
+            if (queryObject.Count != null)
+                query = query.Take(queryObject.Count.Value);
+
+            return query;
+        }
+
+        public async Task<int> GetInvoicesTotal(InvoiceQuery queryObject)
+        {
+            using (var context = _ContextFactory.CreateContext())
+            {
+                var query = GetInvoiceQuery(context, queryObject);
+                return await query.CountAsync();
+            }
+        }
 
         public async Task<InvoiceEntity[]> GetInvoices(InvoiceQuery queryObject)
         {
             using (var context = _ContextFactory.CreateContext())
             {
-                IQueryable<Data.InvoiceData> query = context
-                    .Invoices
-                    .Include(o => o.Payments)
+                var query = GetInvoiceQuery(context, queryObject);
+                query = query.Include(o => o.Payments)
                     .Include(o => o.RefundAddresses);
                 if (queryObject.IncludeAddresses)
                     query = query.Include(o => o.HistoricalAddressInvoices).Include(o => o.AddressInvoices);
                 if (queryObject.IncludeEvents)
                     query = query.Include(o => o.Events);
-                if (!string.IsNullOrEmpty(queryObject.InvoiceId))
-                {
-                    query = query.Where(i => i.Id == queryObject.InvoiceId);
-                }
-
-                if (queryObject.StoreId != null && queryObject.StoreId.Length > 0)
-                {
-                    var stores = queryObject.StoreId.ToHashSet();
-                    query = query.Where(i => stores.Contains(i.StoreDataId));
-                }
-
-                if (queryObject.UserId != null)
-                {
-                    query = query.Where(i => i.StoreData.UserStores.Any(u => u.ApplicationUserId == queryObject.UserId));
-                }
-
-                if (!string.IsNullOrEmpty(queryObject.TextSearch))
-                {
-                    var ids = new HashSet<string>(SearchInvoice(queryObject.TextSearch));
-                    if (ids.Count == 0)
-                        return Array.Empty<InvoiceEntity>();
-                    query = query.Where(i => ids.Contains(i.Id));
-                }
-
-                if (queryObject.StartDate != null)
-                    query = query.Where(i => queryObject.StartDate.Value <= i.Created);
-
-                if (queryObject.EndDate != null)
-                    query = query.Where(i => i.Created <= queryObject.EndDate.Value);
-
-                if (queryObject.OrderId != null && queryObject.OrderId.Length > 0)
-                {
-                    var statusSet = queryObject.OrderId.ToHashSet();
-                    query = query.Where(i => statusSet.Contains(i.OrderId));
-                }
-                if (queryObject.ItemCode != null && queryObject.ItemCode.Length > 0)
-                {
-                    var statusSet = queryObject.ItemCode.ToHashSet();
-                    query = query.Where(i => statusSet.Contains(i.ItemCode));
-                }
-
-                if (queryObject.Status != null && queryObject.Status.Length > 0)
-                {
-                    var statusSet = queryObject.Status.ToHashSet();
-                    query = query.Where(i => statusSet.Contains(i.Status));
-                }
-
-                if (queryObject.Unusual != null)
-                {
-                    var unused = queryObject.Unusual.Value;
-                    query = query.Where(i => unused == (i.Status == "invalid" || i.ExceptionStatus != null));
-                }
-
-                if (queryObject.ExceptionStatus != null && queryObject.ExceptionStatus.Length > 0)
-                {
-                    var exceptionStatusSet = queryObject.ExceptionStatus.Select(s => NormalizeExceptionStatus(s)).ToHashSet();
-                    query = query.Where(i => exceptionStatusSet.Contains(i.ExceptionStatus));
-                }
-
-                query = query.OrderByDescending(q => q.Created);
-
-                if (queryObject.Skip != null)
-                    query = query.Skip(queryObject.Skip.Value);
-
-                if (queryObject.Count != null)
-                    query = query.Take(queryObject.Count.Value);
 
                 var data = await query.ToArrayAsync().ConfigureAwait(false);
-
                 return data.Select(ToEntity).ToArray();
             }
-
         }
 
         private string NormalizeExceptionStatus(string status)

BTCPayServer/Services/Mails/EmailSender.cs

@@ -1,47 +1,40 @@
 using BTCPayServer.Logging;
 using Microsoft.Extensions.Logging;
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net.Mail;
 using System.Threading.Tasks;
 
 namespace BTCPayServer.Services.Mails
 {
-    // This class is used by the application to send email for account confirmation and password reset.
-    // For more details see https://go.microsoft.com/fwlink/?LinkID=532713
-    public class EmailSender : IEmailSender
+    public abstract class EmailSender : IEmailSender
     {
         IBackgroundJobClient _JobClient;
-        SettingsRepository _Repository;
-        public EmailSender(IBackgroundJobClient jobClient, SettingsRepository repository)
+
+        public EmailSender(IBackgroundJobClient jobClient)
         {
-            if (jobClient == null)
-                throw new ArgumentNullException(nameof(jobClient));
-            _JobClient = jobClient;
-            _Repository = repository;
-        }
-        public async Task SendEmailAsync(string email, string subject, string message)
-        {
-            var settings = await _Repository.GetSettingAsync<EmailSettings>() ?? new EmailSettings();
-            if (!settings.IsComplete())
-            {
-                Logs.Configuration.LogWarning("Should have sent email, but email settings are not configured");
-                return;
-            }
-            _JobClient.Schedule(() => SendMailCore(email, subject, message), TimeSpan.Zero);
-            return;
+            _JobClient = jobClient ?? throw new ArgumentNullException(nameof(jobClient));
         }
 
-        public async Task SendMailCore(string email, string subject, string message)
+        public void SendEmail(string email, string subject, string message)
         {
-            var settings = await _Repository.GetSettingAsync<EmailSettings>() ?? new EmailSettings();
-            if (!settings.IsComplete())
-                throw new InvalidOperationException("Email settings not configured");
-            var smtp = settings.CreateSmtpClient();
-            MailMessage mail = new MailMessage(settings.From, email, subject, message);
-            mail.IsBodyHtml = true;
-            await smtp.SendMailAsync(mail);
+            _JobClient.Schedule(async () =>
+            {
+                var emailSettings = await GetEmailSettings();
+                if (emailSettings?.IsComplete() != true)
+                {
+                    Logs.Configuration.LogWarning("Should have sent email, but email settings are not configured");
+                    return;
+                }
+                var smtp = emailSettings.CreateSmtpClient();
+                var mail = new MailMessage(emailSettings.From, email, subject, message)
+                {
+                    IsBodyHtml = true
+                };
+                await smtp.SendMailAsync(mail);
+
+           }, TimeSpan.Zero);
         }
+
+        public abstract Task<EmailSettings> GetEmailSettings();
     }
 }

BTCPayServer/Services/Mails/EmailSenderFactory.cs

@@ -0,0 +1,31 @@
+using System;
+using System.Collections.Concurrent;
+using System.Threading.Tasks;
+using BTCPayServer.Services.Stores;
+
+namespace BTCPayServer.Services.Mails
+{
+    public class EmailSenderFactory
+    {
+        private readonly IBackgroundJobClient _JobClient;
+        private readonly SettingsRepository _Repository;
+        private readonly StoreRepository _StoreRepository;
+
+        public EmailSenderFactory(IBackgroundJobClient jobClient,
+            SettingsRepository repository,
+            StoreRepository storeRepository)
+        {
+            _JobClient = jobClient;
+            _Repository = repository;
+            _StoreRepository = storeRepository;
+        }
+
+        public IEmailSender GetEmailSender(string storeId = null)
+        {
+            var serverSender = new ServerEmailSender(_Repository, _JobClient);
+            if (string.IsNullOrEmpty(storeId))
+                return serverSender;
+            return new StoreEmailSender(_StoreRepository, serverSender, _JobClient, storeId);
+        }
+    }
+}

BTCPayServer/Services/Mails/IEmailSender.cs

@@ -7,6 +7,6 @@ namespace BTCPayServer.Services.Mails
 {
     public interface IEmailSender
     {
-        Task SendEmailAsync(string email, string subject, string message);
+        void SendEmail(string email, string subject, string message);
     }
 }

BTCPayServer/Services/Mails/ServerEmailSender.cs

@@ -0,0 +1,25 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace BTCPayServer.Services.Mails
+{
+    class ServerEmailSender : EmailSender
+    {
+        public ServerEmailSender(SettingsRepository settingsRepository,
+                                IBackgroundJobClient backgroundJobClient) : base(backgroundJobClient)
+        {
+            if (settingsRepository == null)
+                throw new ArgumentNullException(nameof(settingsRepository));
+            SettingsRepository = settingsRepository;
+        }
+
+        public SettingsRepository SettingsRepository { get; }
+
+        public override Task<EmailSettings> GetEmailSettings()
+        {
+            return SettingsRepository.GetSettingAsync<EmailSettings>();
+        }
+    }
+}

BTCPayServer/Services/Mails/StoreEmailSender.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using BTCPayServer.Services.Stores;
+
+namespace BTCPayServer.Services.Mails
+{
+    class StoreEmailSender : EmailSender
+    {
+        public StoreEmailSender(StoreRepository storeRepository,
+                                EmailSender fallback,
+                                IBackgroundJobClient backgroundJobClient,
+                                string storeId) : base(backgroundJobClient)
+        {
+            if (storeId == null)
+                throw new ArgumentNullException(nameof(storeId));
+            StoreRepository = storeRepository;
+            FallbackSender = fallback;
+            StoreId = storeId;
+        }
+
+        public StoreRepository StoreRepository { get; }
+        public EmailSender FallbackSender { get; }
+        public string StoreId { get; }
+
+        public override async Task<EmailSettings> GetEmailSettings()
+        {
+            var store = await StoreRepository.FindStore(StoreId);
+            var emailSettings = store.GetStoreBlob().EmailSettings;
+            if (emailSettings?.IsComplete() == true)
+            {
+                return emailSettings;
+            }
+            return await FallbackSender.GetEmailSettings();
+        }
+    }
+}

BTCPayServer/Views/AppsPublic/ViewPointOfSale.cshtml

@@ -194,6 +194,7 @@
                 <div class="modal-footer bg-light">
                     <form method="post" asp-antiforgery="false" data-buy>
                         <input id="js-cart-amount" class="form-control" type="hidden" name="amount">
+                        <input id="js-cart-posdata" class="form-control" type="hidden" name="posdata">
                         <button id="js-cart-pay" class="btn btn-primary btn-lg" type="submit"><b>@Model.CustomButtonText</b></button>
                     </form>
                 </div>

BTCPayServer/Views/Invoice/Checkout-Body.cshtml

@@ -390,7 +390,7 @@
                     <span v-html="$t('Return to StoreName', srvModel)"></span>
                 </a>
                 <button class="action-button close-action" v-show="isModal">
-                    <span v-html="$t('home.header.title')">{{$t("Return to StoreName", srvModel)}}</span>
+                    <span v-html="$t('Close')">{{$t("Return to StoreName", srvModel)}}</span>
                 </button>
             </div>
         </div>

BTCPayServer/Views/Invoice/Invoice.cshtml

@@ -157,6 +157,10 @@
                         <th>Price</th>
                         <td>@Model.ProductInformation.Price @Model.ProductInformation.Currency</td>
                     </tr>
+                    <tr>
+                        <th>Tax included</th>
+                        <td>@Model.ProductInformation.TaxIncluded @Model.ProductInformation.Currency</td>
+                    </tr>
                 </table>
             }
         </div>
@@ -180,28 +184,15 @@
                         <th>Price</th>
                         <td>@Model.ProductInformation.Price @Model.ProductInformation.Currency</td>
                     </tr>
+                    <tr>
+                        <th>Tax included</th>
+                        <td>@Model.ProductInformation.TaxIncluded @Model.ProductInformation.Currency</td>
+                    </tr>
                 </table>
             </div>
             <div class="col-md-6">
                 <h3>Point of Sale Data</h3>
-                <table class="table table-sm table-responsive-md">
-                    @foreach (var posDataItem in Model.PosData)
-                    {
-                        <tr>
-                            @if (!string.IsNullOrEmpty(posDataItem.Key))
-                            {
-
-                                <th>@posDataItem.Key</th>
-                                <td>@posDataItem.Value</td>
-                            }
-                            else
-                            {
-
-                                <td colspan="2">@posDataItem.Value</td>
-                            }
-                        </tr>
-                    }
-                </table>
+                <partial name="PosData" model="@Model.PosData"></partial>
             </div>
         </div>
     }

BTCPayServer/Views/Invoice/ListInvoices.cshtml

@@ -142,23 +142,31 @@
                     }
                 </tbody>
             </table>
-            <span>
-                @if (Model.Skip != 0)
-                {
-                    <a href="@Url.Action("ListInvoices", new
+
+            <nav aria-label="...">
+                <ul class="pagination">
+                    <li class="page-item  @(Model.Skip == 0 ? "disabled" : null)">
+                        <a class="page-link" tabindex="-1" href="@Url.Action("ListInvoices", new
                         {
                             searchTerm = Model.SearchTerm,
                             skip = Math.Max(0, Model.Skip - Model.Count),
                             count = Model.Count,
-                        })"><<</a><span> - </span>
-                }
-                <a href="@Url.Action("ListInvoices", new
-                    {
-                        searchTerm = Model.SearchTerm,
-                        skip = Model.Skip + Model.Count,
-                        count = Model.Count,
-                    })">>></a>
-            </span>
+                        })">Previous</a>
+                    </li>
+                    <li class="page-item disabled">
+                        <span class="page-link">@(Model.Skip + 1) to @(Model.Skip + Model.Invoices.Count) of @Model.Total</span>
+                    </li>
+                    <li class="page-item @(Model.Total > (Model.Skip + Model.Invoices.Count) ? null : "disabled")">
+                        <a class="page-link" href="@Url.Action("ListInvoices", new
+                        {
+                            searchTerm = Model.SearchTerm,
+                            skip = Model.Skip + Model.Count,
+                            count = Model.Count,
+                        })">Next</a>
+                    </li>
+                </ul>
+            </nav>
+
         </div>
 
     </div>

BTCPayServer/Views/Invoice/PosData.cshtml

@@ -0,0 +1,37 @@
+@model Dictionary<string, object>
+
+<table class="table table-sm table-responsive-md">
+    @foreach (var posDataItem in Model)
+    {
+        <tr>
+            @if (!string.IsNullOrEmpty(posDataItem.Key))
+            {
+                <th>@posDataItem.Key</th>
+                <td>
+                    @if (posDataItem.Value is string)
+                    {
+                        @posDataItem.Value
+                    }
+                    else
+                    {
+                        <partial name="PosData" model="@posDataItem.Value"/>
+                    }
+
+                </td>
+            }
+            else
+            {
+                <td colspan="2">
+                    @if (posDataItem.Value is string)
+                    {
+                        @posDataItem.Value
+                    }
+                    else
+                    {
+                        <partial name="PosData" model="@posDataItem.Value"/>
+                    }
+                </td>
+            }
+        </tr>
+    }
+</table>

BTCPayServer/Views/Stores/Emails.cshtml

@@ -0,0 +1,68 @@
+@model BTCPayServer.Models.ServerViewModels.EmailsViewModel
+@{
+    Layout = "../Shared/_NavLayout.cshtml";
+    ViewData.SetActivePageAndTitle(StoreNavPages.Index, "Update Store Email Settings");
+}
+
+
+<h4>@ViewData["Title"]</h4>
+<partial name="_StatusMessage" for="StatusMessage" />
+
+
+<div class="row">
+    <div class="col-md-6">
+        <div asp-validation-summary="All" class="text-danger"></div>
+    </div>
+</div>
+<div class="row">
+    <div class="col-md-6">
+        <form method="post">
+            <div class="form-group">
+                <label asp-for="Settings.Server"></label>
+                <input asp-for="Settings.Server" class="form-control" />
+                <span asp-validation-for="Settings.Server" class="text-danger"></span>
+            </div>
+            <div class="form-group">
+                <label asp-for="Settings.Port"></label>
+                <input asp-for="Settings.Port" class="form-control" />
+                <span asp-validation-for="Settings.Port" class="text-danger"></span>
+            </div>
+
+            <div class="form-group">
+                <label asp-for="Settings.From"></label>
+                <input asp-for="Settings.From" class="form-control" />
+                <span asp-validation-for="Settings.From" class="text-danger"></span>
+            </div>
+
+            <div class="form-group">
+                <label asp-for="Settings.Login"></label>
+                <input asp-for="Settings.Login" class="form-control" />
+                <span asp-validation-for="Settings.Login" class="text-danger"></span>
+            </div>
+
+            <div class="form-group">
+                <label asp-for="Settings.Password"></label>
+                <input asp-for="Settings.Password" type="password" class="form-control" />
+                <span asp-validation-for="Settings.Password" class="text-danger"></span>
+            </div>
+
+            <div class="form-group">
+                <label asp-for="Settings.EnableSSL"></label>
+                <input asp-for="Settings.EnableSSL" type="checkbox" class="form-check-inline" />
+            </div>
+
+            <div class="form-group">
+                <label asp-for="TestEmail"></label>
+                <input asp-for="TestEmail" class="form-control" />
+                <span asp-validation-for="TestEmail" class="text-danger"></span>
+            </div>
+
+            <button type="submit" class="btn btn-primary" name="command" value="Save">Save</button>
+            <button type="submit" class="btn btn-primary" name="command" value="Test">Test</button>
+        </form>
+    </div>
+</div>
+
+@section Scripts {
+    @await Html.PartialAsync("_ValidationScriptsPartial")
+}

BTCPayServer/Views/Stores/ListTokens.cshtml

@@ -5,6 +5,13 @@
 }
 
 <partial name="_StatusMessage" for="StatusMessage" />
+@if (Model.StoreNotConfigured)
+{
+    <div class="alert alert-warning alert-dismissible" role="alert">
+        <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+        <span>Warning: No wallet has been linked to your BTCPay Store. See <a href="https://docs.btcpayserver.org/btcpay-basics/gettingstarted#connecting-btcpay-store-to-your-wallet" target="_blank">this link</a> for more information on how to connect your store and wallet.</span>
+    </div>
+}
 <h4>Access token</h4>
 <div class="row">
     <div class="col-md-8">
@@ -23,7 +30,7 @@
                 </tr>
             </thead>
             <tbody>
-                @foreach(var token in Model.Tokens)
+                @foreach (var token in Model.Tokens)
                 {
                     <tr>
                         <td>@token.Label</td>

BTCPayServer/Views/Stores/UpdateStore.cshtml

@@ -214,7 +214,29 @@
                     </table>
                 </div>
             </div>
-            
+        <div class="form-group">
+            <div class="form-group">
+                <h5>Services</h5>
+            </div>
+            <div class="form-group">
+                <table class="table table-sm table-responsive-md">
+                    <thead>
+                    <tr>
+                        <th>Service</th>
+                        <th style="text-align:right">Actions</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    <tr>
+                        <td>
+                            Email
+                        </td>
+                        <td style="text-align:right"><a asp-action="Emails" >Modify</a></td>
+                    </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
             @if(Model.CanDelete)
             {
                 <div class="form-group">

BTCPayServer/Views/Wallets/WalletSend.cshtml

@@ -33,7 +33,7 @@
             <div class="form-group">
                 <label asp-for="Amount"></label>
                 <div class="input-group">
-                    <input asp-for="Amount" class="form-control" onkeyup='updateFiatValue();' />
+                    <input asp-for="Amount" asp-format="{0}" class="form-control" onkeyup='updateFiatValue();' />
                     <div class="input-group-prepend">
                         <span class="input-group-text text-muted" style="display:none;" id="fiatValue"></span>
                     </div>

BTCPayServer/Views/Wallets/WalletTransactions.cshtml

@@ -29,7 +29,8 @@
 <h4>@ViewData["Title"]</h4>
 <div class="row">
     <div class="col-md-10">
-        If this wallet got restored, should have received money but nothing is showing up, please <a asp-action="WalletRescan">Rescan it</a>.
+        If BTCPay Server shows you an invalid balance, <a asp-action="WalletRescan">rescan your wallet</a>. <br />
+        If some transactions appear in BTCPay Server, but are missing on Electrum or another wallet, <a href="https://docs.btcpayserver.org/faq-and-common-issues/faq-wallet#missing-payments-in-my-software-or-hardware-wallet">follow those instructions</a>.
     </div>
 </div>
 <div class="row">

BTCPayServer/wwwroot/cart/js/cart.js

@@ -21,6 +21,7 @@ function Cart() {
     
     this.updateItemsCount();
     this.updateAmount();
+    this.updatePosData();
 }
 
 Cart.prototype.setCustomAmount = function(amount) {
@@ -243,6 +244,7 @@ Cart.prototype.updateAll = function() {
     this.updateSummaryTotal();
     this.updateTotal();
     this.updateAmount();
+    this.updatePosData();
 }
 
 // Update number of cart items
@@ -290,6 +292,20 @@ Cart.prototype.updateTip = function(amount) {
 Cart.prototype.updateAmount = function() {
     $('#js-cart-amount').val(this.getTotal(true));
 }
+Cart.prototype.updatePosData = function() {
+
+    var result = {
+      cart: this.content,
+      customAmount: this.fromCents(this.getCustomAmount()),
+      discountPercentage: this.discount? parseFloat(this.discount): 0,
+      subTotal: this.fromCents(this.getTotalProducts()),
+      discountAmount: this.fromCents(this.getDiscountAmount(this.totalAmount)),
+      tip: this.tip? this.tip: 0,
+      total: this.getTotal(true)
+    };
+    console.warn(result);
+    $('#js-cart-posdata').val(JSON.stringify(result));
+}
 
 Cart.prototype.resetDiscount = function() {
     this.setDiscount(0);
@@ -644,6 +660,7 @@ $.fn.inputAmount = function(obj, type) {
 
         obj.updateSummaryTotal();
         obj.updateAmount();
+        obj.updatePosData();
         obj.emptyCartToggle();
     });
 }
@@ -668,4 +685,4 @@ $.fn.removeAmount = function(obj, type) {
         obj.updateSummaryTotal();
         obj.emptyCartToggle();  
     });
-}
+}

BTCPayServer/wwwroot/locales/ja-JP.json

@@ -44,6 +44,6 @@
   "Node Info": "接続情報",
   "txCount": "取引 {{count}} 個",
   "txCount_plural": "取引 {{count}} 個",
-  "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with CoinSwitch": "CoinSwitchでのお支払い",
+  "Pay with Changelly": "Changellyでのお支払い"
 }

BTCPayServer/wwwroot/locales/nl-NL.json

@@ -18,22 +18,22 @@
   "Copy": "Kopiëren",
   "Conversion": "Omzetting",
   "Open in wallet": "Wallet openen",
-  "CompletePay_Body": "Om de betaling te vervoledigen, bedankt om {{btcDue}} {{cryptoCode}} naar het hieronder vemelde adres op te sturen.",
+  "CompletePay_Body": "Om de betaling af te ronden, stuur alstublieft {{btcDue}} {{cryptoCode}} naar het hieronder vemelde adres.",
   "Amount": "Bedrag",
   "Address": "Adres",
   "Copied": "Gekopieerd",
   "ConversionTab_BodyTop": "Je kan altcoins gebruiken die niet ondersteund zijn door de verkoper, om {{btcDue}} {{cryptoCode}} te betalen.",
   "ConversionTab_BodyDesc": "Deze dienst wordt door een externe partij geleverd. Bijgevolg, hebben we geen zicht over jouw fondsen. De factuur wordt pas als betaald beschouwd, wanneer de fondsen door de blockchain aanvaard zijn {{ cryptoCode }}.",
-  "ConversionTab_CalculateAmount_Error": "Retry",
-  "ConversionTab_LoadCurrencies_Error": "Retry",
+  "ConversionTab_CalculateAmount_Error": "Opnieuw proberen",
+  "ConversionTab_LoadCurrencies_Error": "Opnieuw proberen",
   "ConversionTab_Lightning": "Geen leverancier beschikbaar voor de betalingen op het Lightning Network",
-  "ConversionTab_CurrencyList_Select_Option": "Please select a currency to convert from",
+  "ConversionTab_CurrencyList_Select_Option": "Selecteer een valuta om te converteren",
   "Invoice expiring soon...": "De factuur verloopt binnenkort...",
   "Invoice expired": "Vervallen factuur",
   "What happened?": "Wat gebeurde er?",
   "InvoiceExpired_Body_1": "De factuur is vervallen. Een factuur is alleen geldig voor {{maxTimeMinutes}} minuten. \nJe kan terug komen naar {{storeName}} als je de betaling opnieuw wilt proberen",
   "InvoiceExpired_Body_2": "Als je een betaling uitvoerde, dan werd dit nog niet bevestigd door het netwerk. We hebben je fondsen nog niet ontvangen.",
-  "InvoiceExpired_Body_3": "",
+  "InvoiceExpired_Body_3": "Indien we het later ontvangen, zullen we uw order verwerken of nemen we contact op om een terugbetaling te regelen...",
   "Invoice ID": "Factuurnummer",
   "Order ID": "Bestllingsnummer",
   "Return to StoreName": "Terug naar {{storeName}}",
@@ -44,6 +44,6 @@
   "Node Info": "Node Info",
   "txCount": "{{count}} transactie",
   "txCount_plural": "{{count}} transacties",
-  "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly"
+  "Pay with CoinSwitch": "Betalen met CoinSwitch",
+  "Pay with Changelly": "Betalen met Changelly"
 }

README.md

@@ -53,6 +53,7 @@ In addition to Bitcoin, BTCPay supports the following cryptocurrencies:
 * Polis
 * UFO
 * Viacoin
+* Bitcoinplus
 
 ## Documentation