[MM-43337] Updating email templates for trial will end and trial ended emails (#19976)
* Updating email templates for trial will end and trial will end emails * put back variable * Rebuilding * fix tests * Updates * [MM-43339] Add Cloud Subscription Upgrade Confirmation Email (#19989) * Add Cloud Upgrade Confirmation email * Updates * String change * i18n-extract * Updates * make email-mocks * Appease linter * Add a test * GMAIL NEVER RENDERS RIGHT * Important EVERYWHERE because gmail just cant deal * l * Last one * Update image * Update tests * Fix tests Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
@@ -111,6 +111,12 @@ func changeSubscription(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
return
|
||||
}
|
||||
|
||||
// Log failures for purchase confirmation email, but don't show an error to the user so as not to confuse them
|
||||
// At this point, the upgrade is complete.
|
||||
if nErr := c.App.SendUpgradeConfirmationEmail(); nErr != nil {
|
||||
c.Logger.Error("Error sending purchase confirmation email")
|
||||
}
|
||||
|
||||
w.Write(json)
|
||||
}
|
||||
|
||||
@@ -436,6 +442,11 @@ func handleCWSWebhook(c *Context, w http.ResponseWriter, r *http.Request) {
|
||||
c.Err = nErr
|
||||
return
|
||||
}
|
||||
case model.EventTypeSendUpgradeConfirmationEmail:
|
||||
if nErr := c.App.SendUpgradeConfirmationEmail(); nErr != nil {
|
||||
c.Err = nErr
|
||||
return
|
||||
}
|
||||
case model.EventTypeSendAdminWelcomeEmail:
|
||||
user, appErr := c.App.GetUserByUsername(event.CloudWorkspaceOwner.UserName)
|
||||
if appErr != nil {
|
||||
|
||||
Ссылка в новой задаче
Block a user