Merge branch 'amirah'

This commit is contained in:
Azfar Arsyad
2022-03-03 10:52:36 +08:00
4 changed files with 58 additions and 40 deletions
+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');