From 8e0242ef918a9bb6cdcecd406bc9e7e39fff935e Mon Sep 17 00:00:00 2001 From: ilkin-overleaf <100852799+ilkin-overleaf@users.noreply.github.com> Date: Tue, 10 Dec 2024 14:08:32 +0200 Subject: [PATCH] Merge pull request #22371 from overleaf/ii-remove-sales-contact-form-from-subscription-group-controller [web] Add seats sales contact GitOrigin-RevId: a1c5826cc775aa51f201e6cc30a1b2a4dda7ee2b --- .../SubscriptionGroupController.mjs | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs b/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs index ff7fad8d3e..ded144d24c 100644 --- a/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs +++ b/services/web/app/src/Features/Subscription/SubscriptionGroupController.mjs @@ -10,7 +10,6 @@ import { expressify } from '@overleaf/promise-utils' import Modules from '../../infrastructure/Modules.js' import SplitTestHandler from '../SplitTests/SplitTestHandler.js' import ErrorController from '../Errors/ErrorController.js' -import SalesContactFormController from '../../../../modules/cms/app/src/controllers/SalesContactFormController.mjs' import UserGetter from '../User/UserGetter.js' import { Subscription } from '../../models/Subscription.js' @@ -192,19 +191,24 @@ async function submitForm(req, res) { const userEmail = await UserGetter.promises.getUserEmail(userId) const { adding } = req.body - req.body = { + const messageLines = [`\n**Overleaf Sales Contact Form:**`] + messageLines.push('**Subject:** Self-Serve Group User Increase Request') + messageLines.push(`**Estimated Number of Users:** ${adding}`) + messageLines.push( + `**Message:** This email has been generated on behalf of user with email **${userEmail}** ` + + 'to request an increase in the total number of users for their subscription.' + ) + const messageFormatted = messageLines.join('\n\n') + + const data = { email: userEmail, - subject: 'Self-Serve Group User Increase Request', - estimatedNumberOfUsers: adding, - message: - `This email has been generated on behalf of user with email **${userEmail}** ` + - 'to request an increase in the total number of users ' + - `for their subscription.\n\n` + - `The requested number of users to add is: ${adding}`, + subject: 'Sales Contact Form', + message: messageFormatted, inbox: 'sales', } - return SalesContactFormController.submitForm(req, res) + await Modules.promises.hooks.fire('sendSupportRequest', data) + res.sendStatus(204) } async function flexibleLicensingSplitTest(req, res, next) {