From 86fa607efbcc2e040b80d589c3f1049238d355e3 Mon Sep 17 00:00:00 2001 From: fifi97 Date: Wed, 5 May 2021 09:11:11 +0800 Subject: [PATCH] fix laporan --- app/Http/Controllers/LaporanController.php | 31 ++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/LaporanController.php b/app/Http/Controllers/LaporanController.php index 5ee9dbe..7204d7f 100644 --- a/app/Http/Controllers/LaporanController.php +++ b/app/Http/Controllers/LaporanController.php @@ -14,6 +14,7 @@ use App\Panjar; use App\Lelong; use App\Advansur; use App\Vault; +use App\Tunai; use App\Denominasi; use Carbon\Carbon; @@ -72,7 +73,32 @@ class LaporanController extends Controller //e /* Imbang Duga */ - + $totalbakiakhirtunai = 0; + + $vault=Vault::on($cawangan['mysql']) + ->where('kodcaw','=',$request->kodcaw) + ->where('tarikh','<=', $request->tarikh) + ->orderby('tarikh','desc')->first(); + + $tunai = Tunai::on($cawangan['mysql']) + ->where('kodcaw','=',$request->kodcaw) + ->where('tarikh','=', $request->tarikh) + ->get(); + + $total = 0; + foreach($tunai as $index=>$money) + { + $total+=$money['baki']; + } + + + if($total != 0) + { + $totalbakiakhirtunai = $vault['bakiakhir'] + $total; + }else + { + $totalbakiakhirtunai = $vault['bakiakhir']; + } /* Stok Audit */ @@ -153,7 +179,8 @@ class LaporanController extends Controller 'total_keuntungan'=>floatval($total_keuntungan), 'petibesi_sistem'=>$petibesi_sistem, 'petibesi_deno'=>$petibesi_deno, - 'stokaudit'=>$stokaudit + 'stokaudit'=>$stokaudit, + 'petibesiimbangduga'=>$totalbakiakhirtunai ]);