From 50125852e0d7b6cc8246277cb4f8baf51547eb5c Mon Sep 17 00:00:00 2001
From: Myztiq <kahn@runnable.com>
Date: Thu, 18 Aug 2016 16:30:29 -0700
Subject: [PATCH 1/2] REmoved stubbing of big poppa org object.

---
 client/config/routes.js | 27 ++-------------------------
 package.json            |  2 +-
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/client/config/routes.js b/client/config/routes.js
index 6407b0383..ed1518d9d 100755
--- a/client/config/routes.js
+++ b/client/config/routes.js
@@ -125,35 +125,12 @@ module.exports = [
       },
       activeOrg: function (
         $stateParams,
-        whitelists,
-        moment
+        whitelists
       ) {
         var lowerAccountName = $stateParams.userName.toLowerCase();
-        var activeOrg =  whitelists.find(function (whitelist) {
+        return whitelists.find(function (whitelist) {
           return whitelist.attrs.lowerName === lowerAccountName;
         });
-        // All of this should be moved to inside @runnable/api-client
-        activeOrg.attrs.trialEnd = moment().add(2, 'days').toISOString();
-        activeOrg.attrs.activePeriodEnd = moment().subtract(1, 'days').toISOString();
-        activeOrg.attrs.gracePeriodEnd = moment().add(5, 'days').toISOString();
-        activeOrg.attrs.stripeCustomerId = 1234;
-        activeOrg.attrs.hasPaymentMethod = false;
-        activeOrg.isInTrial = function () {
-          return moment(activeOrg.attrs.trialEnd) > moment().utc();
-        };
-        activeOrg.isInGrace = function () {
-          return !activeOrg.isInTrial() && moment(activeOrg.attrs.gracePeriodEnd) > moment().utc();
-        };
-        activeOrg.isInActivePeriod = function () {
-          return moment(activeOrg.attrs.activePeriodEnd) > moment().utc();
-        };
-        activeOrg.isGraceExpired = function () {
-          return !activeOrg.isInTrial() && moment.utc(activeOrg.attrs.gracePeriodEnd) < moment().utc();
-        };
-        activeOrg.trialDaysRemaining = function () {
-          return moment(activeOrg.attrs.trialEnd).diff(moment.utc(), 'days');
-        };
-        return activeOrg;
       },
       activeAccount: function (
         $q,
diff --git a/package.json b/package.json
index 703abe3d6..dadffa7c9 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
   ],
   "dependencies": {
     "101": "0.14.1",
-    "@runnable/api-client": "^9.0.0",
+    "@runnable/api-client": "git://github.com/Runnable/api-client.git#SAN-4781-payments-integration",
     "angular": "1.3.15",
     "angular-animate": "1.3.15",
     "angular-clipboard": "^1.1.1",

From 7e6b616f8b232a6b9d0e15c73a8fa3a834acdd35 Mon Sep 17 00:00:00 2001
From: Myztiq <kahn@runnable.com>
Date: Fri, 19 Aug 2016 16:04:23 -0700
Subject: [PATCH 2/2] Updated version of API client

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index d811bbb42..4e06d012b 100644
--- a/package.json
+++ b/package.json
@@ -50,7 +50,7 @@
   ],
   "dependencies": {
     "101": "0.14.1",
-    "@runnable/api-client": "git://github.com/Runnable/api-client.git#SAN-4781-payments-integration",
+    "@runnable/api-client": "v9.1.0",
     "angular": "1.3.15",
     "angular-animate": "1.3.15",
     "angular-clipboard": "^1.1.1",