From 3ab69046b09dd862b4e771454164ed0d7379ac92 Mon Sep 17 00:00:00 2001
From: "nicolas.dorier" <nicolas.dorier@gmail.com>
Date: Fri, 4 May 2018 02:01:43 +0900
Subject: [PATCH] Add overpaid column Fix #149

---
 .../Controllers/InvoiceController.UI.cs       |  1 +
 .../InvoicingModels/InvoiceDetailsModel.cs    |  1 +
 BTCPayServer/Views/Invoice/Invoice.cshtml     | 23 +++++++++++++------
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/BTCPayServer/Controllers/InvoiceController.UI.cs b/BTCPayServer/Controllers/InvoiceController.UI.cs
index a34ee14e2..93bd37004 100644
--- a/BTCPayServer/Controllers/InvoiceController.UI.cs
+++ b/BTCPayServer/Controllers/InvoiceController.UI.cs
@@ -75,6 +75,7 @@ namespace BTCPayServer.Controllers
                 cryptoPayment.PaymentMethod = ToString(paymentMethodId);
                 cryptoPayment.Due = accounting.Due.ToString() + $" {paymentMethodId.CryptoCode}";
                 cryptoPayment.Paid = accounting.CryptoPaid.ToString() + $" {paymentMethodId.CryptoCode}";
+                cryptoPayment.Overpaid = (accounting.DueUncapped > Money.Zero ? Money.Zero : -accounting.DueUncapped).ToString() + $" {paymentMethodId.CryptoCode}";
 
                 var onchainMethod = data.GetPaymentMethodDetails() as Payments.Bitcoin.BitcoinLikeOnChainPaymentMethod;
                 if (onchainMethod != null)
diff --git a/BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs b/BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs
index 36b270c2b..32717a939 100644
--- a/BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs
+++ b/BTCPayServer/Models/InvoicingModels/InvoiceDetailsModel.cs
@@ -18,6 +18,7 @@ namespace BTCPayServer.Models.InvoicingModels
             public string Address { get; internal set; }
             public string Rate { get; internal set; }
             public string PaymentUrl { get; internal set; }
+            public string Overpaid { get; set; }
         }
         public class AddressModel
         {
diff --git a/BTCPayServer/Views/Invoice/Invoice.cshtml b/BTCPayServer/Views/Invoice/Invoice.cshtml
index 18446e0ab..66f4674e4 100644
--- a/BTCPayServer/Views/Invoice/Invoice.cshtml
+++ b/BTCPayServer/Views/Invoice/Invoice.cshtml
@@ -11,6 +11,7 @@
     .smMaxWidth {
         max-width: 200px;
     }
+
     @@media (min-width: 768px) {
         .smMaxWidth {
             max-width: 400px;
@@ -166,10 +167,14 @@
                             <th class="text-right">Rate</th>
                             <th class="text-right">Paid</th>
                             <th class="text-right">Due</th>
+                            @if(Model.StatusException == "paidOver")
+                            {
+                                <th class="text-right">Overpaid</th>
+                            }
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach (var payment in Model.CryptoPayments)
+                        @foreach(var payment in Model.CryptoPayments)
                         {
                             <tr>
                                 <td>@payment.PaymentMethod</td>
@@ -177,13 +182,17 @@
                                 <td class="text-right">@payment.Rate</td>
                                 <td class="text-right">@payment.Paid</td>
                                 <td class="text-right">@payment.Due</td>
+                                @if(Model.StatusException == "paidOver")
+                                {
+                                    <td class="text-right">@payment.Overpaid</td>
+                                }
                             </tr>
                         }
                     </tbody>
                 </table>
             </div>
         </div>
-        @if (Model.OnChainPayments.Count > 0)
+        @if(Model.OnChainPayments.Count > 0)
         {
             <div class="row">
                 <div class="col-md-12">
@@ -198,7 +207,7 @@
                             </tr>
                         </thead>
                         <tbody>
-                            @foreach (var payment in Model.OnChainPayments)
+                            @foreach(var payment in Model.OnChainPayments)
                             {
                                 var replaced = payment.Replaced ? "class='linethrough'" : "";
                                 <tr @replaced>
@@ -217,7 +226,7 @@
                 </div>
             </div>
         }
-        @if (Model.OffChainPayments.Count > 0)
+        @if(Model.OffChainPayments.Count > 0)
         {
             <div class="row">
                 <div class="col-md-12">
@@ -230,7 +239,7 @@
                             </tr>
                         </thead>
                         <tbody>
-                            @foreach (var payment in Model.OffChainPayments)
+                            @foreach(var payment in Model.OffChainPayments)
                             {
                                 <tr>
                                     <td>@payment.Crypto</td>
@@ -253,7 +262,7 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach (var address in Model.Addresses)
+                        @foreach(var address in Model.Addresses)
                         {
                             var current = address.Current ? "font-weight-bold" : "";
                             <tr>
@@ -277,7 +286,7 @@
                         </tr>
                     </thead>
                     <tbody>
-                        @foreach (var evt in Model.Events)
+                        @foreach(var evt in Model.Events)
                         {
                             <tr>
                                 <td>@evt.Timestamp</td>