From 7a659327ff411e43c7f181caade8b6e3680d3de2 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Fri, 7 Jul 2023 21:39:41 -0400 Subject: [PATCH] YR added --- .../email/ACCOUNT/member_welcome.mailfile | 262 +++++++++--------- .../email/JOB/job_interest_client.mailfile | 104 +++---- wrenchboard/src/shared_tool/email.cc | 19 +- 3 files changed, 196 insertions(+), 189 deletions(-) diff --git a/wrenchboard/email/ACCOUNT/member_welcome.mailfile b/wrenchboard/email/ACCOUNT/member_welcome.mailfile index 640286ce..04e85d4a 100644 --- a/wrenchboard/email/ACCOUNT/member_welcome.mailfile +++ b/wrenchboard/email/ACCOUNT/member_welcome.mailfile @@ -1,26 +1,33 @@ -Subject: Welcome to {{site_name}} +Subject: Welcome to {{site_name}} - + - - Welcome to {{site_name}} + +Welcome to {{site_name}} @@ -28,133 +35,130 @@ img {height: auto;} - - + + + + + +
- - - - - - - - - - + + + + + + + + + + + + - - - + + + - - - - -
+ + + + + - - - - - - + + + + + +
- - - - - - -
- WrenchBoard -
- {{site_trade_name}} -
- -
- - - - -
- Dear {{firstname}}, -
-
+
+WrenchBoard +
+{{site_trade_name}} +
- - - - - -
- - - - - - -
- {{site_name}} empowers you to find jobs or join jobs group. With {{site_name}} you can set up and post your jobs and find expert skills sets to get them done. -
-
-With {{site_name}}, you can enjoy free coordinated skills training section. Empower yourself and be around those that work with latest to update your knowledge.
-
-
- -
- -
- If you did not initiate this account creation or have any further support question, Please contact us at {{server_name}}/contact
+
+ + + + +
+Dear {{firstname}}, +
+
+ + + + + + +
+ + + + + + +
+Welcome to {{site_name}}, your account is now verified and ready to go. +
+
+ +
+ +
+If you did not initiate this account creation or have any further support question, Please contact us at {{server_name}}/contact
-With {{site_name}}, you can enjoy free coordinated skills training section. Empower yourself and be around those that work with latest to update your knowledge. -
+With {{site_name}}, you can set up a family accounts and reward achievements or set up tasks for others to perform or simply find tasks that rewards you +
{{site_name}} Team
{{server_name}} -
- - - - - - - -
- ® {{site_name}} {{YYYY}}
- You received this email because you subscribe to {{site_name}}. If you get this email in error, please contact us. - -
- - - - - -
- - Facebook - - - - Twitter - -
-
-
- -
+ + + + + + + +
+® {{site_name}} {{YYYY}}
+You received this email because you subscribe to {{site_name}}. If you get this email in error, please contact us. +
+ + + + +
+ +Facebook + + + +Twitter + +
+
+
+ + + + + \ No newline at end of file diff --git a/wrenchboard/email/JOB/job_interest_client.mailfile b/wrenchboard/email/JOB/job_interest_client.mailfile index 43ec2d14..b78213cc 100644 --- a/wrenchboard/email/JOB/job_interest_client.mailfile +++ b/wrenchboard/email/JOB/job_interest_client.mailfile @@ -9,18 +9,25 @@ Subject: {{subject}} - {{title}} @@ -33,47 +40,27 @@ img {height: auto;}
- + - + +
- - - - -
- WrenchBoard -
- - - - + + + + + +
- + - -
+ - - - - - - -
- {{site_name}} -
- {{site_trade_name}} -
-
- +
+WrenchBoard
+{{site_trade_name}} +
+ +
@@ -95,15 +82,16 @@ img {height: auto;}
- +
- +

We have delivered your interest in the task at {{site_name}} with details shown below to the task owner.

+
- - - - @@ -147,7 +131,7 @@ Duration Price @@ -156,14 +140,16 @@ Price Detail - - - -
@@ -113,32 +101,28 @@ Title {{title}}
Offer ID -{{offer_code}} +{{offer_code}}
Description -{{description}} +{{description}}
Duration -{{timeline_days}} day(s) +{{timeline_days}} day(s)
-{{price}} Naira +{{price}} Naira
-{{job_description}} +{{job_description}}
+
+ + + + +
@@ -196,8 +182,8 @@ Please contact us at https://www.wrenchboard.com/contact if you have any questi diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc index 6da01806..951acc5f 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -458,18 +458,23 @@ long job_email(long mailtype, CVars in, CVars &out) { form.LetStr("site_name", "WrenchBoard"); form.LetStr("site_trade_name", "Connecting Opportunities"); + + CVars yr; + load_db_record(yr, "SELECT to_char(now(), 'yyyy') AS YYYY"); + switch (mailtype) { case WRENCHBOARD_JOB_REPLY_QUESTION: if (load_db_record(y, "SELECT ms.*,m.email,m.firstname FROM members_messages ms LEFT JOIN members m ON m.id=ms.member_id WHERE ms.id=%lu", in["reply_id"].Long())) { vars2form(y, form); + vars2form(yr, form); form.LetStr("email", y["email"].c_str()); //we need previous message load_db_record(x, "SELECT msg AS prev_message FROM members_messages ms LEFT JOIN members m ON m.id=ms.member_id WHERE ms.memo = '%s' AND ms.id<>%lu ORDER BY ms.id DESC LIMIT 1", in["memo"].c_str(), in["reply_id"].Long()); vars2form(x, form); - form.LetStr("subject", "Relpy Message"); + form.LetStr("subject", "Reply Message"); form.Email("JOB/job_reply_message.mailfile"); } break; @@ -478,6 +483,7 @@ long job_email(long mailtype, CVars in, CVars &out) { if (load_db_record(x, "SELECT o.*,to_char(o.expire, 'Day Mon dd, yyyy HH:MI AM') AS expire2,j.title AS job_title,j.description,j.timeline_days,j.price FROM members_jobs_offer o LEFT JOIN members_jobs j ON j.id =o.job_id WHERE o.id = %lu", in["offer_id"].Long())) { vars2form(x, form); + vars2form(yr, form); form.LetStr("job_title", x["job_title"].c_str()); //form.LetStr( "job_title", "Job title" ); form.LetStr("subject", "Job Interest Message"); @@ -493,6 +499,7 @@ long job_email(long mailtype, CVars in, CVars &out) { case JOBS_PAYMENT_DUE_MAIL: if (load_db_record(y, "SELECT email,firstname FROM members WHERE id = %lu", in["member_id"].Long())) { vars2form(y, form); + vars2form(yr, form); // FOR CRON JOBS SET SERVER NAME form.LetStr("preview_count", in["preview_count"].c_str()); form.LetStr("server_name", out["server_name"].c_str()); @@ -511,6 +518,7 @@ long job_email(long mailtype, CVars in, CVars &out) { // FOR CRON JOBS SET SERVER NAME form.LetStr("server_name", out["server_name"].c_str()); vars2form(x, form); + vars2form(yr, form); form.LetStr("subject", "Task Due Date Approaching"); form.LetStr("email", x["email"].c_str()); //form.LetStr( "email", "ameye@chiefsoft.com" ); @@ -523,6 +531,7 @@ long job_email(long mailtype, CVars in, CVars &out) { if (load_db_record(x, "SELECT *,to_char(delivery_date, 'Day Mon dd, yyyy HH:MI AM') AS delivery_date2 FROM members_jobs_contract WHERE id = %lu", in["contract_id"].Long())) { if (load_db_record(y, "SELECT email FROM members WHERE id = %lu", x["client_id"].Long())) { vars2form(x, form); + vars2form(yr, form); form.LetStr("subject", "Job Offer Accepted"); form.LetStr("email", y["email"].c_str()); form.Email("JOB/job_offer_accepted.mailfile"); @@ -530,6 +539,7 @@ long job_email(long mailtype, CVars in, CVars &out) { if (load_db_record(z, "SELECT email FROM members WHERE id = %lu", x["member_id"].Long())) { vars2form(x, form); + vars2form(yr, form); form.LetStr("subject", "Job Offer Accepted"); form.LetStr("email", z["email"].c_str()); form.Email("JOB/myjob_offer_accepted.mailfile"); @@ -541,6 +551,7 @@ long job_email(long mailtype, CVars in, CVars &out) { if (load_db_record(x, "SELECT o.*,to_char(o.expire, 'Day Mon dd, yyyy HH:MI AM') AS expire2,j.title,j.description,j.timeline_days,j.price FROM members_jobs_offer o LEFT JOIN members_jobs j ON j.id =o.job_id WHERE o.id = %lu AND o.status = 3", in["offer_id"].Long())) { vars2form(x, form); + vars2form(yr, form); form.LetStr("subject", "Job Offer Rejected"); // load_db_record(y, "SELECT email FROM members WHERE id = %lu",x["member_id"].Long()); form.LetStr("email", x["email"].c_str()); @@ -562,6 +573,7 @@ long job_email(long mailtype, CVars in, CVars &out) { vars2form(x, form); load_db_record(y, "SELECT email,'Job by '||firstname||' @ WrenchBoard' AS ltitle,firstname,lastname FROM members WHERE id = %lu",x["member_id"].Long()); vars2form(y, form); + vars2form(yr, form); form.LetStr("subject", y["ltitle"].c_str()); form.LetStr("email", y["email"].c_str()); form.Email("JOB/job_offer_sendtome.mailfile"); @@ -573,6 +585,7 @@ long job_email(long mailtype, CVars in, CVars &out) { vars2form(x, form); if (load_db_record(y, "SELECT email,balance,firstname FROM members WHERE id = %lu", x["member_id"].Long())) { vars2form(y, form); + vars2form(yr, form); form.LetStr("subject", "Job Interest Recieved"); form.LetStr("email", y["email"].c_str()); form.Email("JOB/job_interest_member.mailfile"); @@ -580,6 +593,7 @@ long job_email(long mailtype, CVars in, CVars &out) { if (load_db_record(z, "SELECT mi.*,m.firstname,m.lastname,m.email from members_offer_interest mi LEFT JOIN members m ON m.id = mi.member_id WHERE mi.id = %lu", in["interest_id"].Long())) { vars2form(z, form); + vars2form(yr, form); form.LetStr("subject", "Job Interest Sent"); form.LetStr("email", z["email"].c_str()); form.Email("JOB/job_interest_client.mailfile"); @@ -593,6 +607,7 @@ long job_email(long mailtype, CVars in, CVars &out) { if (load_db_record(x, "SELECT o.*,to_char(o.expire, 'Day Mon dd, yyyy HH:MI AM') AS expire2,j.title,j.description,j.timeline_days,j.price FROM members_jobs_offer o LEFT JOIN members_jobs j ON j.id =o.job_id WHERE o.id = %lu ", in["offer_id"].Long())) { vars2form(x, form); + vars2form(yr, form); form.LetStr("subject", "Job Offer Canceled"); form.LetStr("email", x["email"].c_str()); form.Email("JOB/job_offer_cancel.mailfile"); @@ -604,6 +619,7 @@ long job_email(long mailtype, CVars in, CVars &out) { logfmt(logINFO, "JOBS_INDIVIDUAL_OFFER_MAIL"); if (load_db_record(x, "SELECT o.*,to_char(o.expire, 'Day Mon dd, yyyy HH:MI AM') AS expire2,j.title,j.description,j.timeline_days,j.price FROM members_jobs_offer o LEFT JOIN members_jobs j ON j.id =o.job_id WHERE o.id = %lu", in["offer_id"].Long())) { vars2form(x, form); + vars2form(yr, form); form.LetStr("subject", "Job Offer Recieved"); form.LetStr("email", x["email"].c_str()); form.Email("JOB/job_offer_invidual.mailfile"); @@ -621,6 +637,7 @@ long job_email(long mailtype, CVars in, CVars &out) { CVars rec; map_to_cvars(f, rec); vars2form(x, form); + vars2form(yr, form); form.LetStr("subject", "Job Offer Recieved"); form.LetStr("email", rec["email"].c_str()); form.Email("JOB/job_offer_group.mailfile");
-® {{site_name}} 2022
-You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us. +® {{site_name}} {{YYYY}}
+You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us.