From ed89b0c66590f62ff9e8f44f49e2f42203b5c4b5 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Wed, 23 Mar 2022 15:35:19 +0800 Subject: [PATCH 1/3] update kemaskini marhun --- app/Http/Controllers/MarhunController.php | 32 +++++++++-------------- 1 file changed, 13 insertions(+), 19 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index bc5c882e..ba53100b 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -85,25 +85,19 @@ class MarhunController extends Controller // { if($request->karat != $marhun->karat) { - $checkdata = Pengesahan::where('lelongbid_id', $lelongbid->id) - ->whereNull('disahkan_pada') - ->first(); - if($checkdata) - { - // - } - else - { - $karat = new Pengesahan; - $karat->lelong_id = $lelong->id; - $karat->lelongbid_id = $lelongbid->id; - $karat->lelongbidmarhun_id = $marhun->id; - $karat->norujukan = $lelongbid->norujukan; - $karat->diminta_oleh = $user->id; - $karat->diminta_pada = $currentdate; - $karat->status_ubah = 1; - $karat->save(); - } + // $checkdata = Pengesahan::where('lelongbid_id', $lelongbid->id) + // ->whereNull('disahkan_pada') + // ->first(); + + $karat = new Pengesahan; + $karat->lelong_id = $lelong->id; + $karat->lelongbid_id = $lelongbid->id; + $karat->lelongbidmarhun_id = $marhun->id; + $karat->norujukan = $lelongbid->norujukan; + $karat->diminta_oleh = $user->id; + $karat->diminta_pada = $currentdate; + $karat->status_ubah = 1; + $karat->save(); } $bezaberat = $marhun->berat - $request->berat_emas; $bezahargaasas = $marhun->hargaasas - $request->harga_asas; From 81e6a5b8081d1a89b5b3601fdea7d46db3e92515 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Thu, 24 Mar 2022 15:21:53 +0800 Subject: [PATCH 2/3] pengesahan, view marhun pengesahan mutu marhun & view details marhun --- app/Http/Controllers/MarhunController.php | 106 ++++++++++-------- .../views/pengesahan/mutumarhun.blade.php | 46 ++++---- .../pengesahan/perubahanmutumarhun.blade.php | 22 ++-- routes/web.php | 2 +- 4 files changed, 96 insertions(+), 80 deletions(-) diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index ba53100b..ec2a661e 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -267,69 +267,79 @@ class MarhunController extends Controller public function sahubahmutu($id) { - // dd($request->all()); + $mutumarhun = Lelong::join('pengesahan', 'lelong.id', '=', 'pengesahan.lelong_id') ->where('lelong.id', $id) ->whereNull('disahkan_oleh') - ->select( - 'pengesahan.disahkan_oleh', - 'pengesahan.id as pengesahan_id', - 'pengesahan.norujukan', - 'lelong.id', - 'lelong.tarikh_lelong', - 'lelong.harga_emas_asas', - 'lelong.jbg', - 'lelong.cajlelong' - ) - ->get(); - - return view('pengesahan.perubahanmutumarhun', compact('mutumarhun', 'id')); - } - - public function mutumarhun($pengesahan_id, $norujukan, $id) - { - $pengesahan = Pengesahan::where('id', $pengesahan_id) - ->where('lelong_id', $id) - ->where('norujukan', $norujukan) - ->first(); - - $marhuns = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id) - ->where('id', $pengesahan->lelongbidmarhun_id) + ->selectRaw('count(*) as total, sum(status) as tstat,norujukan') + ->groupBy('pengesahan.norujukan') ->get()->toArray(); - $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first(); - $karat = Lelkarat::where('lelong_id', $id)->get(); + // foreach($mutumarhun as $index1=>$marhun) + // { + // $pengesahan = Pengesahan::where('lelong_id', $id) + // ->where('norujukan', $marhun['norujukan']) + // ->select('id as pengesahan_id') + // ->get(); - foreach($marhuns as $index1=>$marhun) - { - $status = Pengesahan::where('id', $pengesahan_id) - ->where('lelongbid_id', $marhun['lelongbid_id']) - ->select('status_ubah') - ->value('status_ubah'); + // $mutumarhun[$index1]['pengesahan_id'] = $pengesahan; + // } - $gadaimarhun = GadaiMarhun::where('marhun', $marhun['marhun']) - ->where('norujukan', $lelongbid->norujukan) - ->first(); + return view('pengesahan.perubahanmutumarhun', compact('mutumarhun', 'id')); - $karat = $karat->where('karat', $gadaimarhun->karat)->first(); + } - $total = $karat->harga * $gadaimarhun->berat; - $hargaasas = round($total); + public function mutumarhun($norujukan, $id) + { + $pengesahans = Pengesahan::where('lelong_id', $id) + ->where('norujukan', $norujukan) + ->get(); + + $arraypengesahan = []; + foreach($pengesahans as $pengesahan) + { + // dd($pengesahan); + $marhuns = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id) + ->where('id', $pengesahan->lelongbidmarhun_id) + ->get()->toArray(); + + $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first(); + $karat = Lelkarat::where('lelong_id', $id)->get(); + + foreach($marhuns as $index1=>$marhun) + { + $status = Pengesahan::where('id', $pengesahan->id) + ->where('lelongbid_id', $marhun['lelongbid_id']) + ->select('status_ubah') + ->value('status_ubah'); + + $gadaimarhun = GadaiMarhun::where('marhun', $marhun['marhun']) + ->where('norujukan', $lelongbid->norujukan) + ->first(); + + $karat = $karat->where('karat', $gadaimarhun->karat)->first(); + + $total = $karat->harga * $gadaimarhun->berat; + $hargaasas = round($total); + + $marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun; + $marhuns[$index1]['old_karat'] = $gadaimarhun->karat; + $marhuns[$index1]['old_berat'] = $gadaimarhun->berat; + $marhuns[$index1]['old_harga'] = $karat->harga; + $marhuns[$index1]['old_nilaimarhun'] = $total; + $marhuns[$index1]['old_hargaasas'] = $hargaasas; + $marhuns[$index1]['status_ubah'] = $status; + } - $marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun; - $marhuns[$index1]['old_karat'] = $gadaimarhun->karat; - $marhuns[$index1]['old_berat'] = $gadaimarhun->berat; - $marhuns[$index1]['old_harga'] = $karat->harga; - $marhuns[$index1]['old_nilaimarhun'] = $total; - $marhuns[$index1]['old_hargaasas'] = $hargaasas; - $marhuns[$index1]['status_ubah'] = $status; + array_push($arraypengesahan,$marhuns); } - return view('pengesahan.mutumarhun', compact('marhuns', 'lelongbid', 'pengesahan_id', 'norujukan', 'id')); + + return view('pengesahan.mutumarhun', compact('lelongbid', 'norujukan', 'id', 'arraypengesahan', 'marhuns')); } public function terimaperubahan(Request $request) { - // dd($request->all()); + dd($request->all()); //update mutu marhun - gadaimarhun $user = Auth::user(); diff --git a/resources/views/pengesahan/mutumarhun.blade.php b/resources/views/pengesahan/mutumarhun.blade.php index 33b9ff82..a7309b2b 100644 --- a/resources/views/pengesahan/mutumarhun.blade.php +++ b/resources/views/pengesahan/mutumarhun.blade.php @@ -6,7 +6,7 @@
@csrf - + @@ -31,52 +31,52 @@ - @foreach($marhuns as $marhun) + @foreach($arraypengesahan as $index1=>$detail) {{ $loop->iteration }} {{ $lelongbid->norujukan }} - @if($marhun['old_marhun'] != $marhun['marhun']) - {{ $marhun['old_marhun'] }} + @if($detail[0]['old_marhun'] != $detail[0]['marhun']) + {{ $detail['old_marhun'] }} @endif - {{ $marhun['marhun'] }} + {{ $detail[0]['marhun'] }} - @if($marhun['old_karat'] != $marhun['karat']) - {{ $marhun['old_karat'] }} + @if($detail[0]['old_karat'] != $detail[0]['karat']) + {{ $detail[0]['old_karat'] }} @endif - {{ $marhun['karat'] }} + {{ $detail[0]['karat'] }} - @if($marhun['old_berat'] != $marhun['berat']) - {{ number_format($marhun['old_berat'], 2, '.', '') }} + @if($detail[0]['old_berat'] != $detail[0]['berat']) + {{ number_format($detail[0]['old_berat'], 2, '.', '') }} @endif - {{ $marhun['berat'] }} + {{ $detail[0]['berat'] }} - @if($marhun['old_harga'] != $marhun['harga']) - {{ number_format($marhun['old_harga'], 2, '.', '') }} + @if($detail[0]['old_harga'] != $detail[0]['harga']) + {{ number_format($detail[0]['old_harga'], 2, '.', '') }} @endif - {{ $marhun['harga'] }} + {{ $detail[0]['harga'] }} - @if($marhun['old_nilaimarhun'] != $marhun['n_marhun']) - {{ number_format($marhun['old_nilaimarhun'], 2, '.', '') }} + @if($detail[0]['old_nilaimarhun'] != $detail[0]['n_marhun']) + {{ number_format($detail[0]['old_nilaimarhun'], 2, '.', '') }} @endif - {{ $marhun['n_marhun'] }} + {{ $detail[0]['n_marhun'] }} - @if($marhun['old_hargaasas'] != $marhun['hargaasas']) - {{ number_format($marhun['old_hargaasas'], 2, '.', '') }} + @if($detail[0]['old_hargaasas'] != $detail[0]['hargaasas']) + {{ number_format($detail[0]['old_hargaasas'], 2, '.', '') }} @endif - {{ $marhun['hargaasas'] }} + {{ $detail[0]['hargaasas'] }} - @if($marhun['status_ubah'] == 1) + @if($detail[0]['status_ubah'] == 1) - @elseif($marhun['status_ubah'] == 2) + @elseif($detail[0]['status_ubah'] == 2) - @elseif($marhun['status_ubah'] == 3) + @elseif($detail[0]['status_ubah'] == 3) @endif diff --git a/resources/views/pengesahan/perubahanmutumarhun.blade.php b/resources/views/pengesahan/perubahanmutumarhun.blade.php index e61b1b5e..2e9413e6 100644 --- a/resources/views/pengesahan/perubahanmutumarhun.blade.php +++ b/resources/views/pengesahan/perubahanmutumarhun.blade.php @@ -15,22 +15,28 @@ Bil No Rujukan - - JBG - Caj Lelong + Status Action @foreach($mutumarhun as $marhun) - {{ $loop->iteration }} + {{ $marhun['norujukan'] }} - {{ $marhun['harga_emas_asas'] }} - {{ $marhun['jbg'] }} - {{ $marhun['cajlelong'] }} - + @if($marhun['total'] === intval($marhun['tstat'])) + + @else + + @endif + + + @if($marhun['total'] !== intval($marhun['tstat'])) + + @else + + @endif @endforeach diff --git a/routes/web.php b/routes/web.php index 2dfb140b..6be473f8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -157,7 +157,7 @@ Route::group(['middleware' => ['permission:pengesahanpembida'],'prefix'=>'pembid Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], function () { Route::get('/senarailelongubahmutu',['as'=>'pengesahan.senarailelongubahmutu','uses'=>'MarhunController@senarailelongubahmutu']); Route::get('/perubahanmutumarhun/{id}',['as'=>'pengesahan.perubahanmutumarhun','uses'=>'MarhunController@sahubahmutu']); - Route::get('/mutumarhun/{pengesahan_id}/{norujukan}/{id}',['as'=>'pengesahan.mutumarhun','uses'=>'MarhunController@mutumarhun']); + Route::get('/mutumarhun/{norujukan}/{id}',['as'=>'pengesahan.mutumarhun','uses'=>'MarhunController@mutumarhun']); Route::post('/terimaperubahan',['as'=>'pengesahan.terimaperubahan','uses'=>'MarhunController@terimaperubahan']); Route::post('/pcdelete',['as'=>'pengesahan.pcdelete','uses'=>'MarhunController@pcdelete']); Route::get('/senarailelong',['as'=>'pengesahan.senarailelong','uses'=>'MarhunController@senarailelong']); From 94def3b631b3532e8a26382a791dbcba962dae1d Mon Sep 17 00:00:00 2001 From: Nur Izzati Zulkifli Date: Thu, 24 Mar 2022 16:33:56 +0800 Subject: [PATCH 3/3] Update listnotis_excel.blade.php --- resources/views/excel/listnotis_excel.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/excel/listnotis_excel.blade.php b/resources/views/excel/listnotis_excel.blade.php index 8e985d83..d0723604 100644 --- a/resources/views/excel/listnotis_excel.blade.php +++ b/resources/views/excel/listnotis_excel.blade.php @@ -77,7 +77,7 @@ {{ $loop->iteration }} {{ $pay['nama']}} {{ $pay['norujukan']}} - {{ $pay['telefon']}} + 6{{ $pay['telefon']}} {{ $pay['jbg']}} {{ $pay['nokp']}} {{ $pay['pinjaman']}}