Merge branch 'main' into faiqahzaman
This commit is contained in:
faiqahzaman
@@ -72,7 +72,7 @@ class ImportDataController extends Controller
|
||||
mysqli_select_db($db,$caw_dbname);
|
||||
|
||||
$count = 0;
|
||||
$result=mysqli_query($db,"SELECT * FROM gadai where sttebus = '' and upah12 is NOT NULL");
|
||||
$result=mysqli_query($db,"SELECT * FROM gadai where taglel = '0' and sttebus = '' and upah12 is NOT NULL");
|
||||
while($row_gadai = mysqli_fetch_array($result))
|
||||
{
|
||||
|
||||
@@ -108,9 +108,9 @@ class ImportDataController extends Controller
|
||||
$hargajualan = $row_gadai['hargajualan'];
|
||||
$bakihargajualan = $row_gadai['bakihargajualan'];
|
||||
$tempohbayar = $row_gadai['tempohbayar'];
|
||||
|
||||
|
||||
DB::insert("INSERT INTO elelong.gadai (kodcaw,norujukan,nopelanggan,nokp,t_gadai,masa,sirig,nilaimarhun,berat,pinjaman,sttebus,tagcetak,kadarupah,tempoh,t_matang,t_matang1,teller,bakipjm,bakiupah,marhun,taglel,ansakhir,t_update,tagtbaki,penilai,percentpinj,tagpalsu,semakbarcode,historygadaian,upah12,hargajualan,bakihargajualan,tempohbayar)
|
||||
VALUES ('$kodcaw','$norujukan','$nopelanggan','$nokp','$t_gadai','$masa','$sirig','$nilaimarhun','$berat','$pinjaman', '','','$kadarupah','$tempoh','$t_matang','$t_matang1','$teller','$bakipjm','$bakiupah','$marhun','$taglel','$ansakhir','$t_update','$tagtbaki','$penilai','$percentpinj','$tagpalsu','$semakbarcode','$historygadaian','$upah12','$hargajualan','$bakihargajualan','$tempohbayar')");
|
||||
VALUES ('$kodcaw','$norujukan','$nopelanggan','$nokp','$t_gadai','$masa','$sirig','$nilaimarhun','$berat','$pinjaman', '','','$kadarupah','$tempoh','$t_matang','$t_matang1','$teller','$bakipjm','$bakiupah','$marhun','$taglel','$ansakhir','$t_update','0','$penilai','$percentpinj','$tagpalsu','$semakbarcode','$historygadaian','$upah12','$hargajualan','$bakihargajualan','$tempohbayar')");
|
||||
|
||||
//untuk gadaimarhun
|
||||
$result1=mysqli_query($db,"SELECT * FROM marhun where norujukan = '$norujukan'");
|
||||
@@ -127,9 +127,10 @@ class ImportDataController extends Controller
|
||||
$berat1 = $row_tender1['berat'];
|
||||
$harga1 = $row_tender1['harga'];
|
||||
$n_marhun1 = $row_tender1['n_marhun'];
|
||||
$nota2 = $db -> real_escape_string($nota1);
|
||||
|
||||
DB::insert("INSERT INTO elelong.gadaimarhun (kodcaw,norujukan,t_gadai,bil,marhun,nota,karat,berat,harga,n_marhun)
|
||||
VALUES ('$kodcaw1','$norujukan1','$t_gadai1','$bil1','$marhun1','$nota1','$karat1','$berat1','$harga1','$n_marhun1')");
|
||||
VALUES ('$kodcaw1','$norujukan1','$t_gadai1','$bil1','$marhun1','$nota2','$karat1','$berat1','$harga1','$n_marhun1')");
|
||||
|
||||
}
|
||||
|
||||
|
||||
@@ -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();
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
|
||||
$count = 0;
|
||||
// $result = mysql_query("SELECT * FROM cawangan_lelong");
|
||||
$results = DB::select('select * from cawangan');
|
||||
$results = DB::select('select * from cawangan order by caw_name');
|
||||
foreach($results as $row)
|
||||
{
|
||||
$caw_ip = $row->caw_ip;
|
||||
|
||||
@@ -196,7 +196,7 @@
|
||||
order: [[1, 'asc']],
|
||||
"info": false,
|
||||
"lengthChange": false,
|
||||
"pageLength": 15,
|
||||
"pageLength": 40,
|
||||
dom: 'Bfrtip',
|
||||
buttons: [
|
||||
{
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user