From eb10c45a3d0c4c5ab4cd27753706da1b5d5077a2 Mon Sep 17 00:00:00 2001 From: Hafifie PKB Date: Thu, 11 Jul 2024 10:54:30 +0800 Subject: [PATCH] fix akru bulananpecahan --- app/Services/Reports/OnePercentService.php | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/app/Services/Reports/OnePercentService.php b/app/Services/Reports/OnePercentService.php index bd63f56..18ea39f 100644 --- a/app/Services/Reports/OnePercentService.php +++ b/app/Services/Reports/OnePercentService.php @@ -245,14 +245,20 @@ class OnePercentService foreach($cawangan as $caw){ $akru = AkruNetPecahan::on($caw['mysql'])->where('tahun',$request->year)->orderBy('bulan')->orderBy('tahun')->get()->toArray(); for($i=0;$i<=11;$i++){ - if(isset($akru[$i])){ - $array_cawangan[$caw['details_caw']]['ujrah'][$i] = $akru[$i]['pend_akru_ujrah']; - $array_cawangan[$caw['details_caw']]['onepercent'][$i] = $akru[$i]['pend_akru_1persen']; - }else{ - $array_cawangan[$caw['details_caw']]['ujrah'][$i] = 0; - $array_cawangan[$caw['details_caw']]['onepercent'][$i] = 0; - } + $array_akru = array_filter($akru,function($e) use($i){ + return $i == $e['bulan']; + }); + if(!empty($array_akru)){ + foreach($array_akru as $ak){ + $array_cawangan[$caw['details_caw']]['ujrah'][$i] = $ak['pend_akru_ujrah']; + $array_cawangan[$caw['details_caw']]['onepercent'][$i] = $ak['pend_akru_1persen']; + } + } + else{ + $array_cawangan[$caw['details_caw']]['ujrah'][$i] = 0; + $array_cawangan[$caw['details_caw']]['onepercent'][$i] = 0; + } } }