backend-manager 2.5.85 → 2.5.87

package/package.json

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

package/src/manager/functions/core/actions/api/user/sign-up.js

@@ -99,8 +99,9 @@ Module.prototype.signUp = function (payload) {
       result.referrerUid = payload.affiliate.referrer;
     })
     .catch((e) => {
-      payload.affiliate.referrer = undefined;
-      console.error('Failed to update affiliate code', e)
+      payload.affiliate.referrer = null;
+
+      assistant.error('Failed to update affiliate code', e)
     })
 
     // Merge the payload and the default user object
@@ -144,14 +145,15 @@ Module.prototype.signUp = function (payload) {
 
 Module.prototype.updateReferral = function (payload) {
   const self = this;
-  const result = {
-    count: 0,
-    updatedReferral: false,
-    referrerUid: undefined,
-  }
-  payload = payload || {};
 
   return new Promise(function(resolve, reject) {
+    const result = {
+      count: 0,
+      updatedReferral: false,
+      referrerUid: undefined,
+    }
+    payload = payload || {};
+        
     self.libraries.admin.firestore().collection('users')
     .where('affiliate.code', '==', payload.affiliateCode)
     .get()
@@ -183,7 +185,8 @@ Module.prototype.updateReferral = function (payload) {
             }
           }, {merge: true})
           .catch(e => {
-            console.error('Error updating referral', e);
+            self.assistant.error('Error updating referral', e);
+
             error = e;
           })
 

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

@@ -222,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') {
@@ -311,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(
@@ -428,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);
   }