Merge branch 'main' into faiqahzaman
This commit is contained in:
@@ -110,23 +110,26 @@ class LelongController extends Controller
|
||||
|
||||
$keuntungan = 0;
|
||||
$total_upahkeuntungan = 0;
|
||||
$total_upahkeuntungan2 = 0;
|
||||
$total_nilaimarhun = 0;
|
||||
$nilai_marhun = 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')
|
||||
->where('caw_id','=',$cawlel->caw_id)->where('lelong_id','=',$id)->get();
|
||||
|
||||
// dd($databid->toArray());
|
||||
$packet = 0;
|
||||
$berat = 0;
|
||||
$nilai_marhun = 0;
|
||||
$pinjaman =0;
|
||||
$upah = 0;
|
||||
$hargaasas = 0;
|
||||
$cajlelong = 0;
|
||||
$rugilelong = 0;
|
||||
$bakilelong = 0;
|
||||
$total_nilaimarhun = 0;
|
||||
|
||||
foreach($databid as $index1=>$bid)
|
||||
{
|
||||
@@ -134,7 +137,7 @@ class LelongController extends Controller
|
||||
$berat = $berat + $bid['berat'];
|
||||
$nilai_marhun = $nilai_marhun + $bid['nilaimarhun'];
|
||||
$pinjaman =$pinjaman + $bid['pinjaman'];
|
||||
$upah = $upah + $bid['upah'];
|
||||
// $upah = $upah + $bid['upah'];
|
||||
$hargaasas = $hargaasas + $bid['hargaasas'];
|
||||
$cajlelong = $cajlelong + $bid['cajlelong'];
|
||||
|
||||
@@ -142,7 +145,7 @@ class LelongController extends Controller
|
||||
$keuntungan = $bid['bakipjm'] - ($bid['bakihargajualan'] - ($bid['upah12'] - $bid['ansakhir'])-(($bid['tempoh']-$bid['tempohbayar'])*$bid['kadarupah']/100*$bid['bakipjm']) );
|
||||
$databid[$index1]['keuntungan'] = $keuntungan;
|
||||
|
||||
$total_upahkeuntungan = $total_upahkeuntungan + $keuntungan;
|
||||
$total_upahkeuntungan = bcdiv($total_upahkeuntungan,1,1) + bcdiv($keuntungan,1,1);
|
||||
|
||||
|
||||
if($bid['baki'] > 0)
|
||||
@@ -158,7 +161,7 @@ class LelongController extends Controller
|
||||
$total24Kgb += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
|
||||
->where('karat','=','24.0Kgb')
|
||||
->sum('berat');
|
||||
|
||||
|
||||
$total24K += LelongBidMarhun::where('lelongbid_id','=',$bid['id'])
|
||||
->where('karat','=','24.0K')
|
||||
->sum('berat');
|
||||
@@ -210,13 +213,14 @@ class LelongController extends Controller
|
||||
'berat'=>$berat,
|
||||
'n_marhun'=>$nilai_marhun,
|
||||
'pinjaman'=>$pinjaman,
|
||||
'keuntungan'=>$keuntungan,
|
||||
'upahsimpan'=>bcdiv($total_upahkeuntungan,1,1),
|
||||
'hargaasas'=>$hargaasas,
|
||||
'cajlelong'=>$cajlelong,
|
||||
'rugilelong'=>$rugilelong,
|
||||
'bakilelong'=>$bakilelong,
|
||||
]);
|
||||
|
||||
$total_upahkeuntungan2 = $total_upahkeuntungan2 + $total_upahkeuntungan;
|
||||
$total_marhun = $total_marhun + sizeof($databid);
|
||||
$total_berat = $total_berat + $berat;
|
||||
$total_pinjaman = $total_pinjaman + $pinjaman;
|
||||
@@ -261,7 +265,8 @@ class LelongController extends Controller
|
||||
'data',
|
||||
'keuntungan',
|
||||
'total_upahkeuntungan',
|
||||
'total_nilaimarhun'));
|
||||
'total_nilaimarhun',
|
||||
'total_upahkeuntungan2'));
|
||||
}
|
||||
|
||||
public function create($id)
|
||||
@@ -436,6 +441,7 @@ class LelongController extends Controller
|
||||
|
||||
public function kemaskini(Request $request)
|
||||
{
|
||||
// dd($request->all());
|
||||
|
||||
$lelkarat = lelKarat::where('lelong_id','=',$request->idlelong)->get();
|
||||
|
||||
@@ -460,7 +466,7 @@ class LelongController extends Controller
|
||||
|
||||
//update marhun
|
||||
$lelongbid = LelongBid::where('lelong_id','=',$request->idlelong)->get();
|
||||
|
||||
|
||||
foreach($lelongbid as $bid)
|
||||
{
|
||||
$sumhargaasas = 0;
|
||||
@@ -474,18 +480,24 @@ class LelongController extends Controller
|
||||
|
||||
if($karat->karat == $marhun->karat)
|
||||
{
|
||||
$val = round($marhun->berat * $karat->harga);
|
||||
$val = round($marhun->berat * $karat->harga2);
|
||||
$sumhargaasas = $sumhargaasas + $val;
|
||||
|
||||
$marhun->harga = $karat->harga;
|
||||
$marhun->n_marhun = $marhun->berat * $karat->harga;
|
||||
$marhun->hargaasas = floatval(number_format($val,2));
|
||||
$marhun->harga = $karat->harga2;
|
||||
$marhun->n_marhun = $marhun->berat * $karat->harga2;
|
||||
$marhun->hargaasas = floatval($val);
|
||||
// $marhun->hargaasas = floatval(number_format($val,2));
|
||||
|
||||
$marhun->save();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
$lelong = Lelong::where('id',$request->idlelong)->get();
|
||||
$bid->hargaasas = $sumhargaasas;
|
||||
$bid->baki = $sumhargaasas-$bid->pinjaman - $bid->bakiupah - $bid->cajlelong;
|
||||
$sumcajlelong = $sumhargaasas * ($lelong[0]['cajlelong']/100);
|
||||
$bid->cajlelong = bcdiv($sumcajlelong,1,1);
|
||||
$bid->baki = $sumhargaasas-$bid->pinjaman - $bid->bakiupah - $sumcajlelong;
|
||||
$bid->save();
|
||||
|
||||
}
|
||||
@@ -838,7 +850,7 @@ class LelongController extends Controller
|
||||
foreach ($marhuns as $index1=> $cal) {
|
||||
|
||||
$keuntungan = $cal['bakipjm'] - ($cal['bakihargajualan'] - ($cal['upah12'] - $cal['ansakhir'])-(($cal['tempoh']-$cal['tempohbayar'])*$cal['kadarupah']/100*$cal['bakipjm']) );
|
||||
$marhuns[$index1]['keuntungan'] = $keuntungan;
|
||||
$marhuns[$index1]['keuntungan'] = bcdiv($keuntungan,1,1);
|
||||
}
|
||||
|
||||
$arrayinfo = [];
|
||||
@@ -950,7 +962,27 @@ class LelongController extends Controller
|
||||
|
||||
|
||||
public function lapbrglelongdetailsindex (Request $request){
|
||||
// dd('hiio');
|
||||
|
||||
$arraydetails = [];
|
||||
|
||||
$brgdetails= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id')
|
||||
->select('lelong_id','tarikh_lelong')
|
||||
->groupBy('lelong_id')
|
||||
->get()
|
||||
->toArray();
|
||||
|
||||
// dd($brgdetails);
|
||||
|
||||
foreach($brgdetails as $brg)
|
||||
{
|
||||
$details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id')
|
||||
->where('lelong_id', $brg['lelong_id'])
|
||||
->get()
|
||||
->toArray();
|
||||
array_push($arraydetails,['brg' => $brg, 'detailsbrg' => $details ]);
|
||||
}
|
||||
|
||||
return view('lelong.brgleldetails', compact('arraydetails'));
|
||||
}
|
||||
|
||||
public function lapbidaanpembidaindex (Request $request){
|
||||
|
||||
@@ -370,12 +370,18 @@ class SimulasiController extends Controller
|
||||
$total14Kp = 0;
|
||||
$total14K = 0;
|
||||
$total9K = 0;
|
||||
$total_upahkeuntungan2 = 0;
|
||||
$total_nilaimarhun = 0;
|
||||
|
||||
foreach($cawangansim as $cawsim)
|
||||
{
|
||||
$cawangan = Cawangan::where('id','=',$cawsim->caw_id)->first();
|
||||
$databid = SimulasiBid::join('gadai','simulasibid.norujukan','=','gadai.norujukan')
|
||||
->where('caw_id','=',$cawsim->caw_id)->where('simulasi_id','=',$simulasi_id)->get()->toArray();
|
||||
->select('simulasibid.id','simulasibid.berat','simulasibid.marhun','simulasibid.cajlelong','simulasibid.baki','simulasibid.nilaimarhun',
|
||||
'simulasibid.pinjaman','simulasibid.hargaasas','simulasibid.cajlelong','gadai.bakipjm','gadai.bakihargajualan','gadai.upah12',
|
||||
'gadai.ansakhir','gadai.tempoh','gadai.kadarupah','gadai.tempohbayar')
|
||||
->where('caw_id','=',$cawsim->caw_id)->where('simulasi_id','=',$simulasi_id)->get();
|
||||
// ->toArray();
|
||||
|
||||
$packet = 0;
|
||||
$berat = 0;
|
||||
@@ -389,10 +395,7 @@ class SimulasiController extends Controller
|
||||
|
||||
$keuntungan = 0;
|
||||
$total_upahkeuntungan = 0;
|
||||
$total_nilaimarhun = 0;
|
||||
|
||||
|
||||
|
||||
|
||||
foreach($databid as $index1=>$bid)
|
||||
{
|
||||
$marhun = SimulasiBidMarhun::where('simulasibid_id','=',$bid['id'])->get();
|
||||
@@ -400,7 +403,7 @@ class SimulasiController extends Controller
|
||||
// $nilai_marhun = $nilai_marhun + ($marhun->sum('n_marhun'));
|
||||
$nilai_marhun = $nilai_marhun + $bid['nilaimarhun'];
|
||||
$pinjaman =$pinjaman + $bid['pinjaman'];
|
||||
$upah = $upah + $bid['upahsimpan'];
|
||||
// $upah = $upah + $bid['upah'];
|
||||
$hargaasas = $hargaasas + $bid['hargaasas'];
|
||||
$cajlelong = $cajlelong + $bid['cajlelong'];
|
||||
|
||||
@@ -408,7 +411,9 @@ class SimulasiController extends Controller
|
||||
$keuntungan = $bid['bakipjm'] - ($bid['bakihargajualan'] - ($bid['upah12'] - $bid['ansakhir'])-(($bid['tempoh']-$bid['tempohbayar'])*$bid['kadarupah']/100*$bid['bakipjm']) );
|
||||
$databid[$index1]['keuntungan'] = $keuntungan;
|
||||
|
||||
$total_upahkeuntungan = $total_upahkeuntungan + $keuntungan;
|
||||
// $total_upahkeuntungan = $total_upahkeuntungan + $keuntungan;
|
||||
$total_upahkeuntungan = bcdiv($total_upahkeuntungan,1,1) + bcdiv($keuntungan,1,1);
|
||||
|
||||
|
||||
|
||||
if($bid['baki'] > 0)
|
||||
@@ -469,8 +474,6 @@ class SimulasiController extends Controller
|
||||
|
||||
}
|
||||
|
||||
//total keuntungaan full
|
||||
|
||||
array_push($arraycaw,[
|
||||
'id_cawangan'=> $cawangan['id'],
|
||||
'cawangan'=>$cawangan['caw_name'],
|
||||
@@ -479,7 +482,7 @@ class SimulasiController extends Controller
|
||||
'berat'=>$berat,
|
||||
'n_marhun'=>$nilai_marhun,
|
||||
'pinjaman'=>$pinjaman,
|
||||
'upahsimpan'=>$total_upahkeuntungan,
|
||||
'upahsimpan'=>bcdiv($total_upahkeuntungan,1,1),
|
||||
'hargaasas'=>$hargaasas,
|
||||
'cajlelong'=>$cajlelong,
|
||||
'rugilelong'=>$rugilelong,
|
||||
@@ -490,11 +493,13 @@ class SimulasiController extends Controller
|
||||
$total_marhun = $total_marhun + sizeof($databid);
|
||||
$total_berat = $total_berat + $berat;
|
||||
$total_nilaimarhun = $total_nilaimarhun + $nilai_marhun;
|
||||
//dd($nilai_marhun);
|
||||
$total_pinjaman = $total_pinjaman + $pinjaman;
|
||||
$total_hargaasas = $total_hargaasas + $hargaasas;
|
||||
$total_cazlelong = $total_cazlelong + $cajlelong;
|
||||
$total_rugilelong = $total_rugilelong + $rugilelong;
|
||||
$total_bakilelong = $total_bakilelong + $bakilelong;
|
||||
$total_upahkeuntungan2 = $total_upahkeuntungan2 + $total_upahkeuntungan;
|
||||
|
||||
|
||||
$data = Simulasi::where('simulasi.id','=',$simulasi_id)
|
||||
@@ -531,7 +536,8 @@ class SimulasiController extends Controller
|
||||
'jeniskarat',
|
||||
'data',
|
||||
'total_upahkeuntungan',
|
||||
'total_nilaimarhun'
|
||||
'total_nilaimarhun',
|
||||
'total_upahkeuntungan2'
|
||||
));
|
||||
}
|
||||
|
||||
@@ -599,18 +605,23 @@ class SimulasiController extends Controller
|
||||
|
||||
if($karat->karat == $marhun->karat)
|
||||
{
|
||||
$val = round($marhun->berat * $karat->harga);
|
||||
$val = round($marhun->berat * $karat->harga2);
|
||||
$sumhargaasas = $sumhargaasas + $val;
|
||||
|
||||
$marhun->harga = $karat->harga;
|
||||
$marhun->n_marhun = $marhun->berat * $karat->harga;
|
||||
$marhun->hargaasas = floatval(number_format($val,2));
|
||||
$marhun->harga = $karat->harga2;
|
||||
$marhun->n_marhun = $marhun->berat * $karat->harga2;
|
||||
$marhun->hargaasas = $val;
|
||||
// $marhun->hargaasas = floatval(number_format($val,2));
|
||||
$marhun->save();
|
||||
}
|
||||
}
|
||||
}
|
||||
$lelong = Simulasi::where('id',$request->idsimulasi)->get();
|
||||
$bid->hargaasas = $sumhargaasas;
|
||||
$bid->baki = $sumhargaasas-$bid->pinjaman - $bid->bakiupah - $bid->cajlelong;
|
||||
// $bid->baki = $sumhargaasas-$bid->pinjaman - $bid->bakiupah - $bid->cajlelong;
|
||||
$sumcajlelong = $sumhargaasas * ($lelong[0]['cajlelong']/100);
|
||||
$bid->cajlelong = bcdiv($sumcajlelong,1,1);
|
||||
$bid->baki = $sumhargaasas-$bid->pinjaman - $bid->bakiupah - $sumcajlelong;
|
||||
$bid->save();
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user