diff --git a/wrenchboard/email/PROJ/contract_acceptcomplete.mailfile b/wrenchboard/email/PROJ/contract_acceptcomplete.mailfile index 2b60836a..66cf0b60 100644 --- a/wrenchboard/email/PROJ/contract_acceptcomplete.mailfile +++ b/wrenchboard/email/PROJ/contract_acceptcomplete.mailfile @@ -2,231 +2,220 @@ Subject: {{subject}} - + - - {{subject}} - + +{{subject}} + - +
- - - - - - - - - - - + + + + + +
- - - - -
- WrenchBoard -
- - - - - -
- - - - - - - - -
- {{site_name}} -
- {{site_trade_name}} -
-
- -
- - - - - - - -
- Dear {{sender_firstname}}, -
-You have account withdraw action from your account at {{site_name}} with details below. - -
-
- - - - -
- -
- - - - - + + + + + + + + + + + + + + + + - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
Amount Received:{{amount}} Naira
Processing Fee:{{fee}} Naira
Recipient:{{recipient}}
Account No:{{account_no}}
Bank:{{bank_name}}
Confirmation No:{{confirmation}}
{{sendmoney_message}}
-
+ + + + - - - - - - - - -
+ + + -
+WrenchBoard
- -
- -
- Please contact us at https://{{server_name}}/contact if you have any question about this email. -
+
+ + + + + +
+ + + + + + + + +
+{{site_name}} +
+{{site_trade_name}} +
+
+ +
+ + + + + + + +
+Dear {{sender_firstname}}, +
+You have account withdraw action from your account at {{site_name}} with details below. + +
+
+ + + + +
+ +
+ + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Amount Received:{{amount}} Naira
Processing Fee:{{fee}} Naira
Recipient:{{recipient}}
Account No:{{account_no}}
Bank:{{bank_name}}
Confirmation No:{{confirmation}}
{{sendmoney_message}}
+

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

+
+ +
+ +
+Please contact us at https://{{server_name}}/contact if you have any question about this email. +
{{site_name}} Team
{{server_name}} -
- - - - - - - -
- ® {{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/PROMO/promotion1.mailfile b/wrenchboard/email/PROMO/promotion1.mailfile index ed0748fa..da3ba516 100644 --- a/wrenchboard/email/PROMO/promotion1.mailfile +++ b/wrenchboard/email/PROMO/promotion1.mailfile @@ -9,35 +9,26 @@ Subject: {{subject}} @@ -49,7 +40,7 @@ body[yahoo] .unsubscribe {display: block; margin-top: 20px; padding: 10px 50px;
- +
@@ -59,14 +50,14 @@ body[yahoo] .unsubscribe {display: block; margin-top: 20px; padding: 10px 50px;
- +
@@ -89,40 +80,34 @@ body[yahoo] .unsubscribe {display: block; margin-top: 20px; padding: 10px 50px; @@ -146,14 +131,14 @@ For all support, contact us at https: {{server_name}} + -
-{{site_name}} +WrenchBoard
- + + + -
-

At WrenchBoard, we connect you with your natural ability and regular online activities to make money..

+		 +Hi, {{firstname}}, +
+The task at {{site_name}} shown below is fast approaching deadline.
+ - +
+
- - - - - - -
- -{{\inv_items}} -{{...}} -{{pin}} -{{/...}} -{{/inv_items}} -
+
Please login into your account to manage this task.
@@ -136,7 +121,7 @@ body[yahoo] .unsubscribe {display: block; margin-top: 20px; padding: 10px 50px;
-For all support, contact us at https://{{server_name}}/contact +Please contact us at https://www.wrenchboard.com/contact if you have any question about this email.
+ @@ -162,12 +147,12 @@ You received this email because you subscribe to {{site_name}}. If you get this @@ -187,7 +172,5 @@ You received this email because you subscribe to {{site_name}}. If you get this
-® {{site_name}} 2018
-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/PROMO/promotion2.mailfile b/wrenchboard/email/PROMO/promotion2.mailfile index d4926e3e..6fb6d7b9 100644 --- a/wrenchboard/email/PROMO/promotion2.mailfile +++ b/wrenchboard/email/PROMO/promotion2.mailfile @@ -1,41 +1,220 @@ -To: {{email}} -Subject: PayQuic topUp with SMS - +Subject: {{subject}} + + + + + +{{subject}} + - -
 
-
-
-
-
-		
-							
+
+
PayQuic

-Dear {{firstname}}, {{lastname}}
-

+
+
+
+

+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

+
+
+
-		
-

+WrenchBoard
+
 

-Do you know you can topup your phone quickly by adding money to your payquic balance. 
+

+
+
+
+
+
+

+
 
-Then topup any phone number by sending Q#PIN#MSISDN#amount to 38123 from your Etisalat line.
+
+
+
+
+
+
+

+{{site_name}}
+

+{{site_trade_name}}
+

+

+
+

+
+
+
+
+
+
+
+

+Message from  {{firstname}},
+

+The task at {{site_name}} shown below is fast approaching deadline.
+

+

+
+
+
+
+

+
+

+
+
+
+
+
+
+
+
+

+
+
+							
+{{title}}
+
+
+
+
+
+
+
+
+
+
 
-		
-							
-

+Title: 
 
-Top up on the go any time. Set up your pin by visiting PayQuic portal today.
-

+Job ID: 
+{{contract}}
+

+This task will be due very soon. After the due date, the task will be past due, and only the owner can extend it is for a short time before the task is closed permanently.
+

+Delivery Date: 
+
+{{delivery_date}}
+
 

-For further information go to our website at www.payquic.com 
-Thank you for choosing PayQuic - your quick airtime purchase center.
-PayQuic Team	
-
	         
 
 

+
Please login into your account to manage this task.

+

+
+

+
+

+Please contact us at  https://www.wrenchboard.com/contact if you have any question about this email.
+

+{{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/PROMO/promotion_a.mailfile b/wrenchboard/email/PROMO/promotion_a.mailfile index e69de29b..20a816e9 100644 --- a/wrenchboard/email/PROMO/promotion_a.mailfile +++ b/wrenchboard/email/PROMO/promotion_a.mailfile @@ -0,0 +1,220 @@ +Subject: {{subject}} + + + + + + +{{subject}} + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+WrenchBoard +
+ + + + + +
+ + + + + + + + +
+{{site_name}} +
+{{site_trade_name}} +
+
+ +
+ + + + + + + +
+Message from {{firstname}}, +
+The task at {{site_name}} shown below is fast approaching deadline. +
+
+ + + + +
+ +
+ + + + + + + + +
+ + + + + + + + + + + + + + + +
+Title: + +{{title}} +
+Job ID: +{{contract}} +
+This task will be due very soon. After the due date, the task will be past due, and only the owner can extend it is for a short time before the task is closed permanently. +
+Delivery Date: + +{{delivery_date}} +
+

Please login into your account to manage this task.

+
+ +
+ +
+Please contact us at https://www.wrenchboard.com/contact if you have any question about this email. +
+{{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 aafd9cf1..be22a0b3 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -301,17 +301,26 @@ long market_email(long mailtype, CVars in, CVars &out) { form.LetStr("site_name", "WrenchBoard"); form.LetStr("site_trade_name", "Connecting Opportunities"); + try { + CVars yr; + load_db_record(yr, "SELECT to_char(now(), 'yyyy') AS YYYY"); + vars2form(yr, form); + + switch (mailtype) { case WRENCHBOARD_BKO_MARKETING_MSG: REQ_STRING (in, "uid", 5, 149, "(.*)"); if (load_db_record(x, "SELECT email AS market_email, * FROM marketing_list WHERE uid='%s'", in["uid"].c_str())) { vars2form(x, form); - form.LetStr("subject", "marketing subject here "); + form.LetStr("subject", "marketing subject here "); form.LetStr("email", x["market_email"].c_str()); form.Email("PROMO/promotion1.mailfile"); + + // form.Email("PROMO/promotion2.mailfile"); + // form.Email("PROMO/promotion_a.mailfile"); } break;