diff --git a/wrenchboard/email/PROJ/contract_notifycomplete_c.mailfile b/wrenchboard/email/PROJ/contract_notifycomplete_c.mailfile index bd2d838d..cb112b5c 100644 --- a/wrenchboard/email/PROJ/contract_notifycomplete_c.mailfile +++ b/wrenchboard/email/PROJ/contract_notifycomplete_c.mailfile @@ -2,43 +2,34 @@ Subject: {{subject}} - {{title}} - + {{subject}} - {{title}} - + @@ -49,59 +40,44 @@ Subject: {{subject}} - {{title}} - - - + @@ -209,4 +173,13 @@ You received this email because you subscribe to {{site_name}}. If you get this
- +
- - - - -
- WrenchBoard -
- - + +
+ + + + + +
- +
- - - - - - -
- {{site_name}} -
- {{site_trade_name}} -
+
+ WrenchBoard +
+ {{site_trade_name}} +
- +
- @@ -110,37 +86,29 @@ We have notify the task owner of your completion of the task {{contract}} -
+ Dear {{client_firstname}},
-We have notify the task owner of your completion of the task {{contract}} as shown below at {{site_name}}. + We have notify the task owner of your completion of the task {{contract}} as shown below at {{site_name}}.
- - - - -
- -
- - + +
- +
- - - - - - - + + + + + + + + + -
Task:{{contract}}
Title:{{title}}
Task ID:{{contract}}
Title:{{title}}
Price:{{amount}} {{currency}}
+ +

Please wait for response from the task owner to complete this process.

+ 		Please wait for response from the task owner to complete this process.
@@ -151,14 +119,10 @@ We have notify the task owner of your completion of the task {{contract}}
- -
- Please contact us at https://{{server_name}}/contact if you have any question about this email. + Please contact us at {{server_name}}/contact if you have any question about this email.
- \ No newline at end of file + + + + + + + + + + diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc index dba4deb0..4cc04897 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -16,7 +16,7 @@ extern int mailsend(CVars in, CVars &out); long getContractMemberClientEmail(long contract_id, CVars &out); long alert_email(long mailtype, CVars in, CVars &out) { - logfmt(logINFO, "job_email()"); + logfmt(logINFO, "alert_email()"); CVars x, y, z; C_CGI_Form form("", ""); out["alertemail"] = CfgReadChar("transnotif.contact"); @@ -928,7 +928,8 @@ long project_email(long mailtype, CVars in, CVars &out) { form.LetStr("site_trade_name", "Connecting Opportunities"); - load_db_record(out, "SELECT ms.firstname AS member_firstaname,ms.email AS member_email, j.*,js.title,js.description,js.price*0.01 AS amount, c.description AS currency " + load_db_record(out, "SELECT ms.firstname AS member_firstaname,ms.email AS member_email, " + " j.*,js.title,js.description,js.price AS amount, c.description AS currency, js.banner " " FROM members_jobs_contract j " " LEFT JOIN members_jobs js ON js.id=j.job_id " " LEFT JOIN members ms ON ms.id=j.member_id " @@ -946,7 +947,7 @@ long project_email(long mailtype, CVars in, CVars &out) { case CONTRACT_NOTIFY_COMPLETE: vars2form(out, form); - form.LetStr("subject", "Notification of Task Completion"); + form.LetStr("subject", "Task Review Requested"); form.LetStr("email", out["member_email"].c_str()); form.Email("PROJ/contract_notifycomplete_m.mailfile");