From 4e285cb5e15f65914c45d4fd329da19bceeb8da0 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Wed, 15 Mar 2023 11:53:12 +0800 Subject: [PATCH] fix imbang duga sungai petani penghutang kakitangan --- app/Http/Controllers/AkaunController.php | 32 ++++++++++++++++-------- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/AkaunController.php b/app/Http/Controllers/AkaunController.php index 5cbb13c..c295382 100644 --- a/app/Http/Controllers/AkaunController.php +++ b/app/Http/Controllers/AkaunController.php @@ -132,7 +132,6 @@ class AkaunController extends Controller public function cetakimbangduga(Request $request) { - $auth_user = Auth::user(); $api_url = $request->hostname; @@ -194,15 +193,7 @@ class AkaunController extends Controller $totaltunaiditangan = $tunaiditangan; } - if($request->kodcaw == '010219') - { - if($tarikh_imbangan2 >= '2022-11-24') - { - $totaltunaiditangan = $totaltunaiditangan - 78379.9; - }else{ - $penghutangkaki = $penghutangkaki - 78379.9; - } - } + $jualan1stop = 0;$belian1stop = 0;$utgterkumpulxtra = 0;$rugilelongxtra = 0;$bakilelongxtra = 0;$cajlelongxtra = 0;$upahsimpanxtra = 0; //1Stop Special Case @@ -229,6 +220,20 @@ class AkaunController extends Controller $untungrugiterkumpul = Http::get($request->hostname. '/api/UntungRugiTerkumpul/'. $request->kodcaw,['tarikh' => $tarikh_imbangan2])->json(); $hartasemasa = []; + + if($request->kodcaw == '010219') + { + if($tarikh_imbangan2 >= '2023-02-16') + { + $hutang = Http::withOptions(['verify' => config('app.api_verify')])->get($request->hostname.'/admin/ig/penghutang' ,['kodcaw' => $request->kodcaw, 'tarikh' => $tarikh_imbangan2])->json(); + $bayaran_hutang = Http::withOptions(['verify' => config('app.api_verify')])->get($request->hostname.'/admin/ig/bayaran_penghutang' ,['kodcaw' => $request->kodcaw, 'tarikh' => $tarikh_imbangan2])->json(); + //if($bayaran_hutang > 0) array_push($hartasemasa,['glcode' => '8000/501','descpt' => 'Bayaran Penghutang', 'amaun' => $bayaran_hutang]); + $totaltunaiditangan = $totaltunaiditangan; + $penghutangkaki = $hutang['bakihutang'] - $bayaran_hutang; + }else{ + $penghutangkaki = $penghutangkaki; + } + } // $hartasemasa = ['serahan' => $imbangduga['serahan'],'pinjamankoop' => $pinjamandiberi['pinjamankoop'],'emaspalsu' => $pinjamandiberi['emaspalsu'],'tunaiditangan' => $tunaiditangan['bakiakhir']]; if($totaltunaiditangan > 0) array_push($hartasemasa,['glcode' => '1000/011','descpt' => 'Tunai Di Tangan', 'amaun' => $totaltunaiditangan]); @@ -461,11 +466,16 @@ class AkaunController extends Controller return redirect()->back()->with('errormessage', 'Tiada data pada tarikh tersebut.'); } + $hutang = 0; + if($request->kodcaw == '010219'){ + $hutang = Http::withOptions(['verify' => config('app.api_verify')])->get($request->hostname.'/admin/ig/penghutang' ,['kodcaw' => $request->kodcaw, 'tarikh' => $tebus_date])->json(); + $hutang = $hutang['bakihutang']; + } $cawangan=Http::get($request->hostname.'/api/cawangan/detail/'.$request->kodcaw)->json(); $cawangan_detail=$cawangan[0]; - return view('akaun.laporan_petibesi', compact('petibesi','cawangan_detail','tarikh_cetak','tebus_date','api_url')); + return view('akaun.laporan_petibesi', compact('petibesi','cawangan_detail','tarikh_cetak','tebus_date','api_url','hutang')); } public function cetaklaporan_laporan_pendserahan(Request $request)