Nhances/nhance
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
vadivelJ96 2025-08-29 17:56:28 +05:30
commit 28c82ebd1f
8 changed files with 77 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Controllers/EmpDataServiceController.php
View File

@ -1862,6 +1862,7 @@ class EmpDataServiceController extends BaseController
$status = $file['status']; $status = $file['status'];
$batch_code = $file['batch_code']; $batch_code = $file['batch_code'];
$user_id = $file['created_by']; $user_id = $file['created_by'];
$policy_issue_date = $file['policy_issue_date'];
$insurer_id = $this->clientPolicyModel->where('id', $client_policy_id)->first(); $insurer_id = $this->clientPolicyModel->where('id', $client_policy_id)->first();
@ -2086,6 +2087,7 @@ class EmpDataServiceController extends BaseController
'no_of_dependent' => count($no_of_dependent ?? []) ?? null, 'no_of_dependent' => count($no_of_dependent ?? []) ?? null,
'base_premium' => $base_bremium_and_gst['base_premium'] ?? null, 'base_premium' => $base_bremium_and_gst['base_premium'] ?? null,
'gst' => $base_bremium_and_gst['gst'] ?? null, 'gst' => $base_bremium_and_gst['gst'] ?? null,
'policy_issue_date' => $policy_issue_date ?? null,
]]); ]]);
// $this->cashDepositCalculationForInception($depositeData); // $this->cashDepositCalculationForInception($depositeData);
@ -2417,6 +2419,7 @@ class EmpDataServiceController extends BaseController
$batch_code = $file['batch_code']; $batch_code = $file['batch_code'];
$user_id = $file['created_by']; $user_id = $file['created_by'];
$event_type = $file['event_type']; $event_type = $file['event_type'];
$policy_issue_date = $file['policy_issue_date'];
$status_val = 'success'; $status_val = 'success';
@ -2519,6 +2522,7 @@ class EmpDataServiceController extends BaseController
'endorsement_no' => $endorsement_id[0] ?? null, 'endorsement_no' => $endorsement_id[0] ?? null,
'emp_count' => $emp_count ?? null, 'emp_count' => $emp_count ?? null,
'action_type' => $file['event_type'] ?? null, 'action_type' => $file['event_type'] ?? null,
'policy_issue_date' => $policy_issue_date ?? null,
]]); ]]);
@ -2999,6 +3003,7 @@ class EmpDataServiceController extends BaseController
$status = $file['status']; $status = $file['status'];
$batch_code = $file['batch_code']; $batch_code = $file['batch_code'];
$user_id = $file['created_by']; $user_id = $file['created_by'];
$policy_issue_date = $file['policy_issue_date'];
$insurer_id = $this->clientPolicyModel->where('id', $client_policy_id)->first(); $insurer_id = $this->clientPolicyModel->where('id', $client_policy_id)->first();
@ -3179,6 +3184,7 @@ class EmpDataServiceController extends BaseController
'no_of_dependent' => count($no_of_dependent ?? []) ?? null, 'no_of_dependent' => count($no_of_dependent ?? []) ?? null,
'base_premium' => $base_bremium_and_gst['base_premium'] ?? null, 'base_premium' => $base_bremium_and_gst['base_premium'] ?? null,
'gst' => $base_bremium_and_gst['gst'] ?? null, 'gst' => $base_bremium_and_gst['gst'] ?? null,
'policy_issue_date' => $policy_issue_date ?? null,
]]); ]]);
} }
@ -3537,6 +3543,7 @@ class EmpDataServiceController extends BaseController
$status = $file['status']; $status = $file['status'];
$batch_code = $file['batch_code']; $batch_code = $file['batch_code'];
$user_id = $file['created_by']; $user_id = $file['created_by'];
$policy_issue_date = $file['policy_issue_date'];
$insurer_id = $this->clientPolicyModel->where('id', $client_policy_id)->first(); $insurer_id = $this->clientPolicyModel->where('id', $client_policy_id)->first();
@ -3687,6 +3694,7 @@ class EmpDataServiceController extends BaseController
'no_of_dependent' => count($no_of_dependent ?? []) ?? null, 'no_of_dependent' => count($no_of_dependent ?? []) ?? null,
'base_premium' => $base_bremium_and_gst['base_premium'] ?? null, 'base_premium' => $base_bremium_and_gst['base_premium'] ?? null,
'gst' => $base_bremium_and_gst['gst'] ?? null, 'gst' => $base_bremium_and_gst['gst'] ?? null,
'policy_issue_date' => $policy_issue_date ?? null,
]]); ]]);
} }
@ -4981,7 +4989,7 @@ class EmpDataServiceController extends BaseController
'policy_no' => $policy_data['policy_no'] ?? null, 'policy_no' => $policy_data['policy_no'] ?? null,
'cd_ac_no' => $policy_data['cd_ac_no'] ?? null, 'cd_ac_no' => $policy_data['cd_ac_no'] ?? null,
'cd_ac_pk' => $policy_data['cd_ac_pk'] ?? null, 'cd_ac_pk' => $policy_data['cd_ac_pk'] ?? null,
'policy_issue_date' => $policy_data['policy_start_date'] ?? null, 'policy_issue_date' => $policy_data['policy_issue_date'] ?? null,
'policy_start_date' => $policy_data['policy_start_date'] ?? null, 'policy_start_date' => $policy_data['policy_start_date'] ?? null,
'policy_end_date' => $policy_data['policy_end_date'] ?? null, 'policy_end_date' => $policy_data['policy_end_date'] ?? null,
'data_received_date' => $policy_data['data_received_date'] ?? null, 'data_received_date' => $policy_data['data_received_date'] ?? null,
@ -4992,7 +5000,7 @@ class EmpDataServiceController extends BaseController
'co_share' => $policy_data['co_share'] ?? 0, 'co_share' => $policy_data['co_share'] ?? 0,
'pre_payable_by' => $policy_data['pre_payable_by'] ?? 1, 'pre_payable_by' => $policy_data['pre_payable_by'] ?? 1,
'renewal_date' => $policy_data['policy_end_date'] ?? null, 'renewal_date' => $policy_data['policy_end_date'] ?? null,
'month' => date('Y-m-01', strtotime($policy_data['policy_start_date'])) ?? null, 'month' => date('Y-m-01', strtotime($policy_data['policy_issue_date'] ?? "")) ?? null,
'ct_type' => 1, 'ct_type' => 1,
'is_cd_reduce_from_bds' => 0, 'is_cd_reduce_from_bds' => 0,
'client_type_id' => 0, 'client_type_id' => 0,

8
app/Controllers/EmployeeController.php
View File

@ -515,6 +515,7 @@ class EmployeeController extends AdminController
$client_branch_id = $this->request->getPost('client_branch_id'); $client_branch_id = $this->request->getPost('client_branch_id');
$insurer_or_tpa = $this->request->getPost('insurer_or_tpa'); $insurer_or_tpa = $this->request->getPost('insurer_or_tpa');
$actions = $this->request->getPost('action_type'); $actions = $this->request->getPost('action_type');
$policy_issue_date = $this->request->getPost('policy_issue_date');
$client_data = $this->clientPolicyModel->getCliendDataForExcelFileName($client_policy_id); $client_data = $this->clientPolicyModel->getCliendDataForExcelFileName($client_policy_id);
$file_name = generate_filename($client_data['short_name'], $event_type, $actions, $insurer_or_tpa, $client_data['policy_type'], $client_data['branch_code']); $file_name = generate_filename($client_data['short_name'], $event_type, $actions, $insurer_or_tpa, $client_data['policy_type'], $client_data['branch_code']);
@ -530,6 +531,13 @@ class EmployeeController extends AdminController
'actions' => $actions, 'actions' => $actions,
'file_name' => $file_name, 'file_name' => $file_name,
]; ];
$batch_data['policy_issue_date'] = (!empty($policy_issue_date) && strtotime($policy_issue_date) !== false)
? change_date_format($policy_issue_date)
: null;
if ($actions == 'export') { if ($actions == 'export') {
if ($event_type == 'inception' || $event_type == 'addition' || $event_type == 'dependent_addition' || $event_type == 'missed_inception' || ($event_type == 'MultipleEvents' && $insurer_or_tpa == 'tpa')) { if ($event_type == 'inception' || $event_type == 'addition' || $event_type == 'dependent_addition' || $event_type == 'missed_inception' || ($event_type == 'MultipleEvents' && $insurer_or_tpa == 'tpa')) {

1
app/Controllers/LeadsController.php
View File

@ -3676,6 +3676,7 @@ class LeadsController extends BaseController
$result = $this->gmailSentHistoryModel $result = $this->gmailSentHistoryModel
->where('pk', $id) ->where('pk', $id)
->where('module',"leads") ->where('module',"leads")
->orderBy('created_at', 'desc')
->findAll(); ->findAll();
if(!empty($result)){ if(!empty($result)){
$result = !empty($result) ? $result : []; $result = !empty($result) ? $result : [];

4
app/Controllers/ThzController.php
View File

@ -299,7 +299,9 @@ class ThzController extends BaseController
// $details = $this->thzHistoryModal->whereIn('thz_id', $thz_id)->where('is_active', 1)->get()->getResultArray(); // $details = $this->thzHistoryModal->whereIn('thz_id', $thz_id)->where('is_active', 1)->get()->getResultArray();
$details = $this->thzHistoryModel->select('thz_history.*, CONCAT(user_profiles.first_name, " ", user_profiles.last_name) as created_name') $details = $this->thzHistoryModel->select('thz_history.*, CONCAT(user_profiles.first_name, " ", user_profiles.last_name) as created_name')
->join('user_profiles', 'user_profiles.id = thz_history.created_by', 'left') ->join('user_profiles', 'user_profiles.id = thz_history.created_by', 'left')
->where('thz_history.thz_id', $thz_id)->where('thz_history.is_active', 1)->get()->getResultArray(); ->where('thz_history.thz_id', $thz_id)->where('thz_history.is_active', 1)
->orderBy('thz_history.created_at', 'desc')
->get()->getResultArray();

1
app/Models/BatchFileModel.php
View File

@ -25,6 +25,7 @@ class BatchFileModel extends Model
"status", "status",
"error_data", "error_data",
"client_branch_id", "client_branch_id",
"policy_issue_date",
]; ];
// Callbacks // Callbacks

33
app/Views/insurer_or_tpa_data.php
View File

@ -90,9 +90,15 @@
</select> </select>
</div> </div>
</div> </div>
<div class="form-row policy_issue_date_row" style="display:none;">
<div class="form-group col-md-4">
<label id="policy_issue_date_label">Policy Issue Date</label> <br />
<input type="text" class="form-control" id="policy_issue_date" name="policy_issue_date"
placeholder="Enter Policy Issue Date">
</div>
</div>
<br> <br>
<div class="form-row" id="import_excel_btn"> <div class="form-row" id="import_excel_btn">
<div class="form-group col-md-3"> <div class="form-group col-md-3">
<label>Upload file</label>&nbsp;[ <a id="import_excel_download" data-toggle="tooltip" data-placement="top" title="Download Import Sample Excel" style="display: none;">Sample Excel</a> ] <label>Upload file</label>&nbsp;[ <a id="import_excel_download" data-toggle="tooltip" data-placement="top" title="Download Import Sample Excel" style="display: none;">Sample Excel</a> ]
@ -144,6 +150,16 @@
}); });
$(document).ready(function() {
var policy_issue_datePicker = flatpickr("#policy_issue_date", {
dateFormat: "d/m/Y",
allowInput: false,
});
$('#insurer_or_tpa, #action_type').on('change', togglePolicyIssueDate);
});
$(document).ready(function() { $(document).ready(function() {
<?php if (session()->has('error')) : ?> <?php if (session()->has('error')) : ?>
@ -731,3 +747,18 @@
//------------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------------
</script> </script>
<script>
function togglePolicyIssueDate() {
let insurer = $('#insurer_or_tpa').val();
let action = $('#action_type').val();
if (insurer === 'insurer' && action === 'import') {
$('.policy_issue_date_row').show();
$('#policy_issue_date').attr('required', true);
$('#policy_issue_date_label').html('Policy Issue Date <span class="text-danger">*</span>');
} else {
$('.policy_issue_date_row').hide();
$('#policy_issue_date').removeAttr('required').val('');
$('#policy_issue_date_label').text('Policy Issue Date');
}
}
</script>

29
app/Views/thz_list.php
View File

@ -158,7 +158,7 @@ table thead th {
.form-control { .form-control {
background-color: #ECECEC !important; background-color: #ECECEC !important;
border: 1px solid #ccc; /* optional */ border: 1px solid #ccc; /* optional */
color: #000; /* keep text readable */ /* color: #000; keep text readable */
} }
.form-control:focus { .form-control:focus {
@ -175,12 +175,11 @@ table thead th {
/* Text inside */ /* Text inside */
.select2-container .select2-selection__rendered { .select2-container .select2-selection__rendered {
color: #000 !important;
line-height: 36px !important; line-height: 36px !important;
} }
.select2-container--default .select2-results__option--highlighted.select2-results__option--selectable { .select2-container--default .select2-results__option--highlighted.select2-results__option--selectable {
background-color: #ECECEC !important; background-color: #00999E !important;
} }
@ -193,7 +192,7 @@ table thead th {
<div class="card-body maincard"> <div class="card-body maincard">
<div class="row"> <div class="row">
<div class="col-6" style="align-self: center;"> <div class="col-6" style="align-self: center;">
<p class="title-text app-font-family" style="position: relative;">Tickets </p> <p class="title-text app-font-family font-color-black" style="position: relative;">Tickets </p>
</div> </div>
</div> </div>
<div> <div>
@ -286,7 +285,7 @@ table thead th {
<div class="form-row mt-3 w-100"> <div class="form-row mt-3 w-100">
<div class="form-group col-md-6 app-font-family"> <div class="form-group col-md-6 app-font-family">
<label for="client_id">Client</label> <label for="client_id">Client</label>
<select class="form-control app-field-grey" id="client_id" name="client_id"> <select class="form-control app-field-grey font-color-black" id="client_id" name="client_id">
<option value="">Select Client</option> <option value="">Select Client</option>
<?php if(isset($client_list)) { ?> <?php if(isset($client_list)) { ?>
<?php foreach ($client_list as $c) { ?> <?php foreach ($client_list as $c) { ?>
@ -305,7 +304,7 @@ table thead th {
</div> </div>
<div class="form-group col-md-1" style="padding:32.5px 0 0 18px;"> <div class="form-group col-md-1" style="padding:32.5px 0 0 18px;">
<button type="button" class="btn-custom app-btn-primary app-font-family" style="padding: 0 10px !important; border-radius:13px;" onclick="getAutoFetchDetails()"><i class="mdi mdi-cached app-text-white" style="font-size:24px;"></i></button> <button type="button" class="btn-custom app-btn-primary app-font-family" style="padding: 0 10px !important; border-radius:13px;" onclick="getAutoFetchDetails()"><i class="mdi mdi-cached " style="font-size:24px;"></i></button>
</div> </div>
</div> </div>
</div> </div>
@ -419,7 +418,7 @@ table thead th {
</div> </div>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn app-btn-primary app-btn-border-radius mr-2 app-text-white" onclick="resetTicket()">Reset</button> <button type="button" class="btn app-btn-primary app-btn-border-radius mr-2 " onclick="resetTicket()">Reset</button>
<button type="button" class="btn app-btn-secondary app-btn-border-radius" onclick="submitTicket()">Save</button> <button type="button" class="btn app-btn-secondary app-btn-border-radius" onclick="submitTicket()">Save</button>
</div> </div>
</form> </form>
@ -737,31 +736,31 @@ $(document).ready(function() {
"<'row'<'col-sm-5'i><'col-sm-7'p>>", "<'row'<'col-sm-5'i><'col-sm-7'p>>",
buttons: [ buttons: [
{ {
text: '<i class="mdi mdi-plus app-text-white" ></i><span class="app-text-white app-font-family btn-custom"> Create New Ticket </span>', text: '<i class="mdi mdi-plus" ></i><span class="app-font-family btn-custom"> Create New Ticket </span>',
className: 'btn app-btn-primary app-btn-border-radius app-text-white mr-2', className: 'btn app-btn-primary app-btn-border-radius mr-2',
action: function(e, dt, node, config) { action: function(e, dt, node, config) {
openTicket(); openTicket();
} }
}, },
{ {
extend: 'collection', extend: 'collection',
text: '<span class="app-text-white app-font-family btn-custom"> Export </span><i class="mdi mdi-menu-down app-text-white"></i>', text: '<span class="app-font-family btn-custom"> Export </span><i class="mdi mdi-menu-down"></i>',
className: 'btn app-btn-secondary app-btn-border-radius app-text-white', className: 'btn app-btn-secondary app-btn-border-radius',
buttons: [ buttons: [
{ {
extend: 'csv', extend: 'csv',
text: '<i class="mdi mdi-file-delimited app-text-white" ></i><span class="app-text-white app-font-family btn-custom"> CSV </span>', text: '<i class="mdi mdi-file-delimited " ></i><span class=" app-font-family btn-custom"> CSV </span>',
title: 'Tickets', title: 'Tickets',
className: 'app-btn-primary app-text-white', className: 'app-btn-primary ',
}, },
{ {
extend: 'excel', extend: 'excel',
text: '<i class="mdi mdi-file-excel app-text-white" ></i><span class="app-text-white app-font-family btn-custom"> EXCEL </span>', text: '<i class="mdi mdi-file-excel " ></i><span class=" app-font-family btn-custom"> EXCEL </span>',
title: 'Tickets', title: 'Tickets',
exportOptions: { exportOptions: {
orthogonal: 'sort' orthogonal: 'sort'
}, },
className: 'app-btn-primary app-text-white', className: 'app-btn-primary ',
} }
] ]
} }

15
app/Views/thz_notes.php
View File

@ -125,12 +125,12 @@ hr{
/* Text inside */ /* Text inside */
.select2-container .select2-selection__rendered { .select2-container .select2-selection__rendered {
color: #000 !important; /* color: #000 !important; */
line-height: 36px !important; line-height: 36px !important;
} }
.select2-container--default .select2-results__option--highlighted.select2-results__option--selectable { .select2-container--default .select2-results__option--highlighted.select2-results__option--selectable {
background-color: #ECECEC !important; background-color: #00999E !important;
} }
</style> </style>
@ -472,7 +472,7 @@ hr{
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
</div> </div>
<div class="modal-body card-scroll container" style="padding:5px 11px 11px 11px!important;"> <div class="modal-body card-scroll history-container" style="padding:5px 11px 11px 11px!important;">
</div> </div>
</div> </div>
@ -601,12 +601,13 @@ hr{
</script> </script>
<script> <script>
function statusHistory(thzId) { function statusHistory(thzId) {
console.log("*****");
$.ajax({ $.ajax({
url: "<?= base_url('ticketHistoryList?thz_id=') ?>" + thzId, url: "<?= base_url('ticketHistoryList?thz_id=') ?>" + thzId,
type: "GET", type: "GET",
dataType: "json", dataType: "json",
success: function(response) { success: function(response) {
let container = $(".container"); let container = $(".history-container");
container.empty(); // clear old content container.empty(); // clear old content
if (response.status === "success" && response.data.length > 0) { if (response.status === "success" && response.data.length > 0) {
@ -661,7 +662,7 @@ function statusHistory(thzId) {
} else { } else {
container.html(` container.html(`
<div class="d-flex justify-content-center align-items-center" style="height: 50vh; width:100%;"> <div class="d-flex justify-content-center align-items-center" style="height: 50vh; width:100%;">
<p class="text-center"><i>${response.message ?? 'No history found'}</i></p> <p class="text-center app-font-family font-color-black"><i>${response.message ?? 'No history found'}</i></p>
</div> </div>
`); `);
} }
@ -669,9 +670,9 @@ function statusHistory(thzId) {
$("#StatusModal").modal("show"); $("#StatusModal").modal("show");
}, },
error: function(xhr) { error: function(xhr) {
$(".container").html(` $(".history-container").html(`
<div class="d-flex justify-content-center align-items-center" style="height: 50vh; width:100%;"> <div class="d-flex justify-content-center align-items-center" style="height: 50vh; width:100%;">
<p class="text-center"><i>No Data Found</i></p> <p class="text-center app-font-family font-color-black"><i>No Data Found</i></p>
</div> </div>
`); `);
$("#StatusModal").modal("show"); $("#StatusModal").modal("show");