diff --git a/wrenchboard/email/JOB/job_offer_accepted_client.mailfile b/wrenchboard/email/JOB/job_offer_accepted_client.mailfile new file mode 100644 index 00000000..46fc6dae --- /dev/null +++ b/wrenchboard/email/JOB/job_offer_accepted_client.mailfile @@ -0,0 +1,203 @@ +Subject: {{subject}} - {{title}} + + + + + + + Offer Reminder from {{site_name}} + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + +
+ WrenchBoard +
+ {{site_trade_name}} +
+
+ + + + +
+ Dear {{email}}, +
+
+ + + + + +
+ + + + + + + + + + +
+ You have accepted the job offer from a {{site_name}} user with details below +
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ Title : + + {{title}} +
+ Offer ID : + + {{contract}} +
+ Duration : + + {{timeline_days}} day(s) +
+ Reward : + + {{price}} {{currency}} +
+ Detail : + + {{job_description}} +
+
+
+
+ +
+ If you have any further support question, Please contact us at {{server_name}}/contact
+
+
+{{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 + +
+
+
+ +
+ + \ No newline at end of file diff --git a/wrenchboard/email/JOB/job_offer_accepted_owner.mailfile b/wrenchboard/email/JOB/job_offer_accepted_owner.mailfile new file mode 100644 index 00000000..9e25d469 --- /dev/null +++ b/wrenchboard/email/JOB/job_offer_accepted_owner.mailfile @@ -0,0 +1,203 @@ +Subject: {{subject}} - {{title}} + + + + + + + Offer Reminder from {{site_name}} + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + +
+ WrenchBoard +
+ {{site_trade_name}} +
+
+ + + + +
+ Dear {{email}}, +
+
+ + + + + +
+ + + + + + + + + + +
+ Your task {{site_name}} user with details below is now started. +
+ +
+
+ +
+ + + + + + + + + + + + + + + + + + + + + + + +
+ Title : + + {{title}} +
+ Offer ID : + + {{contract}} +
+ Duration : + + {{timeline_days}} day(s) +
+ Reward : + + {{price}} {{currency}} +
+ Detail : + + {{job_description}} +
+
+
+
+ +
+ If you have any further support question, Please contact us at {{server_name}}/contact
+
+
+{{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 + +
+
+
+ +
+ + \ No newline at end of file diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc index 2ecb7cb8..d7f62c82 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -718,21 +718,25 @@ long job_email(long mailtype, CVars in, CVars &out) { case JOBS_OFFER_ACCEPT_MAIL: - 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(x, "SELECT o.*,to_char(o.delivery_date, 'Day Mon dd, yyyy HH:MI AM') AS delivery_date2 ,cc.description AS currency ,j.description AS job_description" + " FROM members_jobs_contract 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["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("subject", "You have started working on the task - "); form.LetStr("email", y["email"].c_str()); - form.Email("JOB/job_offer_accepted.mailfile"); + form.Email("JOB/job_offer_accepted_client.mailfile"); } 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("subject", "Your task was accepted"); form.LetStr("email", z["email"].c_str()); - form.Email("JOB/myjob_offer_accepted.mailfile"); + form.Email("JOB/myjob_offer_accepted_owner.mailfile"); } }