From 8188d59535aac94bbd2b8386e0cc381b44693d3f Mon Sep 17 00:00:00 2001 From: Afiq Date: Sun, 10 Jan 2021 17:14:29 +0800 Subject: [PATCH] fix error --- app/Http/Controllers/GadaiController.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php index d62abfc..18c15c0 100644 --- a/app/Http/Controllers/GadaiController.php +++ b/app/Http/Controllers/GadaiController.php @@ -1088,9 +1088,13 @@ class GadaiController extends Controller $cawangan_all = Cawangan::on('mysql7')->get(); $petibesi_cawangan = []; foreach($cawangan_all as $index=>$cawangan){ - $petibesi = Vault::on('mysql6')->where('Tarikh','=',$tarikh)->first(); - - array_push($petibesi_cawangan,['cawangan'=>$cawangan['details_caw'],'petibesi'=>$petibesi['BakiEod'],'tarikh'=>$tarikh]); + $petibesi = Vault::on($cawangan['mysql'])->where('Tarikh','=',$tarikh)->first(); + if(is_array($petibesi) || is_object($petibesi)){ + array_push($petibesi_cawangan,['cawangan'=>$cawangan['details_caw'],'petibesi'=>$petibesi['BakiEod'],'tarikh'=>$tarikh]); + }else{ + array_push($petibesi_cawangan,['cawangan'=>$cawangan['details_caw'],'petibesi'=>0,'tarikh'=>$tarikh]); + } + } return response()->json($petibesi_cawangan);