krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix bug that prevented sending of emails to admin addresses (#8832)

Browse Source
This commit is contained in:
Alys
2017-06-22 22:33:27 +01:00
committed by Sabe Jones
parent 39a112b605
commit a642d94443
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
website/server/controllers/api-v3/user.js
View File

@@ -329,7 +329,7 @@ api.deleteUser = {
await user.remove(); await user.remove();
if (feedback) { if (feedback) {
txnEmail(TECH_ASSISTANCE_EMAIL, 'admin-feedback', [ txnEmail({email: TECH_ASSISTANCE_EMAIL}, 'admin-feedback', [
{name: 'PROFILE_NAME', content: user.profile.name}, {name: 'PROFILE_NAME', content: user.profile.name},
{name: 'UUID', content: user._id}, {name: 'UUID', content: user._id},
{name: 'EMAIL', content: getUserInfo(user, ['email']).email}, {name: 'EMAIL', content: getUserInfo(user, ['email']).email},

2
website/server/libs/payments.js
View File

@@ -134,7 +134,7 @@ api.addSubToGroupUser = async function addSubToGroupUser (member, group) {
let ignoreCustomerId = customerIdsToIgnore.indexOf(memberPlan.customerId) !== -1; let ignoreCustomerId = customerIdsToIgnore.indexOf(memberPlan.customerId) !== -1;
if (ignorePaymentPlan) { if (ignorePaymentPlan) {
txnEmail(TECH_ASSISTANCE_EMAIL, 'admin-user-subscription-details', [ txnEmail({email: TECH_ASSISTANCE_EMAIL}, 'admin-user-subscription-details', [
{name: 'PROFILE_NAME', content: member.profile.name}, {name: 'PROFILE_NAME', content: member.profile.name},
{name: 'UUID', content: member._id}, {name: 'UUID', content: member._id},
{name: 'EMAIL', content: getUserInfo(member, ['email']).email}, {name: 'EMAIL', content: getUserInfo(member, ['email']).email},