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

fix report about GC not responding without chunk and for currentProfit check for year too not only for month

Browse Source
This commit is contained in:
hafifierahman
2025-02-24 21:28:25 +08:00
parent 956d66182a
commit 004130db85
3 changed files with 70 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Services/Reports/Account/GeneralLedger.php
+2 -2
View File
@@ -518,7 +518,7 @@ class GeneralLedger
$mulaCarbon = new Carbon($this->mula);
$hinggaCarbon = new Carbon($this->hingga);
if($this->isFullMonth($this->mula,$this->hingga) && $mulaCarbon->month < 10){
if($this->isFullMonth($this->mula,$this->hingga) && $mulaCarbon->month < 10 && $mulaCarbon->year == 2024){
$lastDayOfPreviousMonth = $mulaCarbon->subMonth()->endOfMonth();
$balancesheet_previousmonth = imbangdugabackup::on($cawangan['mysql'])->where('tarikh',$lastDayOfPreviousMonth->toDateString())->first()->toArray();
@@ -714,7 +714,7 @@ class GeneralLedger
$t_gadai = Carbon::parse($gadai->t_gadai);
$t_bayaran = Carbon::parse($trans->tarikh_bayaran);
if ($t_gadai->month === $t_bayaran->month) {
if ($t_gadai->month === $t_bayaran->month && $t_gadai->year === $t_bayaran->year) {
return false;
}else{
return true;