From 05bbd5c2c275a77932a68ec1010cc54016c002d5 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Sat, 6 Nov 2021 12:29:14 +0800 Subject: [PATCH] fix lejeram --- app/Http/Controllers/KhazanahController.php | 106 +-- app/Lejeram.php | 21 + .../views/homepage/khazanah/home.blade.php | 664 ++++++++++++++--- .../laporan/pendahuluanserahan.blade.php | 2 +- .../views/print/laporan_lejer_am.blade.php | 681 +++++++++--------- 5 files changed, 973 insertions(+), 501 deletions(-) create mode 100644 app/Lejeram.php diff --git a/app/Http/Controllers/KhazanahController.php b/app/Http/Controllers/KhazanahController.php index 827a7ba..d7cd0f7 100644 --- a/app/Http/Controllers/KhazanahController.php +++ b/app/Http/Controllers/KhazanahController.php @@ -13,6 +13,7 @@ use App\Events\NotifikasiAGH; use App\User; use App\Cawangan; +use App\Lejeram; use Illuminate\Http\Request; use Illuminate\Support\Facades\Http; @@ -2766,64 +2767,73 @@ class KhazanahController extends Controller $tarikh_akhir = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0]; } - //Calculation Imbang Duga - $imbangduga = Http::get(config('api.url').'/api/PendahuluanSerahanLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - - $keuntungan = Http::get(config('api.url').'/api/KeuntunganArRahnLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $rebet = Http::get(config('api.url').'/api/RebetCalculationLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - //Harta semasa - $pinjamandiberi = Http::get(config('api.url').'/api/PinjamanDiberiLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $pembiayaantawarruq = Http::get(config('api.url').'/api/PembiayaanDiberiTawarruqLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $tunaiditangan = Http::get(config('api.url').'/api/TunaiDiTanganLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $untungrugi = Http::get(config('api.url').'/api/UntungRugiCalculationLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $bayaranpendahuluan = Http::get(config('api.url').'/api/BayaranPendahuluanLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + $lejeramdata = Lejeram::orderBy('glcode')->get(); + $lejeram = array(); + $len = count($lejeramdata); + $totalkredit = 0; + $totaldebit = 0; - //Tanggungan Semasa - $panjar = Http::get(config('api.url').'/api/CalculationPanjarLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $bakilelong = Http::get(config('api.url').'/api/BakiLelongCalculationLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $keuntungansebenar = Http::get(config('api.url').'/api/KeuntunganSebenarLejer/' . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); + foreach($lejeramdata as $index => $lejer) + { - $Debit = []; - $TotalDebit = 0; - $TotalTunaiDebit = 0; - $TotalTunaiKredit = 0; + + if($lejer->api_redirect != null) + { + ${$lejer['variable']} = Http::get(config('api.url'). $lejer['api_redirect'] . $auth_user['cawangan'],['mula' => $tarikh_mula, 'hingga' => $tarikh_akhir])->json(); - $TotalTunaiDebit = $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian'] + $bakilelong['rugilelong']; - $TotalTunaiKredit = $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan'] + $bakilelong['bakilelong']; + if($lejer->namadebit == null) + { + $debit = null; + }else{ + if($lejer->oneVar == 1) + { + $debit = ${$lejer['variable']}; + }else{ + $debit = ${$lejer['variable']}[$lejer->namadebit]; + } - array_push($Debit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $TotalTunaiKredit]); - array_push($Debit,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['Gadai']]); - array_push($Debit,['glcode' => '1000/017','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq['Gadai']]); - array_push($Debit,['glcode' => '1000/041','descpt' => 'Bayaran Pendahuluan','amaun' => 0.00]); - array_push($Debit,['glcode' => '1000/241','descpt' => 'Rebet','amaun' => ($rebet)]); - array_push($Debit,['glcode' => '1000/211','descpt' => 'Keuntungan Tertangguh', 'amaun' => $keuntungan]); - if($imbangduga['serahan'] > 0) array_push($Debit,['glcode' => '1000/020','descpt' => 'Serahan Kepada HQ', 'amaun' => $imbangduga['serahan']]); - if($panjar['bds'] > 0) array_push($Debit,['glcode' => '3000/017','descpt' => 'PANJAR - Baiki dan Selenggara','amaun' => $panjar['bds']]); - if($panjar['perubatan'] > 0) array_push($Debit,['glcode' => '3000/018','descpt' => 'PANJAR - Belanja AM','amaun' => $panjar['perubatan']]); - if($panjar['keraian'] > 0) array_push($Debit,['glcode' => '3000/019','descpt' => 'PANJAR - Keraian Dan Promosi','amaun' => $panjar['keraian']]); - if($bakilelong['rugilelong'] != 0) array_push($Debit,['glcode' => '3000/020','descpt' => 'Kerugian Lelong','amaun' => $bakilelong['rugilelong']]); + $totaldebit += floatval($debit); + } + if($lejer->namakredit == null) + { + $kredit = null; + }else{ + if($lejer->oneVar == 1) + { + $kredit = ${$lejer['variable']}; + }else{ + $kredit = ${$lejer['variable']}[$lejer->namakredit]; + } - $TotalDebit = $TotalTunaiKredit + $pinjamandiberi['Gadai'] + $pembiayaantawarruq['Gadai'] + $rebet + $keuntungan + $imbangduga['serahan'] + $panjar['bds'] + $panjar['perubatan'] + $panjar['keraian'] + $bakilelong['rugilelong']; + $totalkredit += floatval($kredit); + } - $Kredit = []; - $TotalKredit = 0; + if(!($kredit == null && $debit == null)) + { + array_push($lejeram,['glcode' => $lejer->glcode, 'descpt' => $lejer->descpt,'debit' => ($debit) ? $debit : 0,'kredit' => ($kredit) ? $kredit : 0]); + } + }else{ + array_push($lejeram,['glcode' => $lejer->glcode, 'descpt' => $lejer->descpt,'debit' => 0,'kredit' => 0]); + } - array_push($Kredit,['glcode' => '1000/010','descpt' => 'Tunai Di Tangan', 'amaun' => $TotalTunaiDebit]); - array_push($Kredit,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['Tebus']]); - array_push($Kredit,['glcode' => '1000/017','descpt' => 'Pembiayaan Di Bawah Tawarruq', 'amaun' => $pembiayaantawarruq['Tebus']]); - array_push($Kredit,['glcode' => '1000/041','descpt' => 'Bayaran Pendahuluan','amaun' => ($bayaranpendahuluan)]); - array_push($Kredit,['glcode' => '5000/241','descpt' => 'Rebet','amaun' => ($rebet)]); - array_push($Kredit,['glcode' => '5000/211','descpt' => 'Keuntungan Tergantung', 'amaun' => $keuntungan]); - array_push($Kredit,['glcode' => '5000/013','descpt' => 'Upah Simpan','amaun' => $keuntungansebenar]); - array_push($Kredit,['glcode' => '5000/007','descpt' => 'Keuntungan Semasa', 'amaun' => $untungrugi]); - if($imbangduga['pendahuluan'] > 0) array_push($Kredit,['glcode' => '7000/102','descpt' => 'Pendahuluan Daripada HQ','amaun' => $imbangduga['pendahuluan']]); - if($bakilelong['bakilelong'] != 0) array_push($Kredit,['glcode' => '7000/090','descpt' => 'Baki Lelong','amaun' => $bakilelong['bakilelong']]); + if($index == $len-1) + { + $lejeram[0]['debit'] = $totalkredit; + $lejeram[0]['kredit'] = $totaldebit; + } + } - $TotalKredit = $TotalTunaiDebit + $pinjamandiberi['Tebus'] + $pembiayaantawarruq['Tebus'] + $rebet + $keuntungan + $keuntungansebenar + $untungrugi + $bayaranpendahuluan + $imbangduga['pendahuluan'] + $bakilelong['bakilelong']; - - return view('print.laporan_lejer_am',compact('cawangan','cawangan_info', 'api_url','cawangan_detail','tarikh_akhir','tarikh_mula','TotalDebit','Debit','TotalKredit','Kredit')); + $totalsamadebit = 0; + $totalsamakredit = 0; + foreach($lejeram as $index=>$lejer) + { + $totalsamadebit += floatval($lejer['debit']); + $totalsamakredit += floatval($lejer['kredit']); + } + + return view('print.laporan_lejer_am',compact('cawangan','tarikh_cetak','cawangan_info', 'api_url','cawangan_detail','tarikh_akhir','tarikh_mula','lejeram','totalsamadebit','totalsamakredit')); } public function laporan_tuntutbaki(Request $request) diff --git a/app/Lejeram.php b/app/Lejeram.php new file mode 100644 index 0000000..d3aaf5f --- /dev/null +++ b/app/Lejeram.php @@ -0,0 +1,21 @@ + - - - + + + + + + + + + + @@ -212,9 +220,9 @@ @endsection diff --git a/resources/views/khazanah/laporan/pendahuluanserahan.blade.php b/resources/views/khazanah/laporan/pendahuluanserahan.blade.php index 19c613a..2f02b2c 100644 --- a/resources/views/khazanah/laporan/pendahuluanserahan.blade.php +++ b/resources/views/khazanah/laporan/pendahuluanserahan.blade.php @@ -110,7 +110,7 @@ Serahan - + Serahan-Online diff --git a/resources/views/print/laporan_lejer_am.blade.php b/resources/views/print/laporan_lejer_am.blade.php index 34c6f05..dfd709b 100644 --- a/resources/views/print/laporan_lejer_am.blade.php +++ b/resources/views/print/laporan_lejer_am.blade.php @@ -1,300 +1,309 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + #glejer { + font-family: Arial, Helvetica, sans-serif; + border-collapse: collapse; + width:100%; + } + + + #glejer td { + padding:4px; + font-size:12px; + /* border: 1px solid #ddd; */ + border-right:1px solid #000000; + border-left:1px solid #000000; + padding: 6px; + + } + + #glejer tr:nth-child(even){background-color: #ffffff;} + + #glejer tr:hover {background-color: #ddd;} + + #glejer th { + /* padding-top: 12px; + padding-bottom: 12px; */ + background-color:#ecf0f1; + text-align: center; + padding:12px; + color:black; + font-size:12px; + border: 1px solid #000000; + margin:20px; + + } + + #glejer td:nth-child(1) { + text-align:center; + } + + #glejer td:nth-child(3) { + text-align:right; + } + #glejer td:nth-child(4) { + text-align:right; + } + #glejer td:nth-child(5),#glejer td:nth-child(5) { + text-align:right; + } + - + @@ -319,69 +328,52 @@
- +
+ [ TARIKH DARI : + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_mula); + $tarikhmula = $myDateTime->format('d-m-Y'); + echo($tarikhmula) + @endphp + ..... + HINGGA : @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_akhir); + $tarikhakhir = $myDateTime->format('d-m-Y'); + echo($tarikhakhir) + @endphp ] + TARIKH CETAK : @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $tarikh_cetak); + $tarikh_cetak = $myDateTime->format('d-m-Y'); + echo($tarikh_cetak) + @endphp +
- - - - -
TARIKH DARI {{$tarikh_mula}} HINGGA {{$tarikh_akhir}}
- -
- - - - - + + + + + - @foreach($Kredit as $index=>$kred) - @foreach($Debit as $index=>$deb) - @if($kred['glcode'] === $deb['glcode']) - - - - - - - - @endif - @endforeach + @foreach($lejeram as $index => $lejer) + + + + + + + @endforeach -@foreach($Debit as $index=>$deb) - @if($deb['glcode'] == '1000/241' || $deb['glcode'] == '1000/211' || $deb['glcode'] == '1000/020' || $deb['glcode'] == '3000/017' || $deb['glcode'] == '3000/018' || $deb['glcode'] == '3000/019' || $deb['glcode'] == '3000/020') - - - - - - - - @endif -@endforeach - -@foreach($Kredit as $index=>$kred) - @if($kred['glcode'] == '5000/241' || $kred['glcode'] == '5000/211' || $kred['glcode'] == '5000/013' || $kred['glcode'] == '5000/007' || $kred['glcode'] == '7000/102' || $kred['glcode'] == '7000/090') - - - - - - - - @endif -@endforeach - - - - - + + + +
KOD GLKETERANGANDEBITKREDITJUMLAHKOD GLKETERANGANDEBITKREDITJUMLAH
{{ $kred['glcode'] }}{{ $kred['descpt'] }}{{ number_format($deb['amaun'],2) }}{{ number_format($kred['amaun'],2) }}@php $Totalsama = $deb['amaun'] - $kred['amaun']; echo number_format($Totalsama,2); @endphp
{{ $lejer['glcode'] }}{{ $lejer['descpt'] }}{{ number_format($lejer['debit'],2) }}{{ number_format($lejer['kredit'],2) }}@php $Totalsama = $lejer['debit'] - $lejer['kredit']; echo number_format($Totalsama,2); @endphp
{{ $deb['glcode'] }}{{ $deb['descpt'] }}{{ number_format($deb['amaun'],2) }}{{ number_format(0,2) }}{{ number_format($deb['amaun'],2) }}
{{ $kred['glcode'] }}{{ $kred['descpt'] }}{{ number_format(0,2) }}{{ number_format($kred['amaun'],2) }}{{ number_format(($kred['amaun']*-1),2) }}
JUMLAH: {{ number_format($TotalDebit,2) }}{{ number_format($TotalKredit,2) }}@php $Total = $TotalDebit - $TotalKredit; echo number_format($Total,2); @endphpJumlah: {{ number_format($totalsamadebit,2) }}{{ number_format($totalsamakredit,2) }}@php $Total = $totalsamadebit - $totalsamakredit; echo number_format($Total,2); @endphp
@@ -391,7 +383,7 @@
- +{{--
@@ -429,4 +421,9 @@ -
DISEMAK DISAHKAN
+ --}} + +
+ Disemak Oleh + Disahkan Oleh +