bump

Merge pull request #60 from lepipele/dev-lepi
Bugfixing loading spinner when switching currency
2018-03-13 15:56:17 +09:00 · 2018-03-13 15:41:22 +09:00 · 2018-03-13 15:39:52 +09:00 · 2018-03-13 15:28:39 +09:00 · 2018-03-13 00:34:26 -05:00 · 2018-03-13 09:13:16 +09:00
15 changed files with 76 additions and 58 deletions
--- a/BTCPayServer.Tests/UnitTest1.cs
+++ b/BTCPayServer.Tests/UnitTest1.cs
@ -45,7 +45,7 @@ namespace BTCPayServer.Tests
        [Fact]
        public void CanCalculateCryptoDue2()
        {
-            var dummy = new Key().PubKey.GetAddress(Network.RegTest);
+            var dummy = new Key().PubKey.GetAddress(Network.RegTest).ToString();
 #pragma warning disable CS0618
            InvoiceEntity invoiceEntity = new InvoiceEntity();
            invoiceEntity.Payments = new System.Collections.Generic.List<PaymentEntity>();
--- a/BTCPayServer/BTCPayServer.csproj
+++ b/BTCPayServer/BTCPayServer.csproj
@ -2,7 +2,7 @@
  <PropertyGroup>
    <OutputType>Exe</OutputType>
    <TargetFramework>netcoreapp2.0</TargetFramework>
-		<Version>1.0.1.46</Version>
+		<Version>1.0.1.48</Version>
    <NoWarn>NU1701,CA1816,CA1308,CA1810,CA2208</NoWarn>
  </PropertyGroup>
  <ItemGroup>
--- a/BTCPayServer/Controllers/InvoiceController.UI.cs
+++ b/BTCPayServer/Controllers/InvoiceController.UI.cs
@ -368,6 +368,7 @@ namespace BTCPayServer.Controllers
                    Date = Prettify(invoice.InvoiceTime),
                    InvoiceId = invoice.Id,
                    OrderId = invoice.OrderId ?? string.Empty,
+                    RedirectUrl = invoice.RedirectURL ?? string.Empty,
                    AmountCurrency = $"{invoice.ProductInformation.Price.ToString(CultureInfo.InvariantCulture)} {invoice.ProductInformation.Currency}"
                });
            }
--- a/BTCPayServer/Models/InvoicingModels/InvoicesModel.cs
+++ b/BTCPayServer/Models/InvoicingModels/InvoicesModel.cs
@ -39,6 +39,7 @@ namespace BTCPayServer.Models.InvoicingModels
        }

        public string OrderId { get; set; }
+        public string RedirectUrl { get; set; }
        public string InvoiceId
        {
            get; set;
--- a/BTCPayServer/Payments/Bitcoin/BitcoinLikeOnChainPaymentMethod.cs
+++ b/BTCPayServer/Payments/Bitcoin/BitcoinLikeOnChainPaymentMethod.cs
@ -17,7 +17,7 @@ namespace BTCPayServer.Payments.Bitcoin

        public string GetPaymentDestination()
        {
-            return DepositAddress?.ToString();
+            return DepositAddress;
        }

        public decimal GetTxFee()
@ -33,10 +33,7 @@ namespace BTCPayServer.Payments.Bitcoin

        public void SetPaymentDestination(string newPaymentDestination)
        {
-            if (newPaymentDestination == null)
-                DepositAddress = null;
-            else
-                DepositAddress = BitcoinAddress.Create(newPaymentDestination, DepositAddress.Network);
+            DepositAddress = newPaymentDestination;
        }

        // Those properties are JsonIgnore because their data is inside CryptoData class for legacy reason
@ -45,7 +42,11 @@ namespace BTCPayServer.Payments.Bitcoin
        [JsonIgnore]
        public Money TxFee { get; set; }
        [JsonIgnore]
-        public BitcoinAddress DepositAddress { get; set; }
+        public String DepositAddress { get; set; }
+        public BitcoinAddress GetDepositAddress(Network network)
+        {
+            return string.IsNullOrEmpty(DepositAddress) ? null : BitcoinAddress.Create(DepositAddress, network);
+        }
        ///////////////////////////////////////////////////////////////////////////////////////
    }
 }
--- a/BTCPayServer/Payments/Bitcoin/BitcoinLikePaymentHandler.cs
+++ b/BTCPayServer/Payments/Bitcoin/BitcoinLikePaymentHandler.cs
@ -34,7 +34,7 @@ namespace BTCPayServer.Payments.Bitcoin
            Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod onchainMethod = new Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod();
            onchainMethod.FeeRate = await getFeeRate;
            onchainMethod.TxFee = onchainMethod.FeeRate.GetFee(100); // assume price for 100 bytes
-            onchainMethod.DepositAddress = await getAddress;
+            onchainMethod.DepositAddress = (await getAddress).ToString();
            return onchainMethod;
        }

--- a/BTCPayServer/Payments/Bitcoin/NBXplorerListener.cs
+++ b/BTCPayServer/Payments/Bitcoin/NBXplorerListener.cs
@ -351,11 +351,11 @@ namespace BTCPayServer.Payments.Bitcoin
            var paymentMethod = invoice.GetPaymentMethod(wallet.Network, PaymentTypes.BTCLike, _ExplorerClients.NetworkProviders);
            if (paymentMethod != null &&
                paymentMethod.GetPaymentMethodDetails() is BitcoinLikeOnChainPaymentMethod btc &&
-                btc.DepositAddress.ScriptPubKey == paymentData.Output.ScriptPubKey &&
+                btc.GetDepositAddress(wallet.Network.NBitcoinNetwork).ScriptPubKey == paymentData.Output.ScriptPubKey &&
                paymentMethod.Calculate().Due > Money.Zero)
            {
                var address = await wallet.ReserveAddressAsync(strategy);
-                btc.DepositAddress = address;
+                btc.DepositAddress = address.ToString();
                await _InvoiceRepository.NewAddress(invoiceId, btc, wallet.Network);
                _Aggregator.Publish(new InvoiceNewAddressEvent(invoiceId, address.ToString(), wallet.Network));
                paymentMethod.SetPaymentMethodDetails(btc);
--- a/BTCPayServer/Services/Invoices/InvoiceEntity.cs
+++ b/BTCPayServer/Services/Invoices/InvoiceEntity.cs
@ -582,7 +582,7 @@ namespace BTCPayServer.Services.Invoices
                return new Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod()
                {
                    FeeRate = FeeRate,
-                    DepositAddress = string.IsNullOrEmpty(DepositAddress) ? null : BitcoinAddress.Create(DepositAddress, Network?.NBitcoinNetwork),
+                    DepositAddress = string.IsNullOrEmpty(DepositAddress) ? null : DepositAddress,
                    TxFee = TxFee
                };
            }
@ -592,7 +592,7 @@ namespace BTCPayServer.Services.Invoices
                if (details is Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod btcLike)
                {
                    btcLike.TxFee = TxFee;
-                    btcLike.DepositAddress = BitcoinAddress.Create(DepositAddress, Network?.NBitcoinNetwork);
+                    btcLike.DepositAddress = string.IsNullOrEmpty(DepositAddress) ? null : DepositAddress;
                    btcLike.FeeRate = FeeRate;
                }
                return details;
--- a/BTCPayServer/Services/Invoices/InvoiceRepository.cs
+++ b/BTCPayServer/Services/Invoices/InvoiceRepository.cs
@ -130,7 +130,7 @@ namespace BTCPayServer.Services.Invoices
                        throw new InvalidOperationException("CryptoCode unsupported");
                    var paymentDestination = paymentMethod.GetPaymentMethodDetails().GetPaymentDestination();

-                    string address = GetDestination(paymentMethod);
+                    string address = GetDestination(paymentMethod, paymentMethod.Network.NBitcoinNetwork);
                    context.AddressInvoices.Add(new AddressInvoiceData()
                    {
                        InvoiceDataId = invoice.Id,
@ -162,12 +162,12 @@ namespace BTCPayServer.Services.Invoices
            return invoice;
        }

-        private static string GetDestination(PaymentMethod paymentMethod)
+        private static string GetDestination(PaymentMethod paymentMethod, Network network)
        {
            // For legacy reason, BitcoinLikeOnChain is putting the hashes of addresses in database
            if (paymentMethod.GetId().PaymentType == Payments.PaymentTypes.BTCLike)
            {
-                return ((Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod)paymentMethod.GetPaymentMethodDetails()).DepositAddress.ScriptPubKey.Hash.ToString();
+                return ((Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod)paymentMethod.GetPaymentMethodDetails()).GetDepositAddress(network).ScriptPubKey.Hash.ToString();
            }
            ///////////////
            return paymentMethod.GetPaymentMethodDetails().GetPaymentDestination();
@ -209,7 +209,7 @@ namespace BTCPayServer.Services.Invoices
                    InvoiceDataId = invoiceId,
                    CreatedTime = DateTimeOffset.UtcNow
                }
-                .Set(GetDestination(currencyData), currencyData.GetId()));
+                .Set(GetDestination(currencyData, network.NBitcoinNetwork), currencyData.GetId()));
                context.HistoricalAddressInvoices.Add(new HistoricalAddressInvoiceData()
                {
                    InvoiceDataId = invoiceId,
--- a/BTCPayServer/Services/Wallets/BTCPayWallet.cs
+++ b/BTCPayServer/Services/Wallets/BTCPayWallet.cs
@ -137,6 +137,7 @@ namespace BTCPayServer.Services.Wallets
                    entry.AbsoluteExpiration = DateTimeOffset.UtcNow + CacheSpan;
                    return result;
                });
+                _FetchingUTXOs.TryRemove(strategy.ToString(), out var unused);
                completionSource.TrySetResult(utxos);
            }
            catch (Exception ex)
--- a/BTCPayServer/Views/Invoice/Checkout.cshtml
+++ b/BTCPayServer/Views/Invoice/Checkout.cshtml
@ -93,7 +93,7 @@
                                                </div>
                                            </div>
                                            <div class="single-item-order__right">
-                                                <div>
+                                                <div class="payment__currencies">
                                                    @foreach (var crypto in Model.AvailableCryptos)
                                                    {
                                                        <a href="@crypto.Link" onclick="return changeCurrency('@crypto.PaymentMethodId');">
@ -101,6 +101,13 @@
                                                        </a>
                                                    }
                                                </div>
+                                                <div class="payment__spinner">
+                                                    <bp-spinner>
+                                                        <svg xml:space="preserve" style="enable-background:new 0 0 50 50;" version="1.1" viewBox="0 0 50 50" x="0px" xmlns="http://www.w3.org/2000/svg" y="0px">
+                                                        <path d="M11.1,29.6c-0.5-1.5-0.8-3-0.8-4.6c0-8.1,6.6-14.7,14.7-14.7S39.7,16.9,39.7,25c0,1.6-0.3,3.2-0.8,4.6l6.1,2c0.7-2.1,1.1-4.3,1.1-6.6c0-11.7-9.5-21.2-21.2-21.2S3.8,13.3,3.8,25c0,2.3,0.4,4.5,1.1,6.6L11.1,29.6z"></path>
+                                                </svg>
+                                                    </bp-spinner>
+                                                </div>
                                            </div>
                                        </div>
                                    }
@ -180,13 +187,6 @@
                                            </a>
                                        </div>
                                    </div>
-                                    <div class="payment__spinner">
-                                        <bp-spinner>
-                                            <svg xml:space="preserve" style="enable-background:new 0 0 50 50;" version="1.1" viewBox="0 0 50 50" x="0px" xmlns="http://www.w3.org/2000/svg" y="0px">
-                                            <path d="M11.1,29.6c-0.5-1.5-0.8-3-0.8-4.6c0-8.1,6.6-14.7,14.7-14.7S39.7,16.9,39.7,25c0,1.6-0.3,3.2-0.8,4.6l6.1,2c0.7-2.1,1.1-4.3,1.1-6.6c0-11.7-9.5-21.2-21.2-21.2S3.8,13.3,3.8,25c0,2.3,0.4,4.5,1.1,6.6L11.1,29.6z"></path>
-                                                </svg>
-                                        </bp-spinner>
-                                    </div>
                                    <div class="bp-view payment manual-flow enter-contact-email active" id="emailAddressView">
                                        <form class="manual__step-one refund-address-form contact-email-form" id="emailAddressForm" name="emailAddressForm" novalidate="">
                                            <div class="manual__step-one__header">
--- a/BTCPayServer/Views/Invoice/Invoice.cshtml
+++ b/BTCPayServer/Views/Invoice/Invoice.cshtml
@ -10,6 +10,9 @@
        text-overflow: ellipsis;
        white-space: nowrap;
    }
+    .money {
+        text-align: right;
+    }
 </style>

 <section>
@ -67,7 +70,7 @@
                    </tr>
                    <tr>
                        <th>Refund email</th>
-                        <td>@Model.RefundEmail</td>
+                        <td><a href="mailto:@Model.RefundEmail">@Model.RefundEmail</a></td>
                    </tr>
                    <tr>
                        <th>Order Id</th>
@ -83,7 +86,7 @@
                    </tr>
                    <tr>
                        <th>Redirect Url</th>
-                        <td>@Model.RedirectUrl</td>
+                        <td><a href="@Model.RedirectUrl">@Model.RedirectUrl</a></td>
                    </tr>
                </table>
            </div>
@ -98,7 +101,7 @@
                    </tr>
                    <tr>
                        <th>Email</th>
-                        <td>@Model.BuyerInformation.BuyerEmail</td>
+                        <td><a href="mailto:@Model.BuyerInformation.BuyerEmail">@Model.BuyerInformation.BuyerEmail</a></td>
                    </tr>
                    <tr>
                        <th>Phone</th>
@ -154,10 +157,10 @@
                    <thead class="thead-inverse">
                        <tr>
                            <th style="white-space:nowrap;">Payment method</th>
-                            <th>Rate</th>
-                            <th>Paid</th>
-                            <th>Due</th>
                            <th>Address</th>
+                            <th class="money">Rate</th>
+                            <th class="money">Paid</th>
+                            <th class="money">Due</th>
                        </tr>
                    </thead>
                    <tbody>
@ -165,10 +168,10 @@
                    {
                        <tr>
                            <td>@payment.PaymentMethod</td>
-                            <td style="text-align:right;">@payment.Rate</td>
-                            <td>@payment.Paid</td>
-                            <td>@payment.Due</td>
                            <td>@payment.Address</td>
+                            <td class="money">@payment.Rate</td>
+                            <td class="money">@payment.Paid</td>
+                            <td class="money">@payment.Due</td>
                        </tr>
                }
                    </tbody>
@ -184,19 +187,18 @@
                            <th style="white-space:nowrap;">Payment method</th>
                            <th>Deposit address</th>
                            <th>Transaction Id</th>
-                            <th>Confirmations</th>
-                            <th>Replaced</th>
+                            <th style="text-align:right;">Confirmations</th>
                        </tr>
                    </thead>
                    <tbody>
                        @foreach(var payment in Model.Payments)
                    {
+                            var replaced = payment.Replaced ? "text-decoration: line-through;" : "";
                        <tr>
-                            <td>@payment.PaymentMethod</td>
-                            <td>@payment.DepositAddress</td>
-                            <td><a href="@payment.TransactionLink" target="_blank">@payment.TransactionId</a></td>
-                            <td>@payment.Confirmations</td>
-                            <td>@payment.Replaced</td>
+                            <td style="@replaced">@payment.PaymentMethod</td>
+                            <td style="@replaced">@payment.DepositAddress</td>
+                            <td style="@replaced"><a href="@payment.TransactionLink" target="_blank">@payment.TransactionId</a></td>
+                            <td style="text-align:right;">@payment.Confirmations</td>
                        </tr>
                }
                    </tbody>
@ -211,16 +213,15 @@
                        <tr>
                            <th style="white-space:nowrap;">Payment method</th>
                            <th>Address</th>
-                            <th>Current</th>
                        </tr>
                    </thead>
                    <tbody>
                        @foreach(var address in Model.Addresses)
-                    {
+                        {
+                            var current = address.Current ? "font-weight: bold;" : "";
                        <tr>
-                            <td style="width:100px;">@address.PaymentMethod</td>
-                            <td style="max-width:100px;overflow:hidden;">@address.Destination</td>
-                            <td>@address.Current.ToString()</td>
+                            <td style="width:100px;@current">@address.PaymentMethod</td>
+                            <td style="max-width:100px;overflow:hidden;@current">@address.Destination</td>
                        </tr>
                    }
                    </tbody>
--- a/BTCPayServer/Views/Invoice/ListInvoices.cshtml
+++ b/BTCPayServer/Views/Invoice/ListInvoices.cshtml
@ -47,8 +47,8 @@
                        <th>OrderId</th>
                        <th>InvoiceId</th>
                        <th>Status</th>
-                        <th>Amount</th>
-                        <th>Actions</th>
+                        <th style="text-align:right">Amount</th>
+                        <th style="text-align:right">Actions</th>
                    </tr>
                </thead>
                <tbody>
@ -56,7 +56,16 @@
                    {
                        <tr>
                            <td>@invoice.Date</td>
-                            <td>@invoice.OrderId</td>
+                            <td>
+                                @if(invoice.RedirectUrl != string.Empty)
+                                {
+                                    <a href="@invoice.RedirectUrl">@invoice.OrderId</a>
+                                }
+                                else
+                                {
+                                    <span>@invoice.OrderId</span>
+                                }
+                            </td>
                            <td>@invoice.InvoiceId</td>
                            @if(invoice.Status == "paid")
                            {
@ -73,10 +82,15 @@
                            }
                            else
                            {
-                                <td>@invoice.Status</td>
+                                <td >@invoice.Status</td>
                            }
-                            <td>@invoice.AmountCurrency</td>
-                            <td><a asp-action="Checkout" asp-route-invoiceId="@invoice.InvoiceId">Checkout</a> - <a asp-action="Invoice" asp-route-invoiceId="@invoice.InvoiceId">Details</a></td>
+                            <td style="text-align:right">@invoice.AmountCurrency</td>
+                            <td style="text-align:right">
+                                @if(invoice.Status == "new")
+                                {
+                                    <a asp-action="Checkout" asp-route-invoiceId="@invoice.InvoiceId">Checkout</a> <span>-</span> 
+                                }<a asp-action="Invoice" asp-route-invoiceId="@invoice.InvoiceId">Details</a>
+                            </td>
                        </tr>
                    }
                </tbody>
--- a/BTCPayServer/wwwroot/css/normalizer.css
+++ b/BTCPayServer/wwwroot/css/normalizer.css
@ -10894,14 +10894,13 @@ bp-spinner {
 }

 .payment__spinner {
-    margin-top: 140px;
    display: none;
 }

    .payment__spinner > bp-spinner > svg {
-        margin: auto auto;
-        height: 60px;
-        width: 60px;
+        margin: auto 0px 0px auto;
+        height: 32px;
+        width: 32px;
        fill: gray;
        animation: spin 0.55s linear infinite;
        opacity: .85;
--- a/BTCPayServer/wwwroot/js/core.js
+++ b/BTCPayServer/wwwroot/js/core.js
@ -49,7 +49,7 @@ function onDataCallback(jsonData) {

    // restoring qr code view only when currency is switched
    if (jsonData.paymentMethodId == srvModel.paymentMethodId) {
-        $("#scan").show();
+        $(".payment__currencies").show();
        $(".payment__spinner").hide();
    }

@ -59,7 +59,7 @@ function onDataCallback(jsonData) {

 function changeCurrency(currency) {
    if (srvModel.paymentMethodId != currency) {
-        $("#scan").hide();
+        $(".payment__currencies").hide();
        $(".payment__spinner").show();
        srvModel.paymentMethodId = currency;
        fetchStatus();
Author	SHA1	Message	Date
nicolas.dorier	cbd40d49c1	bump	2018-03-13 15:56:17 +09:00
Nicolas Dorier	1d051648b7	Merge pull request #60 from lepipele/dev-lepi Bugfixing loading spinner when switching currency	2018-03-13 15:41:22 +09:00
nicolas.dorier	49cf804914	bump	2018-03-13 15:39:52 +09:00
nicolas.dorier	0f6ad75536	Remove internal exception thrown by NBitcoin	2018-03-13 15:28:39 +09:00
lepipele	56eea18b2d	Bugfixing loading spinner when switching currency Moving it to buttons so it directly interacts with actions and doesn't break form states	2018-03-13 00:34:26 -05:00
nicolas.dorier	b3698846c6	Improve UX of invoice list and invoice details	2018-03-13 09:13:16 +09:00