From 5debecc11660dd6536e1f00d81b877e924485fd3 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Wed, 5 Jul 2023 21:52:05 -0400 Subject: [PATCH] family_uid --- wrenchboard/src/shared_tool/mobile.cc | 6 +++++- www-api/app/Models/ResultFormatter.php | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/wrenchboard/src/shared_tool/mobile.cc b/wrenchboard/src/shared_tool/mobile.cc index 169d8a80..489ff217 100644 --- a/wrenchboard/src/shared_tool/mobile.cc +++ b/wrenchboard/src/shared_tool/mobile.cc @@ -252,10 +252,11 @@ long WrenchReturnJobOffersList(CVars in, CVars &out) { " jo.added::date,mj.title, jo.offer_code,jo.uid AS offer_uid,jo.expire, " " jo.public_view, mj.uid AS job_uid, jo.added AS offer_added, " " mj.description AS description, jo.job_description,mj.price, mj.timeline_days,jo.job_description AS job_detail, " - " c.code AS currency_code, c.description AS currency_description,mj.country " + " c.code AS currency_code, c.description AS currency_description,mj.country,mf.uid AS family_uid " " FROM members_jobs_offer jo " " LEFT JOIN members_jobs mj ON mj.id = jo.job_id " " LEFT JOIN currency c ON c.country=mj.country " + " LEFT JOIN members_family mf ON mf.family_member_id = jo.client_id " " WHERE jo.expire > now() AND jo.status = 1 " " AND jo.client_id = %lu LIMIT %lu ", in["member_id"].Long(), in["limit"].Long()); @@ -311,6 +312,9 @@ long WrenchReturnJobOffersList(CVars in, CVars &out) { snprintf(vname, sizeof (vname), "offer_uid_%05d", i); out[vname] = rec["offer_uid"]; + snprintf(vname, sizeof (vname), "family_uid_%05d", i); + out[vname] = rec["family_uid"]; + snprintf(vname, sizeof (vname), "expire_%05d", i); out[vname] = rec["expire"]; diff --git a/www-api/app/Models/ResultFormatter.php b/www-api/app/Models/ResultFormatter.php index b4b62721..b0ccef45 100644 --- a/www-api/app/Models/ResultFormatter.php +++ b/www-api/app/Models/ResultFormatter.php @@ -450,6 +450,7 @@ class ResultFormatter extends Model "delivery_date" => $out["delivery_date_${key}"], "owner_status" => $out["owner_status_${key}"], "offer_uid" => $out["offer_uid_${key}"], + "family_uid" => $out["family_uid_${key}"], "job_uid" => $out["job_uid_${key}"], "expire" => $out["expire_${key}"], "sent" => $out["sent_${key}"],