Merge branch 'main' into amirah
This commit is contained in:
@@ -55,7 +55,7 @@ class LelongController extends Controller
|
||||
$arrayinfo = [];
|
||||
|
||||
$lelong = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
|
||||
->select('lelong_id','tarikh_lelong','masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
|
||||
->select('fasa','lelong_id','tarikh_lelong','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong','sts_lelong')
|
||||
->groupBy('lelong_id')
|
||||
->get()
|
||||
->toArray();
|
||||
@@ -113,23 +113,27 @@ class LelongController extends Controller
|
||||
$total_upahkeuntungan2 = 0;
|
||||
$total_nilaimarhun = 0;
|
||||
$nilai_marhun = 0;
|
||||
$totalkeuntungan = 0;
|
||||
$totalkeuntungan2 = 0;
|
||||
|
||||
foreach($cawanganlel as $cawlel)
|
||||
{
|
||||
$cawangan = Cawangan::where('id','=',$cawlel->caw_id)->first();
|
||||
$databid = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
|
||||
->select('lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.ansakhir','gadai.tempoh','gadai.kadarupah','gadai.tempohbayar')
|
||||
->select('lelongbid.bakiupah','lelongbid.id','lelongbid.berat','lelongbid.marhun','lelongbid.cajlelong','lelongbid.baki','lelongbid.nilaimarhun','lelongbid.pinjaman','lelongbid.hargaasas','lelongbid.cajlelong','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.ansakhir','gadai.tempoh','gadai.kadarupah','gadai.tempohbayar')
|
||||
->where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$id)->get();
|
||||
|
||||
// dd($databid->toArray());
|
||||
$packet = 0;
|
||||
$berat = 0;
|
||||
$pinjaman =0;
|
||||
$nilai_marhun = 0;
|
||||
$upah = 0;
|
||||
$hargaasas = 0;
|
||||
$cajlelong = 0;
|
||||
$rugilelong = 0;
|
||||
$bakilelong = 0;
|
||||
$totalkeuntungan = 0;
|
||||
|
||||
foreach($databid as $index1=>$bid)
|
||||
{
|
||||
@@ -146,7 +150,7 @@ class LelongController extends Controller
|
||||
$databid[$index1]['keuntungan'] = $keuntungan;
|
||||
|
||||
$total_upahkeuntungan = bcdiv($total_upahkeuntungan,1,1) + bcdiv($keuntungan,1,1);
|
||||
|
||||
$totalkeuntungan = $totalkeuntungan + $bid['bakiupah'];
|
||||
|
||||
if($bid['baki'] > 0)
|
||||
{
|
||||
@@ -214,6 +218,7 @@ class LelongController extends Controller
|
||||
'n_marhun'=>$nilai_marhun,
|
||||
'pinjaman'=>$pinjaman,
|
||||
'upahsimpan'=>bcdiv($total_upahkeuntungan,1,1),
|
||||
'bakiupah'=>$totalkeuntungan,
|
||||
'hargaasas'=>$hargaasas,
|
||||
'cajlelong'=>$cajlelong,
|
||||
'rugilelong'=>$rugilelong,
|
||||
@@ -232,6 +237,9 @@ class LelongController extends Controller
|
||||
$total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
|
||||
|
||||
|
||||
$totalkeuntungan2 = $totalkeuntungan2 + $totalkeuntungan;
|
||||
|
||||
|
||||
$data = Lelong::where('lelong.id','=',$lelong_id)
|
||||
->get();
|
||||
}
|
||||
@@ -266,7 +274,8 @@ class LelongController extends Controller
|
||||
'keuntungan',
|
||||
'total_upahkeuntungan',
|
||||
'total_nilaimarhun',
|
||||
'total_upahkeuntungan2'));
|
||||
'total_upahkeuntungan2',
|
||||
'totalkeuntungan2'));
|
||||
}
|
||||
|
||||
public function create($id)
|
||||
@@ -281,6 +290,7 @@ class LelongController extends Controller
|
||||
$lelong->harga_emas_asas = $simulasi->harga_emas_asas;
|
||||
$lelong->jbg = $simulasi->jbg;
|
||||
$lelong->cajlelong = $simulasi->cajlelong;
|
||||
$lelong->fasa = $simulasi->fasa;
|
||||
$lelong->save();
|
||||
|
||||
|
||||
@@ -315,66 +325,103 @@ class LelongController extends Controller
|
||||
$caw_lelong->save();
|
||||
|
||||
$datasimbid = SimulasiBid::where('caw_id','=',$caw->caw_id)->where('simulasi_id',$id)->get();
|
||||
|
||||
foreach ($datasimbid as $simulasibid ) {
|
||||
$lelongbid = new LelongBid;
|
||||
$lelongbid->lelong_id = $lelong->id;
|
||||
$lelongbid->caw_id = $simulasibid->caw_id;
|
||||
$lelongbid->kodcaw =$simulasibid->kodcaw;
|
||||
$lelongbid->norujukan =$simulasibid->norujukan;
|
||||
$lelongbid->t_lelong =$simulasibid->t_lelong;
|
||||
$lelongbid->hargaasas =$simulasibid->hargaasas;
|
||||
$lelongbid->hargajual =$simulasibid->hargajual;
|
||||
$lelongbid->t_jual =$simulasibid->t_jual;
|
||||
$lelongbid->nopembeli =$simulasibid->nopembeli;
|
||||
$lelongbid->jbg =$simulasibid->jbg;
|
||||
$lelongbid->kadarupah =$simulasibid->kadarupah;
|
||||
$lelongbid->upahsimpan =$simulasibid->upahsimpan;
|
||||
$lelongbid->ansuran =$simulasibid->ansuran;
|
||||
$lelongbid->nilaimarhun =$simulasibid->nilaimarhun;
|
||||
$lelongbid->pinjaman =$simulasibid->pinjaman;
|
||||
$lelongbid->bakiupah =$simulasibid->bakiupah;
|
||||
$lelongbid->cajlain =$simulasibid->cajlain;
|
||||
$lelongbid->cajlelong =$simulasibid->cajlelong;
|
||||
$lelongbid->baki =$simulasibid->baki;
|
||||
$lelongbid->berat =$simulasibid->berat;
|
||||
$lelongbid->marhun =$simulasibid->marhun;
|
||||
$lelongbid->percent =$simulasibid->percent;
|
||||
$lelongbid->status_jual =$simulasibid->status_jual;
|
||||
$lelongbid->status_payment =$simulasibid->status_payment;
|
||||
$lelongbid->mora_upah =$simulasibid->mora_upah;
|
||||
$lelongbid->save();
|
||||
if($lelongbid->save())
|
||||
$suratcaw = $datasimbid->all();
|
||||
// foreach ($datasimbid as $simulasibid ) {
|
||||
// $lelongbid = new LelongBid;
|
||||
// $lelongbid->lelong_id = $lelong->id;
|
||||
// $lelongbid->caw_id = $simulasibid->caw_id;
|
||||
// $lelongbid->kodcaw =$simulasibid->kodcaw;
|
||||
// $lelongbid->norujukan =$simulasibid->norujukan;
|
||||
// $lelongbid->t_lelong =$simulasibid->t_lelong;
|
||||
// $lelongbid->hargaasas =$simulasibid->hargaasas;
|
||||
// $lelongbid->hargajual =$simulasibid->hargajual;
|
||||
// $lelongbid->t_jual =$simulasibid->t_jual;
|
||||
// $lelongbid->nopembeli =$simulasibid->nopembeli;
|
||||
// $lelongbid->jbg =$simulasibid->jbg;
|
||||
// $lelongbid->kadarupah =$simulasibid->kadarupah;
|
||||
// $lelongbid->upahsimpan =$simulasibid->upahsimpan;
|
||||
// $lelongbid->ansuran =$simulasibid->ansuran;
|
||||
// $lelongbid->nilaimarhun =$simulasibid->nilaimarhun;
|
||||
// $lelongbid->pinjaman =$simulasibid->pinjaman;
|
||||
// $lelongbid->bakiupah =$simulasibid->bakiupah;
|
||||
// $lelongbid->cajlain =$simulasibid->cajlain;
|
||||
// $lelongbid->cajlelong =$simulasibid->cajlelong;
|
||||
// $lelongbid->baki =$simulasibid->baki;
|
||||
// $lelongbid->berat =$simulasibid->berat;
|
||||
// $lelongbid->marhun =$simulasibid->marhun;
|
||||
// $lelongbid->percent =$simulasibid->percent;
|
||||
// $lelongbid->status_jual =$simulasibid->status_jual;
|
||||
// $lelongbid->status_payment =$simulasibid->status_payment;
|
||||
// $lelongbid->mora_upah =$simulasibid->mora_upah;
|
||||
// $lelongbid->fasa =$simulasibid->fasa;
|
||||
// $lelongbid->save();
|
||||
//dd($suratcaw);
|
||||
foreach(array_chunk($suratcaw,100) as $data_chunk)
|
||||
{
|
||||
$updategadai = Gadai::where('norujukan','=',$simulasibid->norujukan)->first();
|
||||
$updategadai->taglel = 1;
|
||||
$updategadai->save();
|
||||
}
|
||||
//dd($data);
|
||||
foreach($data_chunk as $data)
|
||||
{
|
||||
//dd($simulasi->id);
|
||||
$lelongbid = LelongBid::create([
|
||||
"lelong_id" => $lelong->id,
|
||||
"caw_id" => $data->caw_id,
|
||||
"kodcaw" => $data->kodcaw,
|
||||
"norujukan" => $data->norujukan,
|
||||
"t_lelong" => $data->t_lelong,
|
||||
"hargaasas" => $data->hargaasas,
|
||||
"hargajual" => 0.00,
|
||||
"jbg" => $data->jbg,
|
||||
"kadarupah" => $data->kadarupah,
|
||||
"ansuran" => $data->ansuran,
|
||||
"nilaimarhun" => $data->nilaimarhun,
|
||||
"pinjaman" => $data->pinjaman,
|
||||
"bakiupah" => $data->bakiupah,
|
||||
"upahsimpan" => $data->bakiupah,
|
||||
"cajlain" => $data->cajlain,
|
||||
"cajlelong" => 0.00,
|
||||
"baki" => 0.00,
|
||||
"berat" => $data->berat,
|
||||
"marhun" => $data->marhun,
|
||||
"percent" => $data->percent,
|
||||
"status_jual" => 0,
|
||||
"status_payment" => 0,
|
||||
"mora_upah" => 0,
|
||||
"fasa" => $data->fasa
|
||||
]);
|
||||
|
||||
$simulasibidmarhun = SimulasiBidMarhun::where('simulasibid_id','=',$simulasibid->id)->get();
|
||||
foreach($simulasibidmarhun as $simbidmarhun)
|
||||
{
|
||||
$lelongbidmarhun = new LelongBidMarhun;
|
||||
$lelongbidmarhun->lelongbid_id = $lelongbid->id;
|
||||
$lelongbidmarhun->bil = $simbidmarhun->bil;
|
||||
$lelongbidmarhun->marhun = $simbidmarhun->marhun;
|
||||
$lelongbidmarhun->nota = $simbidmarhun->nota;
|
||||
$lelongbidmarhun->old_karat = $simbidmarhun->karat;
|
||||
$lelongbidmarhun->old_berat = $simbidmarhun->berat;
|
||||
$lelongbidmarhun->old_harga = $simbidmarhun->harga;
|
||||
$lelongbidmarhun->old_nmarhun = $simbidmarhun->n_marhun;
|
||||
$lelongbidmarhun->old_hargaasas = $simbidmarhun->hargaasas;
|
||||
$lelongbidmarhun->karat = $simbidmarhun->karat;
|
||||
$lelongbidmarhun->berat = $simbidmarhun->berat;
|
||||
$lelongbidmarhun->harga = $simbidmarhun->harga;
|
||||
$lelongbidmarhun->n_marhun = $simbidmarhun->n_marhun;
|
||||
$lelongbidmarhun->hargaasas = $simbidmarhun->hargaasas;
|
||||
$lelongbidmarhun->save();
|
||||
|
||||
|
||||
if($lelongbid->save())
|
||||
{
|
||||
$updategadai = Gadai::where('norujukan','=', $data->norujukan)->first();
|
||||
$updategadai->taglel = 1;
|
||||
$updategadai->save();
|
||||
}
|
||||
|
||||
$simulasibidmarhun = SimulasiBidMarhun::where('simulasibid_id','=',$data->id)->get();
|
||||
foreach($simulasibidmarhun as $simbidmarhun)
|
||||
{
|
||||
$lelongbidmarhun = new LelongBidMarhun;
|
||||
$lelongbidmarhun->lelongbid_id = $lelongbid->id;
|
||||
$lelongbidmarhun->bil = $simbidmarhun->bil;
|
||||
$lelongbidmarhun->marhun = $simbidmarhun->marhun;
|
||||
$lelongbidmarhun->nota = $simbidmarhun->nota;
|
||||
$lelongbidmarhun->old_karat = $simbidmarhun->karat;
|
||||
$lelongbidmarhun->old_berat = $simbidmarhun->berat;
|
||||
$lelongbidmarhun->old_harga = $simbidmarhun->harga;
|
||||
$lelongbidmarhun->old_nmarhun = $simbidmarhun->n_marhun;
|
||||
$lelongbidmarhun->old_hargaasas = $simbidmarhun->hargaasas;
|
||||
$lelongbidmarhun->karat = $simbidmarhun->karat;
|
||||
$lelongbidmarhun->berat = $simbidmarhun->berat;
|
||||
$lelongbidmarhun->harga = $simbidmarhun->harga;
|
||||
$lelongbidmarhun->n_marhun = $simbidmarhun->n_marhun;
|
||||
$lelongbidmarhun->hargaasas = $simbidmarhun->hargaasas;
|
||||
$lelongbidmarhun->save();
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return redirect()->route('analisa.senaraisimulasi')
|
||||
->with('success','Create Lelong Berjaya');
|
||||
|
||||
@@ -425,14 +472,22 @@ class LelongController extends Controller
|
||||
$lelong->sts_lelong = 1; //start lelong
|
||||
$lelong->save();
|
||||
|
||||
|
||||
$cawlelong = CawanganLelong::where('lelong_id','=',$id)->first();
|
||||
$cawlelong->masamula_lelong = $currenttime;
|
||||
$cawlelong->masatamat_lelong = $endtime->toTimeString();
|
||||
$cawlelong->status_online = 1; //start lelong
|
||||
$cawlelong->save();
|
||||
|
||||
return redirect()->route('lelong.senarailelong')
|
||||
->with('success','Lelongan bermula');
|
||||
}
|
||||
|
||||
public function refresh($id)
|
||||
{
|
||||
$date = Carbon::now()->toDateTimeString();
|
||||
$lelong = Lelong::where('id','=',$id)->first();
|
||||
$lelong->masakemaskini_data = '2021-12-20 04:51:50';
|
||||
$lelong->masakemaskini_data = $date;
|
||||
$lelong->save();
|
||||
|
||||
return redirect()->route('lelong.senarailelong')
|
||||
@@ -466,12 +521,14 @@ class LelongController extends Controller
|
||||
}
|
||||
|
||||
//update marhun
|
||||
$lelongbid = LelongBid::where('lelong_id','=',$request->idlelong)->get();
|
||||
// $lelongbid = LelongBid::
|
||||
// ->where('lelong_id','=',$request->idlelong)->get();
|
||||
$lelongbid = LelongBid::join('gadai','lelongbid.norujukan','=','gadai.norujukan')
|
||||
->select('lelongbid.id','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12','gadai.ansakhir','gadai.tempoh','gadai.tempohbayar','gadai.kadarupah','gadai.norujukan','lelongbid.lelong_id')
|
||||
->where('lelong_id','=',$request->idlelong)
|
||||
->get();
|
||||
|
||||
foreach($lelongbid as $bid)
|
||||
foreach($lelongbid as $index1=>$bid)
|
||||
{
|
||||
$keuntungan = $bid['bakipjm'] - ($bid['bakihargajualan'] - ($bid['upah12'] - $bid['ansakhir'])-(($bid['tempoh']-$bid['tempohbayar'])*$bid['kadarupah']/100*$bid['bakipjm']) );
|
||||
$sumhargaasas = 0;
|
||||
$lelongbidmarhun = LelongBidMarhun::where('lelongbid_id','=',$bid->id)->get();
|
||||
foreach($lelongbidmarhun as $marhun)
|
||||
@@ -494,29 +551,25 @@ class LelongController extends Controller
|
||||
$marhun->save();
|
||||
}
|
||||
}
|
||||
|
||||
$keuntungan = 0;
|
||||
$keuntungan = $bid->bakipjm- ($bid->bakihargajualan - ($bid->upah12 - $bid->ansakhir)-(($bid->tempoh-$bid->tempohbayar)
|
||||
*$bid->kadarupah/100*$bid->bakipjm) );
|
||||
|
||||
dd($keuntungan);
|
||||
$lelong = Lelong::where('id',$request->idlelong)->get();
|
||||
$bid->hargaasas = $sumhargaasas;
|
||||
$sumcajlelong = $sumhargaasas * ($lelong[0]['cajlelong']/100);
|
||||
$bid->cajlelong = bcdiv($sumcajlelong,1,1);
|
||||
$bid->baki = $sumhargaasas-$bid->pinjaman - $keuntungan - $sumcajlelong;
|
||||
$bid->save();
|
||||
$karat916 = LelKarat::where('karat','=',"22.0K")->get();
|
||||
//dd($karat916);
|
||||
foreach($karat916 as $k916)
|
||||
{
|
||||
|
||||
$updatelelong = Lelong::where('id',$request->idlelong)
|
||||
->update([
|
||||
'harga_emas_asas'=> $k916->harga2,
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
// $lelong = Lelong::where('id',$request->idlelong)->get();
|
||||
// $bid->hargaasas = $sumhargaasas;
|
||||
// $sumcajlelong = $sumhargaasas * ($lelong[0]['cajlelong']/100);
|
||||
// $bid->cajlelong = bcdiv($sumcajlelong,1,1);
|
||||
// $bid->baki = $sumhargaasas-$bid->pinjaman - $keuntungan - $sumcajlelong;
|
||||
// $bid->save();
|
||||
|
||||
$lelong = Lelong::where('id',$request->idlelong)->get();
|
||||
$sumcajlelong = $sumhargaasas * ($lelong[0]['cajlelong']/100);
|
||||
$totalbaki = $sumhargaasas -$bid->bakipjm - bcdiv($keuntungan,1,1) - bcdiv($sumcajlelong,1,1);
|
||||
$kirakeuntungan = LelongBid::where('norujukan',$bid['norujukan'])
|
||||
->update([
|
||||
'bakiupah'=> bcdiv($keuntungan,1,1),
|
||||
'hargaasas'=> $sumhargaasas
|
||||
]);
|
||||
}
|
||||
|
||||
return redirect()->route('lelong.show',$request->idlelong)
|
||||
@@ -650,6 +703,7 @@ class LelongController extends Controller
|
||||
$lelong->masatamat_lelong = $currenttime;
|
||||
$lelong->sts_lelong = 2; //stop lelong
|
||||
$lelong->save();
|
||||
|
||||
|
||||
return redirect()->route('lelong.senarailelong')
|
||||
->with('success','Lelongan berhenti');
|
||||
@@ -852,6 +906,7 @@ class LelongController extends Controller
|
||||
'lelongbid.upahsimpan',
|
||||
'lelongbid.cajlelong',
|
||||
'lelongbid.baki',
|
||||
'lelongbid.bakiupah',
|
||||
'lelongbid.status_jual',
|
||||
'lelongbid.jbg',
|
||||
'gadai.bakipjm',
|
||||
@@ -883,13 +938,11 @@ class LelongController extends Controller
|
||||
{
|
||||
$details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
|
||||
->where('lelong_id',$laporan['lelong_id'])
|
||||
->where('caw_id',$cawid)
|
||||
->get()
|
||||
->toArray();
|
||||
array_push($arrayinfo,['laporan' => $laporan,'details' => $details]);
|
||||
}
|
||||
|
||||
|
||||
|
||||
return view('lelong.senaraimarhun',compact('marhuns','lelongid','cawid','arrayinfo'));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user