separate tips from amounts

1 files changed, 9 insertions, 13 deletions

diff --git a/lib/payments.js b/lib/payments.js
index ff6e9ba5..0a59a868 100644
--- a/lib/payments.js
+++ b/lib/payments.js
@@ -13,7 +13,7 @@ export const types = {
   bitcoin: "bitcoin",
   lightning: "lightning",
   pot: "pot",
-  classic: "classic"
+  classic: "classic",
 };
 
 export let debit = async (
@@ -25,7 +25,7 @@ export let debit = async (
   type = types.internal,
   id = v4()
 ) => {
-  let ref, tip;
+  let ref;
   let { id: uid, currency, username } = user;
 
   let rate = store.rates[currency];
@@ -36,7 +36,7 @@ export let debit = async (
     if (Math.abs(invoice.rate / rate - 1) < 0.01) rate = invoice.rate;
   }
 
-  amount = parseInt(amount);
+  let tip = parseInt(invoice?.tip) || null;
 
   if (!amount || amount < 0) fail("Amount must be greater than zero");
 
@@ -54,24 +54,20 @@ export let debit = async (
         user.username,
         balance,
         amount,
+        tip,
         fee,
         ourfee,
-        amount + fee + ourfee
+        amount + fee + ourfee + tip
       );
-      if (balance < amount + fee + ourfee) fail("Insufficient funds");
+      if (balance < amount + tip + fee + ourfee) fail("Insufficient funds");
       await db
         .multi()
         .decrBy(`credit:${type}:${uid}`, covered)
-        .decrBy(`balance:${uid}`, amount + fee + ourfee)
+        .decrBy(`balance:${uid}`, amount + tip + fee + ourfee)
         .exec();
     });
   });
 
-  if (invoice?.tip) {
-    tip = invoice.tip;
-    amount -= tip;
-  }
-
   let p = {
     id,
     amount: -amount,
@@ -85,7 +81,7 @@ export let debit = async (
     type,
     ref,
     tip,
-    created: Date.now()
+    created: Date.now(),
   };
 
   await s(`payment:${id}`, p);
@@ -120,7 +116,7 @@ export let credit = async (hash, amount, memo, ref, type = types.internal) => {
     ref,
     type,
     confirmed: true,
-    created: Date.now()
+    created: Date.now(),
   };
 
   let { tip } = invoice;