diff --git a/src/js/client.js b/src/js/client.js index 459ade1c8..661343fe2 100644 --- a/src/js/client.js +++ b/src/js/client.js @@ -630,15 +630,6 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N }); }; - Client.prototype.getCaasConfig = function (callback) { - get('/api/v1/caas/config', null, function (error, data, status) { - if (error) return callback(error); - if (status !== 200) return callback(new ClientError(status, data)); - - callback(null, data); - }); - }; - Client.prototype.addAuthorizedKey = function (key, callback) { put('/api/v1/cloudron/ssh/authorized_keys', { key: key }, null, function (error, data, status) { if (error) return callback(error); @@ -1153,18 +1144,6 @@ angular.module('Application').service('Client', ['$http', '$interval', 'md5', 'N }); }; - Client.prototype.changePlan = function (options, password, callback) { - var data = options; - data.password = password; - - post('/api/v1/caas/change_plan', data, null, function (error, data, status) { - if (error) return callback(error); - if (status !== 202) return callback(new ClientError(status, data)); - - callback(null, data); - }); - }; - Client.prototype.setAdmin = function (domain, password, callback) { post('/api/v1/domains/' + domain + '/set_admin', { password: password }, null, function (error, data, status) { if (error) return callback(error); diff --git a/src/views/settings.html b/src/views/settings.html index ea4c2670f..5d00bd47a 100644 --- a/src/views/settings.html +++ b/src/views/settings.html @@ -91,45 +91,6 @@ - - -
@@ -153,10 +114,6 @@ Name {{ config.cloudronName }} - - Model - {{ caasConfig.size }} - {{ caasConfig.region }} - Version {{ config.version }} @@ -192,38 +149,6 @@
-
-

Plans

-
- -
-
-
- Change payment method - or - Cancel this Cloudron -
-
-
-
-
- -
-
-
- -
-
- -
-
-
-

Cloudron.io Account

diff --git a/src/views/settings.js b/src/views/settings.js index a984e9b02..db35860e0 100644 --- a/src/views/settings.js +++ b/src/views/settings.js @@ -6,16 +6,9 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca $scope.client = Client; $scope.user = Client.getUserInfo(); $scope.config = Client.getConfig(); - $scope.caasConfig = {}; $scope.appstoreConfig = {}; $scope.installedApps = Client.getInstalledApps(); - $scope.currency = null; - $scope.availableRegions = []; - $scope.currentRegionSlug = null; - $scope.availablePlans = []; - $scope.currentPlan = null; - $scope.subscription = null; $scope.prettyProviderName = function (provider) { @@ -123,59 +116,6 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca } }; - $scope.planChange = { - busy: false, - error: {}, - password: '', - requestedPlan: null, - - showChangePlan: function () { - $('#planChangeModal').modal('show'); - }, - - planChangeReset: function () { - $scope.planChange.error.password = null; - $scope.planChange.password = ''; - - $scope.planChangeForm.$setPristine(); - $scope.planChangeForm.$setUntouched(); - }, - - doChangePlan: function () { - $scope.planChange.busy = true; - - var options = { - size: $scope.planChange.requestedPlan.slug, - name: $scope.planChange.requestedPlan.name, - price: $scope.planChange.requestedPlan.price, - region: $scope.currentRegionSlug - }; - - Client.changePlan(options, $scope.planChange.password, function (error) { - $scope.planChange.busy = false; - - if (error) { - if (error.statusCode === 403) { - $scope.planChange.error.password = true; - $scope.planChange.password = ''; - $scope.planChangeForm.password.$setPristine(); - $('#inputPlanChangePassword').focus(); - } else { - console.error('Unable to change plan.', error); - } - } else { - $scope.planChange.planChangeReset(); - - $('#planChangeModal').modal('hide'); - - window.location.href = '/update.html'; - } - - $scope.planChange.busy = false; - }); - } - }; - $scope.avatarChange = { busy: false, error: {}, @@ -369,35 +309,6 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca }); } - function getPlans() { - AppStore.getSizes(function (error, result) { - if (error) return console.error(error); - - var found = false; - var SIZE_SLUGS = [ '512mb', '1gb', '2gb', '4gb', '8gb', '16gb', '32gb', '48gb', '64gb' ]; - result = result.filter(function (size) { - // only show plans bigger than the current size - if (found) return true; - found = SIZE_SLUGS.indexOf(size.slug) > SIZE_SLUGS.indexOf($scope.caasConfig.plan.slug); - return found; - }); - angular.copy(result, $scope.availablePlans); - - // prepend the current plan - $scope.availablePlans.unshift($scope.caasConfig.plan); - - $scope.planChange.requestedPlan = $scope.availablePlans[0]; // need the reference to preselect - - AppStore.getRegions(function (error, result) { - if (error) return console.error(error); - - angular.copy(result, $scope.availableRegions); - - $scope.currentRegionSlug = $scope.caasConfig.region; - }); - }); - } - $('#avatarFileInput').get(0).onchange = function (event) { var fr = new FileReader(); fr.onload = function () { @@ -467,18 +378,7 @@ angular.module('Application').controller('SettingsController', ['$scope', '$loca $scope.update.checkStatus(); - if ($scope.config.provider === 'caas') { - Client.getCaasConfig(function (error, caasConfig) { - if (error) return console.error(error); - - $scope.caasConfig = caasConfig; - - getPlans(); - - $scope.currentPlan = caasConfig.plan; - $scope.currency = caasConfig.currency === 'eur' ? '€' : '$'; - }); - } else if (!$scope.config.managed) { + if (!$scope.config.managed) { Client.getAppstoreConfig(function (error, appstoreConfig) { if (error) return console.error(error); if (!appstoreConfig.token) return;