From 515a5fdd9f981789545b99d831ec42a1daec041c Mon Sep 17 00:00:00 2001 From: Olusesan Ameye Date: Sun, 17 Jul 2022 21:24:06 -0400 Subject: [PATCH] fix --- .../email/ALERT/alert_daily_stats.mailfile | 5 ++-- wrenchboard/src/include/wrenchboard_api.h | 1 + wrenchboard/src/shared_tool/email.cc | 6 ++++- wrenchboard/src/shared_tool/site_crons.cc | 26 +++++++++++++++++++ 4 files changed, 35 insertions(+), 3 deletions(-) diff --git a/wrenchboard/email/ALERT/alert_daily_stats.mailfile b/wrenchboard/email/ALERT/alert_daily_stats.mailfile index ddec6279..250d00a1 100644 --- a/wrenchboard/email/ALERT/alert_daily_stats.mailfile +++ b/wrenchboard/email/ALERT/alert_daily_stats.mailfile @@ -71,10 +71,10 @@ img {height: auto;} - - + + @@ -83,6 +83,7 @@ img {height: auto;} + diff --git a/wrenchboard/src/include/wrenchboard_api.h b/wrenchboard/src/include/wrenchboard_api.h index ab97ef29..7074890d 100644 --- a/wrenchboard/src/include/wrenchboard_api.h +++ b/wrenchboard/src/include/wrenchboard_api.h @@ -119,6 +119,7 @@ enum { PARTNER_STRIPE }; #define WRB_CRONJOB_SIGNUP_ALERT 773 #define WRB_CRONJOB_PASTDUE_ALERT 774 #define WRB_CRONJOB_OFFER_REFUND_ALERT 775 +#define WRB_CRONJOB_PENDOFFER_ALERT 776 //************************************************************** #define WRENCHBOARD_BKO_START 10000 diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc index d56ecffa..85704cb5 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -210,7 +210,11 @@ long cron_email(long mailtype, CVars in, CVars &out) { } break; - + case WRB_CRONJOB_PENDOFFER_ALERT: + vars2form(x, form); + form.LetStr("email", in["email"].c_str()); + form.Email("REMINDER/offer_pending_reminder.mailfile"); + break; diff --git a/wrenchboard/src/shared_tool/site_crons.cc b/wrenchboard/src/shared_tool/site_crons.cc index 5ff3a5bf..5f58d27b 100644 --- a/wrenchboard/src/shared_tool/site_crons.cc +++ b/wrenchboard/src/shared_tool/site_crons.cc @@ -52,6 +52,10 @@ long sitecrons_calls(CVars in, CVars &out) { return PastDueOffersRefund(in, out); break; + case WRB_CRONJOB_PENDOFFER_ALERT: + return OfferPending(in, out); + break; + } logfmt(logINFO, "/sitecrons_calls()"); @@ -65,9 +69,31 @@ long ReviewReminder(CVars in, CVars &out) { } long OfferPending(CVars in, CVars &out) { + logfmt(logINFO, "ENTER OfferPending()"); +const PGresult *res = pgsql_query("SELECT jo.id AS offer_id,jo.added,j.title,jo.expire,jo.email, jo.client_id, " + "jo.job_id,jo.reminder_count,jo.reminder_date " + "FROM members_jobs_offer jo " + "LEFT JOIN members_jobs j ON j.id = jo.job_id " + "WHERE now() > jo.added +'6 hrs' " + "AND jo.expire > now() AND jo.status = 1 AND jo.public_view =0 " + "AND jo.reminder_count =0 AND jo.reminder_date IS NULL LIMIT 1 "); + if (res != NULL && pgsql_num_rows(res) > 0) { + for (int i = 0, n = pgsql_num_rows(res); i < n; i++) { + mapf = pgsql_fetch_assoc(res, i); + if (f.empty()) continue; + CVars rec; + map_to_cvars(f, rec); + cron_email(WRB_CRONJOB_PENDOFFER_ALERT, rec, out); // send the cron email + + pgsql_exec("UPDATE members_jobs_offer SET reminder_count=reminder_count+1, reminder_date=now() "\ + "WHERE id=%lu AND job_id=%lu ", rec["offer_id"].Long(),rec["job_id"].Long()); + } + } + logfmt(logINFO, "/OfferPending()"); + return 0; } long InterestPending(CVars in, CVars &out) {

{{report_date}}

{{report_date}}

Today Sign-up
People that completed the sign-up

{{today_signup}}

Pending Sign-up
People still in the process not completed

{{today_pending_signup}}

Active Jobs
People that completed the sign-up

{{today_signup}}