backend-manager 2.5.77 → 2.5.78

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "2.5.77",
+  "version": "2.5.78",
   "description": "Quick tools for developing Firebase functions",
   "main": "src/manager/index.js",
   "bin": {
@@ -62,4 +62,4 @@
     "wonderful-fetch": "^0.0.17",
     "yargs": "^17.7.1"
   }
-}
+}

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

@@ -116,14 +116,27 @@ SubscriptionResolver.prototype.resolve = function (options) {
       get(resource, 'billing_info.last_payment.time', 0)
     )
 
+    // Set last payment
+    if (get(resource, 'billing_info.last_payment')) {
+      resolved.lastPayment.amount = parseFloat(resource.billing_info.last_payment.amount.value);
+      resolved.lastPayment.date.timestamp = moment(resource.billing_info.last_payment.time);
+    } 
+
     // Get trial
     const trialTenure = get(resource, 'plan.billing_cycles', []).find((cycle) => cycle.tenure_type === 'TRIAL');
     const regularTenure = get(resource, 'plan.billing_cycles', []).find((cycle) => cycle.tenure_type === 'REGULAR');
 
     // Resolve trial
+    /* 
+      Special condition for PayPal 
+      Because you cannot remove trial on a sub-level, you have to charge a prorated amount for the "trial".
+      Even if charged, it is still considered a trial period by paypal.
+      Thus, we must remove the trial indicator if the user has been charged.
+    */
     if (
       resolved.status === 'active'
       && (trialTenure && regularTenure && regularTenure.total_cycles === 0)
+      && resolved.lastPayment.amount === 0
     ) {
       resolved.trial.active = true;
       
@@ -154,12 +167,6 @@ SubscriptionResolver.prototype.resolve = function (options) {
       resolved.payment.completed = !['CREATED', 'SAVED', 'APPROVED', 'VOIDED', 'PAYER_ACTION_REQUIRED'].includes(resource.status);         
     }
 
-    // Set last payment
-    if (resource.billing_info && resource.billing_info.last_payment) {
-      resolved.lastPayment.amount = parseFloat(resource.billing_info.last_payment.amount.value);
-      resolved.lastPayment.date.timestamp = moment(resource.billing_info.last_payment.time);
-    }
-
   } else if (profile.processor === 'chargebee') {
     // Set status
     // subscription: https://apidocs.chargebee.com/docs/api/subscriptions?prod_cat_ver=2#subscription_status
@@ -187,6 +194,12 @@ SubscriptionResolver.prototype.resolve = function (options) {
       ) * 1000
     )
 
+    // Set last payment @@@ TODO
+    // if (resource.billing_info && resource.billing_info.last_payment) {
+    //   resolved.lastPayment.amount = parseFloat(resource.billing_info.last_payment.amount.value);
+    //   resolved.lastPayment.date.timestamp = moment(resource.billing_info.last_payment.time);
+    // }    
+
     // Get trial
     if (resource.status === 'in_trial') {
       resolved.trial.active = true;
@@ -218,12 +231,6 @@ SubscriptionResolver.prototype.resolve = function (options) {
       resolved.payment.completed = !['future'].includes(resource.status);
     }
 
-    // Set last payment @@@ TODO
-    // if (resource.billing_info && resource.billing_info.last_payment) {
-    //   resolved.lastPayment.amount = parseFloat(resource.billing_info.last_payment.amount.value);
-    //   resolved.lastPayment.date.timestamp = moment(resource.billing_info.last_payment.time);
-    // }
-
   } else if (profile.processor === 'stripe') {
     // Subscription: https://stripe.com/docs/api/subscriptions/object#subscription_object-status
     // incomplete, incomplete_expired, trialing, active, past_due, canceled, or unpaid
@@ -252,6 +259,14 @@ SubscriptionResolver.prototype.resolve = function (options) {
       get(resource, 'current_period_start', 0) * 1000
     );
 
+    // Set last payment
+    if (resource.latest_invoice) {
+      resolved.lastPayment.amount = resource.latest_invoice.amount_paid / 100;
+      resolved.lastPayment.date.timestamp = moment(
+        get(resource, 'latest_invoice.created', 0) * 1000
+      );
+    }    
+
     // Get trial
     if (resource.status === 'trialing') {
       resolved.trial.active = true;
@@ -264,7 +279,7 @@ SubscriptionResolver.prototype.resolve = function (options) {
       )
     }
 
-    // Resolve frequency @@@
+    // Resolve frequency
     const unit = resource.plan.interval;
     if (unit === 'year') {
       resolved.frequency = 'annually';
@@ -285,14 +300,6 @@ SubscriptionResolver.prototype.resolve = function (options) {
       resolved.payment.completed = !['requires_payment_method', 'requires_confirmation', 'requires_action', 'processing', 'requires_capture', 'canceled'].includes(resource.status);      
     }
 
-    // Set last payment
-    if (resource.latest_invoice) {
-      resolved.lastPayment.amount = resource.latest_invoice.amount_paid / 100;
-      resolved.lastPayment.date.timestamp = moment(
-        get(resource, 'latest_invoice.created', 0) * 1000
-      );
-    }
-
   } else if (profile.processor === 'coinbase') {
     // Set status
     resolved.status = 'cancelled';
@@ -310,6 +317,12 @@ SubscriptionResolver.prototype.resolve = function (options) {
       get(resource, 'created_at', 0)
     );
 
+    // Set last payment
+    if (lastPayment) {
+      resolved.lastPayment.amount = parseFloat(lastPayment.value.local.amount);
+      resolved.lastPayment.date.timestamp = moment(lastPayment.detected_at);
+    }    
+
     // Get trial
     if (true) {
       resolved.trial.active = false;
@@ -329,12 +342,6 @@ SubscriptionResolver.prototype.resolve = function (options) {
       resolved.payment.completed = !!lastPayment;
     }
 
-    // Set last payment
-    if (lastPayment) {
-      resolved.lastPayment.amount = parseFloat(lastPayment.value.local.amount);
-      resolved.lastPayment.date.timestamp = moment(lastPayment.detected_at);
-    }
-
   } else {
     throw new Error('Unknown processor');
   }