From 4fd5bb83aa6e821f2f5babb59773a8175b6a887a Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Fri, 4 Oct 2024 21:14:29 -0400 Subject: [PATCH] Interest separare --- wrenchboard/src/shared_tool/cron_email.cc | 5 ++- wrenchboard/src/shared_tool/email.cc | 42 ++++++++++++++--------- 2 files changed, 29 insertions(+), 18 deletions(-) diff --git a/wrenchboard/src/shared_tool/cron_email.cc b/wrenchboard/src/shared_tool/cron_email.cc index 7a805f05..b5427cb1 100644 --- a/wrenchboard/src/shared_tool/cron_email.cc +++ b/wrenchboard/src/shared_tool/cron_email.cc @@ -100,7 +100,9 @@ CREATE TABLE email_message( try { out["total_record"] = "0"; const PGresult *res; - res = pgsql_query("SELECT * FROM email_message WHERE topic ='JOBS_INDIVIDUAL_OFFER_MAIL' AND status = 1 ORDER BY id ASC LIMIT 20"); + res = pgsql_query("SELECT * FROM email_message " + " WHERE topic IN ('JOBS_INDIVIDUAL_OFFER_MAIL', 'JOBS_OFFER_INTEREST_MAIL') " + " AND status = 1 ORDER BY id ASC LIMIT 20"); if (res != NULL && pgsql_num_rows(res) > 0) { out["total_record"] = pgsql_num_rows(res); @@ -122,6 +124,7 @@ CREATE TABLE email_message( } + return 0; } diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc index 2c27b662..2975c534 100644 --- a/wrenchboard/src/shared_tool/email.cc +++ b/wrenchboard/src/shared_tool/email.cc @@ -798,25 +798,33 @@ long job_email(long mailtype, CVars in, CVars &out) { break; case JOBS_OFFER_INTEREST_MAIL: - if (load_db_record(x, "SELECT o.*,to_char(o.expire, 'Day Mon dd, yyyy HH:MI AM') AS expire2,j.title,j.description,j.timeline_days,j.price FROM members_jobs_offer o LEFT JOIN members_jobs j ON j.id =o.job_id WHERE o.id = %lu AND o.status = 1", in["offer_id"].Long())) { - vars2form(x, form); - if (load_db_record(y, "SELECT email,balance,firstname FROM members WHERE id = %lu", x["member_id"].Long())) { - vars2form(y, form); - vars2form(yr, form); - form.LetStr("subject", "Job Interest Recieved"); - form.LetStr("email", y["email"].c_str()); - form.Email("JOB/job_interest_member.mailfile"); - } - if (load_db_record(z, "SELECT mi.*,m.firstname,m.lastname,m.email from members_offer_interest mi LEFT JOIN members m ON m.id = mi.member_id WHERE mi.id = %lu", in["interest_id"].Long())) { - vars2form(z, form); - vars2form(yr, form); - form.LetStr("subject", "Job Interest Sent"); - form.LetStr("email", z["email"].c_str()); - form.Email("JOB/job_interest_client.mailfile"); - } + ml["action"] = JOBS_OFFER_INTEREST_MAIL; ml["action"].set_valid( true ); + ml["topic"] = "JOBS_OFFER_INTEREST_MAIL"; ml["topic"].set_valid( true ); + ml["offer_id"] = in["offer_id"]; ml["offer_id"].set_valid( true ); + ml["interest_id"] = in["interest_id"]; ml["interest_id"].set_valid( true ); + submit_cron_email(ml); - } + +// if (load_db_record(x, "SELECT o.*,to_char(o.expire, 'Day Mon dd, yyyy HH:MI AM') AS expire2,j.title,j.description,j.timeline_days,j.price FROM members_jobs_offer o LEFT JOIN members_jobs j ON j.id =o.job_id WHERE o.id = %lu AND o.status = 1", in["offer_id"].Long())) { +// vars2form(x, form); +// if (load_db_record(y, "SELECT email,balance,firstname FROM members WHERE id = %lu", x["member_id"].Long())) { +// vars2form(y, form); +// vars2form(yr, form); +// form.LetStr("subject", "Job Interest Recieved"); +// form.LetStr("email", y["email"].c_str()); +// form.Email("JOB/job_interest_member.mailfile"); +// } +// +// if (load_db_record(z, "SELECT mi.*,m.firstname,m.lastname,m.email from members_offer_interest mi LEFT JOIN members m ON m.id = mi.member_id WHERE mi.id = %lu", in["interest_id"].Long())) { +// vars2form(z, form); +// vars2form(yr, form); +// form.LetStr("subject", "Job Interest Sent"); +// form.LetStr("email", z["email"].c_str()); +// form.Email("JOB/job_interest_client.mailfile"); +// } +// +// } break;