backend-manager 2.5.78 → 2.5.80

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "backend-manager",
-  "version": "2.5.78",
+  "version": "2.5.80",
   "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

@@ -194,11 +194,13 @@ 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);
-    // }    
+    // Set last payment
+    if (resource.total_dues) {
+      resolved.lastPayment.amount = resource.total_dues / 100;
+      resolved.lastPayment.date.timestamp = moment(
+        (resource.due_since || 0) * 1000
+      );
+    }
 
     // Get trial
     if (resource.status === 'in_trial') {
@@ -317,11 +319,14 @@ SubscriptionResolver.prototype.resolve = function (options) {
       get(resource, 'created_at', 0)
     );
 
+    // Retrieve last payment
+    const lastPayment = resource.payments.find(p => p.status === 'CONFIRMED');
+
     // 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) {
@@ -337,7 +342,6 @@ SubscriptionResolver.prototype.resolve = function (options) {
     }
 
     // Set completed
-    const lastPayment = resource.payments.find(p => p.status === 'CONFIRMED');
     if (true) {
       resolved.payment.completed = !!lastPayment;
     }