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

CHANGE_BDS_CHANGE

Browse Source
This commit is contained in:
VENKATESHWARAN 2026-03-31 18:33:23 +05:30
parent c331f66c68
commit 47ad26a3a4
7 changed files with 183 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Controllers/PolicyTransactionController.php
View File

@ -701,11 +701,11 @@ class PolicyTransactionController extends BaseController
nhance_branch.branch_name as nhance_branch_name,
rm.first_name AS rm_name
')
->join('user_teams', 'user_profiles.id = user_teams.user_id')
// ->join('user_teams', 'user_profiles.id = user_teams.user_id')
->join('nhance_branch', 'user_profiles.nhance_branch_id = nhance_branch.id','left')
->join('user_profiles AS rm', 'user_profiles.rm_id = rm.id', 'left')
->where('user_teams.team_id', 5)
->where('user_teams.is_active', 1)
// ->where('user_teams.team_id', 5)
// ->where('user_teams.is_active', 1)
->where('user_profiles.is_active', 1)
->groupBy('user_profiles.id', 'asc')
->findAll();
@ -727,7 +727,7 @@ class PolicyTransactionController extends BaseController
->join('user_teams', 'user_profiles.id = user_teams.user_id')
->join('nhance_branch', 'user_profiles.nhance_branch_id = nhance_branch.id', 'left')
->join('user_profiles AS rm', 'user_profiles.rm_id = rm.id', 'left')
->where('user_profiles.role', 3)
// ->where('user_profiles.role', 3)
->where('user_profiles.is_active', 1)
->groupBy('user_profiles.id', 'asc')
->findAll();
@ -970,8 +970,8 @@ class PolicyTransactionController extends BaseController
'valid_date' => 'Please provide a valid D.O.E date.',
'regex_match' => 'The D.O.E date format is incorrect. '
]],
'emp_count' => ['label' => 'No of Insured', 'rules' => 'permit_empty|numeric', 'errors' => [
'numeric' => 'No of Insured must contain only numbers.'
'emp_count' => ['label' => 'No of Employees', 'rules' => 'permit_empty|numeric', 'errors' => [
'numeric' => 'No of Employees must contain only numbers.'
]],
'dependent_count' => ['label' => 'No of Dependents', 'rules' => 'permit_empty|numeric', 'errors' => [
'numeric' => 'No of Dependents must contain only numbers.'
@ -2491,9 +2491,9 @@ class PolicyTransactionController extends BaseController
'errors' => ['valid_date' => 'Please provide a valid Endorsement Effective Date.']
],
'emp_count' => [
'label' => 'No of Insured',
'label' => 'No of Employees',
'rules' => 'permit_empty|numeric',
'errors' => ['numeric' => 'No of Insured must be a number.']
'errors' => ['numeric' => 'No of Employees must be a number.']
],
'dependent_count' => [
'label' => 'No of Dependents',
@ -5792,7 +5792,7 @@ class PolicyTransactionController extends BaseController
'pt_policy_issue_date' => change_date_format($policy_issue_date, 'd/M/Y', 'Y-m-d'),
'file_id' => $params['file_id'],
'created_by' => $file['created_by'] ?? null,
'created_by' => $file['created_by'] ?? null,
];
if(!empty($vehicle_id) && !empty($client_id)){

73
app/Models/PolicyTransactionModel.php
View File

@ -1063,15 +1063,21 @@
->where('policy_transaction.is_active', 1)
->where('policy_transaction.action_type', 'inception');
if (
(!in_array(get_role_id(), [1, 5])) &&
!(
in_array(MANAGEMENT_TEAM_ID, user_team()) ||
in_array(FINANCE_TEAM_ID, user_team()) ||
in_array(BUSINESS_TEAM_ID, user_team())
)
) {
if (get_role_id() == 4 && in_array(POS_TEAM_ID, user_team())) {
// if (
// (!in_array(get_role_id(), [1, 5])) &&
// !(
// in_array(MANAGEMENT_TEAM_ID, user_team()) ||
// in_array(FINANCE_TEAM_ID, user_team()) ||
// in_array(BUSINESS_TEAM_ID, user_team())
// )
// ) {
// if (get_role_id() == 4 && in_array(POS_TEAM_ID, user_team())) {
// $builder->where('policy_transaction.created_by', get_session_userid());
// }
// }
if ((!in_array(get_role_id(), [1, 5]))) {
if (in_array(POS_TEAM_ID, user_team())) {
$builder->where('policy_transaction.created_by', get_session_userid());
}
}
@ -1165,20 +1171,27 @@
->where('policy_transaction.is_active', 1)
->where('policy_transaction.action_type !=', 'inception');
if (
(!in_array(get_role_id(), [1, 5])) &&
!(
in_array(MANAGEMENT_TEAM_ID, user_team()) ||
in_array(FINANCE_TEAM_ID, user_team()) ||
in_array(BUSINESS_TEAM_ID, user_team())
)
) {
if (get_role_id() == 4 && in_array(POS_TEAM_ID, user_team())) {
// if (
// (!in_array(get_role_id(), [1, 5])) &&
// !(
// in_array(MANAGEMENT_TEAM_ID, user_team()) ||
// in_array(FINANCE_TEAM_ID, user_team()) ||
// in_array(BUSINESS_TEAM_ID, user_team())
// )
// ) {
// if (get_role_id() == 4 && in_array(POS_TEAM_ID, user_team())) {
// $builder->where('policy_transaction.created_by', get_session_userid());
// }
// }
if ((!in_array(get_role_id(), [1, 5]))) {
if (in_array(POS_TEAM_ID, user_team())) {
$builder->where('policy_transaction.created_by', get_session_userid());
}
}
if ($start_date != 0 && $end_date != 0 && $date_type != 0) {
$this->validateDateType($date_type);
@ -3067,15 +3080,21 @@
$conditions = ""; // start safely
// 1. Role-based restrictions
if (
(!in_array(get_role_id(), [1, 5])) &&
!(
in_array(MANAGEMENT_TEAM_ID, user_team()) ||
in_array(FINANCE_TEAM_ID, user_team()) ||
in_array(BUSINESS_TEAM_ID, user_team())
)
) {
if (get_role_id() == 4 && in_array(POS_TEAM_ID, user_team())) {
// if (
// (!in_array(get_role_id(), [1, 5])) &&
// !(
// in_array(MANAGEMENT_TEAM_ID, user_team()) ||
// in_array(FINANCE_TEAM_ID, user_team()) ||
// in_array(BUSINESS_TEAM_ID, user_team())
// )
// ) {
// if (get_role_id() == 4 && in_array(POS_TEAM_ID, user_team())) {
// $conditions .= " AND pt.created_by = " . get_session_userid();
// }
// }
if ((!in_array(get_role_id(), [1, 5]))) {
if (in_array(POS_TEAM_ID, user_team())) {
$conditions .= " AND pt.created_by = " . get_session_userid();
}
}

129
app/Views/client_kyc.php
View File

@ -39,26 +39,28 @@
<input type="hidden" name="client_id" id="client_id_kyc" value="<?= isset($client['id']) ? $client['id'] : '' ?>"/>
<input type="hidden" name="kyc_doc_type_id" value="" />
<div class="form-group">
<div class="form-row">
<div class="form-group col-md-4">
<label for="emp_code">Document Name<span
class="text-danger">*</span></label>
<input type="text" class="form-control" id="other_docs_name" placeholder="Document Name" name="other_docs_name" required>
</div>
<div class="form-group col-md-4">
<label for="kyc_docs">File<span
class="text-danger">*</span></label>
<input class="form-control" type="file" name="file_name"
id="kyc_docs_file"
required accept=".pdf, .jpeg, .jpg, .png">
</div>
<!-- <div class="form-group col-md-4 align-self-end"> -->
<div class="form-group col-md-4" style="<?= isset($client['id']) ? 'margin-top: 41px;' : 'margin-top: 30px;' ?>">
<button type="submit" class="btn btn-primary waves-effect waves-light mr-1"id="btnSubmit">Save</button>
<div id="additional_docs_rows">
<div class="form-row additional-doc-row" data-row-index="0">
<div class="form-group col-md-4">
<label>Document Name<span class="text-danger">*</span></label>
<input type="text" class="form-control other-doc-name-field" placeholder="Document Name" name="other_docs_name[]" required>
</div>
<div class="form-group col-md-4">
<label>File<span class="text-danger">*</span></label>
<input class="form-control other-doc-file-field" type="file" name="file_name[]" required accept=".pdf, .jpeg, .jpg, .png">
</div>
<div class="form-group col-md-4" style="<?= isset($client['id']) ? 'margin-top: 41px;' : 'margin-top: 30px;' ?>">
<button type="button" class="btn btn-outline-danger remove-additional-doc-row" style="display:none;">Remove</button>
</div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12">
<button type="button" class="btn btn-outline-primary waves-effect waves-light mr-1" id="add_more_other_docs">Add More</button>
<button type="submit" class="btn btn-primary waves-effect waves-light mr-1" id="btnSubmit">Save</button>
</div>
</div>
</div>
</form>
</div>
@ -94,6 +96,24 @@
var kycPrimaryKey = $('#client_id_kyc').val();
function getAdditionalDocRowTemplate(index) {
return `
<div class="form-row additional-doc-row" data-row-index="${index}">
<div class="form-group col-md-4">
<label>Document Name<span class="text-danger">*</span></label>
<input type="text" class="form-control other-doc-name-field" placeholder="Document Name" name="other_docs_name[]" required>
</div>
<div class="form-group col-md-4">
<label>File<span class="text-danger">*</span></label>
<input class="form-control other-doc-file-field" type="file" name="file_name[]" required accept=".pdf, .jpeg, .jpg, .png">
</div>
<div class="form-group col-md-4" style="<?= isset($client['id']) ? 'margin-top: 41px;' : 'margin-top: 30px;' ?>">
<button type="button" class="btn btn-outline-danger remove-additional-doc-row">Remove</button>
</div>
</div>
`;
}
$(document).ready(function(){
kycPrimaryKey = $('#kyc_PrimaryKey').val();
@ -195,6 +215,20 @@
});
});
$(document).on('click', '#add_more_other_docs', function () {
var nextIndex = $('#additional_docs_rows .additional-doc-row').length;
$('#additional_docs_rows').append(getAdditionalDocRowTemplate(nextIndex));
$('#additional_docs_rows .remove-additional-doc-row').show();
});
$(document).on('click', '.remove-additional-doc-row', function () {
$(this).closest('.additional-doc-row').remove();
if ($('#additional_docs_rows .additional-doc-row').length <= 1) {
$('#additional_docs_rows .remove-additional-doc-row').hide();
}
});
})
/*** for Others documents form submit ***/
@ -202,8 +236,35 @@
event.preventDefault();
var isValid = $('#kyc_form').parsley().validate();
var rowHtml = '';
var form_action = '';
var allowedExtensions = ['pdf', 'png', 'jpeg', 'jpg'];
$('#kyc_form .other-doc-name-field, #kyc_form .other-doc-file-field').removeClass('is-invalid');
$('#additional_docs_rows .additional-doc-row').each(function() {
var docNameField = $(this).find('.other-doc-name-field');
var fileField = $(this).find('.other-doc-file-field');
var docNameValue = (docNameField.val() || '').trim();
var selectedFile = fileField[0].files[0];
if (docNameValue === '' || !selectedFile) {
isValid = false;
if (docNameValue === '') {
docNameField.addClass('is-invalid');
}
if (!selectedFile) {
fileField.addClass('is-invalid');
}
return;
}
var fileExtension = selectedFile.name.split('.').pop().toLowerCase();
if (allowedExtensions.indexOf(fileExtension) === -1) {
isValid = false;
fileField.addClass('is-invalid');
}
});
if (isValid) {
if(kycPrimaryKey === ''){
@ -240,6 +301,8 @@
}
$('#kyc_form').trigger('reset');
$('#additional_docs_rows .additional-doc-row').not(':first').remove();
$('#additional_docs_rows .remove-additional-doc-row').hide();
},
error: function(xhr, status, error) {
console.error(xhr.responseText);
@ -274,6 +337,8 @@
}
});
} else {
toastr.warning('Please fill all Additional Document rows and upload valid files.', 'Warning');
}
});
@ -291,12 +356,14 @@
if (result.isConfirmed) {
var kyc_id = $(this).attr('data-id');
$.get('<?php echo base_url('client/kyc/delete/');?>'+kyc_id, function (data) {
// console.log('kyc-'+ kyc_id)
// console.log(data)
if(data){
$('#form_'+kyc_id).show();
$('#name_'+kyc_id).hide();
var client_id = $(this).attr('data-client-id') || $('#client_id_kyc').val();
$.get('<?php echo base_url('client/kyc/delete/');?>'+kyc_id, { client_id: client_id }, function (data) {
if(data && data.status){
if (data.data) {
$('#tbody').empty();
$('#tbody').append(data.data);
}
toastr.success('Document deleted successfully', 'Success');
}
})
}
@ -317,10 +384,16 @@
if (result.isConfirmed) {
var kyc_id = $(this).attr('data-id');
$.get('<?php echo base_url('util/kyc-other-docs-delete/');?>'+kyc_id, function (data) {
// console.log('kyc-'+ kyc_id)
if(data){
$('#kyc-'+ kyc_id).remove();
var client_id = $(this).attr('data-client-id') || $('#client_id_kyc').val();
$.get('<?php echo base_url('util/kyc-other-docs-delete/');?>'+kyc_id, { client_id: client_id }, function (data) {
if(data && data.status){
if (data.data) {
$('#other_docs').empty();
$('#other_docs').append(data.data);
} else {
$('#kyc-'+ kyc_id).remove();
}
toastr.success('Document deleted successfully', 'Success');
}
})
}

12
app/Views/client_kyc_other_table.php
View File

@ -2,9 +2,17 @@
<?php foreach ($data as $index => $item): ?>
<tr id="kyc-<?= $item['id'] ?>">
<!-- <td><?= $index + 1; ?></td> -->
<td><?= esc($item['file_name']); ?></td>
<td><?= esc($item['other_docs_name']); ?></td>
<td><a id="download_<?= esc($item['id']); ?>" data-id="<?= esc($item['id']); ?>" class="mdi mdi-download" style="font-size:18px;" download title="Download file"></a></td>
<td><?= esc($item['file_name']); ?></td>
<td>
<a href="<?= base_url('download-kyc-docs/') . ($item['file_name'] ?? '') ?>" data-id="<?= esc($item['id']); ?>" class="mdi mdi-download mr-2" style="font-size:18px;" target="_blank"></a>
<i
data-id="<?= esc($item['id']); ?>"
data-client-id="<?= esc($client_id); ?>"
class="mdi mdi-delete btnKycOtherDelete"
style="font-size:18px; cursor:pointer;"
></i>
</td>
</tr>
<?php endforeach; ?>
<?php else: ?>

12
app/Views/client_kyc_primary_table.php
View File

@ -17,7 +17,17 @@
<td></td>
<?php } else { ?>
<td><?= esc($item['upload_doc_name']); ?></td>
<td><a id="download_<?= esc($item['id']); ?>" data-id="<?= esc($item['id']); ?>" class="mdi mdi-download" style="font-size:18px;" download></a></td>
<td>
<a href="<?= base_url('download-kyc-docs/') . ($item['upload_doc_name'] ?? '') ?>" data-id="<?= esc($item['id']); ?>" class="mdi mdi-download mr-2" style="font-size:18px;" target="_blank"></a>
<?php if (!empty($item['upload_doc_name']) && !empty($item['client_kyc_id'])): ?>
<i
data-id="<?= esc($item['client_kyc_id']); ?>"
data-client-id="<?= esc($client_id); ?>"
class="mdi mdi-delete btnKycDelete"
style="font-size:18px; cursor:pointer;"
></i>
<?php endif; ?>
</td>
<?php } ?>
</tr>
<?php endforeach; ?>

2
app/Views/policy_transaction_inception_form.php
View File

@ -766,7 +766,7 @@
</div> -->
<div class="form-group col-md-3" id="no_of_insured_div">
<label for="addon_policy">No of Insured<span id="base_danger"class="text-danger"></span></label>
<label for="addon_policy">No of Employees<span id="base_danger"class="text-danger"></span></label>
<input type="text" class="form-control" id="emp_count" name="emp_count" placeholder="Enter Employeee" onkeypress="return onlyNumbers(event)">
</div>

5
app/Views/policy_transaction_inception_list.php
View File

@ -661,6 +661,11 @@ function getAddPage(){
if(view == 1){
runInceptionAddFlowFromList();
setTimeout(() => {
var backUrl = '<?= base_url("policy_tranction/inception/list"); ?>';
var backButton = `<a href="${backUrl}" aria-label="Back to list"><i class="mdi mdi-arrow-left" style="font-size: 17px;"></i></a>`;
updateNavTitle('Add Policy', backButton);
}, 500);
}
}