diff --git a/app/Http/Controllers/ImportDataController.php b/app/Http/Controllers/ImportDataController.php index e6c12298..f34936ea 100644 --- a/app/Http/Controllers/ImportDataController.php +++ b/app/Http/Controllers/ImportDataController.php @@ -72,7 +72,7 @@ class ImportDataController extends Controller mysqli_select_db($db,$caw_dbname); $count = 0; - $result=mysqli_query($db,"SELECT * FROM gadai where taglel = '0' and sttebus = '' and upah12 is NOT NULL"); + $result=mysqli_query($db,"SELECT 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,lelong_tawarruq FROM gadai where taglel = '0' and sttebus = '' and upah12 is NOT NULL"); while($row_gadai = mysqli_fetch_array($result)) { @@ -108,9 +108,10 @@ class ImportDataController extends Controller $hargajualan = $row_gadai['hargajualan']; $bakihargajualan = $row_gadai['bakihargajualan']; $tempohbayar = $row_gadai['tempohbayar']; + $lelong_tawarruq = $row_gadai['lelong_tawarruq']; - 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','0','$penilai','$percentpinj','$tagpalsu','$semakbarcode','$historygadaian','$upah12','$hargajualan','$bakihargajualan','$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,lelong_tawarruq) + 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','$lelong_tawarruq')"); //untuk gadaimarhun $result1=mysqli_query($db,"SELECT * FROM marhun where norujukan = '$norujukan'"); diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index b5ddddbb..15a7f398 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -62,6 +62,7 @@ class SimulasiController extends Controller $bulan = (int)round($request->jbg); $fasa = $request->fasa; $jbg = $request->jbg; + // dd($fasa); // dd($fasa); $jbgadai = ($t_lelong->subMonths($bulan))->toDateString(); if($request->fasa == '1'){ @@ -156,6 +157,7 @@ class SimulasiController extends Controller $simulasibid->status_jual = 0; $simulasibid->status_payment = 0; $simulasibid->mora_upah = 0; + $simulasibid->fasa = $request->fasa; $simulasibid->save(); $sumhargaasas = 0; @@ -181,7 +183,7 @@ class SimulasiController extends Controller $simmarhun->karat = $marhun->karat; $simmarhun->berat = $marhun->berat; $simmarhun->harga = $karat->harga; - $simmarhun->n_marhun = $marhun->berat * $karat->harga; + $simmarhun->n_marhun = $marhun->n_marhun; $simmarhun->hargaasas = $val; $simmarhun->save(); } @@ -191,20 +193,20 @@ class SimulasiController extends Controller } - $calcaj = ($request->cajlelong/100)*$sumhargaasas; - $updatesimbid = SimulasiBid::where('id','=',$simulasibid->id)->first(); - $updatesimbid->hargaasas = $sumhargaasas; - $updatesimbid->cajlelong = $calcaj; - $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj; - $updatesimbid->berat = $berat; - $updatesimbid->save(); + // $calcaj = ($request->cajlelong/100)*$sumhargaasas; + // $updatesimbid = SimulasiBid::where('id','=',$simulasibid->id)->first(); + // $updatesimbid->hargaasas = $sumhargaasas; + // $updatesimbid->cajlelong = $calcaj; + // $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj; + // $updatesimbid->berat = $berat; + // $updatesimbid->save(); } } } elseif($request->caw && $request->caw != 'all') { //dd($request->caw); - $caw = Cawangan::whereIn('id',$request->caw)->get(); + $caw = Cawangan::whereIn('caw_code',$request->caw)->get(); // dd($caw); foreach($caw as $index=>$cawsimulasi){ // dd($cawsimulasi->id); @@ -246,6 +248,7 @@ class SimulasiController extends Controller $simulasibid->status_jual = 0; $simulasibid->status_payment = 0; $simulasibid->mora_upah = 0; + $simulasibid->fasa = $request->fasa; $simulasibid->save(); $sumhargaasas = 0; @@ -272,7 +275,7 @@ class SimulasiController extends Controller $simmarhun->karat = $marhun->karat; $simmarhun->berat = $marhun->berat; $simmarhun->harga = $karat->harga; - $simmarhun->n_marhun = $marhun->berat * $karat->harga; + $simmarhun->n_marhun = $marhun->n_marhun; $simmarhun->hargaasas = $val; $simmarhun->save(); } @@ -282,13 +285,21 @@ class SimulasiController extends Controller } - $calcaj = ($request->cajlelong/100)*$sumhargaasas; - $updatesimbid = SimulasiBid::where('id','=',$simulasibid->id)->first(); - $updatesimbid->hargaasas = $sumhargaasas; - $updatesimbid->cajlelong = $calcaj; - $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj; - $updatesimbid->berat = $berat; - $updatesimbid->save(); + // $calcaj = ($request->cajlelong/100)*$sumhargaasas; + // $updatesimbid = SimulasiBid::where('id','=',$simulasibid->id)->first(); + // $updatesimbid->hargaasas = $sumhargaasas; + // $updatesimbid->cajlelong = $calcaj; + // $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj; + // $updatesimbid->berat = $berat; + // $updatesimbid->save(); + + $updategadai = Gadai::where('norujukan','=',$data->norujukan)->first(); + $updategadai->taglel = 1; + $updategadai->save(); + // $updatesimbid->cajlelong = $calcaj; + // $updatesimbid->baki = $sumhargaasas-$data->pinjaman - $data->bakiupah - $calcaj; + // $updatesimbid->berat = $berat; + // $updatesimbid->save(); } } } @@ -526,9 +537,20 @@ class SimulasiController extends Controller public function delete($id) { + $simulasibid = SimulasiBid::where('simulasi_id','=',$id)->get(); + foreach($simulasibid as $data) + { + $updategadai = Gadai::where('norujukan','=',$data->norujukan)->first(); + $updategadai->taglel = 0; + $updategadai->save(); + } + //dd($simulasibid); $role = Simulasi::where('id','=',$id)->first(); // dd($role); $role->delete(); + + + return redirect()->route('analisa.senaraisimulasi') ->with('success','Padam Simulasi Berjaya'); } @@ -839,5 +861,222 @@ class SimulasiController extends Controller return redirect()->route('analisa.senaraimarhunlel',['simulasi_id'=>$request->simulasi_id,'cawid'=>$request->cawid]) ->with('success','Delete Berjaya'); } + + public function senaraitempsimulasi(Request $request) + { + + // $t_lelong = $request->tarikh_lelong; + // $tarikh_lelong = Carbon::parse($t_lelong); + // $t_lelongdisplay = $tarikh_lelong->format('d-m-Y'); + // $t_anggaran = ($tarikh_lelong->subDays(20))->format('d/m/Y'); + // $t_daftarlelong = ($tarikh_lelong->subMonths(1))->format('d/m/Y'); + //$t_lelong1 = $request->tarikh_lelong; + $t_lelong1 = date('d-m-Y', strtotime($request->tarikh_lelong)); + $t_lelong2 = $request->tarikh_lelong; + $t_lelong = Carbon::parse($request->tarikh_lelong); + $bulan = (int)round($request->jbg); + $fasa = $request->fasa; + $jbg = $request->jbg; + $cajlelong = $request->cajlelong; + $jbgadai = ($t_lelong->subMonths($bulan))->toDateString(); + $t_lelongdisplay = $t_lelong->format('d-m-Y'); + // $t_lelongdisplay = $t_lelong->format('d-m-Y'); + //dd($fasa); + if($t_lelong != null) + { + if($request->fasa == '1'){ + $getsurat = Gadai::where('t_gadai','<=',$jbgadai) + ->where('sttebus','=','') + ->where('tagpalsu','=',0) + ->where('tagpalsu2','=',0) + ->where('taglel','=',0) + ->where('lelong_tawarruq','=',1) + ->get(); + + $t_gadais = Gadai::where('t_gadai','<=',$jbgadai) + ->where('sttebus', '=', '') + ->where('taglel', '=', 0) + ->where('tagpalsu', '=', 0) + ->where('tagpalsu2', '=', 0) + ->where('lelong_tawarruq','=',1) + ->whereNotNull('upah12') + ->orderBy('t_gadai') + ->select('t_gadai', 'norujukan') + ->first(); + //dd($t_gadais); + // $t_gadais = $request->t_gadai; + // $t_gadaisehingga = Carbon::parse($t_gadais); + // $t_gadaisdisplay = $t_gadaisehingga->format('d/m/Y'); + + + $senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code') + ->orderBy('cawangan.caw_name') + ->where('gadai.t_gadai', '<=', $jbgadai) + ->where('gadai.lelong_tawarruq','=',1) + ->where('gadai.sttebus', '=', '') + ->where('gadai.taglel', '=', 0) + ->where('gadai.tagpalsu', '=', 0) + ->where('gadai.tagpalsu2', '=', 0) + ->whereNotNull('gadai.upah12') + ->groupBy('gadai.kodcaw','cawangan.caw_name') + ->selectRaw('count(*) as bil_lelong, + sum(berat) as total_berat, + sum(nilaimarhun) as total_nilaimarhun, + sum(pinjaman) as total_pembiayaan, + sum(bakipjm) as total_bakipjm, + gadai.kodcaw, + cawangan.caw_name as caw_name') + ->get(); + + $bil_lelong = sizeof($getsurat); + } + + else if($request->fasa == '2'){ + $getsurat = Gadai::where('t_gadai','<=',$jbgadai) + ->where('sttebus','=','') + ->where('tagpalsu','=',0) + ->where('tagpalsu2','=',0) + ->where('taglel','=',0) + ->get(); + //dd($getsurat); + + $t_gadais = Gadai::where('t_gadai','<=',$jbgadai) + ->where('sttebus', '=', '') + ->where('taglel', '=', 0) + ->where('tagpalsu', '=', 0) + ->where('tagpalsu2', '=', 0) + ->whereNotNull('upah12') + ->orderBy('t_gadai') + ->select('t_gadai', 'norujukan') + ->first(); + //dd($t_gadais); + // $t_gadais = $request->t_gadai; + // $t_gadaisehingga = Carbon::parse($t_gadais); + // $t_gadaisdisplay = $t_gadaisehingga->format('d/m/Y'); + + + $senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code') + ->orderBy('cawangan.caw_name') + ->where('gadai.t_gadai', '<=', $jbgadai) + ->where('gadai.sttebus', '=', '') + ->where('gadai.taglel', '=', 0) + ->where('gadai.tagpalsu', '=', 0) + ->where('gadai.tagpalsu2', '=', 0) + ->whereNotNull('gadai.upah12') + ->groupBy('gadai.kodcaw','cawangan.caw_name') + ->selectRaw('count(*) as bil_lelong, + sum(berat) as total_berat, + sum(nilaimarhun) as total_nilaimarhun, + sum(pinjaman) as total_pembiayaan, + sum(bakipjm) as total_bakipjm, + gadai.kodcaw, + cawangan.caw_name as caw_name') + ->get(); + + $bil_lelong = sizeof($getsurat); + } + + if(sizeof($getsurat) == 0) + { + return redirect()->route('analisa.janasimulasi') + ->with('failed','Tiada surat untuk di lelong'); + } + + + + return view('simulasi.senaraitempsimulasi', compact( 't_lelong', + 'getsurat', + 'senarai', + 't_gadais', + 't_lelong1', + 't_lelong2', + 't_lelongdisplay', + 'jbgadai', + 'fasa', + 'jbg', + 'cajlelong' + + + )); + } + else + { + return redirect()->route('analisa.janasimulasi') + ->with('failed','Sila Masukkan Tarikh Lelongan'); + } + } + public function tempbycawsimulasi($details, $t_gadai1, $fasa) + { + $jbgadai = $t_gadai1; + //$fasa = $request->fasa; + //dd($fasa); + if($fasa == '1'){ + $getsurat = Gadai::where('t_gadai', '<=', $jbgadai) + ->where('kodcaw', $details) + ->where('sttebus', '=', '') + ->where('lelong_tawarruq','=',1) + ->where('taglel', '=', 0) + ->where('tagpalsu', '=', 0) + ->where('tagpalsu2', '=', 0) + ->whereNotNull('upah12') + ->get(); + + $t_gadais = Gadai::where('t_gadai', '<=', $jbgadai) + ->where('sttebus', '=', '') + ->where('taglel', '=', 0) + ->where('tagpalsu', '=', 0) + ->where('tagpalsu2', '=', 0) + ->whereNotNull('upah12') + ->orderBy('t_gadai') + ->select('t_gadai') + ->first(); + }else{ + $getsurat = Gadai::where('t_gadai', '<=', $jbgadai) + ->where('kodcaw', $details) + ->where('sttebus', '=', '') + ->where('taglel', '=', 0) + ->where('tagpalsu', '=', 0) + ->where('tagpalsu2', '=', 0) + ->whereNotNull('upah12') + ->get(); + + $t_gadais = Gadai::where('t_gadai', '<=', $jbgadai) + ->where('sttebus', '=', '') + ->where('taglel', '=', 0) + ->where('tagpalsu', '=', 0) + ->where('tagpalsu2', '=', 0) + ->whereNotNull('upah12') + ->orderBy('t_gadai') + ->select('t_gadai') + ->first(); + } + + // $tarikh_lelong = Carbon::parse($t_lelong); + // $t_anggaran = ($tarikh_lelong->subMonths(1))->toDateString(); + // $t_lelongdisplay = $tarikh_lelong->format('d-m-Y'); + //$t_anggaran = ($tarikh_lelong->subDays(20))->format('d/m/Y'); + //$t_daftarlelong = ($tarikh_lelong->subMonths(1))->format('d/m/Y'); + + + foreach($getsurat as $index1=>$surats) + { + $senarai = Gadai::join('cawangan', 'gadai.kodcaw', '=', 'cawangan.caw_code') + ->where('norujukan', $surats['norujukan']) + ->get(); + //dd($senarai); + $getsurat[$index1]['list_norujukan'] = $senarai; + } + + // $keuntungantlhbyr = TransaksiKeuntungan::on('mysql2') + // ->sum('bayaran_keuntungan'); + + return view('simulasi.tempbycawsimulasi', compact( 'getsurat', + 'details', + 'senarai', + + 't_gadais' + + )); + } } \ No newline at end of file diff --git a/resources/views/simulasi/janasimulasi.blade.php b/resources/views/simulasi/janasimulasi.blade.php index acf310f0..c4ec1592 100644 --- a/resources/views/simulasi/janasimulasi.blade.php +++ b/resources/views/simulasi/janasimulasi.blade.php @@ -14,55 +14,59 @@

{{ $message }}

@endif -
+ + @csrf
- -
+ +
- +
- +
- +
- +
- - - +
- + @foreach ($caw as $item) @endforeach - -
+
--> + +
+ + +
+ +
- +
diff --git a/resources/views/simulasi/senaraimarhunlel.blade.php b/resources/views/simulasi/senaraimarhunlel.blade.php index 1044373b..a56425d8 100644 --- a/resources/views/simulasi/senaraimarhunlel.blade.php +++ b/resources/views/simulasi/senaraimarhunlel.blade.php @@ -20,11 +20,11 @@ No. - Tarikh Lelong + Norujukan - Pinjaman (RM) + Pembiayaan (RM) Tempoh Berat (gm) Nilai Marhun (RM) @@ -40,9 +40,9 @@ @foreach ($marhuns as $index=> $marhun) {{$loop->iteration}} - {{ $marhun['t_lelong'] }} + {{ $marhun['norujukan']}} {{ number_format($marhun['pinjaman'], 2, '.', ',') }} {{ number_format($marhun['tempoh'], 2, '.', ',') }} diff --git a/resources/views/simulasi/senaraisimulasi.blade.php b/resources/views/simulasi/senaraisimulasi.blade.php index 174a0e6d..70f1fe6b 100644 --- a/resources/views/simulasi/senaraisimulasi.blade.php +++ b/resources/views/simulasi/senaraisimulasi.blade.php @@ -29,7 +29,11 @@ {{$loop->iteration}} {{$info['info']['simulasi_id']}} - {{$info['info']['tarikh_lelong']}} + @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $info['info']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp {{$info['info']['fasa']}} @foreach($info['detailsinfo'] as $info2) diff --git a/resources/views/simulasi/senaraitempsimulasi.blade.php b/resources/views/simulasi/senaraitempsimulasi.blade.php new file mode 100644 index 00000000..4284942a --- /dev/null +++ b/resources/views/simulasi/senaraitempsimulasi.blade.php @@ -0,0 +1,153 @@ +@extends('layouts.app') + +@section('content') +
+
+
+ @if ($message = Session::get('failed')) +
+

{{ $message }}

+
+ @endif +

Butiran Gadaian Mengikut Cawangan Lelongan Fasa {{$fasa}}

+
+ @csrf + + + +
+
+
+ +

Tarikh Lelong : {{ $t_lelong1 }}

+

Tarikh Gadai Sehingga : @php + if($fasa == '1'){ + $myDateTime = DateTime::createFromFormat('Y-m-d', $jbgadai ); + $t_gadai = $myDateTime->format('d-m-Y'); + $t_gadai1 = $myDateTime->format('Y-m-d'); + echo($t_gadai); + }else{ + $myDateTime = DateTime::createFromFormat('Y-m-d', $t_lelong2 ); + $tarikhlelong = $myDateTime->modify('-12 month')->format('d-m-Y'); + $t_gadai1 = $myDateTime->modify('-12 month')->format('Y-m-d'); + //$t_gadai = $myDateTime->modify('-12 month')->format('Y-m-d'); + echo($tarikhlelong); + } + @endphp

+ + + + + + + + +
+
+
+ + + + + + + + + + + + + + + + @foreach($senarai as $send) + + + + + + + + + + + + @endforeach + +
Kod CawanganCawanganBil LelongBerat (gm)Nilai MarhunPembiayaan (RM)Baki Pembiayaan (RM)Action
{{ $send['kodcaw'] }}{{ $send['caw_name'] }}{{ $send['bil_lelong'] }} {{ number_format($send['total_berat'], 2) }} {{ number_format($send['total_nilaimarhun'], 2) }} {{ number_format($send['total_pembiayaan'] , 2) }} {{ number_format($send['total_bakipjm'] , 2) }} + +
+ +
+ Kembali + +
+
+
+
+
+ + + +@endsection diff --git a/resources/views/simulasi/tempbycawsimulasi.blade.php b/resources/views/simulasi/tempbycawsimulasi.blade.php new file mode 100644 index 00000000..67fe829b --- /dev/null +++ b/resources/views/simulasi/tempbycawsimulasi.blade.php @@ -0,0 +1,128 @@ +@extends('layouts.app') + +@section('content') +
+
+
+

Butiran Gadaian Cawangan {{ $details }}

+ + @if ($message = Session::get('failed')) +
+

{{ $message }}

+
+ @endif +
+ + @csrf +
+
+ +
+
+ + + + + + + + + + + + + + + + + + + + @foreach($getsurat as $surat) + + + + + + + + + + + + + + @endforeach + +
BilNo RujukanNo Kad PengenalanTempohBerat (gm)Pembiayaan (RM)Baki Pembiayaan (RM)Keuntungan 6 Bulan (RM)Keuntungan Telah Bayar (RM)Nilai Marhun (RM)Tamat Kontrak
{{ $loop->iteration }}{{ $surat['list_norujukan'][0]['norujukan'] }}{{ $surat['list_norujukan'][0]['nokp'] }}{{ $surat['list_norujukan'][0]['tempoh'] }}{{ $surat['list_norujukan'][0]['berat'] }}{{ $surat['list_norujukan'][0]['pinjaman'] }}{{ $surat['list_norujukan'][0]['bakipjm'] }}{{ $surat['list_norujukan'][0]['bakiupah'] }}{{ $surat['list_norujukan'][0]['ansakhir'] }}{{ $surat['list_norujukan'][0]['nilaimarhun'] }}{{ $surat['list_norujukan'][0]['t_matang1'] }}
+ +
+
+
+
+ + +@endsection diff --git a/routes/web.php b/routes/web.php index f2f941ce..1738b127 100644 --- a/routes/web.php +++ b/routes/web.php @@ -72,6 +72,9 @@ Route::group(['middleware' => ['permission:analisa'],'prefix'=>'analisa'], funct Route::post('/filter',['as'=>'analisa.filter','uses'=>'SimulasiController@filter']); Route::post('/export',['as'=>'analisa.export','uses'=>'SimulasiController@export']); + + Route::post('/senaraitempsimulasi',['as'=>'analisa.senaraitempsimulasi','uses'=>'SimulasiController@senaraitempsimulasi']); + Route::get('/tempbycawsimulasi/{details}/{t_lelong}/{fasa}',['as'=>'analisa.tempbycawsimulasi','uses'=>'SimulasiController@tempbycawsimulasi']); }); Route::group(['middleware' => ['permission:sistem'],'prefix'=>'sistem'], function () {