Merge branch 'atie' into 'main'

add function radio button fasa 1dan2

See merge request online-sistem1/lelong!29
This commit is contained in:
Nur Izzati Zulkifli
2022-05-10 08:36:25 +00:00
2 changed files with 49 additions and 15 deletions
+18 -2
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
@@ -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();
+31 -13
View File
@@ -27,10 +27,27 @@
</div>
</div>
<div class="form-group row">
<label for="jbg" class="col-sm-1 col-form-label">JBG</label>
<label for="jbg" class="col-sm-1 col-form-label">Fasa Lelong</label>
<div class="col-sm-4">
<input type="text" class="form-control" id="jbg" name="jbg" placeholder="JBG">
<input type="radio" value='1' id="fasa1" name="fasa" checked>
<label for="1">Fasa 1</label>
<input type="radio" value='2' id="fasa2" name="fasa">
<label for="2">Fasa 2</label>
</div>
<label for="cajlelong" class="col-sm-1 col-form-label">Caj Lelong</label>
<div class="col-sm-4">
<input type="text" class="form-control" id="cajlelong" name="cajlelong" placeholder="%">
</div>
</div>
<div class="form-group row">
<label for="jbg" class="col-sm-1 col-form-label">JBG</label>
<div class="col-sm-4" id="fasa_1">
<input type="text" class="form-control" id="jbg" name="jbg" placeholder="JBG">
</div>
<label for="caw" class="col-sm-1 col-form-label">Cawangan</label>
<div class="col-sm-4">
<select class="selectpicker" multiple name="caw[]" id="caw">
@@ -43,17 +60,6 @@
</select>
</div>
</div>
<div class="form-group row">
<label for="cajlelong" class="col-sm-1 col-form-label">Caj Lelong</label>
<div class="col-sm-4">
<input type="text" class="form-control" id="cajlelong" name="cajlelong" placeholder="%">
</div>
{{-- <label for="inputEmail3" class="col-sm-1 col-form-label">Upah</label>
<div class="col-sm-4">
<input type="text" class="form-control" id="inputEmail3" placeholder="Upah">
</div> --}}
</div>
<div class="form-group row">
<div class="col-sm-10">
<button type="submit" class="btn btn-primary">Jana Simulasi</button>
@@ -70,6 +76,18 @@
placeholder: "Pilih Cawangan",
allowClear: true
});
$(document).ready(function () {
$("input[name=fasa]").change(function(){
if($("#fasa1").is(':checked')){
$("#jbg").val('').prop("readonly", false);
}
if($("#fasa2").is(':checked')){
$("#jbg").val('12').prop("readonly", true);
}
});
});
</script>
@endsection