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

Merge branch 'main' into amirah

Browse Source
This commit is contained in:
Amirah22
2022-05-18 12:17:55 +08:00
parent b108eafa1b 2f91401299
commit e53cd7b573
34 changed files with 1543 additions and 174 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/SimulasiController.php
+23 -4
View File
@@ -60,14 +60,29 @@ class SimulasiController extends Controller
//dd($request->all());
$t_lelong = Carbon::parse($request->tarikh_lelong);
$bulan = (int)round($request->jbg);
$fasa = $request->fasa;
$jbg = $request->jbg;
// dd($fasa);
$jbgadai = ($t_lelong->subMonths($bulan))->toDateString();
$surat = Gadai::where('t_gadai','<=',$jbgadai)
if($request->fasa == '1'){
$surat = Gadai::where('t_gadai','<=',$jbgadai)
->where('sttebus','=','')
->where('tagpalsu','=',0)
->where('tagpalsu2','=',0)
->where('taglel','=',0)
->where('lelong_tawarruq','=',1)
->get();
}
else if($request->fasa == '2'){
$surat = Gadai::where('t_gadai','<=',$jbgadai)
->where('sttebus','=','')
->where('tagpalsu','=',0)
->where('tagpalsu2','=',0)
->where('taglel','=',0)
->get();
}
// dd($jbg);
if(sizeof($surat) == 0)
{
return redirect()->route('analisa.janasimulasi')
@@ -80,6 +95,7 @@ class SimulasiController extends Controller
$simulasi->harga_emas_asas = $request->hargaasas;
$simulasi->jbg = $request->jbg;
$simulasi->cajlelong = $request->cajlelong;
$simulasi->fasa = $request->fasa;
$simulasi->save();
//create harga asas berdasarkan input harga asas
@@ -96,10 +112,11 @@ class SimulasiController extends Controller
$simkarat->save();
}
//$fasa = $request->fasa;
// join cawangan yang terlibat dengan simulasi
if($request->caw && $request->caw == 'all')
{
//dd($request->fasa);
foreach($cawangan as $key=>$caw)
{
@@ -108,6 +125,7 @@ class SimulasiController extends Controller
$caw_simulasi->caw_id = $caw->id;
$caw_simulasi->online = 'Online';
$caw_simulasi->lokasi = $caw->lokasi;
$caw_simulasi->fasa = $request->fasa;
$caw_simulasi->save();
$suratcaw = $surat->where('kodcaw','=',$caw->caw_code)->all();
@@ -195,6 +213,7 @@ class SimulasiController extends Controller
$caw_simulasi->caw_id = $cawsimulasi->id;
$caw_simulasi->online = 'Online';
$caw_simulasi->lokasi = $cawsimulasi->lokasi;
$caw_simulasi->fasa = $request->fasa;
$caw_simulasi->save();
// dd($caw_simulasi);
@@ -288,7 +307,7 @@ class SimulasiController extends Controller
$arrayinfo = [];
$simulasi = Simulasi::join('cawangan_simulasi','simulasi.id','=','cawangan_simulasi.simulasi_id')
->select('simulasi_id','tarikh_lelong')
->select('simulasi_id','tarikh_lelong', 'simulasi.fasa')
->groupBy('simulasi_id')
->get()
->toArray();
@@ -359,7 +378,6 @@ class SimulasiController extends Controller
$keuntungan = 0;
$total_upahkeuntungan = 0;
$total_nilaimarhun = 0;
@@ -466,6 +484,7 @@ class SimulasiController extends Controller
$total_cazlelong = $total_cazlelong + $cajlelong;
$total_rugilelong = $total_rugilelong + $rugilelong;
$total_bakilelong = $total_bakilelong + $bakilelong;
$data = Simulasi::where('simulasi.id','=',$simulasi_id)
->get();