diff --git a/wrenchboard/email/PROJ/contract_acceptcomplete.mailfile b/wrenchboard/email/PROJ/contract_acceptcomplete.mailfile index 85bfbaab..2d6d29fe 100644 --- a/wrenchboard/email/PROJ/contract_acceptcomplete.mailfile +++ b/wrenchboard/email/PROJ/contract_acceptcomplete.mailfile @@ -44,34 +44,23 @@ border: none;
- - - - -
-WrenchBoard -
- + + + + + + +
- +
- - - - - - -
-{{site_name}} -
-{{site_trade_name}} -
+
+ WrenchBoard +
+ {{site_trade_name}} +
@@ -86,13 +75,13 @@ border: none; - @@ -104,7 +93,7 @@ You have account withdraw action from your account at
+ Dear {{sender_firstname}},
-You have account withdraw action from your account at {{site_name}} with details below. +You have account withdraw action from your account at {{site_name}} with details below.
- +
@@ -156,13 +145,8 @@ You have account withdraw action from your account at - - - - -Please contact us at https://{{server_name}}/contact if you have any question about this email. +Please contact us at https://www.wrenchboard.com/contact if you have any question about this email. diff --git a/wrenchboard/email/PROJ/contract_acceptcomplete_c.mailfile b/wrenchboard/email/PROJ/contract_acceptcomplete_c.mailfile index 0c7f5fc0..b4e852c4 100644 --- a/wrenchboard/email/PROJ/contract_acceptcomplete_c.mailfile +++ b/wrenchboard/email/PROJ/contract_acceptcomplete_c.mailfile @@ -2,43 +2,34 @@ Subject: {{subject}} - {{title}} - + {{subject}} - {{title}} - + @@ -49,59 +40,44 @@ Subject: {{subject}} - {{title}} - + diff --git a/wrenchboard/src/include/wrenchboard_api.h b/wrenchboard/src/include/wrenchboard_api.h index ad289606..767e828a 100644 --- a/wrenchboard/src/include/wrenchboard_api.h +++ b/wrenchboard/src/include/wrenchboard_api.h @@ -244,6 +244,8 @@ enum { PARTNER_STRIPE }; #define WRENCHBOARD_ACCOUNT_COUNTRY_BANKS 11183 #define WRENCHBOARD_ACCOUNT_HOMEBANNERS 11200 +#define WRENCHBOARD_ACCOUNT_PLAYGROUND 11201 + #define WRENCHBOARD_ACCOUNT_RECENTS 11202 #define WRENCHBOARD_ACCOUNT_NOTIFICATIONS 11205 diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc index f3c3e51d..abc3b9a1 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -943,7 +943,7 @@ long project_email(long mailtype, CVars in, CVars &out) { form.Email("PROJ/contract_notifycomplete_m.mailfile"); vars2form(out, form); - form.LetStr("subject", "Notification of Task Completion"); + form.LetStr("subject", "Review Requested"); form.LetStr("email", out["client_email"].c_str()); form.Email("PROJ/contract_notifycomplete_c.mailfile"); @@ -979,7 +979,7 @@ long project_email(long mailtype, CVars in, CVars &out) { form.Email("PROJ/contract_acceptcomplete_m.mailfile"); vars2form(out, form); - form.LetStr("subject", "Notification of Task Completion Acceptance"); + form.LetStr("subject", "Completion Approved"); form.LetStr("email", out["client_email"].c_str()); form.Email("PROJ/contract_acceptcomplete_c.mailfile");
- +
- - - - -
- WrenchBoard -
- - + +
+ + + + + +
- +
- - - - - - -
- {{site_name}} -
- {{site_trade_name}} -
+
+ WrenchBoard +
+ {{site_trade_name}} +
- +
- @@ -110,37 +86,26 @@ Your completion of the task {{contract}} as shown below at -
+ Dear {{client_firstname}},
-Your completion of the task {{contract}} as shown below at {{site_name}} is accepted. +Your completion of the task {{contract}} as shown below at "{{title}} is accepted.
- - - -
- -
- - + +
-
- + - + - +
Task:{{contract}} Task ID:{{contract}}
Title:{{title}} Title:{{title}}

This task and payment is now complete.

+ 		This task and payment is now complete.
@@ -151,14 +116,10 @@ Your completion of the task {{contract}} as shown below at - -
- 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.