From 72f0b8ed7c5f08e66dfe096ed1554f1eed0fcf78 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Mon, 4 Dec 2017 12:04:07 +0100 Subject: [PATCH] send correct email when user is removed from group plan --- website/server/controllers/api-v3/groups.js | 2 +- website/server/libs/payments.js | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/website/server/controllers/api-v3/groups.js b/website/server/controllers/api-v3/groups.js index 871e70d3c9..5843ee730a 100644 --- a/website/server/controllers/api-v3/groups.js +++ b/website/server/controllers/api-v3/groups.js @@ -861,7 +861,7 @@ api.removeGroupMember = { group.memberCount -= 1; if (group.hasNotCancelled()) { await group.updateGroupPlan(true); - await payments.cancelGroupSubscriptionForUser(member, group); + await payments.cancelGroupSubscriptionForUser(member, group, true); } if (group.quest && group.quest.leader === member._id) { diff --git a/website/server/libs/payments.js b/website/server/libs/payments.js index 2b664c649e..ccbe5c7407 100644 --- a/website/server/libs/payments.js +++ b/website/server/libs/payments.js @@ -235,7 +235,7 @@ api.cancelGroupUsersSubscription = async function cancelGroupUsersSubscription ( await Promise.all(promises); }; -api.cancelGroupSubscriptionForUser = async function cancelGroupSubscriptionForUser (user, group) { +api.cancelGroupSubscriptionForUser = async function cancelGroupSubscriptionForUser (user, group, userWasRemoved = false) { if (user.purchased.plan.customerId !== this.constants.GROUP_PLAN_CUSTOMER_ID) return; let userGroups = user.guilds.toObject(); @@ -256,7 +256,9 @@ api.cancelGroupSubscriptionForUser = async function cancelGroupSubscriptionForUs if (userGroupPlans.length === 0) { let leader = await User.findById(group.leader).exec(); - txnEmail(user, 'group-member-cancel', [ + const email = userWasRemoved ? 'group-member-removed' : 'group-member-cancel'; + + txnEmail(user, email, [ {name: 'LEADER', content: leader.profile.name}, {name: 'GROUP_NAME', content: group.name}, ]);