Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev
This commit is contained in:
commit
cea1e0f42d
@ -185,7 +185,7 @@ class EmployeeRestController extends AdminController
|
|||||||
return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result, 'AccountManagerDetails' => isset($AccountManagerDetails[0]) ? $AccountManagerDetails[0] : null], 200);
|
return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result, 'AccountManagerDetails' => isset($AccountManagerDetails[0]) ? $AccountManagerDetails[0] : null], 200);
|
||||||
} else {
|
} else {
|
||||||
$result = "No Match's";
|
$result = "No Match's";
|
||||||
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 404);
|
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 200);
|
||||||
}
|
}
|
||||||
} catch (\Throwable $th) {
|
} catch (\Throwable $th) {
|
||||||
return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $th], 500);
|
return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $th], 500);
|
||||||
@ -206,7 +206,7 @@ class EmployeeRestController extends AdminController
|
|||||||
return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result], 200);
|
return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result], 200);
|
||||||
} else {
|
} else {
|
||||||
$result = "No Match's";
|
$result = "No Match's";
|
||||||
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 404);
|
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 200);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (\Throwable $th) {
|
} catch (\Throwable $th) {
|
||||||
@ -232,7 +232,7 @@ class EmployeeRestController extends AdminController
|
|||||||
return $this->respond(['status' => 'success', 'code' => 200, 'data' => $employee], 200);
|
return $this->respond(['status' => 'success', 'code' => 200, 'data' => $employee], 200);
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 404);
|
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 200);
|
||||||
}
|
}
|
||||||
} catch (\Throwable $th) {
|
} catch (\Throwable $th) {
|
||||||
return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $th], 500);
|
return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $th], 500);
|
||||||
@ -261,7 +261,7 @@ class EmployeeRestController extends AdminController
|
|||||||
return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result], 200);
|
return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result], 200);
|
||||||
} else {
|
} else {
|
||||||
$result = "No Matches";
|
$result = "No Matches";
|
||||||
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 404);
|
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 200);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
@ -277,7 +277,7 @@ class EmployeeRestController extends AdminController
|
|||||||
|
|
||||||
$openForEnrollment = $this->findThePolicyIsOpenForEnrollment($data[0]->client_policy_id);
|
$openForEnrollment = $this->findThePolicyIsOpenForEnrollment($data[0]->client_policy_id);
|
||||||
if ($openForEnrollment == false) {
|
if ($openForEnrollment == false) {
|
||||||
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => 'Enrollment closed'], 404);
|
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => 'Enrollment closed'], 200);
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($data) {
|
if ($data) {
|
||||||
@ -326,7 +326,7 @@ class EmployeeRestController extends AdminController
|
|||||||
return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result], 200);
|
return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result], 200);
|
||||||
} else {
|
} else {
|
||||||
$result = "No Matches";
|
$result = "No Matches";
|
||||||
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 404);
|
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => $result], 200);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
@ -527,7 +527,7 @@ class EmployeeRestController extends AdminController
|
|||||||
->update();
|
->update();
|
||||||
return $this->respond(['status' => 'success', 'code' => 200, 'data' => []], 200);
|
return $this->respond(['status' => 'success', 'code' => 200, 'data' => []], 200);
|
||||||
} else {
|
} else {
|
||||||
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 404);
|
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 200);
|
||||||
}
|
}
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $e->getMessage()], 500);
|
return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $e->getMessage()], 500);
|
||||||
@ -543,7 +543,7 @@ class EmployeeRestController extends AdminController
|
|||||||
|
|
||||||
$openForEnrollment = $this->findThePolicyIsOpenForEnrollment($requestData[0]->client_policy_id);
|
$openForEnrollment = $this->findThePolicyIsOpenForEnrollment($requestData[0]->client_policy_id);
|
||||||
if ($openForEnrollment == false) {
|
if ($openForEnrollment == false) {
|
||||||
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => 'Enrollment closed'], 404);
|
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => 'Enrollment closed'], 200);
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach ($requestData as $key => $value) {
|
foreach ($requestData as $key => $value) {
|
||||||
@ -612,7 +612,7 @@ class EmployeeRestController extends AdminController
|
|||||||
if ($empData) {
|
if ($empData) {
|
||||||
return $this->respond(['status' => 'success', 'code' => 200, 'data' => $empData], 200);
|
return $this->respond(['status' => 'success', 'code' => 200, 'data' => $empData], 200);
|
||||||
} else {
|
} else {
|
||||||
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 404);
|
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 200);
|
||||||
}
|
}
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $e->getMessage()], 500);
|
return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $e->getMessage()], 500);
|
||||||
@ -713,7 +713,7 @@ class EmployeeRestController extends AdminController
|
|||||||
if ($ClientPolicyData) {
|
if ($ClientPolicyData) {
|
||||||
return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result], 200);
|
return $this->respond(['status' => 'success', 'code' => 200, 'data' => $result], 200);
|
||||||
} else {
|
} else {
|
||||||
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 404);
|
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 200);
|
||||||
}
|
}
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $e->getMessage()], 500);
|
return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $e->getMessage()], 500);
|
||||||
@ -1054,7 +1054,7 @@ class EmployeeRestController extends AdminController
|
|||||||
$this->fileModel->where('id', $file_id)->set(['status' => 'success', 'reason' => '', 'error_data' => ''])->update();
|
$this->fileModel->where('id', $file_id)->set(['status' => 'success', 'reason' => '', 'error_data' => ''])->update();
|
||||||
return $this->respond(['status' => 'success', 'code' => 200, 'message' => "Success"], 200);
|
return $this->respond(['status' => 'success', 'code' => 200, 'message' => "Success"], 200);
|
||||||
} else {
|
} else {
|
||||||
return $this->respond(['status' => 'failed', 'code' => 404, 'message' => "Client id and Client Policy id is Not Match!"], 404);
|
return $this->respond(['status' => 'failed', 'code' => 404, 'message' => "Client id and Client Policy id is Not Match!"], 200);
|
||||||
}
|
}
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $e->getMessage()], 500);
|
return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $e->getMessage()], 500);
|
||||||
@ -1680,7 +1680,7 @@ class EmployeeRestController extends AdminController
|
|||||||
->where('client_branch_id', $this->request->getGet('client_branch_id'))->findAll();
|
->where('client_branch_id', $this->request->getGet('client_branch_id'))->findAll();
|
||||||
return $this->respond(['status' => 'success', 'code' => 200, 'data' => ['client' => $client, 'client_policy' => $clientPolicy]], 200);
|
return $this->respond(['status' => 'success', 'code' => 200, 'data' => ['client' => $client, 'client_policy' => $clientPolicy]], 200);
|
||||||
} else {
|
} else {
|
||||||
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 404);
|
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => []], 200);
|
||||||
}
|
}
|
||||||
} catch (\Exception $e) {
|
} catch (\Exception $e) {
|
||||||
return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $e->getMessage()], 500);
|
return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $e->getMessage()], 500);
|
||||||
@ -3248,7 +3248,7 @@ class EmployeeRestController extends AdminController
|
|||||||
return $this->respond(['status' => 'success', 'code' => 200, 'data' => $feContentData], 200);
|
return $this->respond(['status' => 'success', 'code' => 200, 'data' => $feContentData], 200);
|
||||||
} else {
|
} else {
|
||||||
|
|
||||||
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => 'No Data'], 404);
|
return $this->respond(['status' => 'failed', 'code' => 404, 'data' => 'No Data'], 200);
|
||||||
}
|
}
|
||||||
} catch (\Throwable $th) {
|
} catch (\Throwable $th) {
|
||||||
return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $th], 500);
|
return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $th], 500);
|
||||||
@ -3273,7 +3273,7 @@ class EmployeeRestController extends AdminController
|
|||||||
// return $this->respond(['status' => 'success', 'code' => 200, 'data' => $data], 200);
|
// return $this->respond(['status' => 'success', 'code' => 200, 'data' => $data], 200);
|
||||||
// } else {
|
// } else {
|
||||||
|
|
||||||
// return $this->respond(['status' => 'failed', 'code' => 404, 'data' => 'No Data'], 404);
|
// return $this->respond(['status' => 'failed', 'code' => 404, 'data' => 'No Data'], 200);
|
||||||
// }
|
// }
|
||||||
// } catch (\Throwable $th) {
|
// } catch (\Throwable $th) {
|
||||||
// return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $th], 500);
|
// return $this->respond(['status' => 'failed', 'code' => 500, 'data' => $th], 500);
|
||||||
@ -3359,7 +3359,7 @@ class EmployeeRestController extends AdminController
|
|||||||
return $this->respond(['status' => 'failed', 'code' => 400, 'message' => 'Firebase Token is required'], 400);
|
return $this->respond(['status' => 'failed', 'code' => 400, 'message' => 'Firebase Token is required'], 400);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
return $this->respond(['status' => 'failed', 'code' => 404, 'message' => 'Employee not found'], 404);
|
return $this->respond(['status' => 'failed', 'code' => 404, 'message' => 'Employee not found'], 200);
|
||||||
}
|
}
|
||||||
} catch (\Throwable $th) {
|
} catch (\Throwable $th) {
|
||||||
log_message('error', 'An error occurred: ' . $th->getMessage());
|
log_message('error', 'An error occurred: ' . $th->getMessage());
|
||||||
@ -3825,7 +3825,7 @@ class EmployeeRestController extends AdminController
|
|||||||
return $this->respond(['status' => false, 'code' => 400, 'message' => $message], 200);
|
return $this->respond(['status' => false, 'code' => 400, 'message' => $message], 200);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
return $this->response->setJSON(['status' => false, 'code' => 200, 'message' => 'The employee is not active.'])->setStatusCode(404);
|
return $this->response->setJSON(['status' => false, 'code' => 200, 'message' => 'The employee is not active.'])->setStatusCode(200);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -4011,7 +4011,7 @@ class EmployeeRestController extends AdminController
|
|||||||
'status' => false,
|
'status' => false,
|
||||||
'code' => 404,
|
'code' => 404,
|
||||||
'message' => 'No policy types found'
|
'message' => 'No policy types found'
|
||||||
])->setStatusCode(404);
|
])->setStatusCode(200);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->myLogger->logme('error', "Policy type IDs fetched: " . json_encode($policy_type_ids));
|
$this->myLogger->logme('error', "Policy type IDs fetched: " . json_encode($policy_type_ids));
|
||||||
@ -4084,7 +4084,7 @@ class EmployeeRestController extends AdminController
|
|||||||
// dd($emp_id);
|
// dd($emp_id);
|
||||||
|
|
||||||
if (empty($emp_id)) {
|
if (empty($emp_id)) {
|
||||||
return $this->response->setJSON(['status' => false, 'code' => 200, 'message' => 'emp_id is required.'])->setStatusCode(404);
|
return $this->response->setJSON(['status' => false, 'code' => 200, 'message' => 'emp_id is required.'])->setStatusCode(200);
|
||||||
}
|
}
|
||||||
|
|
||||||
$retail_ticket_data = [];
|
$retail_ticket_data = [];
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user