From 4e167b35be12d4f427ea2b3e145174cd9fe71f66 Mon Sep 17 00:00:00 2001
From: Mario Dian <mariodian@gmail.com>
Date: Thu, 27 Dec 2018 13:19:51 +0800
Subject: [PATCH] Bug fixes

- fix `tip reset` when cart content changes
- fix negative cart value when deleting empty cart items
---
 BTCPayServer/wwwroot/cart/js/cart.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/BTCPayServer/wwwroot/cart/js/cart.js b/BTCPayServer/wwwroot/cart/js/cart.js
index 8a9f124ac..ca0bd8fcb 100644
--- a/BTCPayServer/wwwroot/cart/js/cart.js
+++ b/BTCPayServer/wwwroot/cart/js/cart.js
@@ -192,7 +192,6 @@ Cart.prototype.decrementItem = function(id) {
             }
         }
 
-        // Decrement the total # of items
         self.items += obj.count;
     });
 
@@ -201,23 +200,24 @@ Cart.prototype.decrementItem = function(id) {
 
 Cart.prototype.removeItemAll = function(id) {
     var self = this;
+    this.items = 0;
     
     // Remove by item
     if (typeof id != 'undefined') {
         this.content.filter(function(obj, index, arr){
-            if (obj.id === id)
-            {
+            if (obj.id === id) {
                 self.removeItem(id, index, arr);
     
                 for (var i = 0; i < obj.count; i++) {
                     self.items--;
                 }
             }
+
+            self.items += obj.count;
         });
     } else { // Remove all
         this.$list.find('tbody').empty();
         this.content = [];
-        this.items = 0;
     }
 
     this.emptyCartToggle();
@@ -402,12 +402,13 @@ Cart.prototype.listItems = function() {
             
             if (isQty) {
                 $(this).data('prev', qty);
-                self.resetTip();
             } else {
                 // User hasn't inputed any quantity
                 qty = null;
             }
 
+            self.resetTip();
+
             // Quantity was increased
             if (qtyIncreased) {
                 var item = self.content.filter(function(obj){