diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 098e2740..3c9b092b 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -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 @@ -359,7 +375,6 @@ class SimulasiController extends Controller $keuntungan = 0; $total_upahkeuntungan = 0; - $total_nilaimarhun = 0; @@ -463,6 +478,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(); diff --git a/resources/views/simulasi/janasimulasi.blade.php b/resources/views/simulasi/janasimulasi.blade.php index 1e9de514..acf310f0 100644 --- a/resources/views/simulasi/janasimulasi.blade.php +++ b/resources/views/simulasi/janasimulasi.blade.php @@ -27,10 +27,27 @@