Merge branch 'amirah' into 'main'

Amirah

See merge request online-sistem1/lelong!4
This commit is contained in:
Nur Izzati Zulkifli
2022-04-13 03:06:45 +00:00
22 changed files with 1338 additions and 305 deletions
+268 -16
View File
@@ -248,6 +248,7 @@ class LelongController extends Controller
$lelong->cajlelong = $simulasi->cajlelong;
$lelong->save();
foreach($simkarat as $simulasikarat)
{
$lelkarat = new LelKarat;
@@ -422,7 +423,7 @@ class LelongController extends Controller
{
$karat->karat = $karat->karat;
$karat->keterangan = $karat->keterangan;
$karat->harga = $request->harga[$index];
// $karat->harga = $request->harga[$index];
$karat->harga2 = $request->harga2[$index];
$karat->save();
}
@@ -608,6 +609,15 @@ class LelongController extends Controller
public function lelongtaklaku($lelong_id){
$total_pinjaman = 0;
$total_berat = 0;
$total_nmarhun = 0;
$total_hargaasas = 0;
$total_upahsimpan = 0;
$total_cajlelong = 0;
$total_bakirugi = 0;
$lelongtaklaku = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
->where('status_jual', 0)
->where('lelongbid.lelong_id', $lelong_id)
@@ -638,8 +648,88 @@ class LelongController extends Controller
$lelongtaklaku[$index1]['suratlelongtaklaku'] = sizeof($suratlelongtaklaku);
}
$total_pinjaman = $total_pinjaman + ($lelongtaklaku->sum('pinjaman'));
$total_berat = $total_berat + ($lelongtaklaku->sum('berat'));
$total_nmarhun = $total_nmarhun + ($lelongtaklaku->sum('nilaimarhun'));
$total_hargaasas = $total_hargaasas + ($lelongtaklaku->sum('hargaasas'));
$total_upahsimpan = $total_upahsimpan + ($lelongtaklaku->sum('upahsimpan'));
$total_cajlelong = $total_cajlelong + ($lelongtaklaku->sum('cajlelong'));
$total_bakirugi = $total_bakirugi + ($lelongtaklaku->sum('baki'));
return view('lelong.lelongtaklaku',compact('lelongtaklaku'));
return view('lelong.lelongtaklaku',compact('lelongtaklaku','lelong_id','total_pinjaman',
'total_berat','total_nmarhun','total_hargaasas','total_upahsimpan','total_upahsimpan','total_cajlelong','total_bakirugi'));
}
public function pdflelongtaklaku (Request $request){
$lelong_id = $request->lelongid;
$total_pinjaman = 0;
$total_berat = 0;
$total_nmarhun = 0;
$total_hargaasas = 0;
$total_upahsimpan = 0;
$total_cajlelong = 0;
$total_bakirugi = 0;
$infolelong = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('cawangan_lelong.lelong_id','=',$lelong_id)
->get();
$lelongtaklaku = LelongBid::join('cawangan', 'lelongbid.kodcaw', '=', 'cawangan.caw_code')
->where('status_jual', 0)
->where('lelongbid.lelong_id', $lelong_id)
->whereNull('t_jual')
->select(
'lelongbid.norujukan',
'lelongbid.t_lelong',
'lelongbid.kodcaw',
'cawangan.caw_name',
'lelongbid.pinjaman',
'lelongbid.berat',
'lelongbid.nilaimarhun',
'lelongbid.hargaasas',
'lelongbid.upahsimpan',
'lelongbid.cajlelong',
'lelongbid.baki',
'lelongbid.status_jual',
)
->get();
foreach($lelongtaklaku as $index1=>$suratlelongtaklaku){
$suratlelongtaklaku = LelongBid::join('lelong', 'lelongbid.lelong_id', '=', 'lelong.id')
->where('lelongbid.lelong_id', $lelong_id)
->where('status_jual', '=', 1)
->whereNull('t_jual')
->get();
$lelongtaklaku[$index1]['suratlelongtaklaku'] = sizeof($suratlelongtaklaku);
}
$total_pinjaman = $total_pinjaman + ($lelongtaklaku->sum('pinjaman'));
$total_berat = $total_berat + ($lelongtaklaku->sum('berat'));
$total_nmarhun = $total_nmarhun + ($lelongtaklaku->sum('nilaimarhun'));
$total_hargaasas = $total_hargaasas + ($lelongtaklaku->sum('hargaasas'));
$total_upahsimpan = $total_upahsimpan + ($lelongtaklaku->sum('upahsimpan'));
$total_cajlelong = $total_cajlelong + ($lelongtaklaku->sum('cajlelong'));
$total_bakirugi = $total_bakirugi + ($lelongtaklaku->sum('baki'));
// dd($total_pinjaman);
$pdf = PDF::loadView('pdf.pdflelongtaklaku',compact('lelongtaklaku','lelong_id','infolelong','total_pinjaman',
'total_berat','total_nmarhun','total_hargaasas','total_upahsimpan','total_upahsimpan','total_cajlelong','total_bakirugi'))
->setPaper('a4', 'landscape');
return $pdf->download('Senarai Lelong Tak Laku.pdf');
}
public function senaraipemenang($lelong_id){
@@ -718,7 +808,7 @@ class LelongController extends Controller
}
public function laporansenarailelong(Request $request){
public function lapbrglelongindex (Request $request){
// $user = Auth::user();
@@ -732,18 +822,34 @@ class LelongController extends Controller
public function senaraibrglelong($lelong_id){
$lelong_id = $lelong_id;
$brglelong = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
->where('lelongbid.lelong_id', $lelong_id)
->get()->toArray();
$keuntungan=0;
$total_hargaasas = 0;
$total_upahkeuntungan = 0;
$total_nmarhun = 0;
$total_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;
$total_hargaasas = $total_hargaasas + $upah['hargaasas'];
$total_upahkeuntungan = $total_upahkeuntungan + $keuntungan;
$total_nmarhun = $total_nmarhun + $upah['nilaimarhun'];
$total_pinjaman = $total_pinjaman + $upah['pinjaman'];
}
return view('lelong.senaraibrglelong',compact('brglelong','lelong_id'));
return view('lelong.senaraibrglelong',compact('brglelong','lelong_id','keuntungan','total_hargaasas','total_upahkeuntungan','total_nmarhun','total_pinjaman'));
}
@@ -751,24 +857,170 @@ class LelongController extends Controller
$lelong_id = $request->lelongid;
// $nilai_marhun = 0;
$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()->toArray();
->get();
$pdf = PDF::loadView('pdf.listlelong',compact('brglelong'))
->setPaper('a4', 'potrait');
return $pdf->download('Senarai Lelong.pdf');
$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'))
->setPaper('a4', 'potrait');
return $pdf->download('Senarai Lelong.pdf');
}
public function lapbidaanpembidaindex (Request $request){
$lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->get();
return view('lelong.laporanbidaanindex',compact('lelongid'));
}
public function senarailapbidaan ($lelong_id){
$arraydetails = [];
$laporanpembida= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
->select('lelongbid_id','norujukan','hargaasas')
->where('lelongbid.lelong_id','=',$lelong_id)
->groupBy('lelongbid_id')
->get()
->toArray();
foreach($laporanpembida as $laporan)
{
$details = LelongBidder::where('lelongbid_id',$laporan['lelongbid_id'])
->orderBy('hargabida','desc')
->orderBy('masa_bidaan','asc')
->get()
->toArray();
array_push($arraydetails,['laporan' => $laporan,'details' => $details]);
}
return view('lelong.senarailapbidaan', compact('arraydetails','lelong_id'));
}
Public function pdfsenarailapbidaan (Request $request){
$lelong_id = $request->lelongid;
$lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->where('cawangan_lelong.lelong_id','=',$lelong_id)
->get();
$arraydetails = [];
$laporanpembida= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
->select('lelongbid_id','norujukan','hargaasas')
->where('lelongbid.lelong_id','=',$lelong_id)
->groupBy('lelongbid_id')
->get()
->toArray();
foreach($laporanpembida as $laporan)
{
$details = LelongBidder::where('lelongbid_id',$laporan['lelongbid_id'])
->orderBy('hargabida','desc')
->orderBy('masa_bidaan','asc')
->get()
->toArray();
array_push($arraydetails,['laporan' => $laporan,'details' => $details]);
}
$pdf = PDF::loadView('pdf.pdfsenarailapbidaan',compact('arraydetails','lelong_id','lelongid'))
->setPaper('a4', 'potrait');
return $pdf->download('Senarai Nama Bidaan Pembida.pdf');
}
Public function laplelongindex (Request $request){
$lelongid = CawanganLelong::join('lelong','cawangan_lelong.lelong_id','=','lelong.id')
->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
->get();
return view('lelong.laplelongindex',compact('lelongid'));
}
Public function laplelong ($lelong_id){
$total_nmarhun = 0;
$total_pembiayaan = 0;
$total_upahsimpan = 0;
$total_cajlelong = 0;
$total_hargalelong = 0;
$total_bakirugi = 0;
$total_hargaasas = 0;
$laporanlelong= LelongBid::join('lelongbidder','lelongbid.id','=','lelongbidder.lelongbid_id')
->where('lelongbid.lelong_id','=',$lelong_id)
->where('lelongbidder.status_bidder','=','1')
->select('lelongbid.norujukan','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.upahsimpan',
'lelongbid.cajlelong','lelongbidder.hargabida','lelongbid.baki','lelongbid.hargaasas','lelongbidder.nama_bidder')
->get()->toArray();
foreach($laporanlelong as $index1=>$laplelong)
{
$total_nmarhun = $total_nmarhun + $laplelong['nilaimarhun'];
$total_pembiayaan = $total_pembiayaan + $laplelong['pinjaman'];
$total_upahsimpan = $total_upahsimpan + $laplelong['upahsimpan'];
$total_cajlelong = $total_cajlelong + $laplelong['cajlelong'];
$total_hargalelong = $total_hargalelong $laplelong['hargabida'];
$total_bakirugi = $total_bakirugi + $laplelong['baki'];
$total_hargaasas = $total_hargaasas + $laplelong['hargaasas'];
}
return view('lelong.laplelong', compact('laporanlelong','lelong_id','total_nmarhun'));
}
}
+9 -8
View File
@@ -57,20 +57,20 @@ class NotisController extends Controller
$lelong_id = $lelong_id;
$payment = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
$senarai = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
->where('lelongbid.lelong_id', $lelong_id)
->get()->toArray();
$bayaran=0;
foreach($payment as $index1=>$pay)
foreach($senarai as $index1=>$notis)
{
$bayaran = $pay['hargajualan'] - $pay['bakihargajualan'];
$bayaran = $notis['hargajualan'] - $notis['bakihargajualan'];
}
$payment[$index1]['payment'] = $payment;
$payment[$index1]['bayaran_keuntungan'] = $bayaran;
$senarai[$index1]['payment'] = $senarai;
$senarai[$index1]['bayaran_keuntungan'] = $bayaran;
return view('jananotis.senarainotis',compact('payment','lelong_id','bayaran'));
return view('jananotis.senarainotis',compact('senarai','lelong_id','bayaran'));
}
@@ -87,7 +87,7 @@ class NotisController extends Controller
$current = new Carbon();
$tarikh_cetak = $current->toDateString();
$payment = Gadai::join('lelongbid','gadai.norujukan','=','lelongbid.norujukan')
$payment = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
->join('customer','gadai.nokp','=','customer.kpbaru')
->where('lelongbid.lelong_id', $lelong_id)
->get()->toArray();
@@ -136,11 +136,12 @@ class NotisController extends Controller
if($request->type == 'excel')
{
return view('excel.listnotis_excel',compact('payment','caw','lelong_id','bayaran'));
}
else
{
$pdf = PDF::loadView('pdf.listnotis',compact('payment','caw','lelong_id','bayaran'))
->setPaper('a4', 'landscape');
->setPaper('a4', 'potrait');
return $pdf->download('Senarai Notis.pdf');
}
+3 -4
View File
@@ -91,7 +91,7 @@ class SimulasiController extends Controller
$simkarat->simulasi_id = $simulasi->id;
$simkarat->karat = $item->karat;
$simkarat->keterangan = $item->keterangan;
$simkarat->harga = ($hargaasas + ($item->dariharga916))/2.72; //gram
$simkarat->harga = ($hargaasas + ($item->dariharga916)); //gram
$simkarat->harga2 = $hargaasas + ($item->dariharga916); //rial
$simkarat->save();
}
@@ -486,7 +486,7 @@ class SimulasiController extends Controller
{
$karat->karat = $karat->karat;
$karat->keterangan = $karat->keterangan;
$karat->harga = $request->harga[$index];
// $karat->harga = $request->harga[$index];
$karat->harga2 = $request->harga2[$index];
$karat->save();
}
@@ -666,7 +666,6 @@ class SimulasiController extends Controller
]);
$total_marhun = $total_marhun + sizeof($databid);
$total_berat = $total_berat + $berat;
$total_nmarhun = $total_nmarhun + $nilai_marhun;
@@ -676,7 +675,7 @@ class SimulasiController extends Controller
$total_cazlelong = $total_cazlelong + $cajlelong;
$total_rugilelong = $total_rugilelong + $rugilelong;
$total_bakilelong = $total_bakilelong + $bakilelong;
}