mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-18 07:07:35 +01:00
* Added subscriptions to all members when group subs * Added unsub when group cancels * Give user a subscription when they join a subbed group * Removed subscription when user leaves or is removed from group * Fixed linting issues: * Added tests for users with a subscription being upgraded to group plan * Added tests for checking if existing recurring user sub gets updated during group plan. Added better merging for plans * Added test for existing gift subscriptions * Added additional months to user when they have an existing recurring subscription and get upgraded to group sub * Adds test for user who has cancelled with date termined in the future * Added test to ensure date termined is reset * Added tests for extra months carrying over * Added test for gems bought field * Add tests to for fields that should remain when upgrading * Added test for all payment methods * Added prevention for when a user joins a second group plan * Fixed subscribing tests * Separated group plan payment tests * Added prevention of editing a user with a unlimited sub * Add tests to ensure group keeps plan if they are in two and leave one * Ensured users with two group plans do not get cancelled when on group plan is cancelled * Ensured users without group sub are untouched when group cancels * Fixed lint issues * Added new emails * Added fix for cron tests * Add restore to stubbed methods * Ensured cancelled group subscriptions are updated * Changed group plan exist check to check for date terminated * Updated you cannont delete active group message * Removed description requirement * Added upgrade group plan for Amazon payments * Fixed lint issues * Fixed broken tests * Fixed user delete tests * Fixed function calls * Hid cancel button if user has group plan * Hide difficulty from rewards * Prevented add user functions to be called when group plan is cancelled * Fixed merge issue * Correctly displayed group price * Added message when you are about to join canclled group plan * Fixed linting issues * Updated tests to have no redirect to homes * Allowed leaving a group with a canceld subscription * Fixed spelling issues * Prevented user from changing leader with active sub * Added payment details title to replace subscription title * Ensured we do not count leader when displaying upcoming cost * Prevented party tasks from being displayed twice * Prevented cancelling and already cancelled sub * Fixed styles of subscriptions * Added more specific mystery item tests * Fixed test to refer to leader * Extended test range to account for short months * Fixed merge conflicts * Updated yarn file * Added missing locales * Trigger notification * Removed yarn * Fixed locales * Fixed scope mispelling * Fixed line endings * Removed extra advanced options from rewards * Prevent group leader from leaving an active group plan * Fixed issue with extra months applied to cancelled group plan * Ensured member count is calculated when updatedGroupPlan * Updated amazon payment method constant name * Added comment to cancel sub user method * Fixed smantic issues * Added unite test for user isSubscribed and hasNotCancelled * Add tests for isSubscribed and hasNotCanceled * Changed default days remaining to 2 days for group plans * Fixed logic with adding canceled notice to group invite
123 lines
4.3 KiB
JavaScript
123 lines
4.3 KiB
JavaScript
'use strict';
|
|
|
|
habitrpg.controller("GuildsCtrl", ['$scope', 'Groups', 'User', 'Challenges', '$rootScope', '$state', '$location', '$compile', 'Analytics', 'Pusher',
|
|
function($scope, Groups, User, Challenges, $rootScope, $state, $location, $compile, Analytics, Pusher) {
|
|
$scope.groups = {
|
|
guilds: [],
|
|
public: [],
|
|
};
|
|
|
|
Groups.myGuilds()
|
|
.then(function (guilds) {
|
|
$scope.groups.guilds = guilds;
|
|
});
|
|
|
|
Groups.publicGuilds()
|
|
.then(function (guilds) {
|
|
$scope.groups.public = guilds;
|
|
});
|
|
|
|
$scope.type = 'guild';
|
|
$scope.text = window.env.t('guild');
|
|
|
|
var newGroup = function(){
|
|
return {type:'guild', privacy:'private'};
|
|
}
|
|
$scope.newGroup = newGroup()
|
|
|
|
$scope.create = function(group){
|
|
if (User.user.balance < 1) {
|
|
return $rootScope.openModal('buyGems', {track:"Gems > Create Group"});
|
|
}
|
|
|
|
if (confirm(window.env.t('confirmGuild'))) {
|
|
Groups.Group.create(group)
|
|
.then(function (response) {
|
|
var createdGroup = response.data.data;
|
|
$rootScope.hardRedirect('/#/options/groups/guilds/' + createdGroup._id + '?upgrade=true');
|
|
});
|
|
}
|
|
}
|
|
|
|
$scope.join = function (group) {
|
|
if (group.cancelledPlan && !confirm(window.env.t('aboutToJoinCancelledGroupPlan'))) {
|
|
return;
|
|
}
|
|
|
|
var groupId = group._id;
|
|
|
|
// If we don't have the _id property, we are joining from an invitation
|
|
// which contains a id property of the group
|
|
if (group.id && !group._id) {
|
|
groupId = group.id;
|
|
}
|
|
|
|
Groups.Group.join(groupId)
|
|
.then(function (response) {
|
|
var joinedGroup = response.data.data;
|
|
|
|
User.user.guilds.push(joinedGroup._id);
|
|
|
|
_.pull(User.user.invitations.guilds, group);
|
|
|
|
$location.path('/options/groups/guilds/' + joinedGroup._id);
|
|
});
|
|
}
|
|
|
|
$scope.reject = function(invitationToReject) {
|
|
var index = _.findIndex(User.user.invitations.guilds, function(invite) { return invite.id === invitationToReject.id; });
|
|
User.user.invitations.guilds = User.user.invitations.guilds.splice(0, index);
|
|
Groups.Group.rejectInvite(invitationToReject.id);
|
|
}
|
|
|
|
$scope.leave = function(keep) {
|
|
if (keep == 'cancel') {
|
|
$scope.selectedGroup = undefined;
|
|
$scope.popoverEl.popover('destroy');
|
|
} else {
|
|
Groups.Group.leave($scope.selectedGroup._id, keep, 'remain-in-challenges')
|
|
.success(function (data) {
|
|
var index = User.user.guilds.indexOf($scope.selectedGroup._id);
|
|
delete User.user.guilds[index];
|
|
$scope.selectedGroup = undefined;
|
|
$location.path('/options/groups/guilds');
|
|
});
|
|
}
|
|
}
|
|
|
|
$scope.clickLeave = function(group, $event){
|
|
$scope.selectedGroup = group;
|
|
$scope.popoverEl = $($event.target).closest('.btn');
|
|
|
|
var html, title;
|
|
|
|
Challenges.getGroupChallenges(group._id)
|
|
.then(function(response) {
|
|
var challenges = _.map(_.filter(response.data.data, function(c) {
|
|
return c.group._id == group._id;
|
|
}), '_id');
|
|
|
|
if (_.intersection(challenges, User.user.challenges).length > 0) {
|
|
html = $compile(
|
|
'<a ng-controller="GroupsCtrl" ng-click="leave(\'remove-all\')">' + window.env.t('removeTasks') + '</a><br/>\n<a ng-click="leave(\'keep-all\')">' + window.env.t('keepTasks') + '</a><br/>\n<a ng-click="leave(\'cancel\')">' + window.env.t('cancel') + '</a><br/>'
|
|
)($scope);
|
|
title = window.env.t('leaveGroupCha');
|
|
} else {
|
|
html = $compile(
|
|
'<a ng-controller="GroupsCtrl" ng-click="leave(\'keep-all\')">' + window.env.t('confirm') + '</a><br/>\n<a ng-click="leave(\'cancel\')">' + window.env.t('cancel') + '</a><br/>'
|
|
)($scope);
|
|
title = window.env.t('leaveGroup')
|
|
}
|
|
|
|
$scope.popoverEl.popover('destroy').popover({
|
|
html: true,
|
|
placement: 'top',
|
|
trigger: 'manual',
|
|
title: title,
|
|
content: html
|
|
}).popover('show');
|
|
});
|
|
}
|
|
}
|
|
]);
|