jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

currentSubscription is not required anymore

Browse Source
This commit is contained in:
Johannes Zellner
2018-03-14 19:53:31 +01:00
parent a618f2b523
commit f8ad2fdc11
1 changed files with 12 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
webadmin/src/js/main.js
View File

@@ -7,7 +7,6 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
$scope.config = {};
$scope.status = {};
$scope.client = Client;
$scope.currentSubscription = null;
$scope.appstoreConfig = {};
$scope.hideNavBarActions = $location.path() === '/logs';
@@ -56,8 +55,6 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
AppStore.getSubscription($scope.appstoreConfig, function (error, result) {
if (error) return console.error(error);
$scope.currentSubscription = result;
// check again to give more immediate feedback once a subscription was setup
if (result.plan.id === 'undecided' || result.plan.id === 'free') {
$timeout(checkPlan, 5000);
@@ -88,8 +85,6 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
$('#setupSubscriptionModal').modal('show');
} else if ($scope.config.provider === 'caas') {
$('#updateModal').modal('show');
} else if (!$scope.currentSubscription || !$scope.currentSubscription.plan) {
// do nothing as we were not able to get a subscription, yet
} else {
$('#updateModal').modal('show');
}
@@ -157,28 +152,6 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
});
}
$scope.getSubscription = function () {
Client.getAppstoreConfig(function (error, result) {
if (error) return console.error(error);
if (result.token) {
$scope.appstoreConfig = result;
AppStore.getProfile(result.token, function (error, result) {
if (error) return console.error(error);
$scope.appstoreConfig.profile = result;
AppStore.getSubscription($scope.appstoreConfig, function (error, result) {
if (error) return console.error(error);
$scope.currentSubscription = result;
});
});
}
});
}
Client.getStatus(function (error, status) {
if (error) return $scope.error(error);
@@ -215,7 +188,6 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
window.location.reload(true);
}
Client.refreshUserInfo(function (error) {
if (error) return $scope.error(error);
@@ -232,7 +204,18 @@ angular.module('Application').controller('MainController', ['$scope', '$route',
if ($scope.user.admin) {
runConfigurationChecks();
if ($scope.config.provider !== 'caas') $scope.getSubscription();
Client.getAppstoreConfig(function (error, result) {
if (error) return console.error(error);
if (!result.token) return;
$scope.appstoreConfig = result;
AppStore.getProfile(result.token, function (error, result) {
if (error) return console.error(error);
$scope.appstoreConfig.profile = result;
});
});
}
});
});