From d5e05cb66d91d19ce53fbd29f9acaf6de0441692 Mon Sep 17 00:00:00 2001
From: "CHIEFSOFT\\ameye" <ameye@chiefsfot.com>
Date: Mon, 23 Sep 2024 20:30:18 -0400
Subject: [PATCH] Improve quwey

---
 wrenchboard/email/JOB/job_pastdue_m.mailfile |  4 ++--
 wrenchboard/src/shared_tool/email.cc         | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/wrenchboard/email/JOB/job_pastdue_m.mailfile b/wrenchboard/email/JOB/job_pastdue_m.mailfile
index 914185c6..431a4519 100644
--- a/wrenchboard/email/JOB/job_pastdue_m.mailfile
+++ b/wrenchboard/email/JOB/job_pastdue_m.mailfile
@@ -77,7 +77,7 @@ Hello <b>{{firstname}}</b>,
 </td>
 </tr>
 <tr>
-<td class="bodycopy"  style="padding:20px auto 40px auto; font-weight:bold;  font-size 20px; color:darkgreen; background-color: #e8f6f3;  border-radius:10px; ">
+<td class="bodycopy"  style="padding:20px; font-weight:bold;  font-size 20px; color:darkgreen; background-color: #e8f6f3;  border-radius:10px; ">
 
  <table border="0" width='100%;' id="table1" style="font-family: Trebuchet MS; font-size: 10pt ">
 {{\inv_items}}
@@ -90,7 +90,7 @@ Hello <b>{{firstname}}</b>,
 </td>
 </tr>
 <tr>
-<td class="bodycopy"  style="padding-bottom:10px;">
+<td class="bodycopy"  style="padding:20px;">
 &nbsp;&nbsp; <a href ="{{server_name}}/login">Login</a> into your account to manage your task(s).
 </td>
 </tr>
diff --git a/wrenchboard/src/shared_tool/email.cc b/wrenchboard/src/shared_tool/email.cc
index 96a5131f..3973c294 100644
--- a/wrenchboard/src/shared_tool/email.cc
+++ b/wrenchboard/src/shared_tool/email.cc
@@ -234,9 +234,12 @@ long cron_email(long mailtype, CVars in, CVars &out) {
                     x["job_list_head"] = "";
 
                     res = pgsql_query("     SELECT  '<b>Project ID:</b>'||mc.contract||'<br><b>Title:</b>'||mc.title AS project,mc.delivery_date::date delivery_date,"
-                            "m.firstname||' '||m.lastname AS Client, '<b>Timeline:</b> '||mc.timeline_days||' day(s)<br><b>Price:</b> #'||mc.price*0.01 AS detail ,mc.description, "
+                            "m.firstname||' '||m.lastname AS Client, '<b>Timeline:</b> '||mc.timeline_days||' day(s)<br><b>Reward:</b>'||mc.price*0.01||' '||cc.description AS detail ,mc.description, "
                             "(CASE WHEN mc.status = 1 AND mc.delivery_date > now() THEN 'Active' WHEN mc.status = 1 AND mc.delivery_date <now() THEN 'Past Due'  WHEN mc.status = 4 THEN 'Review' ELSE 'Not Set' END) AS status  "
-                            " FROM members_jobs_contract mc LEFT JOIN members m ON m.id=mc.client_id  "
+                            " FROM members_jobs_contract mc "
+                            " LEFT JOIN members_jobs mj ON mj.id = mc.job_id "
+                            " LEFT JOIN currency cc ON cc.country = mj.country "
+                            " LEFT JOIN members m ON m.id=mc.client_id  "
                             "WHERE mc.member_id = %lu AND mc.status IN (1,2)  "
                             " AND delivery_date < now() ", in["member_id"].Long());
                     
@@ -256,17 +259,16 @@ long cron_email(long mailtype, CVars in, CVars &out) {
                                 in["color"] = "ebfaeb";
                             }
 
-                            c++;
                             map<const char*, const char*>f = pgsql_fetch_assoc(res, i);
                             if (f.empty()) continue;
                             CVars rec;
                             map_to_cvars(f, rec);
-
                             sprintf(listing_items, "<TR style='background-color:#%s'><td >%s</td><td>%s</td><td><b>%s</b><br>%s</td></TR>", in["color"].c_str(), rec["project"].c_str(), rec["detail"].c_str(), rec["status"].c_str(), rec["delivery_date"].c_str());
                             inv_list->LetStr("pin", listing_items);
                             inv_list->CloseElement();
                             //<hr size=1 color=#FF0000>
-                            if (c > 2) {
+                            c++;
+                            if (c > 1) {
                                 c = 0;
                             }
                         }