diff --git a/app/Http/Controllers/NotisController.php b/app/Http/Controllers/NotisController.php
index 933b96c1..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')
@@ -117,16 +124,26 @@ class NotisController extends Controller
$lelong_id = $request->lelong_id;
$payment = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
+ ->join('customer','gadai.nokp','=','customer.kpbaru')
->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 4eef19fb..8e985d83 100644
--- a/resources/views/excel/listnotis_excel.blade.php
+++ b/resources/views/excel/listnotis_excel.blade.php
@@ -43,7 +43,7 @@
-

+
@@ -61,25 +61,28 @@
- | No |
- No Rujukan |
- JBG |
- No KP |
- Pembiayaan |
- Keuntungan 6 Bulan |
- Bayaran Telah Dibuat |
+ No |
+ Nama |
+ No Rujukan |
+ No Telefon |
+ JBG |
+ No KP |
+ Pembiayaan |
+ Keuntungan 6 Bulan |
+ Bayaran Telah Dibuat |
@foreach($payment as $pay)
- | {{ $loop->iteration }} |
- {{ $pay['norujukan']}} |
- {{ $pay['jbg']}} |
- {{ $pay['nokp']}} |
- {{ $pay['pinjaman']}} |
- {{ $pay['bakiupah']}} |
- |
- {{-- join online_arrahn table (transaksi_keuntungan) --}}
+ {{ $loop->iteration }} |
+ {{ $pay['nama']}} |
+ {{ $pay['norujukan']}} |
+ {{ $pay['telefon']}} |
+ {{ $pay['jbg']}} |
+ {{ $pay['nokp']}} |
+ {{ $pay['pinjaman']}} |
+ {{ $pay['bakiupah']}} |
+ {{ $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 0b494a69..dee527d4 100644
--- a/resources/views/pdf/listnotis.blade.php
+++ b/resources/views/pdf/listnotis.blade.php
@@ -60,25 +60,24 @@
- | No |
- No Rujukan |
- JBG |
- No KP |
- Pembiayaan |
- Keuntungan 6 Bulan |
- Bayaran Telah Dibuat |
+ No |
+ No Rujukan |
+ JBG |
+ No KP |
+ Pembiayaan |
+ Keuntungan 6 Bulan |
+ Bayaran Telah Dibuat |
@foreach($payment as $pay)
- | {{ $loop->iteration }} |
- {{ $pay['norujukan']}} |
- {{ $pay['jbg']}} |
- {{ $pay['nokp']}} |
- {{ $pay['pinjaman']}} |
- {{ $pay['bakiupah']}} |
- |
- {{-- join online_arrahn table (transaksi_keuntungan) --}}
+ {{ $loop->iteration }} |
+ {{ $pay['norujukan']}} |
+ {{ $pay['jbg']}} |
+ {{ $pay['nokp']}} |
+ {{ $pay['pinjaman']}} |
+ {{ $pay['bakiupah']}} |
+ {{ $bayaran}} |
@endforeach