KoPKB/api_arrahn
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

from server date 2025-01-14

Browse Source
This commit is contained in:
Hafifie PKB
2025-01-14 22:54:48 +08:00
parent 09af89a249
commit 1aee7390a6
10 changed files with 69 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/Reports/OnePercentService.php
+3 -1
View File
@@ -302,7 +302,9 @@ class OnePercentService
$ujrah_current = $result_audit_current->sum('ujrah');
}
/* B */
$result_audit_previous = $this->StokAuditGenerateTerakru($month_sebelum,$cawangan,$year_generate);
$year_sebelum = $date_sebelum->format('Y');
$year_publish = ($month_sekarang == 1) ? $year_sebelum : $year_generate;
$result_audit_previous = $this->StokAuditGenerateTerakru($month_sebelum,$cawangan,$year_publish);
$onepercent_previous = $result_audit_previous->sum('utgonepercent');
$ujrah_previous = $result_audit_previous->sum('ujrah');
app/Services/Reports/RingkasanHarianService.php
+2 -1
View File
@@ -821,7 +821,8 @@ class RingkasanHarianService
'011233' => '2021-06-28',
];
return $tarikhTawarruq[Str::upper($this->kodCawangan)];
$defaultDate = '2021-01-01';
return $tarikhTawarruq[Str::upper($this->kodCawangan)] ?? $defaultDate;
}
private function getOutstandingImbangDuga()