diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 16c292e9..765ceebe 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -362,10 +362,45 @@ class MarhunController extends Controller return redirect()->route('pengesahan.perubahanmutumarhun')->with('success','Pengesahan Mutu Marhun Berjaya'); } - public function delete($id){ - // dd($id); + public function submitdelete($id){ + + $user = Auth::user(); + + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); + + $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id') + ->where('lelongbid_id','=',$id) + ->get(); + + $pengesahan = new Pengesahan; + $pengesahan->lelong_id = $marhun->lelong_id; + $pengesahan->lelongbid = $id; + $pengesahan->norujukan = $marhun->norujukan; + $pengesahan->diminta_oleh = $user->id; + $pengesahan->diminta_pada = $currentdate; + $pengesahan->save(); + + return redirect()->route('pengesahan.pcdelete',$lelongbid->id) + ->with('success','Permohonan Pengesahan Padam Marhun Telah Berjaya Dihantar'); + + } + + public function pcdelete($id) + { $lelongbidmarhun = LelongBidMarhun::where('id', $id)->first(); + //save in table pengesahan first + $pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id') + ->where('lelongbidmarhun.id', $id) + ->where('lelongbid_id', $lelongbid_id) + ->select('pengesahan.id as pengesahan_id') + ->first(); + + if($pengesahan != null) + { + $lelongbidmarhun->delete(); + } $lelongbid = LelongBid::where('id', $lelongbidmarhun->lelongbid_id)->first(); // dd($lelongbid); @@ -376,19 +411,8 @@ class MarhunController extends Controller $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan; $lelongbid->save(); - $pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id') - ->where('lelongbidmarhun.id', $id) - ->where('lelongbid_id', $lelongbid_id) - ->first(); - - if($pengesahan != null) - { - $lelongbidmarhun->delete(); - } - - return redirect()->route('marhun.show',$lelongbid->id) - ->with('success','Marhun Berjaya Dipadam'); - + return redirect()->route('pengesahan.perubahanmutumarhun') + ->with('success','Pengesahan Padam Marhun Telah Berjaya'); } } diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index fee7a72c..d0cf44b5 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -119,6 +119,11 @@ Perubahan Mutu Marhun +
  • diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php index 2623708c..fd8c65aa 100644 --- a/resources/views/marhun/marhun.blade.php +++ b/resources/views/marhun/marhun.blade.php @@ -44,7 +44,7 @@ {{ $item->nota }} - + @endforeach diff --git a/routes/web.php b/routes/web.php index 70f5e4aa..fca15acc 100644 --- a/routes/web.php +++ b/routes/web.php @@ -123,7 +123,7 @@ Route::group(['middleware' => ['permission:semakanmarhun','permission:kemaskinim Route::get('/senarailelongmarhun',['as'=>'marhun.senarailelongmarhun','uses'=>'MarhunController@senarailelongmarhun']); Route::get('/senaraimarhun/{lelong_id}',['as'=>'marhun.senaraimarhun','uses'=>'MarhunController@index']); Route::get('/marhun/{id}',['as'=>'marhun.show','uses'=>'MarhunController@show']); - Route::get('/deletemarhun/{id}',['as'=>'marhun.delete','uses'=>'MarhunController@delete']); + Route::get('/submitdelete/{id}',['as'=>'marhun.submitdelete','uses'=>'MarhunController@submitdelete']); Route::post('/kemaskini',['as'=>'marhun.kemaskini','uses'=>'MarhunController@kemaskini']); Route::get('/semakan',['as'=>'marhun.semakan','uses'=>'MarhunController@semakan']); @@ -151,6 +151,8 @@ Route::group(['middleware' => ['permission:pengesahan'],'prefix'=>'pengesahan'], Route::get('/perubahanmutumarhun',['as'=>'pengesahan.perubahanmutumarhun','uses'=>'MarhunController@sahubahmutu']); Route::get('/mutumarhun/{pengesahan_id}/{norujukan}',['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::post('/senaraitangguhlelong',['as'=>'pengesahan.senaraitangguhlelong','uses'=>'MarhunController@senaraitangguhlelong']); }); //Operasi