diff --git a/wrenchboard/email/COUPON/member_coupon_allocated.mailfile b/wrenchboard/email/COUPON/member_coupon_allocated.mailfile index d29b8f19..dc69df68 100644 --- a/wrenchboard/email/COUPON/member_coupon_allocated.mailfile +++ b/wrenchboard/email/COUPON/member_coupon_allocated.mailfile @@ -49,7 +49,7 @@ img {height: auto;} -WrenchBoard +WrenchBoard @@ -141,9 +141,8 @@ Recently added task(s) @@ -152,12 +151,12 @@ You received this email because you subscribe to {{site_name}}. If you get this @@ -176,5 +175,6 @@ You received this email because you subscribe to {{site_name}}. If you get this
-® {{site_name}} 2022
-You received this email because you subscribe to {{site_name}}. If you get this email in error, please contact us. - +® {{site_name}} {{YYYY}}
+You received this email because you subscribe to {{site_name}}. If you get this email in error, please contact us.
-Facebook +Facebook - -Twitter + +Twitter
+ - + \ No newline at end of file diff --git a/wrenchboard/email/PROJ/contract_acceptcomplete.mailfile b/wrenchboard/email/PROJ/contract_acceptcomplete.mailfile index 66cf0b60..85bfbaab 100644 --- a/wrenchboard/email/PROJ/contract_acceptcomplete.mailfile +++ b/wrenchboard/email/PROJ/contract_acceptcomplete.mailfile @@ -140,16 +140,11 @@ You have account withdraw action from your account at login into your account to check the status of this transfer soon. +

Please login into your account to check the status of this transfer soon.

diff --git a/wrenchboard/email/PROJ/contract_acceptcomplete_c.mailfile b/wrenchboard/email/PROJ/contract_acceptcomplete_c.mailfile index ae564e3b..0c7f5fc0 100644 --- a/wrenchboard/email/PROJ/contract_acceptcomplete_c.mailfile +++ b/wrenchboard/email/PROJ/contract_acceptcomplete_c.mailfile @@ -168,47 +168,45 @@ Your completion of the task {{contract}} as shown below at - - - - - - - -
- ® {{site_name}} 2017
- You received this email because you are a user @ {{site_name}}. If you get this email in error, please contact us. -
- - - - - -
- - Facebook - - - - Twitter - -
-
- - - - - - + + + + + + + + + +
+® {{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/PROJ/contract_acceptcomplete_m.mailfile b/wrenchboard/email/PROJ/contract_acceptcomplete_m.mailfile index 06496f95..b335dfa7 100644 --- a/wrenchboard/email/PROJ/contract_acceptcomplete_m.mailfile +++ b/wrenchboard/email/PROJ/contract_acceptcomplete_m.mailfile @@ -168,47 +168,45 @@ Your have accepted the completion of task {{contract}} as shown below at {{server_name}} - - - - - - - - - -
- ® {{site_name}} 2017
- You received this email because you are a user @ {{site_name}}. If you get this email in error, please contact us. -
- - - - - -
- - Facebook - - - - Twitter - -
-
- - - - - - + + + + + + + + + +
+® {{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/PROJ/contract_notifycomplete.mailfile b/wrenchboard/email/PROJ/contract_notifycomplete.mailfile index c3023721..acdca237 100644 --- a/wrenchboard/email/PROJ/contract_notifycomplete.mailfile +++ b/wrenchboard/email/PROJ/contract_notifycomplete.mailfile @@ -171,47 +171,45 @@ We are notifying you that task {{contract}} as shown below at - - - - - - - -
- ® {{site_name}} 2017
- You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us. -
- - - - - -
- - Facebook - - - - Twitter - -
-
- - - - - - + + + + + + + + + +
+® {{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/PROJ/contract_notifycomplete_c.mailfile b/wrenchboard/email/PROJ/contract_notifycomplete_c.mailfile index c4e256a8..bd2d838d 100644 --- a/wrenchboard/email/PROJ/contract_notifycomplete_c.mailfile +++ b/wrenchboard/email/PROJ/contract_notifycomplete_c.mailfile @@ -168,47 +168,45 @@ We have notify the task owner of your completion of the task {{contract}} {{server_name}} - - - - - - - - - -
- ® {{site_name}} 2017
- You received this email because you are a user @ {{site_name}}. If you get this email in error, please contact us. -
- - - - - -
- - Facebook - - - - Twitter - -
-
- - - - - - + + + + + + + + + +
+® {{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/PROJ/contract_notifycomplete_m.mailfile b/wrenchboard/email/PROJ/contract_notifycomplete_m.mailfile index f0f5787b..acdca237 100644 --- a/wrenchboard/email/PROJ/contract_notifycomplete_m.mailfile +++ b/wrenchboard/email/PROJ/contract_notifycomplete_m.mailfile @@ -171,47 +171,45 @@ We are notifying you that task {{contract}} as shown below at - - - - - - - -
- ® {{site_name}} 2017
- You received this email because you are a user @ {{site_name}}. If you get this email in error, please contact us. -
- - - - - -
- - Facebook - - - - Twitter - -
-
- - - - - - + + + + + + + + + +
+® {{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/PROJ/contract_rejectcomplete.mailfile b/wrenchboard/email/PROJ/contract_rejectcomplete.mailfile index 2b60836a..d666a240 100644 --- a/wrenchboard/email/PROJ/contract_rejectcomplete.mailfile +++ b/wrenchboard/email/PROJ/contract_rejectcomplete.mailfile @@ -186,47 +186,45 @@ You have account withdraw action from your account at - - - - - - - -
- ® {{site_name}} 2017
- You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us. -
- - - - - -
- - Facebook - - - - Twitter - -
-
- - - - - - + + + + + + + + + +
+® {{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/PROJ/contract_rejectcomplete_c.mailfile b/wrenchboard/email/PROJ/contract_rejectcomplete_c.mailfile index df878aac..bf2a753c 100644 --- a/wrenchboard/email/PROJ/contract_rejectcomplete_c.mailfile +++ b/wrenchboard/email/PROJ/contract_rejectcomplete_c.mailfile @@ -169,12 +169,12 @@ Please contact us at https://{{server_name}}/contact if you have any question a - - + - - + + + +
+ @@ -183,12 +183,12 @@ You received this email because you are a user @ {{site_name}}. If you get this @@ -208,7 +208,5 @@ You received this email because you are a user @ {{site_name}}. If you get this
-® {{site_name}} 2017
-You received this email because you are a user @ {{site_name}}. If you get this email in error, please contact us. +® {{site_name}} {{YYYY}}
+You received this email because you subscribe to {{site_name}}. If you get this email in error, please contact us.
-Facebook +Facebook -Twitter +Twitter
- - - + \ No newline at end of file diff --git a/wrenchboard/email/PROJ/contract_rejectcomplete_m.mailfile b/wrenchboard/email/PROJ/contract_rejectcomplete_m.mailfile index f3e0974d..8786a412 100644 --- a/wrenchboard/email/PROJ/contract_rejectcomplete_m.mailfile +++ b/wrenchboard/email/PROJ/contract_rejectcomplete_m.mailfile @@ -169,29 +169,29 @@ Please contact us at https://{{server_name}}/contact if you have any question a
- + - -
+ @@ -208,7 +208,5 @@ You received this email because you are a user @ {{site_name}}. If you get this
-® {{site_name}} 2017
-You received this email because you are a user @ {{site_name}}. If you get this email in error, please contact us. +® {{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 - -
+ +Facebook + + + +Twitter + +
- - - + \ No newline at end of file diff --git a/wrenchboard/email/PROJ/contract_requestcancel.mailfile b/wrenchboard/email/PROJ/contract_requestcancel.mailfile index 2b60836a..d666a240 100644 --- a/wrenchboard/email/PROJ/contract_requestcancel.mailfile +++ b/wrenchboard/email/PROJ/contract_requestcancel.mailfile @@ -186,47 +186,45 @@ You have account withdraw action from your account at - - - - - - - -
- ® {{site_name}} 2017
- You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us. -
- - - - - -
- - Facebook - - - - Twitter - -
-
-
- -
+ + + + + + + +
+® {{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/PROJ/contract_requestcancel_c.mailfile b/wrenchboard/email/PROJ/contract_requestcancel_c.mailfile index 2b60836a..d666a240 100644 --- a/wrenchboard/email/PROJ/contract_requestcancel_c.mailfile +++ b/wrenchboard/email/PROJ/contract_requestcancel_c.mailfile @@ -186,47 +186,45 @@ You have account withdraw action from your account at - - - - - - - -
- ® {{site_name}} 2017
- You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us. -
- - - - - -
- - Facebook - - - - Twitter - -
-
- - - - - - + + + + + + + + + +
+® {{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/PROJ/contract_requestcancel_m.mailfile b/wrenchboard/email/PROJ/contract_requestcancel_m.mailfile index 2b60836a..d666a240 100644 --- a/wrenchboard/email/PROJ/contract_requestcancel_m.mailfile +++ b/wrenchboard/email/PROJ/contract_requestcancel_m.mailfile @@ -186,47 +186,45 @@ You have account withdraw action from your account at - - - - - - - -
- ® {{site_name}} 2017
- You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please contact us. -
- - - - - -
- - Facebook - - - - Twitter - -
-
- - - - - - + + + + + + + + + +
+® {{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 5b268c4e..96a6728c 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -266,9 +266,10 @@ wrenchboard=> SELECT substring(ca.code,0,4)||'XXXXXXXX' as code, ca.amount,m.ema */ case WRENCHBOARD_COUPON_ACTIVATE: REQ_LONG(in, "coupon_id", 1, -1); - if (load_db_record(x, "SELECT substring(ca.code,0,4)||'XXXXXXXX' as code, ca.amount,m.email,m.firstname FROM coupons_allocation ca LEFT JOIN members m ON m.id=ca.member_id WHERE ca.id = %lu ", in["coupon_id"].Long())) { + if (load_db_record(x, "SELECT substring(ca.code,0,4)||'XXXXXXXX' as code, ca.amount*0.01,m.email,m.firstname FROM coupons_allocation ca LEFT JOIN members m ON m.id=ca.member_id WHERE ca.id = %lu ", in["coupon_id"].Long())) { vars2form(x, form); form.LetStr("email", x["email"].c_str()); + form.LetStr("currency", "Naira"); form.Email("COUPON/member_coupon_allocated.mailfile"); } break;