From 8ecd516e7c6dd18ee4a01698a91bc9dc566758f0 Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Tue, 23 Jul 2024 13:57:22 -0400
Subject: [PATCH] Who invited

---
 wrenchboard/email/FAMILY/family_relative_invite.mailfile | 7 ++++---
 wrenchboard/src/shared_tool/email.cc                     | 3 +++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/wrenchboard/email/FAMILY/family_relative_invite.mailfile b/wrenchboard/email/FAMILY/family_relative_invite.mailfile
index 68e3927b..d657d52d 100644
--- a/wrenchboard/email/FAMILY/family_relative_invite.mailfile
+++ b/wrenchboard/email/FAMILY/family_relative_invite.mailfile
@@ -71,8 +71,8 @@ Dear <b> {{firstname}}</b>,
 <tr>
 
 <tr>
-<td class="bodycopy" style="text-align:center">
-IT_WILL_NICE_TO_SAY_WHO
+<td class="bodycopy" style="text-align:center;">
+<b>Invitation from {{inv_firstname}} {{inv_lastname}}</b>
 </td>
 </tr>
 <tr>
@@ -99,7 +99,8 @@ IT_WILL_NICE_TO_SAY_WHO
 	<tr>
 	<td class="bodycopy">
 	<br>
-	WrenchBoard offers a unique space for our family to stay connected, share updates, and manage important tasks together. By joining, you'll have access to our shared calendar, photo albums, and group messages.
+	WrenchBoard offers a unique space for our family to stay connected, share updates, and manage important tasks together. <br>
+	By joining, you'll have access to our shared calendar, photo albums, and group messages.
 
 	</td>
 	</tr>
diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc
index e1a9caeb..dd053ef7 100644
--- a/wrenchboard/src/shared_tool/email.cc
+++ b/wrenchboard/src/shared_tool/email.cc
@@ -396,6 +396,7 @@ long family_email(long mailtype, CVars in, CVars &out) {
 
    //REQ_LONG( in, "member_id", 1, -1 );
     CVars x;
+    CVars y;
     C_CGI_Form form("", "");
 
     CGIList * inv_list = new CGIList(&form, "inv_items");
@@ -429,7 +430,9 @@ long family_email(long mailtype, CVars in, CVars &out) {
 
                 case WRENCHBOARD_RELATIVES_REMINDER:
                     load_db_record(x, "SELECT * FROM members_family_relative WHERE id = %lu  ",out["relative_id"].Long());
+                    load_db_record(y, "SELECT firstname AS inv_firstname, lastname AS inv_lastname  FROM members WHERE id  = %lu ",x["member_id"].Long());
                     vars2form(x, form);
+                    vars2form(y, form);
                     form.LetStr("subject", "Invitation to Join Our Family Platform on WrenchBoard");
                     form.LetStr("email", x["email"].c_str());
                     form.Email("FAMILY/family_relative_invite.mailfile");