Merge branch 'production'

This commit is contained in:
Dobromir Popov
2024-04-20 17:25:13 +03:00
8 changed files with 25 additions and 10 deletions

View File

@ -8,7 +8,7 @@ NEXT_PUBLIC_PUBLIC_URL=https://localhost:3003
DATABASE=mysql://cart:cartpw@localhost:3306/cart DATABASE=mysql://cart:cartpw@localhost:3306/cart
EMAIL_SENDER='"ССС [ТЕСТ] " <mwitnessing@gmail.com>' EMAIL_SENDER='"ССОМ [ТЕСТ] " <mwitnessing@gmail.com>'
# MAILTRAP_HOST_BULK=bulk.smtp.mailtrap.io # MAILTRAP_HOST_BULK=bulk.smtp.mailtrap.io
# MAILTRAP_HOST=sandbox.smtp.mailtrap.io # MAILTRAP_HOST=sandbox.smtp.mailtrap.io
# MAILTRAP_USER=8ec69527ff2104 # MAILTRAP_USER=8ec69527ff2104

View File

@ -20,7 +20,7 @@
"dir": "auto", "dir": "auto",
"lang": "en-US", "lang": "en-US",
"name": "Специално Свидетелстване София", "name": "Специално Свидетелстване София",
"short_name": "ССС", "short_name": "ССОМ",
"start_url": "/", "start_url": "/",
"scope": "/cart" "scope": "/cart"
} }

View File

@ -750,4 +750,19 @@ exports.root = function (req) {
exports.getInitials = function (names) { exports.getInitials = function (names) {
const parts = names.split(' '); const parts = names.split(' ');
return parts.map(part => part[0] + ".").join(''); return parts.map(part => part[0] + ".").join('');
} }
// exports.getInitials = function (names) {
// const parts = names.split(' '); // Split the full name into parts
// if (parts.length === 0) {
// return '';
// }
// // Extract the first two letters of the first name
// let initials = parts[0].substring(0, 2) + ".";
// // If there is a last name, add the first letter of the last name
// if (parts.length > 1) {
// initials += parts[parts.length - 1][0] + ".";
// }
// return initials;
// }

View File

@ -74,7 +74,7 @@ function normalizeEmailAddresses(to) {
exports.SendEmail = async function (to, subject, text, html, attachments = []) { exports.SendEmail = async function (to, subject, text, html, attachments = []) {
let sender = process.env.EMAIL_SENDER || '"Специално Свидетелстване София " <sofia@mwitnessing.com>'; let sender = process.env.EMAIL_SENDER || '"Специално Свидетелстване София" <sofia@mwitnessing.com>';
let emailAddresses = normalizeEmailAddresses(to) let emailAddresses = normalizeEmailAddresses(to)
const bypassEmailReccipients = process.env.EMAIL_BYPASS_TO || null; const bypassEmailReccipients = process.env.EMAIL_BYPASS_TO || null;
@ -114,7 +114,7 @@ exports.SendEmailHandlebars = async function (to, templateName, model, attachmen
const subjectMatch = templateSource.match(/{{!--\s*Subject:\s*(.*?)\s*--}}/); const subjectMatch = templateSource.match(/{{!--\s*Subject:\s*(.*?)\s*--}}/);
const textMatch = templateSource.match(/{{!--\s*Text:\s*([\s\S]*?)\s*--}}/); const textMatch = templateSource.match(/{{!--\s*Text:\s*([\s\S]*?)\s*--}}/);
let subject = subjectMatch ? subjectMatch[1].trim() : 'ССС: Известие'; let subject = subjectMatch ? subjectMatch[1].trim() : 'ССОМ: Известие';
let textVersion = textMatch ? textMatch[1].trim() : null; let textVersion = textMatch ? textMatch[1].trim() : null;
// Remove the subject and text annotations from the template source // Remove the subject and text annotations from the template source

View File

@ -1,4 +1,4 @@
{{!--Subject: ССС: Нужен е заместник --}} {{!--Subject: ССОМ: Нужен е заместник --}}
<section> <section>
<h3>Търси се зместник: <h3>Търси се зместник:

View File

@ -1,4 +1,4 @@
{{!-- Subject: ССС: Нужен е заместник--}} {{!-- Subject: ССОМ: Нужен е заместник--}}
{{!-- Text: Plain text version of your email. If not provided, HTML tags will be stripped from the HTML version for the {{!-- Text: Plain text version of your email. If not provided, HTML tags will be stripped from the HTML version for the
text version. --}} text version. --}}

View File

@ -5,7 +5,7 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" <meta name="viewport"
content="width=device-width, initial-scale=1.0"> content="width=device-width, initial-scale=1.0">
<title>ССС известия</title> <title>ССОМ известия</title>
</head> </head>
<body> <body>
@ -18,7 +18,7 @@
</main> </main>
<footer style="background-color: #f3f3f3; padding: 20px; text-align: center;"> <footer style="background-color: #f3f3f3; padding: 20px; text-align: center;">
© 2024 ССС. Openly licensed. © 2024 ССОМ. Openly licensed.
</footer> </footer>
</body> </body>

View File

@ -1,4 +1,4 @@
{{!-- Subject: ССС: Нови назначени смени--}} {{!-- Subject: ССОМ: Нови назначени смени--}}
<section> <section>
<h2>Здравей {{publisherFirstName}} {{publisherLastName}}!</h2> <h2>Здравей {{publisherFirstName}} {{publisherLastName}}!</h2>