Merge branch 'main' into amirah

This commit is contained in:
Amirah22
2022-05-25 13:52:23 +08:00
14 changed files with 840 additions and 106 deletions
+263 -23
View File
@@ -62,6 +62,7 @@ class SimulasiController extends Controller
$bulan = (int)round($request->jbg);
$fasa = $request->fasa;
$jbg = $request->jbg;
// dd($fasa);
// dd($fasa);
$jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
if($request->fasa == '1'){
@@ -156,6 +157,7 @@ class SimulasiController extends Controller
$simulasibid->status_jual = 0;
$simulasibid->status_payment = 0;
$simulasibid->mora_upah = 0;
$simulasibid->fasa = $request->fasa;
$simulasibid->save();
$sumhargaasas = 0;
@@ -181,7 +183,7 @@ class SimulasiController extends Controller
$simmarhun->karat = $marhun->karat;
$simmarhun->berat = $marhun->berat;
$simmarhun->harga = $karat->harga;
$simmarhun->n_marhun = $marhun->berat * $karat->harga;
$simmarhun->n_marhun = $marhun->n_marhun;
$simmarhun->hargaasas = $val;
$simmarhun->save();
}
@@ -191,20 +193,20 @@ class SimulasiController extends Controller
}
$calcaj = ($request->cajlelong/100)*$sumhargaasas;
$updatesimbid = SimulasiBid::where('id','=',$simulasibid->id)->first();
$updatesimbid->hargaasas = $sumhargaasas;
$updatesimbid->cajlelong = $calcaj;
$updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj;
$updatesimbid->berat = $berat;
$updatesimbid->save();
// $calcaj = ($request->cajlelong/100)*$sumhargaasas;
// $updatesimbid = SimulasiBid::where('id','=',$simulasibid->id)->first();
// $updatesimbid->hargaasas = $sumhargaasas;
// $updatesimbid->cajlelong = $calcaj;
// $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj;
// $updatesimbid->berat = $berat;
// $updatesimbid->save();
}
}
}
elseif($request->caw && $request->caw != 'all')
{
//dd($request->caw);
$caw = Cawangan::whereIn('id',$request->caw)->get();
$caw = Cawangan::whereIn('caw_code',$request->caw)->get();
// dd($caw);
foreach($caw as $index=>$cawsimulasi){
// dd($cawsimulasi->id);
@@ -246,6 +248,7 @@ class SimulasiController extends Controller
$simulasibid->status_jual = 0;
$simulasibid->status_payment = 0;
$simulasibid->mora_upah = 0;
$simulasibid->fasa = $request->fasa;
$simulasibid->save();
$sumhargaasas = 0;
@@ -272,7 +275,7 @@ class SimulasiController extends Controller
$simmarhun->karat = $marhun->karat;
$simmarhun->berat = $marhun->berat;
$simmarhun->harga = $karat->harga;
$simmarhun->n_marhun = $marhun->berat * $karat->harga;
$simmarhun->n_marhun = $marhun->n_marhun;
$simmarhun->hargaasas = $val;
$simmarhun->save();
}
@@ -282,13 +285,21 @@ class SimulasiController extends Controller
}
$calcaj = ($request->cajlelong/100)*$sumhargaasas;
$updatesimbid = SimulasiBid::where('id','=',$simulasibid->id)->first();
$updatesimbid->hargaasas = $sumhargaasas;
$updatesimbid->cajlelong = $calcaj;
$updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj;
$updatesimbid->berat = $berat;
$updatesimbid->save();
// $calcaj = ($request->cajlelong/100)*$sumhargaasas;
// $updatesimbid = SimulasiBid::where('id','=',$simulasibid->id)->first();
// $updatesimbid->hargaasas = $sumhargaasas;
// $updatesimbid->cajlelong = $calcaj;
// $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj;
// $updatesimbid->berat = $berat;
// $updatesimbid->save();
$updategadai = Gadai::where('norujukan','=',$data->norujukan)->first();
$updategadai->taglel = 1;
$updategadai->save();
// $updatesimbid->cajlelong = $calcaj;
// $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj;
// $updatesimbid->berat = $berat;
// $updatesimbid->save();
}
}
}
@@ -359,6 +370,8 @@ class SimulasiController extends Controller
$total14Kp = 0;
$total14K = 0;
$total9K = 0;
$total_upahkeuntungan2 = 0;
$total_nilaimarhun = 0;
foreach($cawangansim as $cawsim)
{
@@ -381,10 +394,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();
@@ -461,7 +471,6 @@ class SimulasiController extends Controller
}
array_push($arraycaw,[
'id_cawangan'=> $cawangan['id'],
'cawangan'=>$cawangan['caw_name'],
@@ -481,11 +490,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)
@@ -522,15 +533,27 @@ class SimulasiController extends Controller
'jeniskarat',
'data',
'total_upahkeuntungan',
'total_nilaimarhun'
'total_nilaimarhun',
'total_upahkeuntungan2'
));
}
public function delete($id)
{
$simulasibid = SimulasiBid::where('simulasi_id','=',$id)->get();
foreach($simulasibid as $data)
{
$updategadai = Gadai::where('norujukan','=',$data->norujukan)->first();
$updategadai->taglel = 0;
$updategadai->save();
}
//dd($simulasibid);
$role = Simulasi::where('id','=',$id)->first();
// dd($role);
$role->delete();
return redirect()->route('analisa.senaraisimulasi')
->with('success','Padam Simulasi Berjaya');
}
@@ -841,5 +864,222 @@ class SimulasiController extends Controller
return redirect()->route('analisa.senaraimarhunlel',['simulasi_id'=>$request->simulasi_id,'cawid'=>$request->cawid])
->with('success','Delete Berjaya');
}
public function senaraitempsimulasi(Request $request)
{
// $t_lelong = $request->tarikh_lelong;
// $tarikh_lelong = Carbon::parse($t_lelong);
// $t_lelongdisplay = $tarikh_lelong->format('d-m-Y');
// $t_anggaran = ($tarikh_lelong->subDays(20))->format('d/m/Y');
// $t_daftarlelong = ($tarikh_lelong->subMonths(1))->format('d/m/Y');
//$t_lelong1 = $request->tarikh_lelong;
$t_lelong1 = date('d-m-Y', strtotime($request->tarikh_lelong));
$t_lelong2 = $request->tarikh_lelong;
$t_lelong = Carbon::parse($request->tarikh_lelong);
$bulan = (int)round($request->jbg);
$fasa = $request->fasa;
$jbg = $request->jbg;
$cajlelong = $request->cajlelong;
$jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
$t_lelongdisplay = $t_lelong->format('d-m-Y');
// $t_lelongdisplay = $t_lelong->format('d-m-Y');
//dd($fasa);
if($t_lelong != null)
{
if($request->fasa == '1'){
$getsurat = Gadai::where('t_gadai','<=',$jbgadai)
->where('sttebus','=','')
->where('tagpalsu','=',0)
->where('tagpalsu2','=',0)
->where('taglel','=',0)
->where('lelong_tawarruq','=',1)
->get();
$t_gadais = Gadai::where('t_gadai','<=',$jbgadai)
->where('sttebus', '=', '')
->where('taglel', '=', 0)
->where('tagpalsu', '=', 0)
->where('tagpalsu2', '=', 0)
->where('lelong_tawarruq','=',1)
->whereNotNull('upah12')
->orderBy('t_gadai')
->select('t_gadai', 'norujukan')
->first();
//dd($t_gadais);
// $t_gadais = $request->t_gadai;
// $t_gadaisehingga = Carbon::parse($t_gadais);
// $t_gadaisdisplay = $t_gadaisehingga->format('d/m/Y');
$senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
->orderBy('cawangan.caw_name')
->where('gadai.t_gadai', '<=', $jbgadai)
->where('gadai.lelong_tawarruq','=',1)
->where('gadai.sttebus', '=', '')
->where('gadai.taglel', '=', 0)
->where('gadai.tagpalsu', '=', 0)
->where('gadai.tagpalsu2', '=', 0)
->whereNotNull('gadai.upah12')
->groupBy('gadai.kodcaw','cawangan.caw_name')
->selectRaw('count(*) as bil_lelong,
sum(berat) as total_berat,
sum(nilaimarhun) as total_nilaimarhun,
sum(pinjaman) as total_pembiayaan,
sum(bakipjm) as total_bakipjm,
gadai.kodcaw,
cawangan.caw_name as caw_name')
->get();
$bil_lelong = sizeof($getsurat);
}
else if($request->fasa == '2'){
$getsurat = Gadai::where('t_gadai','<=',$jbgadai)
->where('sttebus','=','')
->where('tagpalsu','=',0)
->where('tagpalsu2','=',0)
->where('taglel','=',0)
->get();
//dd($getsurat);
$t_gadais = Gadai::where('t_gadai','<=',$jbgadai)
->where('sttebus', '=', '')
->where('taglel', '=', 0)
->where('tagpalsu', '=', 0)
->where('tagpalsu2', '=', 0)
->whereNotNull('upah12')
->orderBy('t_gadai')
->select('t_gadai', 'norujukan')
->first();
//dd($t_gadais);
// $t_gadais = $request->t_gadai;
// $t_gadaisehingga = Carbon::parse($t_gadais);
// $t_gadaisdisplay = $t_gadaisehingga->format('d/m/Y');
$senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
->orderBy('cawangan.caw_name')
->where('gadai.t_gadai', '<=', $jbgadai)
->where('gadai.sttebus', '=', '')
->where('gadai.taglel', '=', 0)
->where('gadai.tagpalsu', '=', 0)
->where('gadai.tagpalsu2', '=', 0)
->whereNotNull('gadai.upah12')
->groupBy('gadai.kodcaw','cawangan.caw_name')
->selectRaw('count(*) as bil_lelong,
sum(berat) as total_berat,
sum(nilaimarhun) as total_nilaimarhun,
sum(pinjaman) as total_pembiayaan,
sum(bakipjm) as total_bakipjm,
gadai.kodcaw,
cawangan.caw_name as caw_name')
->get();
$bil_lelong = sizeof($getsurat);
}
if(sizeof($getsurat) == 0)
{
return redirect()->route('analisa.janasimulasi')
->with('failed','Tiada surat untuk di lelong');
}
return view('simulasi.senaraitempsimulasi', compact( 't_lelong',
'getsurat',
'senarai',
't_gadais',
't_lelong1',
't_lelong2',
't_lelongdisplay',
'jbgadai',
'fasa',
'jbg',
'cajlelong'
));
}
else
{
return redirect()->route('analisa.janasimulasi')
->with('failed','Sila Masukkan Tarikh Lelongan');
}
}
public function tempbycawsimulasi($details, $t_gadai1, $fasa)
{
$jbgadai = $t_gadai1;
//$fasa = $request->fasa;
//dd($fasa);
if($fasa == '1'){
$getsurat = Gadai::where('t_gadai', '<=', $jbgadai)
->where('kodcaw', $details)
->where('sttebus', '=', '')
->where('lelong_tawarruq','=',1)
->where('taglel', '=', 0)
->where('tagpalsu', '=', 0)
->where('tagpalsu2', '=', 0)
->whereNotNull('upah12')
->get();
$t_gadais = Gadai::where('t_gadai', '<=', $jbgadai)
->where('sttebus', '=', '')
->where('taglel', '=', 0)
->where('tagpalsu', '=', 0)
->where('tagpalsu2', '=', 0)
->whereNotNull('upah12')
->orderBy('t_gadai')
->select('t_gadai')
->first();
}else{
$getsurat = Gadai::where('t_gadai', '<=', $jbgadai)
->where('kodcaw', $details)
->where('sttebus', '=', '')
->where('taglel', '=', 0)
->where('tagpalsu', '=', 0)
->where('tagpalsu2', '=', 0)
->whereNotNull('upah12')
->get();
$t_gadais = Gadai::where('t_gadai', '<=', $jbgadai)
->where('sttebus', '=', '')
->where('taglel', '=', 0)
->where('tagpalsu', '=', 0)
->where('tagpalsu2', '=', 0)
->whereNotNull('upah12')
->orderBy('t_gadai')
->select('t_gadai')
->first();
}
// $tarikh_lelong = Carbon::parse($t_lelong);
// $t_anggaran = ($tarikh_lelong->subMonths(1))->toDateString();
// $t_lelongdisplay = $tarikh_lelong->format('d-m-Y');
//$t_anggaran = ($tarikh_lelong->subDays(20))->format('d/m/Y');
//$t_daftarlelong = ($tarikh_lelong->subMonths(1))->format('d/m/Y');
foreach($getsurat as $index1=>$surats)
{
$senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code')
->where('norujukan', $surats['norujukan'])
->get();
//dd($senarai);
$getsurat[$index1]['list_norujukan'] = $senarai;
}
// $keuntungantlhbyr = TransaksiKeuntungan::on('mysql2')
// ->sum('bayaran_keuntungan');
return view('simulasi.tempbycawsimulasi', compact( 'getsurat',
'details',
'senarai',
't_gadais'
));
}
}