From 657f333d34ae04b1153420193515cb6ef0ec3d33 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sat, 1 Jul 2023 16:35:31 -0400 Subject: [PATCH] Fix syntx --- wrenchboard/src/shared_tool/account.cc | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/wrenchboard/src/shared_tool/account.cc b/wrenchboard/src/shared_tool/account.cc index 49b5a075..9f7075c5 100644 --- a/wrenchboard/src/shared_tool/account.cc +++ b/wrenchboard/src/shared_tool/account.cc @@ -771,8 +771,8 @@ long WrenchLoadDashData(CVars in, CVars &out) { } // LET SEE IF YOU HAVE NEXT DUE ITEM NOW out["next_due_status"] = "0"; - const PGresult *res2 = pgsql_query(" - "SELECT mj.contract AS item_code,mj.delivery_date AS due_date,mj.price,mj.client_id ,c.description AS currency " + + const PGresult *res2 = pgsql_query( "SELECT mj.contract AS item_code,mj.delivery_date AS due_date,mj.price,mj.client_id ,c.description AS currency " " FROM members_jobs_contract mj " " LEFT JOIN members_jobs j ON j.id = mj.job_id " " LEFT JOIN currency c ON c.country=j.country " @@ -783,9 +783,16 @@ long WrenchLoadDashData(CVars in, CVars &out) { " LEFT JOIN members_jobs j ON j.id = mj.job_id " " LEFT JOIN currency c ON c.country=j.country " " WHERE mj.client_id = %lu AND mj.status =1 AND mj.delivery_date > now() " - " ORDER BY due_date ASC;",member_id,member_id); + " ORDER BY due_date ASC",member_id,member_id); if (res2 != NULL && pgsql_num_rows(res2) > 0) { out["next_due_status"] = "1"; + mapf = pgsql_fetch_assoc(res2, 0); + CVars rec; + map_to_cvars(f, rec); + out["item_code"] = rec["item_code"]; + out["due_date"] = rec["due_date"]; + out["price"] = rec["price"]; + out["currency"] = rec["currency"]; } } catch (bad_parameter) {