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

Merge remote-tracking branch 'origin/dev' into dev

Browse Source
This commit is contained in:
velz 2026-04-01 14:37:42 +05:30
commit 423f711f97
2 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Controllers/PolicyTransactionController.php
View File

@ -5263,6 +5263,7 @@ class PolicyTransactionController extends BaseController
bds_dump_files.file_name,
bds_dump_files.status,
bds_dump_files.created_at,
bds_dump_files.created_by,
up.first_name as user_name
')
->join('user_profiles as up', 'bds_dump_files.created_by = up.id', 'left')
@ -5270,6 +5271,12 @@ class PolicyTransactionController extends BaseController
->orderBy('bds_dump_files.id', 'desc')
->findAll();
if (in_array(get_role_id(), [2, 3, 4])) {
$data['bds_dump_file_data'] = array_values(array_filter($data['bds_dump_file_data'], function ($file) {
return (int) ($file['created_by'] ?? 0) === (int) get_session_userid();
}));
}
return $this->loadLayout('bds_dump_file_list', $data);
} else {
@ -5313,7 +5320,8 @@ class PolicyTransactionController extends BaseController
$status = 'inprogress';
$insert_data = [
'file_name' => $filename,
'status' => $status
'status' => $status,
'created_by' => get_session_userid()
];
$file_id = $this->bdsDumpModel->insert($insert_data);

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

@ -2084,16 +2084,13 @@ body[data-sidebar-size="condensed"] .footer {
<div class="collapse" id="policyTransactionsSub">
<ul>
<?php 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()) || in_array(POS_TEAM_ID, user_team()))) { ?>
<?php if (in_array(get_role_id(), [1, 2, 3, 4, 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()))) { ?>
<li>
<a href="<?= base_url('/policy_tranction/inception/list?view=1') ?>">Policy Add</a>
</li>
<li>
<a href="<?= base_url('/policy_tranction/inception/list') ?>">Policy List</a>
</li>
<!-- <li>
<a href="<?= base_url('/policy_tranction/inception/list2') ?>">Policy 2</a>
</li> -->
<li>
<a href="<?= base_url('/policy_tranction/endorsement/list') ?>">Endorsement</a>
</li>
@ -2108,9 +2105,10 @@ body[data-sidebar-size="condensed"] .footer {
</div>
</li>
<?php if ((get_role_id() == 1 || get_role_id() == 5) || (get_role_id() == 4 && in_array(FINANCE_TEAM_ID, user_team())) || (in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(FINANCE_TEAM_ID, user_team()) || in_array(BUSINESS_TEAM_ID, user_team()))) { ?>
<?php if ((in_array(get_role_id(), [1, 5])) || ((in_array(get_role_id(), [2, 3, 4])) && in_array(FINANCE_TEAM_ID, user_team())) || (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()) || in_array(POS_TEAM_ID, user_team())) { ?>
<?php if (in_array(get_role_id(), [1, 5]) || (get_role_id() == 4 && in_array(FINANCE_TEAM_ID, user_team())) || in_array(MANAGEMENT_TEAM_ID, user_team())) { ?>
<li>
<a href="#policyReports" data-toggle="collapse" class="waves-effect">
@ -2119,10 +2117,19 @@ body[data-sidebar-size="condensed"] .footer {
</a>
<div class="collapse" id="policyReports">
<ul class="nav-third-level">
<li>
<a href="<?= base_url('/policy_tranction/report/list') ?>">BDS</a>
</li>
<?php if (in_array(get_role_id(), [1, 5]) || (get_role_id() == 4 && in_array(FINANCE_TEAM_ID, user_team())) || in_array(MANAGEMENT_TEAM_ID, user_team())) { ?>
<?php if (
in_array(POS_TEAM_ID, user_team()) // Case 4: Role Any + Must be in POS Team (global guard)
&& (
in_array(get_role_id(), [1, 5]) // Case 1: Role 1 or 5
|| (in_array(get_role_id(), [4]) && in_array(FINANCE_TEAM_ID, user_team())) // Case 2: Role 4 + Finance Team
|| in_array(MANAGEMENT_TEAM_ID, user_team()) // Case 3: Role Any + Management Team
)
) { ?>
<li>
<a href="<?= base_url('/policy_tranction/report/list') ?>">BDS</a>
</li>
<?php } ?>
<?php if (in_array(get_role_id(), [1, 5]) || ((in_array(get_role_id(), [2, 3])) && in_array(FINANCE_TEAM_ID, user_team())) || in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(POS_TEAM_ID, user_team())) { ?>
<li>
<a href="<?= base_url('/policy_tranction/report/report-varience-list') ?>">Variance</a>
</li>
@ -2142,7 +2149,8 @@ body[data-sidebar-size="condensed"] .footer {
</ul>
</div>
</li>
<?php } ?>
<?php if (in_array(get_role_id(), [1, 5]) || in_array(MANAGEMENT_TEAM_ID, user_team()) || in_array(POS_TEAM_ID, user_team())) { ?>
<li>
<a href="#policy_tat_report_type" data-toggle="collapse" class="waves-effect">
<i class="ri-file-chart-fill"></i>
@ -2245,8 +2253,7 @@ body[data-sidebar-size="condensed"] .footer {
</li>
<?php } ?>
<?php 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()))) { ?>
<?php if (in_array(get_role_id(), [1,5])) { ?>
<li>
<a href="<?= base_url('/policy_tranction/inception/list2') ?>">
<i class="ri-barcode-line"></i>