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:
VENKATESHWARAN 2025-04-11 17:29:52 +05:30
commit c40068619e
6 changed files with 91 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -33,3 +33,5 @@ build/
composer.lock composer.lock
.env .env
.phpunit* .phpunit*
phpqueue.sh

13
app/Models/PolicyTransactionModel.php
View File

@ -785,6 +785,19 @@ class PolicyTransactionModel extends Model
->where('policy_transaction.is_active', 1) ->where('policy_transaction.is_active', 1)
->where('pt_co_share_details.is_active', 1); ->where('pt_co_share_details.is_active', 1);
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());
}
}
// Check if the start date and end date are provided // Check if the start date and end date are provided
if ($start_date != 0 && $end_date != 0 && $date_type != 0 && $date_type != 'statement_month') { if ($start_date != 0 && $end_date != 0 && $date_type != 0 && $date_type != 'statement_month') {

12
app/Views/layout/header.php
View File

@ -732,9 +732,9 @@
</div> </div>
</li> </li>
<?php if ((get_role_id() == 1 || get_role_id() == 5) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()))) { ?> <?php if ((get_role_id() == 1 || get_role_id() == 5) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()) || in_array(POS_TEAM_ID, user_team()))) { ?>
<?php if (in_array(get_role_id(), [1,5]) || in_array(MANAGEMENT_TEAM_ID, user_team())) { ?> <?php if (in_array(get_role_id(), [1,5]) || in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(POS_TEAM_ID, user_team()) ) { ?>
<li> <li>
<a href="#policyReports" data-toggle="collapse" class="waves-effect"> <a href="#policyReports" data-toggle="collapse" class="waves-effect">
<i class="ri-file-chart-fill"></i> <i class="ri-file-chart-fill"></i>
@ -745,6 +745,7 @@
<li> <li>
<a href="<?= base_url('/policy_tranction/report/list') ?>">BDS</a> <a href="<?= base_url('/policy_tranction/report/list') ?>">BDS</a>
</li> </li>
<?php if (in_array(get_role_id(), [1,5]) || in_array(MANAGEMENT_TEAM_ID, user_team())) { ?>
<li> <li>
<a href="<?= base_url('/policy_tranction/report/report-varience-list') ?>">Variance</a> <a href="<?= base_url('/policy_tranction/report/report-varience-list') ?>">Variance</a>
</li> </li>
@ -757,11 +758,13 @@
<li> <li>
<a href="<?= base_url('/bdsReport/renewal_report') ?>">Renewal Reports</a> <a href="<?= base_url('/bdsReport/renewal_report') ?>">Renewal Reports</a>
</li> </li>
<?php } ?>
</ul> </ul>
</div> </div>
</li> </li>
<?php } ?> <?php } ?>
<?php if ((get_role_id() == 1 || get_role_id() == 5) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()) )) { ?>
<li> <li>
<a href="#policyPendingActions" data-toggle="collapse" class="waves-effect"> <a href="#policyPendingActions" data-toggle="collapse" class="waves-effect">
<i class="mdi mdi-timer-sand"></i> <i class="mdi mdi-timer-sand"></i>
@ -783,7 +786,9 @@
</ul> </ul>
</div> </div>
</li> </li>
<?php } ?>
<?php if ((get_role_id() == 1 || get_role_id() == 5) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()) )) { ?>
<li> <li>
<a href="#policyMasters" data-toggle="collapse" class="waves-effect"> <a href="#policyMasters" data-toggle="collapse" class="waves-effect">
<i class="ri-database-2-line"></i> <i class="ri-database-2-line"></i>
@ -800,13 +805,16 @@
</ul> </ul>
</div> </div>
</li> </li>
<?php } ?>
<?php if ((get_role_id() == 1 || get_role_id() == 5) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()))) { ?>
<li> <li>
<a href="<?= base_url('/dmsSearch') ?>"> <a href="<?= base_url('/dmsSearch') ?>">
<i class="ri-book-open-line"></i> <i class="ri-book-open-line"></i>
<span> Documents</span> <span> Documents</span>
</a> </a>
</li> </li>
<?php } ?>
<?php } ?> <?php } ?>
</ul> </ul>

12
app/Views/notification.php
View File

@ -264,7 +264,7 @@
<!-- Unlayer editor --> <!-- Unlayer editor -->
<div class="form-row" id="rac_rate_dropdown"> <div class="form-row" id="rac_rate_dropdown">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<div id="member_welcome_mail_editor_container" style="height: 600px;width:max-content"></div> <div id="member_welcome_mail_editor_container" style="height: 600px"></div>
</div> </div>
</div> </div>
@ -360,7 +360,7 @@
<!-- Unlayer editor --> <!-- Unlayer editor -->
<div class="form-row" id="rac_rate_dropdown"> <div class="form-row" id="rac_rate_dropdown">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<div id="member_reminder_mail_editor_container" style="height: 600px;width:max-content"></div> <div id="member_reminder_mail_editor_container" style="height: 600px"></div>
</div> </div>
</div> </div>
@ -440,7 +440,7 @@
<!-- Unlayer editor --> <!-- Unlayer editor -->
<div class="form-row" id="rac_rate_dropdown"> <div class="form-row" id="rac_rate_dropdown">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<div id="member_ecard_mail_editor_container" style="height: 600px;width:max-content"></div> <div id="member_ecard_mail_editor_container" style="height: 600px"></div>
</div> </div>
</div> </div>
@ -542,7 +542,7 @@
<!-- Unlayer editor --> <!-- Unlayer editor -->
<div class="form-row" id="rac_rate_dropdown"> <div class="form-row" id="rac_rate_dropdown">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<div id="member_review_and_summary_mail_editor_container" style="height: 600px;width:max-content"></div> <div id="member_review_and_summary_mail_editor_container" style="height: 600px;"></div>
</div> </div>
</div> </div>
@ -615,7 +615,7 @@
<!-- Unlayer editor --> <!-- Unlayer editor -->
<!-- <div class="form-row" id="rac_rate_dropdown"> --> <!-- <div class="form-row" id="rac_rate_dropdown"> -->
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<div id="account_maneger_summary_mail_editor_container" style="height: 600px;width:max-content"></div> <div id="account_maneger_summary_mail_editor_container" style="height: 600px"></div>
</div> </div>
<!-- </div> --> <!-- </div> -->
<div class="form-group text-right m-b-0"> <div class="form-group text-right m-b-0">
@ -702,7 +702,7 @@
<!-- Unlayer editor --> <!-- Unlayer editor -->
<div class="form-row" id="rac_rate_dropdown"> <div class="form-row" id="rac_rate_dropdown">
<div class="form-group col-md-12"> <div class="form-group col-md-12">
<div id="client_hr_summary_mail_editor_container" style="height: 600px;width:max-content"></div> <div id="client_hr_summary_mail_editor_container" style="height: 600px"></div>
</div> </div>
</div> </div>

4
app/Views/policy_transaction_endorsement_form.php
View File

@ -1808,7 +1808,7 @@ function addInsurerColumn() {
break; break;
} }
}else if(team_id.includes('3')){ }else if(team_id.includes('3') || team_id.includes('8')){
switch(index) { switch(index) {
case 0: // Insurer selection case 0: // Insurer selection
@ -2194,7 +2194,7 @@ function populateTable(dataArray, status = false) {
cell.find('input[type="hidden"]').val(status ? data.id : ''); cell.find('input[type="hidden"]').val(status ? data.id : '');
break; break;
} }
}else if(team_id.includes('3')){ }else if(team_id.includes('3') || team_id.includes('8')){
switch (rowIndex) { switch (rowIndex) {
case 0: // Insurer selection case 0: // Insurer selection
cell.find('select').val(insurer); cell.find('select').val(insurer);

4
app/Views/policy_transaction_inception_form.php
View File

@ -3950,7 +3950,7 @@ function addInsurerColumn() {
} }
}else if(team_id.includes('3')){ }else if(team_id.includes('3') || team_id.includes('8')){
switch(index) { switch(index) {
case 0: // Insurer selection case 0: // Insurer selection
@ -4345,7 +4345,7 @@ function populateTable(dataArray, cd_ac_pk) {
cell.find('input[type="hidden"]').val(data.id); cell.find('input[type="hidden"]').val(data.id);
break; break;
} }
}else if(team_id.includes('3')){ }else if(team_id.includes('3') || team_id.includes('8')){
switch (rowIndex) { switch (rowIndex) {
case 0: // Insurer selection case 0: // Insurer selection