krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 07:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed cancel sub button and added info for apple/google subs (Fixes #8642) (#8666)

Browse Source 
* Removed cancel sub button and added info for apple/google subs

* Refactored logic and constants from subscriptions view
This commit is contained in:
Kevin Smith
2017-05-24 17:13:44 +01:00
committed by Keith Holliday
parent b4d5c634b3
commit ba66a1c098
4 changed files with 71 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
website/client-old/js/controllers/settingsCtrl.js
View File

@@ -2,8 +2,8 @@
// Make user and settings available for everyone through root scope.
habitrpg.controller('SettingsCtrl',
['$scope', 'User', '$rootScope', '$http', 'ApiUrl', 'Guide', '$location', '$modalStack', '$timeout', 'Content', 'Notification', 'Shared', 'Social', '$compile',
function($scope, User, $rootScope, $http, ApiUrl, Guide, $location, $modalStack, $timeout, Content, Notification, Shared, Social, $compile) {
['$scope', 'User', '$rootScope', '$http', 'ApiUrl', 'Guide', '$location', '$modalStack', '$timeout', 'Content', 'Notification', 'Shared', 'Social', '$compile', '$sce', 'Payments',
function($scope, User, $rootScope, $http, ApiUrl, Guide, $location, $modalStack, $timeout, Content, Notification, Shared, Social, $compile, $sce, Payments) {
var RELEASE_ANIMAL_TYPES = {
pets: 'releasePets',
mounts: 'releaseMounts',
@@ -341,6 +341,49 @@ habitrpg.controller('SettingsCtrl',
$scope.socialLogin = Social.socialLogin;
$scope.hasSubscription = function (user) {
return !!user.purchased.plan.customerId;
}
$scope.hasCanceledSubscription = function (user) {
return (
$scope.hasSubscription(user) &&
!!user.purchased.plan.dateTerminated
);
}
$scope.canCancelSubscription = function (user) {
return (
user.purchased.plan.paymentMethod !== Payments.paymentMethods.GOOGLE &&
user.purchased.plan.paymentMethod !== Payments.paymentMethods.APPLE &&
!$scope.hasCanceledSubscription(user) &&
!$scope.hasGroupPlan(user)
);
};
$scope.hasPlan = function (user) {
return !!user.purchased.plan.planId;
};
$scope.hasGroupPlan = function (user) {
return user.purchased.plan.customerId === "group-plan";
};
$scope.hasConsecutiveSubscription = function (user) {
return !!user.purchased.plan.consecutive.count || !!user.purchased.plan.consecutive.offset;
};
$scope.canEditCardDetails = function (user) {
return (
!$scope.hasCanceledSubscription(user) &&
user.purchased.plan.paymentMethod === Payments.paymentMethods.STRIPE
);
};
$scope.getCancelSubInfo = function (user) {
return $sce.trustAsHtml(env.t('cancelSubInfo' + user.purchased.plan.paymentMethod));
};
function _calculateNextCron() {
$scope.dayStart;