From 7f4ba3545cd693fe2fc78ee1c6ef9d7f91730fa2 Mon Sep 17 00:00:00 2001
From: Dobromir Popov <dobromir.popov@gateway.one>
Date: Sat, 6 Apr 2024 12:38:02 +0300
Subject: [PATCH] mailing UI tweaks and bugs fixed

---
 pages/api/email.ts                       | 19 ++++++++-----------
 src/templates/emails/coverMe.hbs         |  2 +-
 src/templates/emails/coverMeAccepted.hbs | 10 +++++++---
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/pages/api/email.ts b/pages/api/email.ts
index df2002c..f565e5f 100644
--- a/pages/api/email.ts
+++ b/pages/api/email.ts
@@ -131,7 +131,10 @@ export default async function handler(req, res) {
 
                 const shiftStr = `${CON.weekdaysBG[assignment.shift.startTime.getDay()]} ${CON.GetDateFormat(assignment.shift.startTime)} at ${assignment.shift.cartEvent.location.name} from ${CON.GetTimeFormat(assignment.shift.startTime)} to ${CON.GetTimeFormat(assignment.shift.endTime)}`;
 
-                const allNewPubNames = newAssignment.shift.assignments.map(a => a.publisher.firstName + " " + a.publisher.lastName + "\t\t" + a.publisher.phone + "").join("</br>");
+                const newPubs = newAssignment.shift.assignments.map(a => ({
+                    name: `${a.publisher.firstName} ${a.publisher.lastName}`,
+                    phone: a.publisher.phone
+                }));
 
                 let model = {
                     user: publisher,
@@ -141,7 +144,7 @@ export default async function handler(req, res) {
                     oldPubName: assignment.publisher.firstName + " " + assignment.publisher.lastName,
                     firstName: publisher.firstName,
                     lastName: publisher.lastName,
-                    newPubNames: allNewPubNames,
+                    newPubs: newPubs,
                     placeName: assignment.shift.cartEvent.location.name,
                     dateStr: common.getDateFormated(assignment.shift.startTime),
                     time: common.formatTimeHHmm(assignment.shift.startTime),
@@ -150,15 +153,9 @@ export default async function handler(req, res) {
 
                 emailHelper.SendEmailHandlebars(to, "coverMeAccepted", model);
 
-                // await prisma.user.update({
-                //     where: {
-                //         id: parseInt(userId)
-                //     },
-                //     data: {
-                //         status: "accepted",
-                //         acceptedAt: date
-                //     }
-                // });
+                const messagePageUrl = `/message?message=${encodeURIComponent('Вашата заявка за замстване е обработена успешно')}&type=info&caption=${encodeURIComponent('Благодарим ви!')}`;
+                res.redirect(messagePageUrl);
+
                 break;
 
             //POST
diff --git a/src/templates/emails/coverMe.hbs b/src/templates/emails/coverMe.hbs
index 2a954f8..2855a11 100644
--- a/src/templates/emails/coverMe.hbs
+++ b/src/templates/emails/coverMe.hbs
@@ -1,7 +1,7 @@
 {{!--Subject: ССС: Нужен е заместник --}}
 
 <section>
-    <h3>Търси се зместник
+    <h3>Търси се зместник:
         {{!-- за смяна на {{placeName}} за {{dateStr}}! --}}
     </h3>
     <p>Здравей {{firstName}},</p>
diff --git a/src/templates/emails/coverMeAccepted.hbs b/src/templates/emails/coverMeAccepted.hbs
index accba5e..62cbb6c 100644
--- a/src/templates/emails/coverMeAccepted.hbs
+++ b/src/templates/emails/coverMeAccepted.hbs
@@ -1,11 +1,15 @@
-{{!-- Subject: ССС: Нови назначени смени--}}
+{{!-- Subject: ССС: Промени в твоята смяна --}}
 
 <section>
     <h2>Промяна твоята смяна на {{placeName}} {{dateStr}} </h2>
     <p>Здравейте {{firstName}}, </p>
-    <p>{{firstName}} {{lastName}} ще замести {{oldPubName}} на смяната ви на {{dateStr}}</p>
+    <p>{{firstName}} {{lastName}} ще замести {{oldPubName}} на смяната ви на {{dateStr}} от {{time}}</p>
     <p>Новаия списък с участници за тази смяна е:</p>
-    <p>{{{newPubNames}}}</p>
+    <ul>
+        {{#each newPubs}}
+        <li>{{this.name}} - {{this.phone}}</li>
+        {{/each}}
+    </ul>
     <div>
     </div>
 </section>