@xuda.io/account_module 1.2.86 → 1.2.87

package/index.js

@@ -1393,6 +1393,48 @@ exports.get_account_rt_info = async function (uid) {
   return account_info;
 };
 
+// exports.validate_account_topup = async function (uid, items = []) {
+//   const stripe_module = require(`${module_path}/stripe_module`);
+
+//   const { code, data } = await stripe_module.get_billing_metrics({ uid });
+//   if (code < 0) {
+//     throw new Error(data);
+//   }
+//   let topup = 0;
+//   for (const item of items) {
+//     topup += get_prices(uid, item);
+//   }
+
+//   // if ((!data?.customer_obj?.default_source, { billing_problem: true, topup })) {
+//   //   throw new Error("no card on file");
+//   // }
+//   debugger;
+//   if (data?.balance?.past_due) {
+//     throw new Error(`past_due ${data?.balance?.past_due}`, {
+//       billing_problem: true,
+//       topup,
+//     });
+//   }
+
+//   const balance = data?.balance?.account || 0; // minus balance represents positive balance
+
+//   if (balance > 0) {
+//     throw new Error(`negative balance ${-balance}`, {
+//       billing_problem: true,
+//       topup: topup - balance, // ask for whole balance
+//     });
+//   }
+
+//   if (topup + balance > 0) {
+//     throw new Error(`not enough balance ${topup + balance}`, {
+//       billing_problem: true,
+//       topup, //-(topup + balance)
+//     });
+//   }
+
+//   return true;
+// };
+
 exports.validate_account_topup = async function (uid, items = []) {
   const stripe_module = require(`${module_path}/stripe_module`);
 
@@ -1405,77 +1447,35 @@ exports.validate_account_topup = async function (uid, items = []) {
     topup += get_prices(uid, item);
   }
 
-  // if ((!data?.customer_obj?.default_source, { billing_problem: true, topup })) {
-  //   throw new Error("no card on file");
-  // }
-  debugger;
+  if ((!data?.customer_obj?.default_source, { billing_problem: true, topup })) {
+    throw new Error("no card on file");
+  }
   if (data?.balance?.past_due) {
-    throw new Error(`past_due ${data?.balance?.past_due}`, {
-      billing_problem: true,
-      topup,
-    });
+    let err = new Error(`past_due ${data?.balance?.past_due}`);
+    err.billing_problem = true;
+    err.topup = topup;
+    throw err;
   }
 
   const balance = data?.balance?.account || 0; // minus balance represents positive balance
 
   if (balance > 0) {
-    throw new Error(`negative balance ${-balance}`, {
-      billing_problem: true,
-      topup: topup - balance, // ask for whole balance
-    });
+    let err = new Error(`negative balance ${-balance}`);
+    err.billing_problem = true;
+    err.topup = topup - balance; // ask for whole balance
+    throw err;
   }
 
   if (topup + balance > 0) {
-    throw new Error(`not enough balance ${topup + balance}`, {
-      billing_problem: true,
-      topup, //-(topup + balance)
-    });
+    let err = new Error(`not enough balance ${topup + balance}`);
+    err.billing_problem = true;
+    err.topup = topup;
+    throw err;
   }
 
   return true;
 };
 
-// exports.validate_account_topup2 = async function (uid, items = []) {
-//   const stripe_module = require(`${module_path}/stripe_module`);
-
-//   const { code, data } = await stripe_module.get_billing_metrics({ uid });
-//   if (code < 0) {
-//     throw new Error(data);
-//   }
-//   let topup = 0;
-//   for (const item of items) {
-//     topup += get_prices(item);
-//   }
-
-//   if ((!data?.customer_obj?.default_source, { billing_problem: true, topup })) {
-//     throw new Error("no card on file");
-//   }
-//   if (data?.balance?.past_due) {
-//     let err = new Error(`past_due ${data?.balance?.past_due}`);
-//     err.billing_problem = true;
-//     err.topup = topup;
-//     throw err;
-//   }
-
-//   const balance = data?.balance?.account || 0; // minus balance represents positive balance
-
-//   if (balance > 0) {
-//     let err = new Error(`negative balance ${-balance}`);
-//     err.billing_problem = true;
-//     err.topup = topup - balance; // ask for whole balance
-//     throw err;
-//   }
-
-//   if (topup + balance > 0) {
-//     let err = new Error(`not enough balance ${topup + balance}`);
-//     err.billing_problem = true;
-//     err.topup = topup;
-//     throw err;
-//   }
-
-//   return true;
-// };
-
 const get_prices = function (uid, item) {
   let price;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xuda.io/account_module",
-  "version": "1.2.86",
+  "version": "1.2.87",
   "description": "Xuda Account Server Module",
   "main": "index.js",
   "dependencies": {