diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php index ee1e17d..7142cae 100644 --- a/app/Http/Controllers/AliranTunaiController.php +++ b/app/Http/Controllers/AliranTunaiController.php @@ -206,4 +206,51 @@ class AliranTunaiController extends Controller } } + + public function LaporanSerahan(Request $request) + { + $auth_user = Auth::user(); + $api_url = config('api.url'); + + $current = Carbon::now(); + $current = new Carbon(); + + $cawangan_info = Http::get(config('api.url') . '/api/cawangan/'. $auth_user['cawangan'])->json(); + $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'.$auth_user['cawangan'])->json(); + $cawangan_detail=$cawangan[0]; + + $tarikh_cetak = $current->toDateString(); + + $array_requestteller = []; + //wang Syilling Initialize + $rekodsen1 = 0; $rekodsen5 = 0; $rekodsen10 = 0; + $rekodsen20 = 0; $rekodsen50 = 0; + + //Wang Ringgit Initialize + $rekodring1 = 0; $rekodring5 = 0; $rekodring10 = 0; + $rekodring20 = 0; $rekodring50 = 0; $rekodring100 = 0; + + $requestteller = Http::get(config('api.url').'/api/requestTeller/getlaporan/'.$auth_user['cawangan'],["teller" => Auth::user()->name ])->json(); + + foreach($requestteller as $index => $reqtel) + { + $rekodsen1 += $reqtel['txtsen1']; + $rekodsen5 += $reqtel['txtsen5']; + $rekodsen10 += $reqtel['txtsen10']; + $rekodsen20 += $reqtel['txtsen20']; + $rekodsen50 += $reqtel['txtsen50']; + + $rekodring1 += $reqtel['txtring1']; + $rekodring5 += $reqtel['txtring5']; + $rekodring10 += $reqtel['txtring10']; + $rekodring20 += $reqtel['txtring20']; + $rekodring50 += $reqtel['txtring50']; + $rekodring100 += $reqtel['txtring100']; + } + + array_push($array_requestteller,[ "rekodsen1" => $rekodsen1,"rekodsen5" => $rekodsen5,"rekodsen10" => $rekodsen10,"rekodsen20" => $rekodsen20,"rekodsen50" => $rekodsen50 + ,"rekodring1" => $rekodring1,"rekodring5" => $rekodring5,"rekodring10" => $rekodring10,"rekodring20" => $rekodring20,"rekodring50" => $rekodring50,"rekodring100" => $rekodring100]); + + return view('aliran_tunai.laporan.laporanserahan',compact('tarikh_cetak','cawangan_info','cawangan','api_url','cawangan_detail','array_requestteller')); + } } diff --git a/public/js/main.js b/public/js/main.js index 493938c..5d9d4d0 100644 --- a/public/js/main.js +++ b/public/js/main.js @@ -513,7 +513,8 @@ function tambahdanserahanfunc(e) title: 'Serahan Modal', text: 'Serahan modal berjaya dipohon!' }).then(function(){ - location.reload(); + window.open(laporanroute, '_blank'); + location.reload(); }); }else{ Swal.fire({ diff --git a/resources/views/aliran_tunai/index.blade.php b/resources/views/aliran_tunai/index.blade.php index f542f8e..1d4fa15 100644 --- a/resources/views/aliran_tunai/index.blade.php +++ b/resources/views/aliran_tunai/index.blade.php @@ -124,6 +124,7 @@