backend-manager 2.5.84 → 2.5.86

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "2.5.84",
+  "version": "2.5.86",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {

package/src/manager/helpers/subscription-resolver.js

@@ -190,9 +190,19 @@ SubscriptionResolver.prototype.resolve = function (options) {
   } else if (profile.processor === 'chargebee') {
     // Set status
     // subscription: https://apidocs.chargebee.com/docs/api/subscriptions?prod_cat_ver=2#subscription_status
-    // future The subscription is scheduled to start at a future date. in_trial The subscription is in trial. active The subscription is active and will be charged for automatically based on the items in it. non_renewing The subscription will be canceled at the end of the current term. paused The subscription is paused. The subscription will not renew while in this state. cancelled The subscription has been canceled and is no longer in service.
+    // future The subscription is scheduled to start at a future date. 
+    // in_trial The subscription is in trial. 
+    // active The subscription is active and will be charged for automatically based on the items in it. 
+    // non_renewing The subscription will be canceled at the end of the current term. 
+    // paused The subscription is paused. The subscription will not renew while in this state. 
+    // cancelled The subscription has been canceled and is no longer in service.
     if (['in_trial', 'active'].includes(resource.status)) {
       resolved.status = 'active';
+      
+      // If there's a due invoice, it's suspended
+      if (resource.total_dues > 0) {
+        resolved.status = 'suspended';
+      }
     } else if (['paused'].includes(resource.status)) {
       resolved.status = 'suspended';
     } else {
@@ -212,7 +222,16 @@ SubscriptionResolver.prototype.resolve = function (options) {
       (
         get(resource, 'current_term_start', 0)
       ) * 1000
-    )
+    )    
+    // if (resource.total_dues > 0) {
+    //   resolved.expires.timestamp = moment(0);
+    // } else {
+    //   resolved.expires.timestamp = moment(
+    //     (
+    //       get(resource, 'current_term_start', 0)
+    //     ) * 1000
+    //   )
+    // }
 
     // Set cancelled
     if (resolved.status === 'cancelled') {
@@ -222,11 +241,16 @@ SubscriptionResolver.prototype.resolve = function (options) {
     }
 
     // Set last payment
-    if (resource.total_dues) {
-      resolved.lastPayment.amount = resource.total_dues / 100;
+    if (resource.total_dues > 0) {
+      resolved.lastPayment.amount = 0;
       resolved.lastPayment.date.timestamp = moment(
         (resource.due_since || 0) * 1000
       );
+    } else {
+      resolved.lastPayment.amount = resource.plan_amount / 100;
+      resolved.lastPayment.date.timestamp = moment(
+        (resource.current_term_start || 0) * 1000
+      );
     }
 
     // Get trial
@@ -296,6 +320,7 @@ SubscriptionResolver.prototype.resolve = function (options) {
     }    
 
     // Set last payment
+    // TODO: check if suspended payments are handled correctly when using resource.latest_invoice.amount_paid
     if (resource.latest_invoice) {
       resolved.lastPayment.amount = resource.latest_invoice.amount_paid / 100;
       resolved.lastPayment.date.timestamp = moment(
@@ -413,8 +438,11 @@ SubscriptionResolver.prototype.resolve = function (options) {
     }
   }
 
-  // If there was NEVER any payment sent AND they are not trialing
-  if (!resolved.payment.completed && !resolved.trial.active) {
+  // If they are not trialing AND there was NEVER any payment sent OR the last payment failed, then set the expiration to 0
+  if (
+    !resolved.trial.active
+    && (!resolved.payment.completed || resolved.lastPayment.amount === 0)
+  ) {
     resolved.expires.timestamp = moment(0);
   }