diff --git a/wrenchboard/email/JOB/job_due_reviewreminder.mailfile b/wrenchboard/email/JOB/job_due_reviewreminder.mailfile index a1a8aaf0..f42abea6 100644 --- a/wrenchboard/email/JOB/job_due_reviewreminder.mailfile +++ b/wrenchboard/email/JOB/job_due_reviewreminder.mailfile @@ -93,8 +93,8 @@ It is essential that you login and process the task(s) appropriately. In the eve - -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/JOB/job_duereminder.mailfile b/wrenchboard/email/JOB/job_duereminder.mailfile index b4c2e63e..eaf80f2e 100644 --- a/wrenchboard/email/JOB/job_duereminder.mailfile +++ b/wrenchboard/email/JOB/job_duereminder.mailfile @@ -174,7 +174,7 @@ This task will be due very soon. After the due date, the task will be past due, -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. @@ -189,7 +189,7 @@ Please contact us at https://{{server_name}}/contact if you have any question a @@ -225,6 +225,5 @@ You received this email because a subscriber to {{site_name}}. If you get this e
-® {{site_name}} 2017
+® {{site_name}} 2022
You received this email because a subscriber to {{site_name}}. If you get this email in error, please contact us.
- diff --git a/wrenchboard/email/JOB/job_interest_client.mailfile b/wrenchboard/email/JOB/job_interest_client.mailfile index 566a225c..34ec4dc7 100644 --- a/wrenchboard/email/JOB/job_interest_client.mailfile +++ b/wrenchboard/email/JOB/job_interest_client.mailfile @@ -202,7 +202,7 @@ Note that this task was posted in the public domain and the owner can select any -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. @@ -217,7 +217,7 @@ Please contact us at https://{{server_name}}/contact if you have any question a @@ -253,6 +253,5 @@ You received this email because a user sent a job to you from {{site_name}}. If
-® {{site_name}} 2017
+® {{site_name}} 2022
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.
- diff --git a/wrenchboard/email/JOB/job_interest_member.mailfile b/wrenchboard/email/JOB/job_interest_member.mailfile index af37bf96..0883f722 100644 --- a/wrenchboard/email/JOB/job_interest_member.mailfile +++ b/wrenchboard/email/JOB/job_interest_member.mailfile @@ -197,7 +197,7 @@ Detail -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. @@ -212,7 +212,7 @@ Please contact us at https://{{server_name}}/contact if you have any question a diff --git a/wrenchboard/email/JOB/job_interest_message.mailfile b/wrenchboard/email/JOB/job_interest_message.mailfile index 189dfc4c..a7a37177 100644 --- a/wrenchboard/email/JOB/job_interest_message.mailfile +++ b/wrenchboard/email/JOB/job_interest_message.mailfile @@ -156,7 +156,7 @@ You have received a messager from a - 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. @@ -171,7 +171,7 @@ You have received a messager from a diff --git a/wrenchboard/email/JOB/job_message_m.mailfile b/wrenchboard/email/JOB/job_message_m.mailfile index 50c43870..60b5831d 100644 --- a/wrenchboard/email/JOB/job_message_m.mailfile +++ b/wrenchboard/email/JOB/job_message_m.mailfile @@ -169,7 +169,7 @@ Last Message @@ -184,7 +184,7 @@ Please contact us at https://{{server_name}}/contact if you have any question a
-® {{site_name}} 2017
+® {{site_name}} 2022
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.
- ® {{site_name}} 2017
+ ® {{site_name}} 2022
You received this email because of your interest in a task @ {{site_name}}. If you get this email in error, please contact us.
-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/JOB/job_offer_accepted.mailfile b/wrenchboard/email/JOB/job_offer_accepted.mailfile index 71e45b51..aaefdfa9 100644 --- a/wrenchboard/email/JOB/job_offer_accepted.mailfile +++ b/wrenchboard/email/JOB/job_offer_accepted.mailfile @@ -195,7 +195,7 @@ img {height: auto;} @@ -210,7 +210,7 @@ img {height: auto;}
-® {{site_name}} 2024
+® {{site_name}} 2022
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.
- 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/JOB/job_offer_cancel.mailfile b/wrenchboard/email/JOB/job_offer_cancel.mailfile index a14e68f5..7834068f 100644 --- a/wrenchboard/email/JOB/job_offer_cancel.mailfile +++ b/wrenchboard/email/JOB/job_offer_cancel.mailfile @@ -185,7 +185,7 @@ img {height: auto;} @@ -200,7 +200,7 @@ img {height: auto;}
- ® {{site_name}} 2018
+ ® {{site_name}} 2022
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.
- 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/JOB/job_offer_group.mailfile b/wrenchboard/email/JOB/job_offer_group.mailfile index d36c3d0e..45a755bc 100644 --- a/wrenchboard/email/JOB/job_offer_group.mailfile +++ b/wrenchboard/email/JOB/job_offer_group.mailfile @@ -190,7 +190,7 @@ You have received a job offer from a {{site_na @@ -205,7 +205,7 @@ You have received a job offer from a {{site_na
- ® {{site_name}} 2018
+ ® {{site_name}} 2022
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.
- 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/JOB/job_offer_invidual.mailfile b/wrenchboard/email/JOB/job_offer_invidual.mailfile index a9b9f335..290c44c5 100644 --- a/wrenchboard/email/JOB/job_offer_invidual.mailfile +++ b/wrenchboard/email/JOB/job_offer_invidual.mailfile @@ -213,7 +213,7 @@ You have received a job offer from a - 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. @@ -228,7 +228,7 @@ You have received a job offer from a diff --git a/wrenchboard/email/JOB/job_offer_public.mailfile b/wrenchboard/email/JOB/job_offer_public.mailfile index 84be6aa9..652c67c1 100644 --- a/wrenchboard/email/JOB/job_offer_public.mailfile +++ b/wrenchboard/email/JOB/job_offer_public.mailfile @@ -187,7 +187,7 @@ Offer Expire diff --git a/wrenchboard/email/JOB/job_offer_rejected.mailfile b/wrenchboard/email/JOB/job_offer_rejected.mailfile index f8fc64fb..4d35ffba 100644 --- a/wrenchboard/email/JOB/job_offer_rejected.mailfile +++ b/wrenchboard/email/JOB/job_offer_rejected.mailfile @@ -192,7 +192,7 @@ img {height: auto;} @@ -207,7 +207,7 @@ img {height: auto;}
- ® {{site_name}} 2018
+ ® {{site_name}} 2022
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.
- ® {{site_name}} 2017
+ ® {{site_name}} 2022
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.
-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.
- 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/JOB/job_offer_sendtome.mailfile b/wrenchboard/email/JOB/job_offer_sendtome.mailfile index 071f5087..85418366 100644 --- a/wrenchboard/email/JOB/job_offer_sendtome.mailfile +++ b/wrenchboard/email/JOB/job_offer_sendtome.mailfile @@ -208,8 +208,5 @@ Price
- ® {{site_name}} 2018
+ ® {{site_name}} 2022
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.
- - - \ No newline at end of file diff --git a/wrenchboard/email/JOB/job_pastdue_m.mailfile b/wrenchboard/email/JOB/job_pastdue_m.mailfile index 52df9fc8..d61ad938 100644 --- a/wrenchboard/email/JOB/job_pastdue_m.mailfile +++ b/wrenchboard/email/JOB/job_pastdue_m.mailfile @@ -143,7 +143,7 @@ You have task that are in past due status as shown below, Please log in to close -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. @@ -158,7 +158,7 @@ Please contact us at https://{{server_name}}/contact if you have any question a diff --git a/wrenchboard/email/JOB/job_reply_message.mailfile b/wrenchboard/email/JOB/job_reply_message.mailfile index 7a870a45..fd59a042 100644 --- a/wrenchboard/email/JOB/job_reply_message.mailfile +++ b/wrenchboard/email/JOB/job_reply_message.mailfile @@ -148,7 +148,7 @@ You have received a reply message from -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. @@ -163,7 +163,7 @@ Please contact us at https://{{server_name}}/contact if you have any question a
-® {{site_name}} 2018
+® {{site_name}} 2022
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.
diff --git a/wrenchboard/email/JOB/myjob_offer_accepted.mailfile b/wrenchboard/email/JOB/myjob_offer_accepted.mailfile index 2e4bbacf..a6aeddba 100644 --- a/wrenchboard/email/JOB/myjob_offer_accepted.mailfile +++ b/wrenchboard/email/JOB/myjob_offer_accepted.mailfile @@ -178,7 +178,7 @@ img {height: auto;} @@ -193,7 +193,7 @@ img {height: auto;}
-® {{site_name}} 2018
+® {{site_name}} 2022
You received this email because of your interest in a task @ {{site_name}}. If you get this email in error, please contact us.
- 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.
@@ -227,8 +227,5 @@ img {height: auto;}
- ® {{site_name}} 2017
+ ® {{site_name}} 2022
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.
- - - diff --git a/wrenchboard/src/shared_tool/site_crons.cc b/wrenchboard/src/shared_tool/site_crons.cc index b5828514..bbe5fb38 100644 --- a/wrenchboard/src/shared_tool/site_crons.cc +++ b/wrenchboard/src/shared_tool/site_crons.cc @@ -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++) { + mapf = 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; }