diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php index f2ce2c0e..d747ae90 100644 --- a/app/Http/Controllers/NotisController.php +++ b/app/Http/Controllers/NotisController.php @@ -61,11 +61,18 @@ class NotisController extends Controller $payment = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan') ->where('lelongbid.lelong_id', $lelong_id) - ->get()->toArray(); + ->get()->toArray(); - + $bayaran=0; + foreach($payment as $index1=>$pay) + { + $bayaran = $pay['hargajualan'] - $pay['bakihargajualan']; + } - return view('jananotis.senarainotis',compact('payment','lelong_id')); + $payment[$index1]['payment'] = $payment; + $payment[$index1]['bayaran_keuntungan'] = $bayaran; + + return view('jananotis.senarainotis',compact('payment','lelong_id','bayaran')); } @@ -85,7 +92,7 @@ class NotisController extends Controller $payment = Gadai::join('lelongbid','gadai.norujukan','=','lelongbid.norujukan') ->join('customer','gadai.nokp','=','customer.kpbaru') ->where('lelongbid.lelong_id', $lelong_id) - ->get()->toArray(); + ->get()->toArray(); $lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id') ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') @@ -121,13 +128,22 @@ class NotisController extends Controller ->where('lelongbid.lelong_id', $lelong_id) ->get()->toArray(); + $bayaran=0; + foreach($payment as $index1=>$pay) + { + $bayaran = $pay['hargajualan'] - $pay['bakihargajualan']; + } + + $payment[$index1]['payment'] = $payment; + $payment[$index1]['bayaran_keuntungan'] = $bayaran; + if($request->type == 'excel') { - return view('excel.listnotis_excel',compact('payment','caw','lelong_id')); + return view('excel.listnotis_excel',compact('payment','caw','lelong_id','bayaran')); } else { - $pdf = PDF::loadView('pdf.listnotis',compact('payment','caw','lelong_id')) + $pdf = PDF::loadView('pdf.listnotis',compact('payment','caw','lelong_id','bayaran')) ->setPaper('a4', 'landscape'); return $pdf->download('Senarai Notis.pdf'); diff --git a/resources/views/excel/listnotis_excel.blade.php b/resources/views/excel/listnotis_excel.blade.php index e914af9e..8e985d83 100644 --- a/resources/views/excel/listnotis_excel.blade.php +++ b/resources/views/excel/listnotis_excel.blade.php @@ -82,8 +82,7 @@ {{ $pay['nokp']}} {{ $pay['pinjaman']}} {{ $pay['bakiupah']}} - - {{-- join online_arrahn table (transaksi_keuntungan) --}} + {{ $bayaran}} @endforeach diff --git a/resources/views/jananotis/senarainotis.blade.php b/resources/views/jananotis/senarainotis.blade.php index 833f6a20..4b27ad4f 100644 --- a/resources/views/jananotis/senarainotis.blade.php +++ b/resources/views/jananotis/senarainotis.blade.php @@ -37,9 +37,8 @@ {{ $pay['jbg']}} {{ $pay['nokp']}} {{ $pay['pinjaman']}} - {{ $pay['bakiupah']}} - - {{-- join online_arrahn table (transaksi_keuntungan) --}} + {{ $pay['bakiupah']}} + {{ $bayaran}} @endforeach diff --git a/resources/views/pdf/listnotis.blade.php b/resources/views/pdf/listnotis.blade.php index f1f67bf5..dee527d4 100644 --- a/resources/views/pdf/listnotis.blade.php +++ b/resources/views/pdf/listnotis.blade.php @@ -77,8 +77,7 @@ {{ $pay['nokp']}} {{ $pay['pinjaman']}} {{ $pay['bakiupah']}} - - {{-- join online_arrahn table (transaksi_keuntungan) --}} + {{ $bayaran}} @endforeach