diff --git a/wrenchboard/src/shared_tool/account_mngt.cc b/wrenchboard/src/shared_tool/account_mngt.cc index 9836600d..23283aac 100644 --- a/wrenchboard/src/shared_tool/account_mngt.cc +++ b/wrenchboard/src/shared_tool/account_mngt.cc @@ -436,7 +436,7 @@ long WrenchReturnJobList(CVars in, CVars &out) { " m.uid AS offer_uid,j.uid AS job_uid,m.added::date AS offer_added,j.country AS job_country, " " c.code AS currency_code, c.description AS currency_description,j.country " " FROM members_jobs_offer m " - "LEFT JOIN members_jobs j ON j.id=m.job_id " + " LEFT JOIN members_jobs j ON j.id=m.job_id " " LEFT JOIN currency c ON c.country=j.country " " WHERE m.status = 1 AND m.client_id=0 " " AND m.expire IS NOT NULL " diff --git a/wrenchboard/src/shared_tool/jobs_manager.cc b/wrenchboard/src/shared_tool/jobs_manager.cc index b2ab88a2..ecdf262c 100644 --- a/wrenchboard/src/shared_tool/jobs_manager.cc +++ b/wrenchboard/src/shared_tool/jobs_manager.cc @@ -77,8 +77,11 @@ long WrenchJobManagerOffers( CVars in, CVars &out){ 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,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 " + " (CASE WHEN jo.public_view > 0 THEN 'public' ELSE jo.email END) AS job_to, " + " c.code AS currency_code, c.description AS currency_description,j.country " + " FROM members_jobs_offer jo " + " LEFT JOIN members_jobs j ON j.id = jo.job_id " + " LEFT JOIN currency c ON c.country=j.country " " WHERE jo.expire > now() AND jo.status = 1 AND jo.member_id = %lu AND jo.status=1 " " ORDER BY jo.id DESC LIMIT %lu OFFSET %lu", in["member_id"].Long(), limit, offset); @@ -130,6 +133,15 @@ long WrenchJobManagerOffers( CVars in, CVars &out){ snprintf(vname, sizeof (vname), "offer_code_%05d", i); out[vname] = rec["offer_code"]; + snprintf(vname, sizeof (vname), "job_country_%05d", i); + out[vname] = rec["job_country"]; + + snprintf(vname, sizeof (vname), "currency_%05d", i); + out[vname] = rec["currency_description"]; + + snprintf(vname, sizeof (vname), "currency_code_%05d", i); + out[vname] = rec["currency_code"]; + } } ret = PHP_API_OK;