From 1c873ab1dcd8750f6cb45d7628606576929c2360 Mon Sep 17 00:00:00 2001 From: "CHIEFSOFT\\ameye" Date: Mon, 4 Dec 2023 20:10:48 -0500 Subject: [PATCH] jobmessage --- wrenchboard/src/include/account_mngt.h | 2 ++ wrenchboard/src/include/wrenchboard_api.h | 1 + wrenchboard/src/shared_tool/account.cc | 6 ++++++ wrenchboard/src/shared_tool/mobile.cc | 5 +++++ www-api/app/Config/Constants.php | 1 + www-api/app/Config/Routes.php | 1 + www-api/app/Controllers/BaseController.php | 1 + www-api/app/Controllers/WrenchApi.php | 3 +++ www-api/app/Models/ResultFormatter.php | 1 + 9 files changed, 21 insertions(+) diff --git a/wrenchboard/src/include/account_mngt.h b/wrenchboard/src/include/account_mngt.h index c56b93dc..ef5da705 100644 --- a/wrenchboard/src/include/account_mngt.h +++ b/wrenchboard/src/include/account_mngt.h @@ -10,6 +10,8 @@ long CompleteMobileAccountCreation(CVars in, CVars &out); long WrenchReturnJobList(CVars in, CVars &out); long WrenchReturnMemberMessages(CVars in, CVars &out); long WrenchMemberMarketMessages(CVars in, CVars &out); +long WrenchMemberOwnerMarketMessages(CVars in, CVars &out); + long WrenchMemberActiveJobs(CVars in, CVars &out); long WrenchReturnMemberPaymentHx(CVars in, CVars &out); long WrenchReturnMemberBankAccount(CVars in, CVars &out); diff --git a/wrenchboard/src/include/wrenchboard_api.h b/wrenchboard/src/include/wrenchboard_api.h index 327245bd..18de58dd 100644 --- a/wrenchboard/src/include/wrenchboard_api.h +++ b/wrenchboard/src/include/wrenchboard_api.h @@ -329,6 +329,7 @@ enum { PARTNER_STRIPE }; #define WRENCHBOARD_MOBILE_LOADPROFILE 15030 #define WRENCHBOARD_MOBILE_UPDATEPROFILE 15031 #define WRENCHBOARD_MOBILE_ACCOUNT 15040 +#define WRENCHBOARD_MOBILE_JOB_MESSAGE 15044 #define WRENCHBOARD_MOBILE_MESSAGE 15045 #define WRENCHBOARD_MOBILE_PAYMENTHX 15046 #define WRENCHBOARD_MOBILE_TASKMESSAGE 15047 diff --git a/wrenchboard/src/shared_tool/account.cc b/wrenchboard/src/shared_tool/account.cc index 74b97bc4..bbdd7b0a 100644 --- a/wrenchboard/src/shared_tool/account.cc +++ b/wrenchboard/src/shared_tool/account.cc @@ -158,6 +158,12 @@ long account_calls(CVars in, CVars &out) { return WrenchMemberMarketMessages(in, out); break; + + case WRENCHBOARD_MOBILE_JOB_MESSAGE: + return WrenchMemberOwnerMarketMessages(in, out); + break; + + case WRENCHBOARD_MOBILE_ACTIVEJOB: return WrenchMemberActiveJobs(in, out); break; diff --git a/wrenchboard/src/shared_tool/mobile.cc b/wrenchboard/src/shared_tool/mobile.cc index 20225c4f..bf07d219 100644 --- a/wrenchboard/src/shared_tool/mobile.cc +++ b/wrenchboard/src/shared_tool/mobile.cc @@ -52,6 +52,11 @@ long mobile_calls(CVars in, CVars &out) { //return WrenchReturnMemberMessages(in, out); return WrenchMemberMarketMessages(in, out); break; + + case WRENCHBOARD_MOBILE_JOB_MESSAGE: + return WrenchMemberOwnerMarketMessages(in, out); + break; + case WRENCHBOARD_MOBILE_PAYMENTHX: return WrenchReturnMemberPaymentHx( in, out); break; diff --git a/www-api/app/Config/Constants.php b/www-api/app/Config/Constants.php index 4117f2aa..a1a56502 100644 --- a/www-api/app/Config/Constants.php +++ b/www-api/app/Config/Constants.php @@ -336,6 +336,7 @@ define('WRENCHBOARD_MOBILE_ACTIVEJOB', 15020); define('WRENCHBOARD_MOBILE_LOADPROFILE', 15030); define('WRENCHBOARD_MOBILE_UPDATEPROFILE',15031); define('WRENCHBOARD_MOBILE_ACCOUNT', 15040); +define('WRENCHBOARD_MOBILE_JOB_MESSAGE', 15044); define('WRENCHBOARD_MOBILE_MESSAGE', 15045); define('WRENCHBOARD_MOBILE_PAYMENTHX', 15046); define('WRENCHBOARD_MOBILE_TASKMESSAGE', 15047); diff --git a/www-api/app/Config/Routes.php b/www-api/app/Config/Routes.php index b30b03ff..952a97bc 100644 --- a/www-api/app/Config/Routes.php +++ b/www-api/app/Config/Routes.php @@ -80,6 +80,7 @@ $routes->post('/en/wrench/api/v1/loadprofile', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/updateprofile', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/account', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/message', 'WrenchApi::apigate'); +$routes->post('/en/wrench/api/v1/jobmessage', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/pendingjob', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/paymenthx', 'WrenchApi::apigate'); $routes->post('/en/wrench/api/v1/purchasehx', 'WrenchApi::apigate'); diff --git a/www-api/app/Controllers/BaseController.php b/www-api/app/Controllers/BaseController.php index b2a548a4..7a476d79 100644 --- a/www-api/app/Controllers/BaseController.php +++ b/www-api/app/Controllers/BaseController.php @@ -151,6 +151,7 @@ abstract class BaseController extends Controller 'updateprofile' => ['POST'], 'account' => ['POST'], 'message' => ['POST'], + 'jobmessage' => ['POST'], 'pendingjob' => ['POST'], 'paymenthx' => ['POST'], 'purchasehx' => ['POST'], diff --git a/www-api/app/Controllers/WrenchApi.php b/www-api/app/Controllers/WrenchApi.php index a4009a21..2def18a5 100644 --- a/www-api/app/Controllers/WrenchApi.php +++ b/www-api/app/Controllers/WrenchApi.php @@ -322,6 +322,9 @@ class WrenchApi extends BaseController break; case 'message': $in["action"] = WRENCHBOARD_MOBILE_MESSAGE; + break; + case 'jobmessage': + $in["action"] = WRENCHBOARD_MOBILE_JOB_MESSAGE; break; case 'paymenthx': $in["action"] = WRENCHBOARD_MOBILE_PAYMENTHX; diff --git a/www-api/app/Models/ResultFormatter.php b/www-api/app/Models/ResultFormatter.php index 5cf6b43c..686806b5 100644 --- a/www-api/app/Models/ResultFormatter.php +++ b/www-api/app/Models/ResultFormatter.php @@ -602,6 +602,7 @@ class ResultFormatter extends Model } break; + case WRENCHBOARD_MOBILE_JOB_MESSAGE: case WRENCHBOARD_MOBILE_MESSAGE: $total = $out["total_record"]; $res = array(