diff --git a/wrenchboard/email/JOB/job_offer_public.mailfile b/wrenchboard/email/JOB/job_offer_public.mailfile index 28b9a8cb..31388216 100644 --- a/wrenchboard/email/JOB/job_offer_public.mailfile +++ b/wrenchboard/email/JOB/job_offer_public.mailfile @@ -40,7 +40,7 @@ border: none;
- +
@@ -50,14 +50,14 @@ border: none;
- +
@@ -95,38 +95,29 @@ You have posted a job offer at {{site_name}} - - - +
- WrenchBoard + WrenchBoard
- - - - -
- -
- - + + +
- - - -
- Title - + + + + + - - + + + @@ -135,7 +126,7 @@ Offer ID Description @@ -144,7 +135,7 @@ Description Duration @@ -153,7 +144,7 @@ Duration Price @@ -162,7 +153,7 @@ Price Detail @@ -174,9 +165,8 @@ Offer Expire {{expire}} +
+Title + {{title}} -
Offer ID -{{offer_code}} +{{offer_code}}
-{{description}} +{{description}}
-{{timeline_days}} day(s) +{{timeline_days}} day(s)
-{{price}} Naira +{{price}} {{currency}}
-{{job_description}} +{{job_description}}
- -
@@ -187,11 +177,7 @@ Offer Expire
- -
Please contact us at https://www.wrenchboard.com/contact if you have any question about this email. diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc index c9367dfc..3b7d1cca 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -714,7 +714,11 @@ long job_email(long mailtype, CVars in, CVars &out) { case JOBS_INDIVIDUAL_OFFER_MAIL: 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())) { + 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,cc.description AS currency " + " FROM members_jobs_offer o " + " LEFT JOIN members_jobs j ON j.id =o.job_id " + " LEFT JOIN currency cc ON cc.country = j.country " + " WHERE o.id = %lu", in["offer_id"].Long())) { vars2form(x, form); vars2form(yr, form); form.LetStr("subject", "Job Offer Recieved"); @@ -745,7 +749,11 @@ long job_email(long mailtype, CVars in, CVars &out) { case JOBS_GROUP_OFFER_PUBLIC: logfmt(logINFO, "JOBS_GROUP_OFFER_PUBLIC"); - if (load_db_record(x, "SELECT o.*,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())) { + if (load_db_record(x, "SELECT o.*,j.title,j.description,j.timeline_days,j.price,cc.description AS currency " + " FROM members_jobs_offer o " + " LEFT JOIN members_jobs j ON j.id =o.job_id " + " LEFT JOIN currency cc ON cc.country = j.country " + " WHERE o.id = %lu", in["offer_id"].Long())) { vars2form(x, form); if (load_db_record(y, "SELECT email,balance,firstname FROM members WHERE id = %lu", x["member_id"].Long())) { vars2form(y, form);