fix outgoing email bug (#1147)

* fix outgoing email bug * update tests and add a different message
opencollective · Feb 21, 2018 · 8cce1ae · 8cce1ae
1 parent c635085
commit 8cce1ae
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/server/lib/subscriptions.js b/server/lib/subscriptions.js
@@ -188,7 +188,8 @@ export async function sendFailedEmail(order, lastAttempt) {
     lastAttempt,
     order: order.info,
     collective: order.collective.info,
-    fromCollective: order.fromCollective.minimal
+    fromCollective: order.fromCollective.minimal,
+    subscriptionsLink: user.generateLoginLink(`/${order.fromCollective.slug}/subscriptions`)
   }, {
     from: `${order.collective.name} <hello@${order.collective.slug}.opencollective.com>`
   });
@@ -208,7 +209,7 @@ export async function sendThankYouEmail(order, transaction) {
     relatedCollectives,
     config: { host: config.host },
     interval: order.Subscription.interval,
-    subscriptionsLink: user.generateLoginLink(`/${order.fromCollective.slug}/subscriptions`),
+    subscriptionsLink: user.generateLoginLink(`/${order.fromCollective.slug}/subscriptions`)
   }, {
     from: `${order.collective.name} <hello@${order.collective.slug}.opencollective.com>`
   });

diff --git a/templates/emails/payment.failed.hbs b/templates/emails/payment.failed.hbs
@@ -8,6 +8,8 @@ Subject: Payment failed: Update your info to continue supporting {{collective.na
 
 {{> toplogo}}
 
+Update: Apologies for the earlier email with the missing link. This email contains the right link.
+
 {{#if fromCollective.name}}
 <p>Dear {{fromCollective.name}},</p>
 {{else}}

diff --git a/templates/emails/payment.failed.text.hbs b/templates/emails/payment.failed.text.hbs
@@ -4,6 +4,7 @@ Subject: Payment failed: Subscription cancelled to {{collective.name}}
 Subject: Payment failed: Update your info to continue supporting {{collective.name}}
 {{/if}}
 
+Update: Apologies for the earlier email with the missing link. This email contains the right link.
 
 {{#if fromCollective.name}}
 Dear {{fromCollective.name}},

diff --git a/test/lib.subscriptions.test.js b/test/lib.subscriptions.test.js
@@ -247,7 +247,8 @@ describe('LibSubscription', () => {
         lastAttempt: false,
         order: order.info,
         collective: order.collective.info,
-        fromCollective: order.fromCollective.minimal
+        fromCollective: order.fromCollective.minimal,
+        subscriptionsLink: '/'
       });
 
       // When the status of the order is handled
@@ -272,7 +273,8 @@ describe('LibSubscription', () => {
         lastAttempt: true,
         order: order.info,
         collective: order.collective.info,
-        fromCollective: order.fromCollective.minimal
+        fromCollective: order.fromCollective.minimal,
+        subscriptionsLink: '/'
       });
 
       // When the status of the order is handled