From 501c807b739abf3b01a43c7c9fae501afc0bebd2 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Sat, 6 May 2023 19:37:48 -0400 Subject: [PATCH] fix q --- wrenchboard/src/shared_tool/jobs_manager.cc | 5 ++++- www-api/app/Models/ResultFormatter.php | 1 - www-api/public/svs/user/formarter.php | 1 - 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/wrenchboard/src/shared_tool/jobs_manager.cc b/wrenchboard/src/shared_tool/jobs_manager.cc index a578c8fd..a8ac1429 100644 --- a/wrenchboard/src/shared_tool/jobs_manager.cc +++ b/wrenchboard/src/shared_tool/jobs_manager.cc @@ -77,7 +77,7 @@ long WrenchJobManagerOffers( CVars in, CVars &out){ res = pgsql_query("SELECT id FROM members_jobs_offer WHERE member_id = %lu AND status=1 AND expire > now() ", in["member_id"].Long()); out["total_record"] = pgsql_num_rows(res); - res = pgsql_query("SELECT j.id AS job_id,jo.expire,jo.public_view, j.*,jo.uid AS offer_uid, + res = pgsql_query(" SELECT j.id AS job_id,jo.expire,jo.public_view, j.*,jo.uid AS offer_uid,jo.offer_code AS offer_code, " " (CASE WHEN jo.public_view > 0 THEN 'public' ELSE jo.email END) AS job_to " " FROM members_jobs_offer jo LEFT JOIN members_jobs j ON j.id = jo.job_id " " WHERE jo.expire > now() AND jo.status = 1 AND jo.member_id = %lu AND jo.status=1 " @@ -127,6 +127,9 @@ long WrenchJobManagerOffers( CVars in, CVars &out){ snprintf(vname, sizeof (vname), "public_view_%05d", i); out[vname] = rec["public_view"]; +// + snprintf(vname, sizeof (vname), "offer_code_%05d", i); + out[vname] = rec["offer_code"]; } } diff --git a/www-api/app/Models/ResultFormatter.php b/www-api/app/Models/ResultFormatter.php index dc3eaf52..5a9e1cda 100644 --- a/www-api/app/Models/ResultFormatter.php +++ b/www-api/app/Models/ResultFormatter.php @@ -223,7 +223,6 @@ class ResultFormatter extends Model "expire" => $out["expire_${key}"], "sent" => $out["sent_${key}"], "offer_code" => $out["offer_code_${key}"], - "offer_uid" => $out["offer_uid_${key}"], "job_to" => $out["job_to_${key}"], "public_view" => $out["public_view_${key}"], "whishlisted"=> false, diff --git a/www-api/public/svs/user/formarter.php b/www-api/public/svs/user/formarter.php index 06fc7afc..7951ed71 100755 --- a/www-api/public/svs/user/formarter.php +++ b/www-api/public/svs/user/formarter.php @@ -174,7 +174,6 @@ function processOutJson($in, $out) { "expire" => $out["expire_${key}"], "sent" => $out["sent_${key}"], "offer_code" => $out["offer_code_${key}"], - "offer_uid" => $out["offer_uid_${key}"], "job_to" => $out["job_to_${key}"], "public_view" => $out["public_view_${key}"], "whishlisted"=> false,