Merge pull request #2189 from CodeNow/SAN-6074

SAN-6074 Remove billing options

Author: damienrunnable

client/controllers/controllerApp.js

@@ -188,6 +188,9 @@ function ControllerApp(
   };
 
   if (currentOrg.isPaymentDue()) {
+    if (!currentOrg.isBillingVisible()) {
+      return $state.go('paused');
+    }
     // Determine if it's a trial end or just a normal payment due
     if (currentOrg.poppa.attrs.hasPaymentMethod) {
       ModalService.showModal({

client/directives/accountsSelect/popoverAccountMenu/viewPopoverAccountMenu.jade

@@ -23,6 +23,7 @@
           )
             li.list-item.popover-list-item.small.disabled {{data.currentOrg.github.oauthName()}} Settings
             li.list-item.popover-list-item(
+              ng-if = "data.currentOrg.isBillingVisible()"
               ng-click = "actions.openSettingsModal('billing')"
             )
               svg.iconnables

client/directives/modals/settingsModal/settingsModalView.jade

@@ -19,6 +19,7 @@
       .row.modal-tabs.tabs-all.grid-block.clearfix
         button.btn.btn-radio.grid-block.vertical(
           ng-attr-data-badge-count = "{{SEMC.currentOrg.poppa.isInTrial() && !SEMC.currentOrg.poppa.attrs.hasPaymentMethod ? SEMC.currentOrg.poppa.trialDaysRemaining() : ''}}"
+          ng-if = "SEMC.currentOrg.isBillingVisible()"
           ng-class = "{\
             'active': SEMC.currentTab === 'billing',\
             'badge': SEMC.currentOrg.poppa.isInTrial() && !SEMC.currentOrg.poppa.attrs.hasPaymentMethod,\

client/services/createAndBuildNewContainerService.js

@@ -61,6 +61,10 @@ function createAndBuildNewContainer(
       user: fetchUser()
     })
       .then(function (response) {
+        if (!currentOrg.isBillingVisible()) {
+          return response;
+        }
+
         return fetchPlan()
           .then(function (plan) {
             oldPlanId = keypather.get(plan, 'next.id');
@@ -109,7 +113,11 @@ function createAndBuildNewContainer(
           var repoName = instance.getRepoName();
           invitePersonalRunnabot({githubUsername: githubUsername, repoName: repoName});
         }
-        alertContainerCreated(oldPlanId);
+
+        if (currentOrg.isBillingVisible()) {
+          alertContainerCreated(oldPlanId);
+        }
+
         return instance;
       })
       .catch(function (err) {

client/services/currentOrgService.js

@@ -34,5 +34,10 @@ function currentOrg(
     return org.poppa.attrs.isPermanentlyBanned || !org.poppa.attrs.isActive;
   };
 
+  org.isBillingVisible = function () {
+    // Hide when onPrem or when FF is on
+    return !(keypather.get(org, 'poppa.isOnPrem') || featureFlags.flags.hideBilling);
+  };
+
   return org;
 }

client/services/featureFlagService.js

@@ -35,6 +35,7 @@ function featureFlags(
     envVars2: false, // new env vars
     fullScreen: false, // toggles full screen
     fullScreenToggle: false, // toggles the button that toggles full screen
+    hideBilling: false,
     hideExplorer: false,
     hostnameNotifications: false,
     hostnameTool: false,

test/unit/controllers/controllerApp.unit.js

@@ -43,7 +43,8 @@ describe('controllerApp'.bold.underline.blue, function () {
         }
       },
       willAcceptPayment: sinon.stub().returns(true),
-      isPaymentDue: sinon.stub().returns(true)
+      isPaymentDue: sinon.stub().returns(true),
+      isBillingVisible: sinon.stub().returns(true)
     };
     ctx = {};
     ctx.fetchInstancesByPodMock = new (require('../fixtures/mockFetch'))();

test/unit/controllers/controllerInstances.unit.js

@@ -70,7 +70,7 @@ describe('ControllerInstances'.bold.underline.blue, function () {
       org1: {
         models: [{
           attrs: angular.copy(apiMocks.instances.building)
-        }]
+        }],
       },
       org2: {
         models: []
@@ -103,7 +103,8 @@ describe('ControllerInstances'.bold.underline.blue, function () {
             hasCompletedDemo: true
           }
         }
-      }
+      },
+      isBillingVisible: sinon.stub().returns(true)
     };
     mockBranch = {
       name: 'mockBranch',

test/unit/services/createAndBuildNewContainerService.unit.js

@@ -20,6 +20,26 @@ describe('createAndBuildNewContainer'.bold.underline.blue, function () {
     var errsStub;
     var alertContainerCreatedStub;
 
+    var mockCurrentOrg = {
+      poppa: {
+        trialDaysRemaining: sinon.stub(),
+        isInTrial: sinon.stub(),
+        isInGrace: sinon.stub(),
+        isGraceExpired: sinon.stub(),
+        attrs: {
+          hasPaymentMethod: false
+        }
+      },
+      github: {
+        attrs: {
+          id: 'githubId1234'
+        }
+      },
+      willAcceptPayment: sinon.stub().returns(true),
+      isPaymentDue: sinon.stub().returns(true),
+      isBillingVisible: sinon.stub().returns(true)
+    };
+
     function createMasterPods() {
       ctx.masterPods = runnable.newInstances(
         [apiMocks.instances.building, apiMocks.instances.runningWithContainers[0]],
@@ -90,6 +110,7 @@ describe('createAndBuildNewContainer'.bold.underline.blue, function () {
           return mockFetchPlan;
         });
         $provide.value('errs', errsStub);
+        $provide.value('currentOrg', mockCurrentOrg);
       });
       angular.mock.inject(function (
         _$rootScope_,