Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev

This commit is contained in:
VENKATESHWARAN 2025-12-10 11:45:28 +05:30
commit 109c982c79
4 changed files with 9 additions and 6 deletions

View File

@ -360,7 +360,7 @@ class ApiServiceController extends BaseController
// ---------- STEP 1: Build plaintext payload ---------- // ---------- STEP 1: Build plaintext payload ----------
$plainPayload = json_encode([ $plainPayload = json_encode([
"email" => $email, "email" => $email,
"corporateId" => env('VIDAL_WELLNESS_CORPORATE_ID'), // "corporateId" => env('VIDAL_WELLNESS_CORPORATE_ID'),
"urlIdentifier" => env('VIDAL_WELLNESS_URL_IDENTIFIER') "urlIdentifier" => env('VIDAL_WELLNESS_URL_IDENTIFIER')
]); ]);
@ -375,7 +375,7 @@ class ApiServiceController extends BaseController
// ---------- STEP 3: Call Authentication API ---------- // ---------- STEP 3: Call Authentication API ----------
$requestBody = json_encode([ $requestBody = json_encode([
"payload" => $encryptedPayload, "payload" => $encryptedPayload,
"source" => "portal", "source" => env('VIDAL_WELLNESS_SUB_PARTNER_ID'),
"subPartnerId" => env('VIDAL_WELLNESS_SUB_PARTNER_ID') "subPartnerId" => env('VIDAL_WELLNESS_SUB_PARTNER_ID')
]); ]);

View File

@ -3176,7 +3176,9 @@ class EmployeeRestController extends AdminController
{ {
try { try {
$img = $this->addImgModel->where('is_active', 1)->findAll(); $client_id = $this->request->getGet('client_id');
$img = $this->addImgModel->where('is_active', 1)->where('client_id',$client_id)->findAll();
if (count($img) > 0) { if (count($img) > 0) {
$data = []; $data = [];

View File

@ -620,8 +620,8 @@ class MediAssistApiController extends BaseController
$headers = [ $headers = [
'Content-Type: application/json', 'Content-Type: application/json',
'Username:' .'NhanceUsr', 'Username:' . getenv('MEDI_ASSIST_API_USERNAME'),
'Password:' .'NhU$p&Cc5wGQbr2', 'Password:' . getenv('MEDI_ASSIST_API_PASSWORD'),
]; ];
$body = [ $body = [

View File

@ -13,6 +13,7 @@ class AddImgModel extends Model
"created_by", "created_by",
"updated_by", "updated_by",
"is_active", "is_active",
"client_id",
]; ];