diff --git a/wrenchboard/src/include/wrenchboard_api.h b/wrenchboard/src/include/wrenchboard_api.h index b896709e..c4c031e6 100644 --- a/wrenchboard/src/include/wrenchboard_api.h +++ b/wrenchboard/src/include/wrenchboard_api.h @@ -182,6 +182,7 @@ enum { PARTNER_STRIPE }; #define LOGIN_APPLE 990012 #define WRENCHBOARD_ACCOUNT_CREATEACC 11020 +#define WRENCHBOARD_ACCOUNT_QRLOGIN 11022 #define WRENCHBOARD_ACCOUNT_AUXLOGIN 11024 #define WRENCHBOARD_ACCOUNT_LOGIN 11025 #define WRENCHBOARD_FACEBOOK_LOGIN 11026 diff --git a/wrenchboard/src/shared_tool/account.cc b/wrenchboard/src/shared_tool/account.cc index feb71017..b3516e2a 100644 --- a/wrenchboard/src/shared_tool/account.cc +++ b/wrenchboard/src/shared_tool/account.cc @@ -129,6 +129,7 @@ long WrenchFlutterCreditHook(CVars in, CVars &out); long WrenchBoardTopupResult(CVars in, CVars &out); long WrenchRegisterMyFileUpload(CVars in, CVars &out); long WrenchGetRecentDash(CVars in, CVars &out); +long LoginWrenchBoardQRAccount(CVars in, CVars &out); long test() { FILE* oldFile = Output2FILE::Stream(); @@ -223,12 +224,16 @@ long account_calls(CVars in, CVars &out) { break; + case WRENCHBOARD_ACCOUNT_QRLOGIN: + return LoginWrenchBoardQRAccount(in, out); + break; + case WRENCHBOARD_ACCOUNT_LOGIN: return LoginWrenchBoardAccount(in, out); break; case WRENCHBOARD_ACCOUNT_AUXLOGIN: - return LoginWrenchBoardAuxAccount(in, out); + return LoginWrenchBoardAuxAccount(in, out); break; case WRENCHBOARD_FACEBOOK_LOGIN: @@ -2101,6 +2106,11 @@ long LoginWrenchBoardAuxAccount(CVars in, CVars &out) { return 0; } +long LoginWrenchBoardQRAccount(CVars in, CVars &out) { + + return 0; +} + long LoginWrenchBoardAccount(CVars in, CVars &out) { long ret = PHP_API_BAD_PARAM; logfmt(logINFO, "LoginWrenchBoardAccount()"); diff --git a/wrenchboard/src/shared_tool/jobs_manager.cc b/wrenchboard/src/shared_tool/jobs_manager.cc index 8dd350bf..6dbd1df8 100644 --- a/wrenchboard/src/shared_tool/jobs_manager.cc +++ b/wrenchboard/src/shared_tool/jobs_manager.cc @@ -92,62 +92,62 @@ long WrenchJobManagerOffers( CVars in, CVars &out){ for (int i = 0, n = pgsql_num_rows(res); i < n; i++) { mapf = pgsql_fetch_assoc(res, i); if (f.empty()) continue; - CVars rec; - map_to_cvars(f, rec); + CVars rec; + map_to_cvars(f, rec); - snprintf(vname, sizeof (vname), "banner_%05d", i); - out[vname] = rec["banner"]; + snprintf(vname, sizeof (vname), "banner_%05d", i); + out[vname] = rec["banner"]; - snprintf(vname, sizeof (vname), "job_id_%05d", i); - out[vname] = rec["job_id"]; + snprintf(vname, sizeof (vname), "job_id_%05d", i); + out[vname] = rec["job_id"]; - snprintf(vname, sizeof (vname), "title_%05d", i); - out[vname] = rec["title"]; + snprintf(vname, sizeof (vname), "title_%05d", i); + out[vname] = rec["title"]; - snprintf(vname, sizeof (vname), "description_%05d", i); - out[vname] = rec["description"]; + snprintf(vname, sizeof (vname), "description_%05d", i); + out[vname] = rec["description"]; - snprintf(vname, sizeof (vname), "job_detail_%05d", i); - out[vname] = rec["job_detail"]; + snprintf(vname, sizeof (vname), "job_detail_%05d", i); + out[vname] = rec["job_detail"]; - snprintf(vname, sizeof (vname), "family_uid_%05d", i); - out[vname] = rec["family_uid"]; + snprintf(vname, sizeof (vname), "family_uid_%05d", i); + out[vname] = rec["family_uid"]; - snprintf(vname, sizeof (vname), "timeline_days_%05d", i); - out[vname] = rec["timeline_days"]; + snprintf(vname, sizeof (vname), "timeline_days_%05d", i); + out[vname] = rec["timeline_days"]; - snprintf(vname, sizeof (vname), "price_%05d", i); - out[vname] = rec["price"]; + snprintf(vname, sizeof (vname), "price_%05d", i); + out[vname] = rec["price"]; - snprintf(vname, sizeof (vname), "country_%05d", i); - out[vname] = rec["country"]; + snprintf(vname, sizeof (vname), "country_%05d", i); + out[vname] = rec["country"]; - snprintf(vname, sizeof (vname), "job_uid_%05d", i); - out[vname] = rec["uid"]; + snprintf(vname, sizeof (vname), "job_uid_%05d", i); + out[vname] = rec["uid"]; - snprintf(vname, sizeof (vname), "expire_%05d", i); - out[vname] = rec["expire"]; + snprintf(vname, sizeof (vname), "expire_%05d", i); + out[vname] = rec["expire"]; - snprintf(vname, sizeof (vname), "offer_uid_%05d", i); - out[vname] = rec["offer_uid"]; + snprintf(vname, sizeof (vname), "offer_uid_%05d", i); + out[vname] = rec["offer_uid"]; - snprintf(vname, sizeof (vname), "job_to_%05d", i); - out[vname] = rec["job_to"]; + snprintf(vname, sizeof (vname), "job_to_%05d", i); + out[vname] = rec["job_to"]; - 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"]; + 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"]; - snprintf(vname, sizeof (vname), "job_country_%05d", i); - out[vname] = rec["job_country"]; + 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_%05d", i); + out[vname] = rec["currency_description"]; - snprintf(vname, sizeof (vname), "currency_code_%05d", i); - out[vname] = rec["currency_code"]; + snprintf(vname, sizeof (vname), "currency_code_%05d", i); + out[vname] = rec["currency_code"]; } diff --git a/www-api/app/Config/Constants.php b/www-api/app/Config/Constants.php index b2063b26..035f873b 100644 --- a/www-api/app/Config/Constants.php +++ b/www-api/app/Config/Constants.php @@ -194,6 +194,7 @@ const LOGIN_FACEBOOK = 990011; const LOGIN_APPLE = 990012; define('WRENCHBOARD_ACCOUNT_DASHRECENT', 11206); +define('WRENCHBOARD_ACCOUNT_QRLOGIN', 11022); define('WRENCHBOARD_ACCOUNT_CREATEACC', 11020); define('WRENCHBOARD_ACCOUNT_AUXSTART', 11023); define('WRENCHBOARD_ACCOUNT_AUXLOGIN', 11024); diff --git a/www-api/app/Config/Routes.php b/www-api/app/Config/Routes.php index 7658c538..bcf8c09c 100644 --- a/www-api/app/Config/Routes.php +++ b/www-api/app/Config/Routes.php @@ -64,6 +64,7 @@ $routes->post('/en/wrench/api/v1/completemobileuser', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/startresetpasword', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/userlogin', 'WrenchApi::apigate'); +$routes->post('/en/wrench/api/v1/qrlogin', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/homebanners', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/startjoblist', 'WrenchApi::apigate'); diff --git a/www-api/app/Controllers/BaseController.php b/www-api/app/Controllers/BaseController.php index 040c7645..0779c000 100644 --- a/www-api/app/Controllers/BaseController.php +++ b/www-api/app/Controllers/BaseController.php @@ -121,6 +121,7 @@ abstract class BaseController extends Controller 'startresetpasword' => ['POST'], 'stepresetpass' => ['POST'], 'userlogin' => ['POST'], + 'qrlogin' => ['POST'], 'authlogin' => ['POST'], 'startjoblist' => ['POST'], 'dashdata' => ['POST'], @@ -304,6 +305,7 @@ abstract class BaseController extends Controller 'startresetpasword' => ['POST'], 'stepresetpass' => ['POST'], 'userlogin' => ['POST'], + 'qrlogin' => ['POST'], 'authlogin' => ['POST'], 'startjoblist' => ['POST'], 'sitecontact' => ['POST'], diff --git a/www-api/app/Controllers/WrenchApi.php b/www-api/app/Controllers/WrenchApi.php index 81d99f83..67a918e0 100644 --- a/www-api/app/Controllers/WrenchApi.php +++ b/www-api/app/Controllers/WrenchApi.php @@ -311,7 +311,11 @@ class WrenchApi extends BaseController break; case 'getjobsdata': $in["action"] = WRENCHBOARD_ACCOUNT_JOBLIST; break; - + case 'qrlogin': $in["action"] = WRENCHBOARD_ACCOUNT_QRLOGIN; + if (!isset($in["login_mode"])){ + $in["login_mode"] = MOBILE_LOGIN; + } + break; case 'userlogin': $in["action"] = WRENCHBOARD_ACCOUNT_LOGIN; if (!isset($in["login_mode"])){ $in["login_mode"] = MOBILE_LOGIN;