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

Merge branch 'amirah' into 'main'

Browse Source 
Amirah

See merge request online-sistem1/lelong!34
This commit is contained in:
Nur Izzati Zulkifli
2022-05-18 04:15:34 +00:00
parent 2f91401299 b108eafa1b
commit 667981316d
11 changed files with 116 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/LelongController.php
+26 -57
View File
@@ -210,7 +210,7 @@ class LelongController extends Controller
'berat'=>$berat,
'n_marhun'=>$nilai_marhun,
'pinjaman'=>$pinjaman,
'upah'=>$total_upahkeuntungan,
'keuntungan'=>$keuntungan,
'hargaasas'=>$hargaasas,
'cajlelong'=>$cajlelong,
'rugilelong'=>$rugilelong,
@@ -259,6 +259,7 @@ class LelongController extends Controller
'lelong_id',
'jeniskarat',
'data',
'keuntungan',
'total_upahkeuntungan',
'total_nilaimarhun'));
}
@@ -840,11 +841,27 @@ class LelongController extends Controller
$marhuns[$index1]['keuntungan'] = $keuntungan;
}
$arrayinfo = [];
$lelong_id = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
->where('cawangan_lelong.lelong_id','=',$lelongid)
->select('lelong_id','tarikh_lelong')
->groupBy('lelong_id')
->get()->toArray();
foreach($lelong_id as $laporan)
{
$details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('lelong_id',$laporan['lelong_id'])
->get()
->toArray();
array_push($arrayinfo,['laporan' => $laporan,'details' => $details]);
}
return view('lelong.senaraimarhun',compact('marhuns','lelongid','cawid'));
return view('lelong.senaraimarhun',compact('marhuns','lelongid','cawid','arrayinfo'));
}
public function deletemarhun(Request $request){
@@ -913,73 +930,25 @@ class LelongController extends Controller
$keuntungan=0;
$total_hargaasas = 0;
$total_upahkeuntungan = 0;
$total_nmarhun = 0;
$total_pinjaman = 0;
$total_berat = 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;
$total_hargaasas = $total_hargaasas + $upah['hargaasas'];
$total_upahkeuntungan = $total_upahkeuntungan + $keuntungan;
$total_nmarhun = $total_nmarhun + $upah['nilaimarhun'];
$total_pinjaman = $total_pinjaman + $upah['pinjaman'];
$total_berat = $total_berat + $upah['berat'];
}
return view('lelong.senaraibrglelong',compact('arrayinfo','lelongid','brglelong','lelong_id','keuntungan','total_hargaasas','total_upahkeuntungan','total_nmarhun','total_pinjaman'));
}
public function pdfsenarailelong(Request $request){
$lelong_id = $request->lelongid;
$lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->where('lelong.id', $lelong_id)
->get();
$brglelong = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
->where('lelongbid.lelong_id', $lelong_id)
->get();
$keuntungan=0;
$totharga_asas=0;
$totkeuntungan=0;
$totnilai_marhun=0;
$tot_pinjaman=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;
}
$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','lelong_id','lelongid'))
$pdf = PDF::loadView('pdf.listlelong',compact('arrayinfo','lelongid','brglelong','lelong_id','keuntungan','total_hargaasas','total_berat'))
->setPaper('a4', 'potrait');
return $pdf->download('Senarai Lelong.pdf');
return $pdf->download('Senarai Barang Lelong.pdf');
}
public function lapbrglelongdetailsindex (Request $request){
// dd('hiio');
}
app/Http/Controllers/SimulasiController.php
+3
View File
@@ -457,6 +457,9 @@ class SimulasiController extends Controller
}
//total keuntungaan full
array_push($arraycaw,[
'id_cawangan'=> $cawangan['id'],
'cawangan'=>$cawangan['caw_name'],