From 7516c636759bdb05666db2f866e1c9ffd6d39944 Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Sat, 26 Nov 2022 11:53:07 +0800 Subject: [PATCH] update design table dan customize semakan marhun --- app/Http/Controllers/LelongController.php | 6 ++- app/Http/Controllers/MarhunController.php | 51 +++++++++++++------ app/Http/Controllers/SimulasiController.php | 15 ++++-- .../Controllers/TangguhLelongController.php | 4 -- resources/views/marhun/marhun.blade.php | 2 +- resources/views/marhun/scanbarcode.blade.php | 2 +- .../views/marhun/senaraimarhun.blade.php | 27 ++++++---- .../views/marhun/terimaserahmarhun.blade.php | 29 ++++++++--- .../pdf/cetakterimaserahmarhun.blade.php | 2 +- .../listperubahanmutumarhun.blade.php | 9 +++- .../views/tangguhlelong/carian.blade.php | 44 +++++++++++----- .../views/tangguhlelong/searchbyic.blade.php | 13 ++++- .../tangguhlelong/searchtodownload.blade.php | 21 +++++--- .../senarailelongtangguh.blade.php | 14 +++-- .../senaraimohontangguh.blade.php | 18 +++++-- .../tangguhlelong/senleltangguh.blade.php | 13 +++-- routes/web.php | 1 + 17 files changed, 191 insertions(+), 80 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 8a90b555..9b6a93e9 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -856,7 +856,11 @@ class LelongController extends Controller $total_untung_asal = TransaksiKeuntungan::where('norujukan','=',$bid['norujukan'])->sum('bayaran_keuntungan'); $beza_keuntungan = $total_untung_asal - $total_untung_rebet; $detail_sag = Gadai::on($bid->kodcaw)->where('norujukan',$bid->norujukan)->first(); - $keuntungan = bcdiv(($detail_sag['tempoh']-$detail_sag['tempohbayar'])*$detail_sag['kadarupah']/100*$detail_sag['bakipjm'],1,1)-$beza_keuntungan; + if($detail_sag['tempohbayar'] == $detail_sag['tempoh'] ){ + $keuntungan = 0.00; + }else{ + $keuntungan = bcdiv(($detail_sag['tempoh']-$detail_sag['tempohbayar'])*$detail_sag['kadarupah']/100*$detail_sag['bakipjm'],1,1)-$beza_keuntungan; + } $sumhargaasas = 0; $sumnmarhuns = 0; diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 17946569..025b4abe 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -59,10 +59,9 @@ class MarhunController extends Controller $caw = Cawangan::where('caw_code', '=', $user->kodcaw)->first(); - $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id) //keseluruhan - ->where('caw_id', '=', $caw->id) - ->get(); - // dd($lelongbid->toArray()); + + + // dd($lelongbid); $sag = LelongBid::where('lelong_id', $lelong_id) //belum disemak ->where('caw_id', $caw->id) @@ -127,15 +126,20 @@ class MarhunController extends Controller ->distinct() ->get(); + $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id) //keseluruhan + ->where('caw_id', '=', $caw->id) + ->get(); foreach ($lelongbid as $index1 => $bid) { - $sudahdisahkan = Pengesahan::where('lelongbid_id', $bid['id']) - ->where('lelong_id', $lelong_id) - ->get(); + $statusdrpdpc = Pengesahan::where('lelongbid_id', $bid['id']) ->where('lelong_id', $lelong_id) ->where('status_ubah', 6) ->first(); + + // $status = Pengesahan::where('lelongbid_id', $bid['id']) + // ->where('lelong_id', $lelong_id) + // ->first(); $statusSemakMarhun = ScanSemak::where('lelongbid_id', $bid['id']) ->whereNotNull('scan_keluar') @@ -147,32 +151,47 @@ class MarhunController extends Controller } $lelongbid[$index1]['statustangguhlel'] = $statusdrpdpc; + // $lelongbid[$index1]['status'] = $status; - if ($sudahdisahkan) { + $sudahdisahkan = Pengesahan::where('lelongbid_id', $bid['id']) + ->where('lelong_id', $lelong_id) + ->get(); + // dump($sudahdisahkan); + // if ($sudahdisahkan) { foreach ($sudahdisahkan as $sahkan) { // dd($sahkan); - $lelongbidmarhun = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.id', '=', 'pengesahan.lelongbidmarhun_id') + $status = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.id', '=', 'pengesahan.lelongbidmarhun_id') ->where('lelongbidmarhun.id', $sahkan['lelongbidmarhun_id']) ->where('pengesahan.status', '0') ->select('pengesahan.disahkan_oleh', - 'pengesahan.disahkan_pada' + 'pengesahan.disahkan_pada', + 'pengesahan.status' ) ->first(); - $lelongbid[$index1]['pengesahan'] = $lelongbidmarhun; + $lelongbid[$index1]['status'] = $status; + // $lelongbid[$index1]['pengesahanbysag'] = $sudahdisahkan; // dd($lelongbid[$index1]['pengesahan']); } - } else { - // - } + // } else { + + // } + $marhun = LelongBidMarhun::where('lelongbid_id', '=', $bid['id']) ->get() ->toArray(); $lelongbid[$index1]['marhun'] = $marhun; - } - return view('marhun.senaraimarhun', compact('lelongbid', 'lelong_id', 'caw', 'sag', 'dalamproses', 'sdhdisemak', 'sdhdisahkan', 'sdhdisemaktangguhlel', 'dalamprosestangguhlel', 'sdhdisahkantangguhlel')); + + // dd($status); + + + // $index->status = $status; + } + // dd($sudahdisahkan); + + return view('marhun.senaraimarhun', compact('sudahdisahkan','lelongbid', 'lelong_id', 'caw', 'sag', 'dalamproses', 'sdhdisemak', 'sdhdisahkan', 'sdhdisemaktangguhlel', 'dalamprosestangguhlel', 'sdhdisahkantangguhlel')); } public function kemaskini(Request $request) diff --git a/app/Http/Controllers/SimulasiController.php b/app/Http/Controllers/SimulasiController.php index 5dda42a3..99dfa779 100644 --- a/app/Http/Controllers/SimulasiController.php +++ b/app/Http/Controllers/SimulasiController.php @@ -1133,7 +1133,12 @@ class SimulasiController extends Controller $total_untung_asal = TransaksiKeuntungan::where('norujukan','=',$bid['norujukan'])->sum('bayaran_keuntungan'); $beza_keuntungan = $total_untung_asal - $total_untung_rebet; $detail_sag = Gadai::on($bid->kodcaw)->where('norujukan',$bid->norujukan)->first(); - $keuntungan = bcdiv(($detail_sag['tempoh']-$detail_sag['tempohbayar'])*$detail_sag['kadarupah']/100*$detail_sag['bakipjm'],1,1)-$beza_keuntungan; + // $keuntungan = bcdiv(($detail_sag['tempoh']-$detail_sag['tempohbayar'])*$detail_sag['kadarupah']/100*$detail_sag['bakipjm'],1,1)-$beza_keuntungan; + if($detail_sag['tempohbayar'] == $detail_sag['tempoh'] ){ + $keuntungan = 0.00; + }else{ + $keuntungan = bcdiv(($detail_sag['tempoh']-$detail_sag['tempohbayar'])*$detail_sag['kadarupah']/100*$detail_sag['bakipjm'],1,1)-$beza_keuntungan; + } $sumhargaasas = 0; $simulasibidmarhun = SimulasiBidMarhun::where('simulasibid_id','=',$bid['id'])->get(); @@ -1167,13 +1172,13 @@ class SimulasiController extends Controller $simulasi = Simulasi::where('id',$request->idsimulasi)->get(); $sumcajlelong = $sumhargaasas * ($simulasi[0]['cajlelong']/100); $sumcajlel = round($sumcajlelong,1,1); - $keuntungannew = bcdiv($keuntungan,1,1); + // $keuntungannew = bcdiv($keuntungan,1,1); - $totalbaki = $sumhargaasas - $detail_sag->bakipjm - $keuntungannew - $sumcajlel; + $totalbaki = $sumhargaasas - $detail_sag->bakipjm - $keuntungan - $sumcajlel; // dump($sumhargaasas); $kirakeuntungan = SimulasiBid::where('norujukan',$bid['norujukan']) ->update([ - 'bakiupah'=> $keuntungannew, + 'bakiupah'=> $keuntungan, 'hargaasas'=> $sumhargaasas, 'cajlelong'=> $sumcajlel, 'baki'=> $totalbaki, @@ -1186,7 +1191,7 @@ class SimulasiController extends Controller $loguser->username = $user->username; $loguser->nama_user = $user->name; $loguser->norujukan = $bid['norujukan']; - $loguser->nota = ' Kemaskini Harga Asas/Keuntungan '.$keuntungannew; + $loguser->nota = ' Kemaskini Harga Asas/Keuntungan '.$keuntungan; $loguser->save(); } diff --git a/app/Http/Controllers/TangguhLelongController.php b/app/Http/Controllers/TangguhLelongController.php index 31f0e50d..fba19143 100644 --- a/app/Http/Controllers/TangguhLelongController.php +++ b/app/Http/Controllers/TangguhLelongController.php @@ -43,10 +43,6 @@ class TangguhLelongController extends Controller foreach($lelong as $info) { - // $detailsinfo = CawanganLelong::join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') - // ->where('lelong_id',$info['lelong_id']) - - $detailsinfo = CawanganLelong::select('cawangan_lelong.caw_id','caw_name','lelongbid.status_jual','caw_code') ->join('cawangan','cawangan_lelong.caw_id','=','cawangan.id') ->join('lelongbid','lelongbid.kodcaw','=','cawangan.caw_code') diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php index 4b00aa60..0cf53ac1 100644 --- a/resources/views/marhun/marhun.blade.php +++ b/resources/views/marhun/marhun.blade.php @@ -231,7 +231,7 @@ @elseif($status['status'] == 1) @else - --}} - {{-- @if(isset($bid['pengesahan']['disahkan_oleh'])) --}} - @if(!empty($bid['pengesahan'] !== null)) - + @if(isset($bid['status']['status'])) + @if(($bid['status']['status'] == 0)) + + @elseif($bid['status']['status'] == 1) + + @endif @else - + @endif - @elseif(($bid['pengesahan'] !== null) && ($bid->status_semak == 1)) - @if($bid['pengesahan']['disahkan_oleh'] !== null) - + @elseif(($bid->status_semak == 1)) + @if(isset($bid['status']['status'])) + @if(($bid['status']['status'] == 1)) + + @endif @else - + @endif - @elseif(($bid->status_semak == 1) && ($bid['pengesahan'] === null)) - @endif + {{-- @endif --}} {{-- @if($bid['statustangguhlel'] != null) diff --git a/resources/views/marhun/terimaserahmarhun.blade.php b/resources/views/marhun/terimaserahmarhun.blade.php index 14b35a23..0dceeeef 100644 --- a/resources/views/marhun/terimaserahmarhun.blade.php +++ b/resources/views/marhun/terimaserahmarhun.blade.php @@ -50,7 +50,8 @@ - @foreach($senaraiScanKeluar as $index) + {{-- @foreach($senaraiScanKeluar as $index) --}} + @forelse($senaraiScanKeluar as $index) {{$loop->iteration}} @@ -58,7 +59,13 @@ {{$index->scan_keluar}} Belum Terima - @endforeach + @empty + + No Data + + + @endforelse + {{-- @endforeach --}}
@@ -82,7 +89,7 @@ - @foreach($sedangDinilai as $index) + @forelse($sedangDinilai as $index) {{$loop->iteration}} @@ -99,7 +106,11 @@ Sedang Dinilai @endif - @endforeach + @empty + + No Data + + @endforelse
@@ -122,7 +133,8 @@ - @foreach($sudahSerah as $index) + {{-- @foreach($sudahSerah as $index) --}} + @forelse($sudahSerah as $index) {{$loop->iteration}} {{$index->norujukan}} @@ -131,7 +143,12 @@ {{$index->serah_marhun}} Sudah Serah - @endforeach + @empty + + No Data + + @endforelse + {{-- @endforeach --}}
diff --git a/resources/views/pdf/cetakterimaserahmarhun.blade.php b/resources/views/pdf/cetakterimaserahmarhun.blade.php index 33b590f9..53112131 100644 --- a/resources/views/pdf/cetakterimaserahmarhun.blade.php +++ b/resources/views/pdf/cetakterimaserahmarhun.blade.php @@ -75,7 +75,7 @@ tr:nth-child(even) { - LAPORAN MARHUN KELUAR PETI BESI + LAPORAN SERAHAN MARHUN KEPADA KHAZANAH Cawangan: {{$caw['caw_name']}} diff --git a/resources/views/pengesahan/listperubahanmutumarhun.blade.php b/resources/views/pengesahan/listperubahanmutumarhun.blade.php index cde3c494..eb2ae778 100644 --- a/resources/views/pengesahan/listperubahanmutumarhun.blade.php +++ b/resources/views/pengesahan/listperubahanmutumarhun.blade.php @@ -6,9 +6,16 @@
+ @hasrole('pengurus-cawangan') + @endhasrole + @hasrole('penilai') + + + + @endhasrole
Senarai SAG: Pengesahan Oleh PC
@@ -107,7 +114,7 @@ @empty - No Data + No Data @endforelse diff --git a/resources/views/tangguhlelong/carian.blade.php b/resources/views/tangguhlelong/carian.blade.php index 9e17c00c..8e9ec08f 100644 --- a/resources/views/tangguhlelong/carian.blade.php +++ b/resources/views/tangguhlelong/carian.blade.php @@ -2,10 +2,19 @@ @section('content')
-

Permohonan Tangguh Lelong

-
-
- +{{--

Permohonan Tangguh Lelong

--}} +
+
+
+
+ + + +
+ Permohonan Tangguh Lelong (Masukkan No Kad Pengenalan) +
+
+
@if ($message = Session::get('success'))

{{ $message }}

@@ -23,21 +32,28 @@

{{ $message }}

@endif -

Sila Masukkan No Kad Pengenalan

- + + {{--
--}} + {{--

Masukkan No Kad Pengenalan

--}}
@csrf -
- -
- + +
+
+ +
+
+ +

+ +
-
+
-
- Kembali - + + {{-- Kembali --}} +
diff --git a/resources/views/tangguhlelong/searchbyic.blade.php b/resources/views/tangguhlelong/searchbyic.blade.php index e6a529b0..59d21b0a 100644 --- a/resources/views/tangguhlelong/searchbyic.blade.php +++ b/resources/views/tangguhlelong/searchbyic.blade.php @@ -3,8 +3,17 @@ @section('content')
-
- +
+
+
+ + + +
+ Permohonan Tangguh Lelong +
+
+
@if ($message = Session::get('success'))

{{ $message }}

diff --git a/resources/views/tangguhlelong/searchtodownload.blade.php b/resources/views/tangguhlelong/searchtodownload.blade.php index ac9da7a7..14ff8cff 100644 --- a/resources/views/tangguhlelong/searchtodownload.blade.php +++ b/resources/views/tangguhlelong/searchtodownload.blade.php @@ -3,8 +3,17 @@ @section('content')
-
-

Permohonan Tangguh Lelong

+
+
+
+ + + +
+ Permohonan Tangguh Lelong +
+
+
@if ($message = Session::get('success'))

{{ $message }}

@@ -15,7 +24,7 @@
@endif
- + {{-- --}}
@@ -45,7 +54,7 @@ @csrf - +
@@ -78,10 +87,10 @@

-
+ {{--
Kembali -
+
--}}
diff --git a/resources/views/tangguhlelong/senarailelongtangguh.blade.php b/resources/views/tangguhlelong/senarailelongtangguh.blade.php index 1b183145..d77d6965 100644 --- a/resources/views/tangguhlelong/senarailelongtangguh.blade.php +++ b/resources/views/tangguhlelong/senarailelongtangguh.blade.php @@ -3,8 +3,16 @@ @section('content')
-
-

Permohonan Tangguh Lelong

+
+
+
+ +
+ Permohonan Tangguh Lelong +
+
+
+ {{--

Permohonan Tangguh Lelong

--}} @if ($message = Session::get('success'))

{{ $message }}

@@ -12,7 +20,7 @@ @endif
- +
diff --git a/resources/views/tangguhlelong/senaraimohontangguh.blade.php b/resources/views/tangguhlelong/senaraimohontangguh.blade.php index 942e269b..6ca23799 100644 --- a/resources/views/tangguhlelong/senaraimohontangguh.blade.php +++ b/resources/views/tangguhlelong/senaraimohontangguh.blade.php @@ -3,8 +3,16 @@ @section('content')
-
-

Senarai Permohonan Tangguh Lelong

+
+
+
+ +
+ Senarai Permohonan Tangguh Lelong +
+
+
+ {{--

Senarai Permohonan Tangguh Lelong

--}} @if ($message = Session::get('success'))

{{ $message }}

@@ -12,7 +20,7 @@ @endif -
No
+
@@ -75,12 +83,12 @@ diff --git a/resources/views/tangguhlelong/senleltangguh.blade.php b/resources/views/tangguhlelong/senleltangguh.blade.php index 11c2c9b4..a481fc35 100644 --- a/resources/views/tangguhlelong/senleltangguh.blade.php +++ b/resources/views/tangguhlelong/senleltangguh.blade.php @@ -3,8 +3,15 @@ @section('content')
-
-

Senarai Permohonan Tangguh Lelong

+
+
+
+ +
+ Senarai Permohonan Tangguh Lelong +
+
+
@if ($message = Session::get('success'))

{{ $message }}

@@ -12,7 +19,7 @@ @endif -
No @if($mohon['status'] == 0) - + @elseif($mohon['status'] == 1 || $mohon['status'] >= 4) - + @endif
+
diff --git a/routes/web.php b/routes/web.php index 034821d5..6fd670a4 100644 --- a/routes/web.php +++ b/routes/web.php @@ -264,6 +264,7 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim Route::get('/senaraimarhun/{lelong_id}',['as'=>'marhun.senaraimarhun','uses'=>'MarhunController@index']); Route::get('/marhun/{id}/{lelong_id}',['as'=>'marhun.show','uses'=>'MarhunController@show']); Route::post('/submitdelete',['as'=>'marhun.submitdelete','uses'=>'MarhunController@submitdelete']); + Route::get('/listperubahanmutumarhun/{id}',['as'=>'marhun.listperubahanmutumarhun','uses'=>'MarhunController@listsahubahmutu']); Route::get('/senlelmarhun',['as'=>'marhun.senlelmarhun','uses'=>'MarhunController@senlelmarhun']); Route::get('/sentangguhlelongsah/{lelong_id}',['as'=>'marhun.sentangguhlelongsah','uses'=>'MarhunController@sentangguhlelongsah']);
No