diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 171296fe..a042c98e 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -719,18 +719,24 @@ class LelongController extends Controller public function senaraibrglelong($lelong_id){ - $lelong_id = $lelong_id; - $brglelong = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') ->where('lelongbid.lelong_id', $lelong_id) ->get()->toArray(); - - + $keuntungan=0; + + foreach($brglelong as $index1=>$upah) + { + + $keuntungan = $upah['bakipjm'] - ($upah['bakihargajualan'] - ($upah['upah12'] - $upah['ansakhir'])-(($upah['tempoh']-$upah['tempohbayar'])*$upah['kadarupah']/100*$upah['bakipjm']) ); + $brglelong[$index1]['keuntungan'] = $keuntungan; + } - return view('lelong.senaraibrglelong',compact('brglelong','lelong_id')); + + + return view('lelong.senaraibrglelong',compact('brglelong','lelong_id','keuntungan')); } @@ -738,14 +744,34 @@ class LelongController extends Controller $lelong_id = $request->lelongid; - // $nilai_marhun = 0; - + $brglelong = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') ->where('lelongbid.lelong_id', $lelong_id) - ->get()->toArray(); + ->get(); + + $keuntungan=0; + $totharga_asas=0; + $totkeuntungan=0; + $totnilai_marhun=0; + $tot_pinjaman=0; - $pdf = PDF::loadView('pdf.listlelong',compact('brglelong')) + foreach($brglelong as $index1=>$upah) + { + $keuntungan = $upah['bakipjm'] - ($upah['bakihargajualan'] - ($upah['upah12'] - $upah['ansakhir']) - (($upah['tempoh']-$upah['tempohbayar'])*$upah['kadarupah']/100*$upah['bakipjm']) ); + $brglelong[$index1]['keuntungan'] = $keuntungan; + + } + + $totharga_asas = $totharga_asas + ($upah->sum('hargaasas')); + $totkeuntungan = $totkeuntungan + ($brglelong->sum('keuntungan')); + $totnilai_marhun = $totnilai_marhun + ($upah->sum('nilaimarhun')); + $tot_pinjaman = $tot_pinjaman + ($upah->sum('pinjaman')); + + + + + $pdf = PDF::loadView('pdf.listlelong',compact('brglelong','totharga_asas','totkeuntungan','totnilai_marhun','tot_pinjaman')) ->setPaper('a4', 'potrait'); return $pdf->download('Senarai Lelong.pdf'); diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php index ceb92048..6700cbfa 100644 --- a/app/Http/Controllers/NotisController.php +++ b/app/Http/Controllers/NotisController.php @@ -57,20 +57,20 @@ class NotisController extends Controller $lelong_id = $lelong_id; - $payment = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') + $senarai = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') ->where('lelongbid.lelong_id', $lelong_id) ->get()->toArray(); $bayaran=0; - foreach($payment as $index1=>$pay) + foreach($senarai as $index1=>$notis) { - $bayaran = $pay['hargajualan'] - $pay['bakihargajualan']; + $bayaran = $notis['hargajualan'] - $notis['bakihargajualan']; } - $payment[$index1]['payment'] = $payment; - $payment[$index1]['bayaran_keuntungan'] = $bayaran; + $senarai[$index1]['payment'] = $senarai; + $senarai[$index1]['bayaran_keuntungan'] = $bayaran; - return view('jananotis.senarainotis',compact('payment','lelong_id','bayaran')); + return view('jananotis.senarainotis',compact('senarai','lelong_id','bayaran')); } @@ -87,7 +87,7 @@ class NotisController extends Controller $current = new Carbon(); $tarikh_cetak = $current->toDateString(); - $payment = Gadai::join('lelongbid','gadai.norujukan','=','lelongbid.norujukan') + $payment = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') ->join('customer','gadai.nokp','=','customer.kpbaru') ->where('lelongbid.lelong_id', $lelong_id) ->get()->toArray(); diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index c59d8d5c..32085359 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -667,7 +667,6 @@ class SimulasiController extends Controller ]); - $total_marhun = $total_marhun + sizeof($databid); $total_berat = $total_berat + $berat; $total_nmarhun = $total_nmarhun + $nilai_marhun; @@ -677,7 +676,7 @@ class SimulasiController extends Controller $total_cazlelong = $total_cazlelong + $cajlelong; $total_rugilelong = $total_rugilelong + $rugilelong; $total_bakilelong = $total_bakilelong + $bakilelong; - + } diff --git a/resources/views/jananotis/senarainotis.blade.php b/resources/views/jananotis/senarainotis.blade.php index a7376fba..3627708f 100644 --- a/resources/views/jananotis/senarainotis.blade.php +++ b/resources/views/jananotis/senarainotis.blade.php @@ -30,14 +30,14 @@ - @foreach($payment as $pay) + @foreach($senarai as $notis) {{ $loop->iteration }} - {{ $pay['norujukan']}} - {{ $pay['jbg']}} - {{ $pay['nokp']}} - {{ $pay['pinjaman']}} - {{ $pay['bakiupah']}} + {{ $notis['norujukan']}} + {{ $notis['jbg']}} + {{ $notis['nokp']}} + {{ $notis['pinjaman']}} + {{ $notis['bakiupah']}} {{ $bayaran}} @endforeach diff --git a/resources/views/lelong/senaraibrglelong.blade.php b/resources/views/lelong/senaraibrglelong.blade.php index 3d689086..1a3482c4 100644 --- a/resources/views/lelong/senaraibrglelong.blade.php +++ b/resources/views/lelong/senaraibrglelong.blade.php @@ -21,7 +21,7 @@ No No Rujukan Harga Asas - Upah + Upah Keuntungan JBG Nilai Marhun Asal Pinjaman @@ -35,11 +35,12 @@ {{ $loop->iteration }} {{ $brg['norujukan']}} {{$brg['hargaasas']}} - {{$brg['upahsimpan']}} + {{ $brg['keuntungan'] }} {{ $brg['jbg']}} {{ $brg['nilaimarhun']}} {{ $brg['pinjaman']}} {{ $brg['marhun']}} + @endforeach diff --git a/resources/views/pdf/jananotis.blade.php b/resources/views/pdf/jananotis.blade.php index b490c55a..f18dbfca 100644 --- a/resources/views/pdf/jananotis.blade.php +++ b/resources/views/pdf/jananotis.blade.php @@ -66,8 +66,11 @@

No Rujukan: {{$notis['norujukan']}}
- Kepada:{{ $notis['nama'] }}
{{ strtoupper($notis['alamat1']) }} {!! ($notis['alamat2'] === null || $notis['alamat2'] === '') ? '' : '
' . strtoupper($notis['alamat2']) !!}
{{ ' ' . $notis['poskod'] . ' ' . strtoupper($notis['koddaerah']) . ' ' . strtoupper($notis['kodnegeri'])}} -
+ Kepada:{{ $notis['nama'] }}
{{ strtoupper($notis['alamat1']) }} {!! ($notis['alamat2'] === null || $notis['alamat2'] === '') ? '' : '
' + . strtoupper($notis['alamat2']) !!}
{{ ' ' . $notis['poskod'] . ' ' . strtoupper($notis['koddaerah']) . ' ' . strtoupper($notis['kodnegeri'])}} + +

+

No Telefon: {{$notis['telefon']}}
No K/P: {{$notis['kpbaru']}}

diff --git a/resources/views/pdf/listlelong.blade.php b/resources/views/pdf/listlelong.blade.php index e19288ee..f5944d48 100644 --- a/resources/views/pdf/listlelong.blade.php +++ b/resources/views/pdf/listlelong.blade.php @@ -105,29 +105,27 @@ tr:nth-child(even) { {{ $loop->iteration }} {{ $brg['norujukan'] }} - {{ ($brg['norujukan']) }} {{ number_format($brg['hargaasas'], 2, '.', ',') }} - {{ number_format($brg['upahsimpan'], 2, '.', ',') }} - - + {{ number_format($brg['keuntungan'], 2, '.', ',') }} + {{ $brg['jbg'] }} {{ number_format($brg['nilaimarhun'], 2, '.', ',') }} {{ number_format($brg['pinjaman'], 2, '.', ',') }} {{ ($brg['marhun']) }} @endforeach - + + + JUMLAH KESELURUHAN + {{ number_format($totharga_asas, 2, '.', ',') }} + {{ number_format($totkeuntungan, 2, '.', ',') }} + + {{ number_format($totnilai_marhun, 2, '.', ',') }} + {{ number_format($tot_pinjaman, 2, '.', ',') }} + + + - {{-- - Jumlah Keseluruhan - - {{ number_format($total_berat, 2, '.', ',') }} - {{ number_format($total_nmarhun, 2, '.', ',') }} - {{ number_format($total_pinjaman, 2, '.', ',') }} - {{ number_format($total_upah, 2, '.', ',') }} - {{ number_format($total_hargaasas, 2, '.', ',') }} - {{ number_format($total_cazlelong, 2, '.', ',') }} - --}}