diff --git a/wrenchboard/email/PROJ/contract_acceptcomplete_c.mailfile b/wrenchboard/email/PROJ/contract_acceptcomplete_c.mailfile index b4e852c4..080634bd 100644 --- a/wrenchboard/email/PROJ/contract_acceptcomplete_c.mailfile +++ b/wrenchboard/email/PROJ/contract_acceptcomplete_c.mailfile @@ -91,17 +91,20 @@ Your completion of the task {{contract}} as shown below at + - - - - - - + + + + + + + + + -
Task ID:{{contract}}
Title:{{title}}
Task ID:{{contract}}
Title:{{title}}
Price:{{amount}} {{currency}} - credited to your wallet
+ diff --git a/wrenchboard/email/PROJ/contract_acceptcomplete_m.mailfile b/wrenchboard/email/PROJ/contract_acceptcomplete_m.mailfile index b335dfa7..15aa2643 100644 --- a/wrenchboard/email/PROJ/contract_acceptcomplete_m.mailfile +++ b/wrenchboard/email/PROJ/contract_acceptcomplete_m.mailfile @@ -2,172 +2,135 @@ Subject: {{subject}} - {{title}} - + - - {{subject}} - {{title}} - + +{{subject}} - {{title}} + -
- - - - - - - - - -
- - - - -
- WrenchBoard -
- - - - - -
- - - - - - - - -
- {{site_name}} -
- {{site_trade_name}} -
-
- -
- - - - - - - -
- Dear {{client_firstname}}, -
-Your have accepted the completion of task {{contract}} as shown below at {{site_name}}. - -
-
- - - - -
- -
- - - - - + + + + + + + + + + + + + + - + +
- - - - - - - - - - - -
Task:{{contract}}
Title:{{title}}
-
+ + + + + +
+ + + + - - - - - - - - - + + +
+ + + + -
+WrenchBoard
- -
- -
- Please contact us at https://{{server_name}}/contact if you have any question about this email. -
+
+{{site_trade_name}} +
+
+ +
+ + + + + + + +
+Dear {{member_firstaname}}, +
+Your have accepted the completion of task {{contract}} as shown below at {{site_name}}. +
+
+ + + + + + + + +
+ + + + + + + + + + + + + + +
Task ID:{{contract}}
Title:{{title}}
Price:{{amount}} {{currency}} - credited to {{client_firstname}} wallet
+
This task and payment is now complete. +
+ +
+Please contact us at {{server_name}}/contact if you have any question about this email. +
{{site_name}} Team
{{server_name}} -
@@ -207,6 +170,5 @@ You received this email because you subscribe to {{site_name}}. If you get this
- - \ No newline at end of file + diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc index abc3b9a1..dba4deb0 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -928,11 +928,19 @@ 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 AS amount 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 WHERE j.id=%lu", contract_id); + 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 " + " 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 " + " LEFT JOIN currency c ON c.country = js.country " + " WHERE j.id=%lu", contract_id); load_db_record(out, "SELECT email AS client_email,firstname AS client_firstname FROM members WHERE id = %lu", out["client_id"].Long()); out["alertemail"] = CfgReadChar("transnotif.contact"); + CVars yr; + load_db_record(yr, "SELECT to_char(now(), 'yyyy') AS YYYY"); + vars2form(yr, form); switch (mailtype) { case CONTRACT_NOTIFY_COMPLETE: @@ -974,7 +982,7 @@ long project_email(long mailtype, CVars in, CVars &out) { case CONTRACT_ACCEPT_COMPLETE: vars2form(out, form); - form.LetStr("subject", "Notification of Task Completion Acceptance"); + form.LetStr("subject", "Completion Approval"); form.LetStr("email", out["member_email"].c_str()); form.Email("PROJ/contract_acceptcomplete_m.mailfile");