diff --git a/package.json b/package.json index d379585564..bfb99e9ff6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "bitwarden", "version": "1.9.1", - "production": true, + "production": false, "devDependencies": { "connect": "3.6.0", "lodash": "4.17.4", diff --git a/src/app/filters/jsonDateFilter.js b/src/app/filters/jsonDateFilter.js deleted file mode 100644 index 8d05e4a124..0000000000 --- a/src/app/filters/jsonDateFilter.js +++ /dev/null @@ -1,8 +0,0 @@ -angular - .module('bit.filters') - - .filter('jsonDate', function () { - return function (input) { - return input.split('T').join(' '); - }; - }); diff --git a/src/app/organization/organizationBillingChangePaymentController.js b/src/app/organization/organizationBillingChangePaymentController.js new file mode 100644 index 0000000000..422e001f50 --- /dev/null +++ b/src/app/organization/organizationBillingChangePaymentController.js @@ -0,0 +1,23 @@ +angular + .module('bit.organization') + + .controller('organizationBillingChangePaymentController', function ($scope, $state, $uibModalInstance, apiService, stripe, + $analytics) { + $scope.submit = function () { + $scope.submitPromise = stripe.card.createToken($scope.card).then(function (response) { + var request = { + paymentToken: response.id + }; + + return apiService.organizations.putPayment({ id: $state.params.orgId }, request).$promise; + }).then(function (response) { + $scope.card = null; + $analytics.eventTrack('Changed Payment Method'); + $uibModalInstance.close(); + }); + }; + + $scope.close = function () { + $uibModalInstance.dismiss('cancel'); + }; + }); diff --git a/src/app/organization/organizationBillingController.js b/src/app/organization/organizationBillingController.js index 9202a54edc..1074272279 100644 --- a/src/app/organization/organizationBillingController.js +++ b/src/app/organization/organizationBillingController.js @@ -1,7 +1,7 @@ angular .module('bit.organization') - .controller('organizationBillingController', function ($scope, apiService, $state) { + .controller('organizationBillingController', function ($scope, apiService, $state, $uibModal) { $scope.charges = []; $scope.paymentSource = null; $scope.plan = null; @@ -63,7 +63,15 @@ }); $scope.changePayment = function () { + var modal = $uibModal.open({ + animation: true, + templateUrl: 'app/organization/views/organizationBillingChangePayment.html', + controller: 'organizationBillingChangePaymentController' + }); + modal.result.then(function () { + // TODO: reload + }); }; $scope.cancel = function () { diff --git a/src/app/organization/views/organizationBilling.html b/src/app/organization/views/organizationBilling.html index d77b4fbc6b..9f81765853 100644 --- a/src/app/organization/views/organizationBilling.html +++ b/src/app/organization/views/organizationBilling.html @@ -14,17 +14,17 @@