From 3e2403c796f2415c2abbebe323a2cd69fb82db67 Mon Sep 17 00:00:00 2001 From: Amirah22 <94591077+Amirah22@users.noreply.github.com> Date: Tue, 21 Jun 2022 11:32:25 +0800 Subject: [PATCH] update error comment by kak aida --- app/Http/Controllers/ImportDataController.php | 4 +- app/Http/Controllers/LelongController.php | 28 ++++++++-- app/Http/Controllers/ReportController.php | 4 +- .../views/lelong/lelongtaklaku.blade.php | 17 ++++-- .../views/lelong/senarailelong.blade.php | 52 ++++++++++-------- .../lelong/senarailelongtaklaku.blade.php | 41 ++++++++++---- .../views/lelong/senaraimarhun.blade.php | 55 ++++++++++++------- resources/views/lelong/showlelong.blade.php | 15 ++--- resources/views/pdf/jananotis.blade.php | 2 +- .../views/pengesahan/senarailelong.blade.php | 4 +- .../senarailelongubahmutu.blade.php | 2 +- .../pengesahan/senaraitangguhlelong.blade.php | 4 +- .../views/simulasi/senaraisimulasi.blade.php | 44 +++++++-------- .../views/simulasi/showsimulasi.blade.php | 12 ++-- .../simulasi/tempbycawsimulasi.blade.php | 3 +- .../senarailelongtangguh.blade.php | 7 +-- .../tangguhlelong/senleltangguh.blade.php | 2 +- resources/views/welcome.blade.php | 2 +- 18 files changed, 182 insertions(+), 116 deletions(-) diff --git a/app/Http/Controllers/ImportDataController.php b/app/Http/Controllers/ImportDataController.php index 851aa990..0a420d06 100644 --- a/app/Http/Controllers/ImportDataController.php +++ b/app/Http/Controllers/ImportDataController.php @@ -110,7 +110,7 @@ class ImportDataController extends Controller $tempohbayar = $row_gadai['tempohbayar']; $lelong_tawarruq = $row_gadai['lelong_tawarruq']; - DB::insert("INSERT INTO lelong.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) + DB::insert("INSERT INTO lelong2.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 @@ -130,7 +130,7 @@ class ImportDataController extends Controller $n_marhun1 = $row_tender1['n_marhun']; $nota2 = $db -> real_escape_string($nota1); - DB::insert("INSERT INTO lelong.gadaimarhun (kodcaw,norujukan,t_gadai,bil,marhun,nota,karat,berat,harga,n_marhun) + DB::insert("INSERT INTO lelong2.gadaimarhun (kodcaw,norujukan,t_gadai,bil,marhun,nota,karat,berat,harga,n_marhun) VALUES ('$kodcaw1','$norujukan1','$t_gadai1','$bil1','$marhun1','$nota2','$karat1','$berat1','$harga1','$n_marhun1')"); } diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index dac5f08d..dd88fa97 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -759,12 +759,31 @@ class LelongController extends Controller public function senarailelongtaklaku(Request $request){ + $arraydetails = []; + $senarai = CawanganLelong::join('lelong', 'cawangan_lelong.lelong_id', '=', 'lelong.id') ->join('cawangan','cawangan_lelong.caw_id', '=', 'cawangan.id') + ->select('lelong_id','tarikh_lelong','fasa','lelong.masatamat_lelong','harga_emas_asas','jbg','cajlelong') + ->groupBy('lelong_id') ->where('lelong.sts_lelong', 3) - ->get(); + ->get()->toArray(); - return view('lelong.senarailelongtaklaku',compact('senarai')); + foreach($senarai as $laporan) + { + $details = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') + ->where('lelong_id',$laporan['lelong_id']) + ->get() + ->toArray(); + array_push($arraydetails,['laporan' => $laporan,'details' => $details]); + } + + // $laporanpembida= Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') + // ->select('lelong_id','tarikh_lelong','fasa') + // ->groupBy('lelong_id') + // ->get() + // ->toArray(); + + return view('lelong.senarailelongtaklaku',compact('senarai','arraydetails')); } public function lelongtaklaku($lelong_id){ @@ -786,7 +805,7 @@ class LelongController extends Controller 'lelongbid.norujukan', 'lelongbid.t_lelong', 'lelongbid.kodcaw', - 'cawangan.caw_name', + // 'cawangan.caw_name', 'lelongbid.pinjaman', 'lelongbid.berat', 'lelongbid.nilaimarhun', @@ -796,6 +815,7 @@ class LelongController extends Controller 'lelongbid.baki', 'lelongbid.status_jual', ) + ->get(); foreach($lelongtaklaku as $index1=>$suratlelongtaklaku){ @@ -979,7 +999,7 @@ class LelongController extends Controller $lelong_id = Lelong::join('cawangan_lelong','lelong.id','=','cawangan_lelong.lelong_id') ->where('cawangan_lelong.lelong_id','=',$lelongid) - ->select('lelong_id','tarikh_lelong') + ->select('lelong_id','tarikh_lelong','fasa') ->groupBy('lelong_id') ->get()->toArray(); diff --git a/app/Http/Controllers/ReportController.php b/app/Http/Controllers/ReportController.php index fdcf378e..998d05ad 100644 --- a/app/Http/Controllers/ReportController.php +++ b/app/Http/Controllers/ReportController.php @@ -369,9 +369,7 @@ class ReportController extends Controller } - - - + Public function lapbrglelpembidaindex (){ diff --git a/resources/views/lelong/lelongtaklaku.blade.php b/resources/views/lelong/lelongtaklaku.blade.php index 525b8901..de2f6de7 100644 --- a/resources/views/lelong/lelongtaklaku.blade.php +++ b/resources/views/lelong/lelongtaklaku.blade.php @@ -4,11 +4,18 @@
+ +
+ +
@if ($message = Session::get('success'))

{{ $message }}

@endif +
@csrf @@ -24,12 +31,12 @@ Bilangan Pinjaman (RM) Berat (gm) - Nilai Marhun (RM) + N. Marhun (RM) Harga Asas (RM) Upah Simpan (RM) - Caj Lelong (RM) - Rugi Lelong (RM) - Baki Lelong (RM) + Caj (RM) + Rugi (RM) + Baki (RM) Status Lelong (RM) Action @@ -41,7 +48,7 @@ {{ $leltaklaku->t_lelong }} {{ $leltaklaku->norujukan }} {{ $leltaklaku->caw_name }} - {{ $leltaklaku['suratlelongtaklaku'] }} + {{ $leltaklaku['suratlelongtaklaku'] }} {{ $leltaklaku->pinjaman }} {{ $leltaklaku->berat }} {{ $leltaklaku->nilaimarhun }} diff --git a/resources/views/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index ede55d84..4902e329 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -16,15 +16,15 @@ No - Lelong ID + ID Lelong Tarikh Lelong Fasa Cawangan Masa Tamat Lelong Harga Emas Asas - JBG + Tempoh Caj Lelong - Action + Tindakan @@ -44,6 +44,12 @@ {{$details['caw_name']}}
@endforeach + {{-- @php + $myDateTime = DateTime::createFromFormat('H:i:s', $lel['info']['masatamat_lelong'] ); + $masa_lelong = $myDateTime->format('h:i: a'); + dd($masa_lelong); + echo($masa_lelong); + @endphp --}} {{$lel['info']['masatamat_lelong']}} {{$lel['info']['harga_emas_asas']}} {{$lel['info']['jbg']}} @@ -133,26 +139,26 @@ "lengthChange": false, "pageLength": 99999999, dom: 'Bfrtip', - buttons: [ - // 'copy', 'excel', 'pdf' - // { text: 'copy', className: 'btn btn-primary' }, - // { - // className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim', - // text: '', - // titleAttr: 'Tambah Simulasi', - // action: function ( e, dt, node, config ) { - // alert( 'Button activated' ); - // } - // }, - { - className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export', - titleAttr: 'Export to CSV', - text: '', - action: function ( e, dt, node, config ) { - $("#exportform").submit(); - } - } - ] + // buttons: [ + // // 'copy', 'excel', 'pdf' + // // { text: 'copy', className: 'btn btn-primary' }, + // // { + // // className: 'btn btn-outline-success pl-4 pr-4 btn-sm addsim', + // // text: '', + // // titleAttr: 'Tambah Simulasi', + // // action: function ( e, dt, node, config ) { + // // alert( 'Button activated' ); + // // } + // // }, + // { + // className: 'btn btn-outline-secondary pl-4 pr-4 btn-sm export', + // titleAttr: 'Export to CSV', + // text: '', + // action: function ( e, dt, node, config ) { + // $("#exportform").submit(); + // } + // } + // ] }); $('.addsim').tooltip(); diff --git a/resources/views/lelong/senarailelongtaklaku.blade.php b/resources/views/lelong/senarailelongtaklaku.blade.php index ca183c3e..fa5a1219 100644 --- a/resources/views/lelong/senarailelongtaklaku.blade.php +++ b/resources/views/lelong/senarailelongtaklaku.blade.php @@ -5,6 +5,7 @@
+ @if ($message = Session::get('success'))

{{ $message }}

@@ -13,25 +14,43 @@ - + + + + - + - + - @foreach($senarai as $data) + @foreach($arraydetails as $data) - - - - - - - + + + + + + + + + + @endforeach diff --git a/resources/views/lelong/senaraimarhun.blade.php b/resources/views/lelong/senaraimarhun.blade.php index 6f36a7c2..dc57847e 100644 --- a/resources/views/lelong/senaraimarhun.blade.php +++ b/resources/views/lelong/senaraimarhun.blade.php @@ -5,21 +5,34 @@
- @foreach ($arrayinfo as $laporan) + + + +
BilID Lelong Tarikh LelongFasaCawangan Masa Tamat Lelong Harga Emas AsasJBGTempoh Caj LelongActionTindakan
{{ $data->tarikh_lelong }}{{ $data->masatamat_lelong }}{{ $data->harga_emas_asas }}{{ $data->jbg }}{{ $data->cajlelong }}{{$loop->iteration}}{{ $data['laporan']['lelong_id'] }}@php + $myDateTime = DateTime::createFromFormat('Y-m-d', $data['laporan']['tarikh_lelong'] ); + $t_lelong = $myDateTime->format('d-m-Y'); + echo($t_lelong); + @endphp{{ $data['laporan']['fasa'] }} + @foreach($data['details'] as $details) + {{ $details['caw_name']}}
+ @endforeach + 		@php + $myDateTime = DateTime::createFromFormat('H:i:s', $data['laporan']['masatamat_lelong'] ); + $masa_lelong = $myDateTime->format('h:i: a'); + echo($masa_lelong); + @endphp{{ $data['laporan']['harga_emas_asas'] }}{{ $data['laporan']['jbg'] }}{{ $data['laporan']['cajlelong'] }}
+ + @foreach ($arrayinfo as $laporan) + + + + + @foreach($laporan['details'] as $details) + + + @endforeach + + @endforeach + + +
ID Lelong: {{ $laporan['laporan']['lelong_id']}} Fasa Lelong: {{ $laporan['laporan']['fasa']}} Tarikh Lelong : @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); + $datez = $myDateTime->format('d-m-Y'); + echo($datez); + @endphpNama Cawangan : {{ $details['caw_name']}}Kod Cawangan : {{ $details['caw_code']}}
- Lelong ID : {{ $laporan['laporan']['lelong_id']}} - Tarikh Lelong : @php - $myDateTime = DateTime::createFromFormat('Y-m-d', $laporan['laporan']['tarikh_lelong'] ); - $datez = $myDateTime->format('d-m-Y'); - echo($datez); - - @endphp - @foreach($laporan['details'] as $details) - Nama Cawangan : {{ $details['caw_name']}} - Kod Cawangan : {{ $details['caw_code']}} - @endforeach - - @endforeach + + @if ($message = Session::get('success'))
@@ -37,16 +50,16 @@ Norujukan Tempoh Berat (gm) - Nilai Marhun (RM) + N. Marhun (RM) Tarikh Jual (RM) Harga Asas (RM) Harga Jual (RM) Pembiayaan (RM) Keuntungan (RM) - Caj Lelong (%) - Rugi Lelong (RM) - Baki Lelong (RM) - Action + Caj (%) + Rugi (RM) + Baki (RM) + Pilih @@ -89,8 +102,8 @@
- Kembali - + {{-- Kembali --}} +
{{-- Kembali --}} diff --git a/resources/views/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php index 9468a203..c2ca1085 100644 --- a/resources/views/lelong/showlelong.blade.php +++ b/resources/views/lelong/showlelong.blade.php @@ -6,6 +6,7 @@