-
+
-
+
+
|
@@ -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.
|
-
+
+
|
@@ -113,32 +101,28 @@ Title
{{title}}
|
-
-
|
Offer ID
|
-{{offer_code}}
+{{offer_code}}
|
-
|
Description
|
-{{description}}
+{{description}}
|
-
|
Duration
|
-{{timeline_days}} day(s)
+{{timeline_days}} day(s)
|
@@ -147,7 +131,7 @@ Duration
Price
-{{price}} Naira
+{{price}} Naira
|
@@ -156,14 +140,16 @@ Price
Detail
-{{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");
| | |
- 
- 
+
+
-