+
@if ($message = Session::get('success'))
{{ $message }}
diff --git a/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php
index a63aa75f..161206a4 100644
--- a/resources/views/simulasi/showsimulasi.blade.php
+++ b/resources/views/simulasi/showsimulasi.blade.php
@@ -30,12 +30,20 @@
Pembiayaan Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',') }} |
- | Keuntungan Keseluruhan : RM{{ number_format($total_upah, 2, '.', ',') }} |
+ Keuntungan Keseluruhan : RM{{ number_format($total_upahkeuntungan, 2, '.', ',') }} |
- @foreach ($data as $data1)
- | Tarikh Lelong: {{ $data1['tarikh_lelong']}} |
+ @foreach($data as $data1)
+ Tarikh Lelong :
+ @php
+ $myDateTime = DateTime::createFromFormat('Y-m-d', $data1['tarikh_lelong'] );
+ $datez = $myDateTime->format('d-m-Y');
+ echo($datez);
+
+ @endphp
+ |
@endforeach
+
diff --git a/routes/web.php b/routes/web.php
index f0d1269a..9ece54ed 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -108,7 +108,6 @@ Route::group(['prefix'=>'lelong'], function () {
Route::get('/lapbrglelongindex',['as'=>'lelong.lapbrglelongindex','uses'=>'LelongController@lapbrglelongindex']);
Route::get('/senaraibrglelong/{lelong_id}',['as'=>'lelong.senaraibrglelong','uses'=>'LelongController@senaraibrglelong']);
- Route::post('/pdfsenarailelong',['as'=>'lelong.pdfsenarailelong','uses'=>'LelongController@pdfsenarailelong']);
Route::get('/lapbrglelongdetailsindex',['as'=>'lelong.lapbrglelongdetailsindex','uses'=>'LelongController@lapbrglelongdetailsindex']);
From e7e1e74d0cbc8fb997cb43237446f1cb6f0c88ed Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Wed, 18 May 2022 11:58:56 +0800
Subject: [PATCH 2/4] cal keuntungan
---
app/Http/Controllers/LelongController.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 8229bf84..cca1ad42 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -210,7 +210,7 @@ class LelongController extends Controller
'berat'=>$berat,
'n_marhun'=>$nilai_marhun,
'pinjaman'=>$pinjaman,
- 'upah'=>$total_upahkeuntungan,
+ 'keuntungan'=>$keuntungan,
'hargaasas'=>$hargaasas,
'cajlelong'=>$cajlelong,
'rugilelong'=>$rugilelong,
From b108eafa1b4b8969ec13acd17996df4a0a51b75e Mon Sep 17 00:00:00 2001
From: Amirah22 <94591077+Amirah22@users.noreply.github.com>
Date: Wed, 18 May 2022 12:12:47 +0800
Subject: [PATCH 3/4] number format
---
resources/views/pdf/listlelong.blade.php | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/resources/views/pdf/listlelong.blade.php b/resources/views/pdf/listlelong.blade.php
index 1e605e39..a2056843 100644
--- a/resources/views/pdf/listlelong.blade.php
+++ b/resources/views/pdf/listlelong.blade.php
@@ -121,9 +121,8 @@ tr:nth-child(even) {
{{ $loop->iteration }} |
{{ $brg['norujukan']}} |
{{ $brg['marhun']}} |
-
{{ $brg['berat']}} |
-
{{$brg['hargaasas']}} |
- {{--
{{ number_format($brg['hargaasas'], 2, '.', ',') }} | --}}
+
{{ number_format($brg['berat'], 2, '.', ',') }} |
+
{{ number_format($brg['hargaasas'], 2, '.', ',') }} |
@endforeach
From 72285dacd0225cc2b46aba424d84839c974c00c8 Mon Sep 17 00:00:00 2001
From: Nur Izzati Zulkifli
Date: Thu, 19 May 2022 16:34:04 +0800
Subject: [PATCH 4/4] update jana simulasi
---
app/Http/Controllers/ImportDataController.php | 7 +-
app/Http/Controllers/SimulasiController.php | 273 ++++++++++++++++--
.../views/simulasi/janasimulasi.blade.php | 38 +--
.../views/simulasi/senaraimarhunlel.blade.php | 10 +-
.../views/simulasi/senaraisimulasi.blade.php | 6 +-
.../simulasi/senaraitempsimulasi.blade.php | 153 ++++++++++
.../simulasi/tempbycawsimulasi.blade.php | 128 ++++++++
routes/web.php | 3 +
8 files changed, 575 insertions(+), 43 deletions(-)
create mode 100644 resources/views/simulasi/senaraitempsimulasi.blade.php
create mode 100644 resources/views/simulasi/tempbycawsimulasi.blade.php
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 }}