diff --git a/wrenchboard/src/shared_tool/jobs_manager.cc b/wrenchboard/src/shared_tool/jobs_manager.cc index 5f53b54b..e2da5253 100644 --- a/wrenchboard/src/shared_tool/jobs_manager.cc +++ b/wrenchboard/src/shared_tool/jobs_manager.cc @@ -162,35 +162,6 @@ long WrenchJobManagerOffers( CVars in, CVars &out){ } ret = PHP_API_OK; out["status"] = "OK"; - /* - wrenchboard=> \d members_jobs - Table "public.members_jobs" - Column | Type | Collation | Nullable | Default - ---------------+-----------------------------+-----------+----------+------------------------------------------ - id | integer | | not null | nextval('members_jobs_id_seq'::regclass) - member_id | integer | | | - title | character varying(150) | | | - description | character varying(300) | | | - job_detail | text | | | - timeline_days | integer | | not null | - price | integer | | not null | - loc | inet | | | - created | timestamp without time zone | | | now() - updated | timestamp without time zone | | | now() - status | integer | | | 1 - country | character varying(2) | | | - uid | uuid | | | uuid_generate_v4() - Indexes: - "members_jobs_id_key" UNIQUE CONSTRAINT, btree (id) - Foreign-key constraints: - "members_jobs_country_fkey" FOREIGN KEY (country) REFERENCES country(code) - "members_jobs_member_id_fkey" FOREIGN KEY (member_id) REFERENCES members(id) - Referenced by: - TABLE "members_jobs_offer" CONSTRAINT "members_jobs_offer_job_id_fkey" FOREIGN KEY (job_id) REFERENCES members_jobs(id) - - wrenchboard=> - - */ } catch (bad_parameter) { logfmt(logINFO, "ERROR CALL long WrenchJobManagerOffers"); @@ -339,42 +310,6 @@ long WrenchJobManagerList( CVars in, CVars &out){ } ret = PHP_API_OK; out["status"] = "OK"; - /* - - - 'job_country' => $out["job_country_${key}"], - 'currency' => 'Naira', - 'currency_code' => 'NGN', - c.description AS currency_description - - wrenchboard=> \d members_jobs - Table "public.members_jobs" - Column | Type | Collation | Nullable | Default - ---------------+-----------------------------+-----------+----------+------------------------------------------ - id | integer | | not null | nextval('members_jobs_id_seq'::regclass) - member_id | integer | | | - title | character varying(150) | | | - description | character varying(300) | | | - job_detail | text | | | - timeline_days | integer | | not null | - price | integer | | not null | - loc | inet | | | - created | timestamp without time zone | | | now() - updated | timestamp without time zone | | | now() - status | integer | | | 1 - country | character varying(2) | | | - uid | uuid | | | uuid_generate_v4() - Indexes: - "members_jobs_id_key" UNIQUE CONSTRAINT, btree (id) - Foreign-key constraints: - "members_jobs_country_fkey" FOREIGN KEY (country) REFERENCES country(code) - "members_jobs_member_id_fkey" FOREIGN KEY (member_id) REFERENCES members(id) - Referenced by: - TABLE "members_jobs_offer" CONSTRAINT "members_jobs_offer_job_id_fkey" FOREIGN KEY (job_id) REFERENCES members_jobs(id) - - wrenchboard=> - - */ } catch (bad_parameter) { logfmt(logINFO, "ERROR CALL long WrenchJobManagerList"); diff --git a/wrenchboard/src/shared_tool/reco_egine.cc b/wrenchboard/src/shared_tool/reco_egine.cc index 0054a3f2..ea2878fe 100644 --- a/wrenchboard/src/shared_tool/reco_egine.cc +++ b/wrenchboard/src/shared_tool/reco_egine.cc @@ -466,9 +466,10 @@ long WrenchHomeBanners(CVars in, CVars &out) { char vname[30]; long member_id = REQ_LONG(in, "member_id", 1, -1); int itm_count= 0; + if( RecoCheckOffers( itm_count, in, out ) != PHP_API_BAD_PARAM ) { itm_count++; } /*ONLY IF OFFER IS GREATER THAN 2 */ if( RecoRecentPastDueTask( itm_count, in, out ) != PHP_API_BAD_PARAM ) { itm_count++; } if( RecoFamilyWaiting( itm_count, in, out ) != PHP_API_BAD_PARAM ) { itm_count++; } - if( RecoCheckOffers( itm_count, in, out ) != PHP_API_BAD_PARAM ) { itm_count++; } /*ONLY IF OFFER IS GREATER THAN 2 */ + if( RecoCheckActiveTask( itm_count, in, out ) != PHP_API_BAD_PARAM ) { itm_count++; } if( RecoStartMarketCardUS( itm_count, in, out ) != PHP_API_BAD_PARAM ) { itm_count++; } if( RecoStartMarketCard( itm_count, in, out ) != PHP_API_BAD_PARAM ) { itm_count++; } diff --git a/wrenchboard/src/shared_tool/wrenchboard_api_main.cc b/wrenchboard/src/shared_tool/wrenchboard_api_main.cc index e35fd279..a0062a1b 100644 --- a/wrenchboard/src/shared_tool/wrenchboard_api_main.cc +++ b/wrenchboard/src/shared_tool/wrenchboard_api_main.cc @@ -998,7 +998,7 @@ long wrenchboard_api_main(CVars in, CVars &out) { case WRENCHBOARD_ADD_MONEYRECIPIENT: REQ_LONG(in, "customerid", 1, -1); - REQ_STRING(in, "bank_code", 1, 5, "(.*)"); + REQ_STRING(in, "bank_code", 1,25, "(.*)"); REQ_STRING(in, "lastname", 1, 50, "(.*)"); REQ_STRING(in, "firstname", 1, 50, "(.*)"); REQ_STRING(in, "account_no", 5, 12, "(.*)");