KoPKB/lelong
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'amirah'

Browse Source
This commit is contained in:
Azfar Arsyad
2022-03-03 10:52:36 +08:00
parent 66ae556023 6f4b99a4a3
commit ec99ce6fbc
4 changed files with 58 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/NotisController.php
+23 -6
View File
@@ -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');
resources/views/excel/listnotis_excel.blade.php
+19 -16
View File
@@ -43,7 +43,7 @@
<div class="row">
<div class="first-prgph">
<img src="http://lelongrpt.test/img/icon_pkb.png" alt="PKB LOGO" width="100" height="100">
<img src="{{ asset('img/icon_pkb.png') }}" alt="PKB LOGO" width="100" height="100">
</div>
<div class="first-prgph1">
@@ -61,25 +61,28 @@
<table width="100%" height="168" id="customers">
<thead>
<tr>
<th>No</th>
<th>No Rujukan</th>
<th>JBG</th>
<th>No KP</th>
<th>Pembiayaan</th>
<th>Keuntungan 6 Bulan</th>
<th>Bayaran Telah Dibuat</th>
<th align="left">No</th>
<th align="left">Nama</th>
<th align="left">No Rujukan</th>
<th align="left">No Telefon</th>
<th align="left">JBG</th>
<th align="left">No KP</th>
<th align="left">Pembiayaan</th>
<th align="left">Keuntungan 6 Bulan</th>
<th align="left">Bayaran Telah Dibuat</th>
</tr>
</thead>
@foreach($payment as $pay)
<tr>
<td>{{ $loop->iteration }} </td>
<td>{{ $pay['norujukan']}}</td>
<td>{{ $pay['jbg']}}</td>
<td>{{ $pay['nokp']}}</td>
<td>{{ $pay['pinjaman']}}</td>
<td>{{ $pay['bakiupah']}}</td>
<td></td>
{{-- join online_arrahn table (transaksi_keuntungan) --}}
<td align="left">{{ $loop->iteration }} </td>
<td align="left">{{ $pay['nama']}}</td>
<td align="left">{{ $pay['norujukan']}}</td>
<td align="left">{{ $pay['telefon']}}</td>
<td align="left">{{ $pay['jbg']}}</td>
<td align="left">{{ $pay['nokp']}}</td>
<td align="left">{{ $pay['pinjaman']}}</td>
<td align="left">{{ $pay['bakiupah']}}</td>
<td align="left">{{ $bayaran}}</td>
@endforeach
resources/views/jananotis/senarainotis.blade.php
+2 -3
View File
@@ -37,9 +37,8 @@
<td>{{ $pay['jbg']}}</td>
<td>{{ $pay['nokp']}}</td>
<td>{{ $pay['pinjaman']}}</td>
<td>{{ $pay['bakiupah']}}</td>
<td></td>
{{-- join online_arrahn table (transaksi_keuntungan) --}}
<td>{{ $pay['bakiupah']}}</td>
<td>{{ $bayaran}}</td>
@endforeach
</tbody>
resources/views/pdf/listnotis.blade.php
+14 -15
View File
@@ -60,25 +60,24 @@
<table width="100%" height="168" id="customers">
<thead>
<tr>
<th>No</th>
<th>No Rujukan</th>
<th>JBG</th>
<th>No KP</th>
<th>Pembiayaan</th>
<th>Keuntungan 6 Bulan</th>
<th>Bayaran Telah Dibuat</th>
<th align="left">No</th>
<th align="left">No Rujukan</th>
<th align="left">JBG</th>
<th align="left">No KP</th>
<th align="left">Pembiayaan</th>
<th align="left">Keuntungan 6 Bulan</th>
<th align="left">Bayaran Telah Dibuat</th>
</tr>
</thead>
@foreach($payment as $pay)
<tr>
<td>{{ $loop->iteration }} </td>
<td>{{ $pay['norujukan']}}</td>
<td>{{ $pay['jbg']}}</td>
<td>{{ $pay['nokp']}}</td>
<td>{{ $pay['pinjaman']}}</td>
<td>{{ $pay['bakiupah']}}</td>
<td></td>
{{-- join online_arrahn table (transaksi_keuntungan) --}}
<td align="left">{{ $loop->iteration }} </td>
<td align="left">{{ $pay['norujukan']}}</td>
<td align="left">{{ $pay['jbg']}}</td>
<td align="left">{{ $pay['nokp']}}</td>
<td align="left">{{ $pay['pinjaman']}}</td>
<td align="left">{{ $pay['bakiupah']}}</td>
<td align="left">{{ $bayaran}}</td>
@endforeach