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

MERGE_UAT_BUG_FIXES

Browse Source
This commit is contained in:
Ubuntu 2026-07-10 11:41:20 +05:30
commit 18a76f125f
2 changed files with 40 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/Controllers/EmployeeRestController.php
View File

@ -483,6 +483,33 @@ class EmployeeRestController extends AdminController
}
}
private function getClaimStatusReason(string $claimStatus, array $claimsData): string
{
$statusReasonConfig = [
'REJECTED' => ['denial_reason', 'head_rejection_reason'],
'CANCELLED' => ['cancel_remark'],
'CANCELED' => ['cancel_remark'],
'RETURNED' => ['return_remark'],
];
$claimStatusKey = strtoupper($claimStatus);
if (! isset($statusReasonConfig[$claimStatusKey])) {
return '';
}
foreach ($statusReasonConfig[$claimStatusKey] as $field) {
if (! empty($claimsData[$field])) {
$reason = trim((string) $claimsData[$field]);
if ($reason !== '') {
return $reason;
}
}
}
return '';
}
public function deleteDependence()
{
try {
@ -2779,10 +2806,19 @@ class EmployeeRestController extends AdminController
$unique_key = $display_name;
}
$filtered_history[$unique_key] = [
$modifiedAt = date('d-m-Y h:i A', strtotime($value['created_at']));
$reason = $this->getClaimStatusReason($status, $data['claims_data']);
$statusEntry = [
'modified_by' => "",
'modified_at' => date('d-m-Y h:i A', strtotime($value['created_at'])),
'modified_at' => $modifiedAt,
];
if ($reason !== '') {
$statusEntry['reason'] = ' Reason : ' . $reason;
}
$filtered_history[$unique_key] = $statusEntry;
}
}
}

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

@ -2150,7 +2150,7 @@ body[data-sidebar-size="condensed"] .footer {
<?php } ?>
<!-- Expence -->
<?php if (in_array(get_role_id(), [1, 5])) { ?>
<!-- <?php if (in_array(get_role_id(), [1, 5])) { ?>
<li class="li-seperate" id="clients-li">
<a href="<?= base_url('expense') ?>" class="img-inactive">
<img style="border-radius: 5px;"
@ -2158,7 +2158,7 @@ body[data-sidebar-size="condensed"] .footer {
<span> Expense </span>
</a>
</li>
<?php } ?>
<?php } ?> -->
<!-- BDS -->
<?php if ((get_role_id() == 1 || get_role_id() == 5 || get_role_id() == 4) || (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()))) { ?>