Merge pull request #1683 from CodeNow/SAN-4839-refresh-cc-information

Fix bug where payment method wouldn't refresh until after page load

Author: Myztiq

client/directives/modals/settingsModal/forms/billingForm/changePaymentForm/changePaymentFormController.js

@@ -6,11 +6,13 @@ require('app')
 function ChangePaymentFormController(
   $rootScope,
   currentOrg,
+  errs,
   fetchPaymentMethod,
+  fetchPlan,
+  fetchWhitelists,
   loading,
   savePaymentMethod,
-  stripe,
-  fetchPlan
+  stripe
 ) {
   var CPFC = this;
   CPFC.currentOrg = currentOrg;
@@ -44,6 +46,9 @@ function ChangePaymentFormController(
         .then(function (res) {
           return savePaymentMethod(res.id);
         })
+        .then(function () {
+          return fetchWhitelists();
+        })
         .then(function () {
           // Not doing an angular timeout because we don't care about the digest.
           // We want to wait for this form to no longer be visible before we clear it and cause error outlines to show.
@@ -60,6 +65,9 @@ function ChangePaymentFormController(
           } else {
             CPFC.error = messageConversion[err.type];
           }
+          if (!CPFC.error) {
+            errs.handler(err);
+          }
         })
         .finally(function () {
           loading('savePayment', false);

test/unit/directives/modals/settingsModal/forms/billingForm/changePaymentForm/changePaymentFormController.unit.js

@@ -14,6 +14,7 @@ describe('ChangePaymentFormController'.bold.underline.blue, function () {
   var savePaymentMethodStub;
   var mockCurrentOrg;
   var mockFetchPlan;
+  var mockFetchWhitelists;
 
   beforeEach(function () {
     mockCurrentOrg = {
@@ -35,6 +36,10 @@ describe('ChangePaymentFormController'.bold.underline.blue, function () {
         mockFetchPlan = sinon.stub().returns($q.when({}));
         return mockFetchPlan;
       });
+      $provide.factory('fetchWhitelists', function ($q) {
+        mockFetchWhitelists = sinon.stub().returns($q.when([]));
+        return mockFetchWhitelists;
+      });
       $provide.factory('fetchPaymentMethod', function ($q) {
         fetchPaymentMethodStub = sinon.stub().returns($q.when({}));
         fetchPaymentMethodStub.cache = {
@@ -89,7 +94,6 @@ describe('ChangePaymentFormController'.bold.underline.blue, function () {
         sinon.assert.calledWith(loadingStub, 'savePayment', true);
         sinon.assert.calledWith(loadingStub, 'savePayment', false);
         sinon.assert.calledWith(loadingStub.reset, 'savePayment');
-
         sinon.assert.calledOnce(savePaymentMethodStub);
         sinon.assert.calledWith(savePaymentMethodStub, 123);
         sinon.assert.calledOnce(fetchPaymentMethodStub.cache.clear);