bump

Fixing a tiny typo in the AppsController.cs

BTCPayServer.Tests/docker-compose.yml

@@ -69,7 +69,7 @@ services:
 
 
   nbxplorer:
-    image: nicolasdorier/nbxplorer:2.0.0.8
+    image: nicolasdorier/nbxplorer:2.0.0.15
     restart: unless-stopped
     ports:
       - "32838:32838"
@@ -119,7 +119,7 @@ services:
       - "bitcoin_datadir:/data"
 
   customer_lightningd:
-    image: btcpayserver/lightning:v0.6.2-dev
+    image: btcpayserver/lightning:v0.7.0-1-dev
     stop_signal: SIGKILL
     restart: unless-stopped
     environment: 
@@ -165,7 +165,7 @@ services:
       - merchant_lightningd
 
   merchant_lightningd:
-    image: btcpayserver/lightning:v0.6.2-dev
+    image: btcpayserver/lightning:v0.7.0-1-dev
     stop_signal: SIGKILL
     environment: 
       EXPOSE_TCP: "true"

BTCPayServer/BTCPayServer.csproj

@@ -2,7 +2,7 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-		<Version>1.0.3.76</Version>
+		<Version>1.0.3.78</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.9" />
+    <PackageReference Include="BTCPayServer.Lightning.All" Version="1.1.0.10" />
     <PackageReference Include="BuildBundlerMinifier" Version="2.7.385" />
     <PackageReference Include="DigitalRuby.ExchangeSharp" Version="0.5.3" />
     <PackageReference Include="HtmlSanitizer" Version="4.0.199" />

BTCPayServer/Controllers/AppsController.cs

@@ -84,7 +84,7 @@ namespace BTCPayServer.Controllers
                 StatusMessage = new StatusMessageModel()
                 {
                     Html =
-                        $"Error: You must have created at least one store. <a href='{(Url.Action("CreateStore", "UserStores"))}'>Create store</a>",
+                        $"Error: You need to create at least one store. <a href='{(Url.Action("CreateStore", "UserStores"))}'>Create store</a>",
                     Severity = StatusMessageModel.StatusSeverity.Error
                 }.ToString();
                 return RedirectToAction(nameof(ListApps));
@@ -104,7 +104,7 @@ namespace BTCPayServer.Controllers
                 StatusMessage = new StatusMessageModel()
                 {
                     Html =
-                        $"Error: You must have created at least one store. <a href='{(Url.Action("CreateStore", "UserStores"))}'>Create store</a>",
+                        $"Error: You need to create at least one store. <a href='{(Url.Action("CreateStore", "UserStores"))}'>Create store</a>",
                     Severity = StatusMessageModel.StatusSeverity.Error
                 }.ToString();
                 return RedirectToAction(nameof(ListApps));

BTCPayServer/Controllers/AppsPublicController.cs

@@ -131,10 +131,8 @@ namespace BTCPayServer.Controllers
 
             var isAdmin = await _AppService.GetAppDataIfOwner(GetUserId(), appId, AppType.Crowdfund) != null;
 
-            if (!settings.Enabled)
-            {
-                if (!isAdmin)
-                    return NotFound("Crowdfund is not currently active");
+            if (!settings.Enabled && !isAdmin) {
+                return NotFound("Crowdfund is not currently active");
             }
 
             var info = (ViewCrowdfundViewModel)await _AppService.GetAppInfo(appId);

BTCPayServer/Controllers/ServerController.cs

@@ -384,18 +384,17 @@ namespace BTCPayServer.Controllers
             if (user == null)
                 return NotFound();
 
-            var admins = await _UserManager.GetUsersInRoleAsync(Roles.ServerAdmin);
-            if (admins.Count == 1)
-            {
-                // return
-                return View("Confirm", new ConfirmModel("Unable to Delete Last Admin",
-                    "This is the last Admin, so it can't be removed"));
-            }
-
-
             var roles = await _UserManager.GetRolesAsync(user);
             if (IsAdmin(roles))
             {
+                var admins = await _UserManager.GetUsersInRoleAsync(Roles.ServerAdmin);
+                if (admins.Count == 1)
+                {
+                    // return
+                    return View("Confirm", new ConfirmModel("Unable to Delete Last Admin",
+                        "This is the last Admin, so it can't be removed"));
+                }
+
                 return View("Confirm", new ConfirmModel("Delete Admin " + user.Email,
                     "Are you sure you want to delete this Admin and delete all accounts, users and data associated with the server account?",
                     "Delete"));
@@ -658,15 +657,24 @@ namespace BTCPayServer.Controllers
                     return NotFound();
                 return File(System.IO.File.ReadAllBytes(settings.KeyFile), "application/octet-stream", "id_rsa");
             }
+
+            var server = IsLocalNetwork(settings.Server) ? this.Request.Host.Host: settings.Server;
             SSHServiceViewModel vm = new SSHServiceViewModel();
             string port = settings.Port == 22 ? "" : $" -p {settings.Port}";
-            vm.CommandLine = $"ssh {settings.Username}@{settings.Server}{port}";
+            vm.CommandLine = $"ssh {settings.Username}@{server}{port}";
             vm.Password = settings.Password;
             vm.KeyFilePassword = settings.KeyFilePassword;
             vm.HasKeyFile = !string.IsNullOrEmpty(settings.KeyFile);
             return View(vm);
         }
 
+        private static bool IsLocalNetwork(string server)
+        {
+            return server.EndsWith(".internal", StringComparison.OrdinalIgnoreCase) ||
+                   server.Equals("127.0.0.1", StringComparison.OrdinalIgnoreCase) ||
+                   server.Equals("localhost", StringComparison.OrdinalIgnoreCase);
+        }
+
         [Route("server/theme")]
         public async Task<IActionResult> Theme()
         {

BTCPayServer/Models/AppViewModels/ViewCrowdfundViewModel.cs

@@ -55,6 +55,7 @@ namespace BTCPayServer.Models.AppViewModels
 
         public bool Ended => !EndDate.HasValue || DateTime.Now.ToUniversalTime() > EndDate;
         public bool DisplayPerksRanking { get; set; }
+        public bool Enabled { get; set; }
     }
 
     public class ContributeToCrowdfund

BTCPayServer/Models/PaymentRequestViewModels/ListPaymentRequestsViewModel.cs

@@ -140,6 +140,7 @@ namespace BTCPayServer.Models.PaymentRequestViewModels
             public string Id { get; set; }
             public DateTime ExpiryDate { get; set; }
             public decimal Amount { get; set; }
+            public string AmountFormatted { get; set; }
             public string Status { get; set; }
 
             public List<PaymentRequestInvoicePayment> Payments { get; set; }

BTCPayServer/Models/ServerViewModels/EmailsViewModel.cs

@@ -18,8 +18,9 @@ namespace BTCPayServer.Models.ServerViewModels
         {
             get; set;
         }
-        
+
         [EmailAddress]
+        [Display(Name = "Test Email")]
         public string TestEmail
         {
             get; set;

BTCPayServer/PaymentRequest/PaymentRequestService.cs

@@ -100,6 +100,7 @@ namespace BTCPayServer.PaymentRequest
                 {
                     Id = entity.Id,
                     Amount = entity.ProductInformation.Price,
+                    AmountFormatted = _currencies.FormatCurrency(entity.ProductInformation.Price, blob.Currency),
                     Currency = entity.ProductInformation.Currency,
                     ExpiryDate = entity.ExpirationTime.DateTime,
                     Status = entity.GetInvoiceState().ToString(),

BTCPayServer/Services/Apps/AppService.cs

@@ -140,6 +140,7 @@ namespace BTCPayServer.Services.Apps
                 EnforceTargetAmount = settings.EnforceTargetAmount,
                 StatusMessage = statusMessage,
                 Perks = perks,
+                Enabled = settings.Enabled,
                 DisqusEnabled = settings.DisqusEnabled,
                 SoundsEnabled = settings.SoundsEnabled,
                 DisqusShortname = settings.DisqusShortname,

BTCPayServer/Services/BTCPayServerEnvironment.cs

@@ -13,11 +13,10 @@ namespace BTCPayServer.Services
 {
     public class BTCPayServerEnvironment
     {
+        IHttpContextAccessor httpContext;
         public BTCPayServerEnvironment(IHostingEnvironment env, BTCPayNetworkProvider provider, IHttpContextAccessor httpContext)
         {
-            ExpectedHost = httpContext.HttpContext.Request.Host.Value;
-            ExpectedDomain = httpContext.HttpContext.Request.Host.Host;
-            ExpectedProtocol = httpContext.HttpContext.Request.Scheme;
+            this.httpContext = httpContext;
             Version = typeof(BTCPayServerEnvironment).GetTypeInfo().Assembly.GetCustomAttribute<AssemblyFileVersionAttribute>().Version;
 #if DEBUG
             Build = "Debug";
@@ -32,9 +31,9 @@ namespace BTCPayServer.Services
             get; set;
         }
 
-        public string ExpectedDomain { get; set; }
-        public string ExpectedHost { get; set; }
-        public string ExpectedProtocol { get; set; }
+        public string ExpectedDomain => httpContext.HttpContext.Request.Host.Host;
+        public string ExpectedHost => httpContext.HttpContext.Request.Host.Value;
+        public string ExpectedProtocol => httpContext.HttpContext.Request.Scheme;
 
         public NetworkType NetworkType { get; set; }
         public string Version

BTCPayServer/Services/Mails/EmailSettings.cs

@@ -35,6 +35,7 @@ namespace BTCPayServer.Services.Mails
             get; set;
         }
 
+        [Display(Name = "Enable SSL")]
         public bool EnableSSL
         {
             get; set;

BTCPayServer/Views/AppsPublic/Crowdfund/VueCrowdfund.cshtml

@@ -1,4 +1,10 @@
 <div class="container p-0" id="app" v-cloak>
+    @if(!Model.Enabled) 
+    {
+    <div class="alert alert-warning" role="alert" style="text-align: center;">
+        This crowdfund page is not publically viewable!
+    </div>
+    }
     <div class="row h-100 w-100 py-sm-0 py-md-4 mx-0">
         <div class="card w-100 p-0 mx-0">
             <img class="card-img-top" :src="srvModel.mainImageUrl" v-if="srvModel.mainImageUrl" id="crowdfund-main-image">

BTCPayServer/Views/Invoice/Checkout-Body.cshtml

@@ -71,12 +71,11 @@
             }
             else
             {
-                <div class="payment__currencies">
+                <div class="payment__currencies_noborder">
                     <img v-bind:src="srvModel.cryptoImage" />
                     <span>{{srvModel.paymentMethodName}} ({{srvModel.cryptoCode}})</span>
                     <span v-show="srvModel.isLightning">&#9889;</span>
                 </div>
-
             }
             <div class="payment__spinner">
                 <partial name="Checkout-Spinner" />

BTCPayServer/Views/PaymentRequest/ViewPaymentRequest.cshtml

@@ -107,7 +107,7 @@ else
                                         <template v-else v-for="invoice of srvModel.invoices" :key="invoice.id">
                                             <tr class="bg-light">
                                                 <td scope="row">{{invoice.id}}</td>
-                                                <td>{{invoice.amount}} {{invoice.currency}}</td>
+                                                <td>{{invoice.amountFormatted}}</td>
                                                 <td>{{moment(invoice.expiryDate).format('L HH:mm')}}</td>
                                                 <td>{{invoice.status}}</td>
                                             </tr>

BTCPayServer/Views/Server/Emails.cshtml

@@ -41,7 +41,7 @@
 
             <div class="form-group">
                 <label asp-for="Settings.Password"></label>
-                <input asp-for="Settings.Password" type="password" class="form-control" />
+                <input asp-for="Settings.Password" type="password" class="form-control" value="@Model.Settings.Password" />
                 <span asp-validation-for="Settings.Password" class="text-danger"></span>
             </div>
 

BTCPayServer/Views/Shared/_Layout.cshtml

@@ -85,7 +85,7 @@
             </div>
             <div id="badUrl" class="alert alert-danger alert-dismissible" style="display:none; position:absolute; top:75px;" role="alert">
                 <button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <span>BTCPay is expecting you to access this website from <b>@(env.ExpectedProtocol)://@(env.ExpectedHost)/</b>. If you use a reverse proxy, please set the <b>X-Forwarded-Proto</b> header to <b>@(env.ExpectedProtocol)</b> (<a href="https://docs.btcpayserver.org/faq-and-common-issues/faq-deployment#btcpay-is-expecting-you-to-access-this-website-from" target="_blank">More information</a>)</span>
+                <span>BTCPay is expecting you to access this website from <b>@(env.ExpectedProtocol)://@(env.ExpectedHost)/</b>. If you use a reverse proxy, please set the <b>X-Forwarded-Proto</b> header to <b id="browserScheme">@(env.ExpectedProtocol)</b> (<a href="https://docs.btcpayserver.org/faq-and-common-issues/faq-deployment#btcpay-is-expecting-you-to-access-this-website-from" target="_blank">More information</a>)</span>
             </div>
         </div>
     </nav>
@@ -112,6 +112,7 @@
         var expectedProtocol = @Html.Raw(Json.Serialize(env.ExpectedProtocol));
         if (window.location.host != expectedDomain || window.location.protocol != expectedProtocol + ":") {
             document.getElementById("badUrl").style.display = "block";
+            document.getElementById("browserScheme").innerText = window.location.protocol.substr(0, window.location.protocol.length -1);
         }
     </script>
 </body>

BTCPayServer/wwwroot/checkout/css/vex-extrastyles.css

@@ -55,10 +55,16 @@
     padding: 6px;
 }
 
-    .payment__currencies img {
-        margin-top: -3px;
-        height: 24px;
-    }
+.payment__currencies_noborder {
+    font-size: 13px;
+    border-radius: 5px;
+    padding: 6px;
+}
+
+.payment__currencies img , .payment__currencies_noborder img{
+    margin-top: -3px;
+    height: 24px;
+}
 
     .payment__currencies:hover .clickable_underline {
         border-bottom: 1px dotted black;

BTCPayServer/wwwroot/locales/fr-FR.json

@@ -44,7 +44,7 @@
   "Node Info": "Informations sur le nœud",
   "txCount": "{{count}} transaction",
   "txCount_plural": "{{count}} transactions",
-  "Pay with CoinSwitch": "Pay with CoinSwitch",
-  "Pay with Changelly": "Pay with Changelly",
-  "Close": "Close"
+  "Pay with CoinSwitch": "Payer avec CoinSwitch",
+  "Pay with Changelly": "Payer avec Changelly",
+  "Close": "Fermer"
 }