Merge branch 'dev' of bitbucket.org:jubilian/nhance into dev
This commit is contained in:
commit
9f35e20e2b
@ -17,6 +17,10 @@ class Acl
|
|||||||
'#^/swagger#' => ['roles' => [ADMIN_ROLE_ID]],
|
'#^/swagger#' => ['roles' => [ADMIN_ROLE_ID]],
|
||||||
'#^/fedeploy#' => ['roles' => [ADMIN_ROLE_ID]],
|
'#^/fedeploy#' => ['roles' => [ADMIN_ROLE_ID]],
|
||||||
'#^/visitOffBoardCheck#' => ['roles' => [ADMIN_ROLE_ID]],
|
'#^/visitOffBoardCheck#' => ['roles' => [ADMIN_ROLE_ID]],
|
||||||
|
'#^/logs#' => ['roles' => [ADMIN_ROLE_ID]],
|
||||||
|
'#^/util/log_list#' => ['roles' => [ADMIN_ROLE_ID]],
|
||||||
|
'#^/util/view_log#' => ['roles' => [ADMIN_ROLE_ID]],
|
||||||
|
'#^/util/download_log#' => ['roles' => [ADMIN_ROLE_ID]],
|
||||||
|
|
||||||
// ===================== PUBLIC DOWNLOADS / FORMS =====================
|
// ===================== PUBLIC DOWNLOADS / FORMS =====================
|
||||||
'#^/download-#' => ['public' => true],
|
'#^/download-#' => ['public' => true],
|
||||||
|
|||||||
@ -5621,32 +5621,25 @@ class ClientController extends AdminController
|
|||||||
],
|
],
|
||||||
|
|
||||||
'type' => [
|
'type' => [
|
||||||
'rules' => 'required|is_natural_no_zero',
|
'rules' => 'required',
|
||||||
'errors' => [
|
'errors' => [
|
||||||
'required' => 'Vehicle type is required'
|
'required' => 'Vehicle type is required'
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
|
|
||||||
'description' => [
|
'description' => [
|
||||||
'rules' => 'required|is_natural_no_zero',
|
'rules' => 'required',
|
||||||
'errors' => [
|
'errors' => [
|
||||||
'required' => 'Vehicle description is required'
|
'required' => 'Vehicle description is required'
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
'owner' => [
|
'owner' => [
|
||||||
'rules' => 'required|is_natural_no_zero',
|
'rules' => 'required',
|
||||||
'errors' => [
|
'errors' => [
|
||||||
'required' => 'Owner is required'
|
'required' => 'Owner is required'
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
|
|
||||||
'old_onwer' => [
|
|
||||||
'rules' => 'permit_empty|alpha_space',
|
|
||||||
'errors' => [
|
|
||||||
'alpha_space' => 'Old owner name can contain only letters and spaces'
|
|
||||||
]
|
|
||||||
],
|
|
||||||
|
|
||||||
];
|
];
|
||||||
if (!$this->validate($rules)) {
|
if (!$this->validate($rules)) {
|
||||||
return $this->response->setStatusCode(400)->setJSON([
|
return $this->response->setStatusCode(400)->setJSON([
|
||||||
|
|||||||
@ -4477,9 +4477,9 @@ class EmployeeController extends AdminController
|
|||||||
public function visitOffBoard(array $params)
|
public function visitOffBoard(array $params)
|
||||||
{
|
{
|
||||||
// 1. Load credentials from .env
|
// 1. Load credentials from .env
|
||||||
$apiUrl = env('WELLNESS_ONBOARD_ENDPOINT_URL');
|
$apiUrl = env('WELLNESS_ONBOARD_ENDPOINT_URL').'delete-policy-with-dependents';
|
||||||
$apiToken = env('WELLNESS_ONBOARD_AUTHORIZATION');
|
$apiToken = env('WELLNESS_ONBOARD_AUTHORIZATION');
|
||||||
|
// echo $apiUrl;die();
|
||||||
// 2. Initialize the CI4 CURL service
|
// 2. Initialize the CI4 CURL service
|
||||||
$client = \Config\Services::curlrequest([
|
$client = \Config\Services::curlrequest([
|
||||||
'base_uri' => $apiUrl,
|
'base_uri' => $apiUrl,
|
||||||
|
|||||||
@ -449,7 +449,7 @@ class MasterController extends AdminController
|
|||||||
$insert = $this->insurerBranchModel->insert($sanitized_post_data);
|
$insert = $this->insurerBranchModel->insert($sanitized_post_data);
|
||||||
|
|
||||||
if($insert){
|
if($insert){
|
||||||
for ($i = 0; $i < count($sanitized_post_data('name')); $i++) {
|
for ($i = 0; $i < count($sanitized_post_data['name']); $i++) {
|
||||||
// Prepare data to insert
|
// Prepare data to insert
|
||||||
$sanitized_post_data_for_level = [
|
$sanitized_post_data_for_level = [
|
||||||
'contact_type' => 'insurer',
|
'contact_type' => 'insurer',
|
||||||
@ -465,7 +465,7 @@ class MasterController extends AdminController
|
|||||||
}
|
}
|
||||||
|
|
||||||
if($insert){
|
if($insert){
|
||||||
$branchData = $this->insurerBranchModel->where('insurer_id', $sanitized_post_data_for_level['insurer_id'])->findAll();
|
$branchData = $this->insurerBranchModel->where('insurer_id', $sanitized_post_data['insurer_id'])->findAll();
|
||||||
echo json_encode(array("status" => true , 'data' => $branchData));
|
echo json_encode(array("status" => true , 'data' => $branchData));
|
||||||
}else{
|
}else{
|
||||||
echo json_encode(array("status" => false));
|
echo json_encode(array("status" => false));
|
||||||
@ -2168,6 +2168,10 @@ class MasterController extends AdminController
|
|||||||
public function createCDMasterData()
|
public function createCDMasterData()
|
||||||
{
|
{
|
||||||
$this->myLogger->logme("error", 'Create CD Master Data API called.');
|
$this->myLogger->logme("error", 'Create CD Master Data API called.');
|
||||||
|
$data = $this->request->getPost();
|
||||||
|
$sanitized_post_data = sanitizeInputArrayAdvanced($data);
|
||||||
|
$id = $sanitized_post_data['PrimaryKey'] ?? null;
|
||||||
|
if($id === null){
|
||||||
$rules = [
|
$rules = [
|
||||||
|
|
||||||
// ======================
|
// ======================
|
||||||
@ -2229,11 +2233,9 @@ class MasterController extends AdminController
|
|||||||
'errors' => $this->validator->getErrors()
|
'errors' => $this->validator->getErrors()
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
$data = $this->request->getPost();
|
}
|
||||||
$sanitized_post_data = sanitizeInputArrayAdvanced($data);
|
|
||||||
$this->myLogger->logme("error", 'Received POST data: ' . json_encode($data));
|
$this->myLogger->logme("error", 'Received POST data: ' . json_encode($data));
|
||||||
|
|
||||||
$id = $sanitized_post_data['PrimaryKey'] ?? null;
|
|
||||||
$date = (string) ($sanitized_post_data['opening_date'] ?? '');
|
$date = (string) ($sanitized_post_data['opening_date'] ?? '');
|
||||||
$sanitized_post_data['opening_date'] = date('Y-m-d', strtotime($date));
|
$sanitized_post_data['opening_date'] = date('Y-m-d', strtotime($date));
|
||||||
$this->myLogger->logme("error", 'Formatted opening_date: ' . $data['opening_date']);
|
$this->myLogger->logme("error", 'Formatted opening_date: ' . $data['opening_date']);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user