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

Merge branch 'main' into faiqahzaman

Browse Source
This commit is contained in:
faiqahzaman
2022-05-11 10:34:24 +08:00
parent 5e2e73789b 17c367dd4f
commit 5b07a612e7
5 changed files with 56 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/ImportDataController.php
+5 -4
View File
@@ -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')");
}
app/Http/Controllers/SimulasiController.php
+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();