Merged in hotfix/bilangan-kuantiti (pull request #195)
fix akru bulananpecahan
This commit is contained in:
@@ -245,14 +245,20 @@ class OnePercentService
|
|||||||
foreach($cawangan as $caw){
|
foreach($cawangan as $caw){
|
||||||
$akru = AkruNetPecahan::on($caw['mysql'])->where('tahun',$request->year)->orderBy('bulan')->orderBy('tahun')->get()->toArray();
|
$akru = AkruNetPecahan::on($caw['mysql'])->where('tahun',$request->year)->orderBy('bulan')->orderBy('tahun')->get()->toArray();
|
||||||
for($i=0;$i<=11;$i++){
|
for($i=0;$i<=11;$i++){
|
||||||
if(isset($akru[$i])){
|
$array_akru = array_filter($akru,function($e) use($i){
|
||||||
$array_cawangan[$caw['details_caw']]['ujrah'][$i] = $akru[$i]['pend_akru_ujrah'];
|
return $i == $e['bulan'];
|
||||||
$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;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user