added user email to plan upgrade email tempöate (#7908)

scalableminds · Jun 27, 2024 · 0a07571 · 0a07571
1 parent 876971d
commit 0a07571
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/app/controllers/OrganizationController.scala b/app/controllers/OrganizationController.scala
@@ -202,6 +202,7 @@ class OrganizationController @Inject()(
       _ = Mailer ! Send(defaultMails.extendPricingPlanMail(request.identity, userEmail))
       _ = Mailer ! Send(
         defaultMails.upgradePricingPlanRequestMail(request.identity,
+                                                   userEmail,
                                                    organization.displayName,
                                                    "Extend WEBKNOSSOS plan by a year"))
     } yield Ok
@@ -223,6 +224,7 @@ class OrganizationController @Inject()(
         _ = Mailer ! Send(mail(request.identity, userEmail))
         _ = Mailer ! Send(
           defaultMails.upgradePricingPlanRequestMail(request.identity,
+                                                     userEmail,
                                                      organization.displayName,
                                                      s"Upgrade WEBKNOSSOS Plan to $requestedPlan"))
       } yield Ok
@@ -237,6 +239,7 @@ class OrganizationController @Inject()(
         _ = Mailer ! Send(defaultMails.upgradePricingPlanUsersMail(request.identity, userEmail, requestedUsers))
         _ = Mailer ! Send(
           defaultMails.upgradePricingPlanRequestMail(request.identity,
+                                                     userEmail,
                                                      organization.displayName,
                                                      s"Purchase $requestedUsers additional users"))
       } yield Ok
@@ -251,6 +254,7 @@ class OrganizationController @Inject()(
         _ = Mailer ! Send(defaultMails.upgradePricingPlanStorageMail(request.identity, userEmail, requestedStorage))
         _ = Mailer ! Send(
           defaultMails.upgradePricingPlanRequestMail(request.identity,
+                                                     userEmail,
                                                      organization.displayName,
                                                      s"Purchase $requestedStorage TB additional storage"))
       } yield Ok

diff --git a/app/mail/DefaultMails.scala b/app/mail/DefaultMails.scala
@@ -130,11 +130,14 @@ class DefaultMails @Inject()(conf: WkConf) {
       recipients = List(userEmail)
     )
 
-  def upgradePricingPlanRequestMail(user: User, organizationDisplayName: String, messageBody: String): Mail =
+  def upgradePricingPlanRequestMail(user: User,
+                                    userEmail: String,
+                                    organizationDisplayName: String,
+                                    messageBody: String): Mail =
     Mail(
       from = defaultSender,
       subject = "Request to upgrade WEBKNOSSOS plan",
-      bodyHtml = html.mail.upgradePricingPlanRequest(user.name, organizationDisplayName, messageBody).body,
+      bodyHtml = html.mail.upgradePricingPlanRequest(user.name, userEmail, organizationDisplayName, messageBody).body,
       recipients = List("[email protected]")
     )
 

diff --git a/app/views/mail/upgradePricingPlanRequest.scala.html b/app/views/mail/upgradePricingPlanRequest.scala.html
@@ -1,9 +1,9 @@
-@(name: String, organizationDisplayName: String, messageBody: String)
+@(name: String, email: String, organizationDisplayName: String, messageBody: String)
 
 @emailBaseTemplate() {
 <p>Hi WEBKNOSSOS sales team</p>
 <p>There is a new request to upgrade a WEBKNOSSOS organization with additional plan/features.</p>
-<p>User: @{name}</p> 
+<p>User: @{name} (<a href="mailto:@{email}">@{email}</a>)</p>  
 <p>Organization: @{organizationDisplayName}</p>
 <p>Request: @{messageBody}</p>