WrenchBoard/WrenchBoradWeb
1
0
Fork 0
Code Issues Pull Requests Releases Activity

fix

Browse Source
This commit is contained in:
Olusesan Ameye
2022-07-30 08:50:58 -04:00
parent 130c8f8b9c
commit efc3692e1d
17 changed files with 49 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
wrenchboard/email/JOB/job_due_reviewreminder.mailfile
+2 -2
View File
@@ -93,8 +93,8 @@ It is essential that you login and process the task(s) appropriately. In the eve
<tr>
<td class="innerpadding bodycopy">
Please contact us at https://{{server_name}}/contact if you have any question about this email.
<td class="innerpaddig bodycopy">
Please contact us at https://www.wrenchboard.com/contact if you have any question about this email.
</td>
</tr>
<tr>
wrenchboard/email/JOB/job_duereminder.mailfile
+2 -3
View File
@@ -174,7 +174,7 @@ This task will be due very soon. After the due date, the task will be past due,
</tr>
<tr>
<td class="innerpadding bodycopy">
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.
</td>
</tr>
<tr>
@@ -189,7 +189,7 @@ Please contact us at https://{{server_name}}/contact if you have any question a
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
<tr>
<td align="center" class="footercopy">
&reg; {{site_name}} 2017<br/>
&reg; {{site_name}} 2022<br/>
You received this email because a subscriber to {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
</td>
</tr>
@@ -225,6 +225,5 @@ You received this email because a subscriber to {{site_name}}. If you get this e
</table>
<!--analytics-->
<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
</body>
</html>
wrenchboard/email/JOB/job_interest_client.mailfile
+2 -3
View File
@@ -202,7 +202,7 @@ Note that this task was posted in the public domain and the owner can select any
</tr>
<tr>
<td class="innerpadding bodycopy">
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.
</td>
</tr>
<tr>
@@ -217,7 +217,7 @@ Please contact us at https://{{server_name}}/contact if you have any question a
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
<tr>
<td align="center" class="footercopy">
&reg; {{site_name}} 2017<br/>
&reg; {{site_name}} 2022<br/>
You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
</td>
</tr>
@@ -253,6 +253,5 @@ You received this email because a user sent a job to you from {{site_name}}. If
</table>
<!--analytics-->
<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
</body>
</html>
wrenchboard/email/JOB/job_interest_member.mailfile
+2 -2
View File
@@ -197,7 +197,7 @@ Detail
</tr>
<tr>
<td class="innerpadding bodycopy">
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.
</td>
</tr>
<tr>
@@ -212,7 +212,7 @@ Please contact us at https://{{server_name}}/contact if you have any question a
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
<tr>
<td align="center" class="footercopy">
&reg; {{site_name}} 2017<br/>
&reg; {{site_name}} 2022<br/>
You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
</td>
</tr>
wrenchboard/email/JOB/job_interest_message.mailfile
+2 -2
View File
@@ -156,7 +156,7 @@ You have received a messager from a <a href="https://{{server_name}}/eoffer?offe
</tr>
<tr>
<td class="innerpadding bodycopy">
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.
</td>
</tr>
<tr>
@@ -171,7 +171,7 @@ You have received a messager from a <a href="https://{{server_name}}/eoffer?offe
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
<tr>
<td align="center" class="footercopy">
&reg; {{site_name}} 2017<br/>
&reg; {{site_name}} 2022<br/>
You received this email because of your interest in a task @ {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
</td>
</tr>
wrenchboard/email/JOB/job_message_m.mailfile
+2 -2
View File
@@ -169,7 +169,7 @@ Last Message
</tr>
<tr>
<td class="innerpadding bodycopy">
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.
</td>
</tr>
<tr>
@@ -184,7 +184,7 @@ Please contact us at https://{{server_name}}/contact if you have any question a
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
<tr>
<td align="center" class="footercopy">
&reg; {{site_name}} 2024<br/>
&reg; {{site_name}} 2022<br/>
You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
</td>
</tr>
wrenchboard/email/JOB/job_offer_accepted.mailfile
+2 -2
View File
@@ -195,7 +195,7 @@ img {height: auto;}
</tr>
<tr>
<td class="innerpadding bodycopy">
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.
</td>
</tr>
<tr>
@@ -210,7 +210,7 @@ img {height: auto;}
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
<tr>
<td align="center" class="footercopy">
&reg; {{site_name}} 2018<br/>
&reg; {{site_name}} 2022<br/>
You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
</td>
</tr>
wrenchboard/email/JOB/job_offer_cancel.mailfile
+2 -2
View File
@@ -185,7 +185,7 @@ img {height: auto;}
</tr>
<tr>
<td class="innerpadding bodycopy">
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.
</td>
</tr>
<tr>
@@ -200,7 +200,7 @@ img {height: auto;}
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
<tr>
<td align="center" class="footercopy">
&reg; {{site_name}} 2018<br/>
&reg; {{site_name}} 2022<br/>
You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
</td>
</tr>
wrenchboard/email/JOB/job_offer_group.mailfile
+2 -2
View File
@@ -190,7 +190,7 @@ You have received a job offer from a <a href="https://{{server_name}}">{{site_na
</tr>
<tr>
<td class="innerpadding bodycopy">
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.
</td>
</tr>
<tr>
@@ -205,7 +205,7 @@ You have received a job offer from a <a href="https://{{server_name}}">{{site_na
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
<tr>
<td align="center" class="footercopy">
&reg; {{site_name}} 2018<br/>
&reg; {{site_name}} 2022<br/>
You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
</td>
</tr>
wrenchboard/email/JOB/job_offer_invidual.mailfile
+2 -2
View File
@@ -213,7 +213,7 @@ You have received a job offer from a <a href="https://{{server_name}}/eoffer?off
</tr>
<tr>
<td class="innerpadding bodycopy">
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.
</td>
</tr>
<tr>
@@ -228,7 +228,7 @@ You have received a job offer from a <a href="https://{{server_name}}/eoffer?off
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
<tr>
<td align="center" class="footercopy">
&reg; {{site_name}} 2017<br/>
&reg; {{site_name}} 2022<br/>
You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
</td>
</tr>
wrenchboard/email/JOB/job_offer_public.mailfile
+1 -1
View File
@@ -187,7 +187,7 @@ Offer Expire
</tr>
<tr>
<td class="innerpadding bodycopy">
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.
</td>
</tr>
<tr>
wrenchboard/email/JOB/job_offer_rejected.mailfile
+2 -2
View File
@@ -192,7 +192,7 @@ img {height: auto;}
</tr>
<tr>
<td class="innerpadding bodycopy">
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.
</td>
</tr>
<tr>
@@ -207,7 +207,7 @@ img {height: auto;}
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
<tr>
<td align="center" class="footercopy">
&reg; {{site_name}} 2018<br/>
&reg; {{site_name}} 2022<br/>
You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
</td>
</tr>
wrenchboard/email/JOB/job_offer_sendtome.mailfile
-3
View File
@@ -208,8 +208,5 @@ Price
</td>
</tr>
</table>
<!--analytics-->
<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
</body>
</html>
wrenchboard/email/JOB/job_pastdue_m.mailfile
+2 -2
View File
@@ -143,7 +143,7 @@ You have task that are in past due status as shown below, Please log in to close
</tr>
<tr>
<td class="innerpadding bodycopy">
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.
</td>
</tr>
<tr>
@@ -158,7 +158,7 @@ Please contact us at https://{{server_name}}/contact if you have any question a
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
<tr>
<td align="center" class="footercopy">
&reg; {{site_name}} 2018<br/>
&reg; {{site_name}} 2022<br/>
You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
</td>
</tr>
wrenchboard/email/JOB/job_reply_message.mailfile
+2 -2
View File
@@ -148,7 +148,7 @@ You have received a reply message from <a href="https://{{server_name}}/eoffer?o
</tr>
<tr>
<td class="innerpadding bodycopy">
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.
</td>
</tr>
<tr>
@@ -163,7 +163,7 @@ Please contact us at https://{{server_name}}/contact if you have any question a
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
<tr>
<td align="center" class="footercopy">
&reg; {{site_name}} 2018<br/>
&reg; {{site_name}} 2022<br/>
You received this email because of your interest in a task @ {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
</td>
</tr>
wrenchboard/email/JOB/myjob_offer_accepted.mailfile
+2 -5
View File
@@ -178,7 +178,7 @@ img {height: auto;}
</tr>
<tr>
<td class="innerpadding bodycopy">
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.
</td>
</tr>
<tr>
@@ -193,7 +193,7 @@ img {height: auto;}
<table width="100%" border="0" cellspacing="0" cellpadding="0" >
<tr>
<td align="center" class="footercopy">
&reg; {{site_name}} 2017<br/>
&reg; {{site_name}} 2022<br/>
You received this email because a user sent a job to you from {{site_name}}. If you get this email in error, please <a href="https://{{server_name}}/contactus" class="unsubscribe"><font color="#ffffff">contact</font></a> us.
</td>
</tr>
@@ -227,8 +227,5 @@ img {height: auto;}
</td>
</tr>
</table>
<!--analytics-->
<script src="http://code.jquery.com/jquery-1.10.1.min.js"></script>
</body>
</html>
wrenchboard/src/shared_tool/site_crons.cc
+20
View File
@@ -267,6 +267,8 @@ long PaymentPending(CVars in, CVars &out) {
long DeadlineLineApprachClient(CVars in, CVars &out) // called
{
logfmt(logINFO, "DeadlineLineApprachClient()");
// First Reminder
const PGresult *res = pgsql_query("SELECT j.client_id,j.id AS contract_id FROM members_jobs_contract j "\
"WHERE j.due_remind IS NULL AND j.status IN (1,2) "\
"AND j.delivery_date > now() AND j.delivery_date < now() + '1 day' "\
@@ -281,6 +283,24 @@ long DeadlineLineApprachClient(CVars in, CVars &out) // called
pgsql_exec("UPDATE members_jobs_contract SET due_remind=now() WHERE id=%lu", rec["contract_id"].Long());
}
}
const PGresult *res2 = pgsql_query("SELECT j.client_id,j.id AS contract_id FROM members_jobs_contract j "\
"WHERE now() > j.due_remind + '6 hours' AND j.status IN (1,2) "\
"AND j.delivery_date > now() AND j.delivery_date < now() + '1 day' "\
"AND j.client_id IS NOT NULL AND j.client_id > 0 limit %lu", in["one_limit"].Long());
if (res2 != NULL && pgsql_num_rows(res2) > 0) {
for (int i = 0, n = pgsql_num_rows(res2); i < n; i++) {
map<const char*, const char*>f = pgsql_fetch_assoc(res2, i);
if (f.empty()) continue;
CVars rec;
map_to_cvars(f, rec);
job_email(JOBS_DUE_APPROACH_MAIL, rec, out); // send the reminder email
pgsql_exec("UPDATE members_jobs_contract SET due_remind=now() WHERE id=%lu", rec["contract_id"].Long());
}
}
logfmt(logINFO, "/DeadlineLineApprachClient()");
return 0;
}