diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 85fbb7ae..765ceebe 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -41,7 +41,7 @@ class MarhunController extends Controller * * @return \Illuminate\Contracts\Support\Renderable */ - public function index() + public function index($lelong_id) { $user = Auth::user(); @@ -171,7 +171,13 @@ class MarhunController extends Controller { // dd($request->all()); //get request from form and create lelongbidmarhun + $user = Auth::user(); + + $currentdate = Carbon::now(); + $currentdate = $currentdate->toDateTimeString(); + $lelongbid = LelongBid::where('norujukan', $request->norujukan_marhuntambahan)->first(); + $lelong = Lelong::where('id','=',$lelongbid->lelong_id)->first(); $lelongbidmarhun = new LelongBidMarhun; $lelongbidmarhun->lelongbid_id = $lelongbid->id; @@ -185,11 +191,19 @@ class MarhunController extends Controller $lelongbidmarhun->hargaasas = $request->harga_asastambahan; $lelongbidmarhun->status_semak = 0; $lelongbidmarhun->save(); - + $lelongbid->marhun = $lelongbid->marhun ."1 " . $request->marhuntambahan . "," ; $lelongbid->berat = $lelongbid->berat + $request->berat_emastambahan; $lelongbid->hargaasas = $lelongbid->hargaasas + $request->harga_asastambahan; $lelongbid->save(); + + $karat = new Pengesahan; + $karat->lelong_id = $lelong->id; + $karat->lelongbid_id = $lelongbid->id; + $karat->norujukan = $lelongbid->norujukan; + $karat->diminta_oleh = $user->id; + $karat->diminta_pada = $currentdate; + $karat->save(); return redirect()->route('marhun.show',$lelongbid->id) ->with('success','Marhun Berjaya Ditambah'); @@ -348,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); @@ -362,11 +411,8 @@ class MarhunController extends Controller $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan; $lelongbid->save(); - $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/lelong/showlelong.blade.php b/resources/views/lelong/showlelong.blade.php index 68175bd9..30292945 100644 --- a/resources/views/lelong/showlelong.blade.php +++ b/resources/views/lelong/showlelong.blade.php @@ -30,10 +30,10 @@ Nilai Marhun Keseluruhan : RM{{ number_format($total_nmarhun, 2, '.', ',') }} - Pinjaman Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',') }} + Pembiayaan Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',') }} - Upah Keseluruhan : RM{{ number_format($total_upah, 2, '.', ',') }} + Keuntungan Keseluruhan : RM{{ number_format($total_upah, 2, '.', ',') }} @@ -63,8 +63,8 @@ Bil Marhun (Paket) Berat (gm) Nilai Marhun (RM) - Pinjaman (RM) - Upah (RM) + Pembiayaan (RM) + Keuntungan (RM) Harga Asas (RM) Caj Lelong (RM) Baki Lelong (RM) 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/resources/views/simulasi/showsimulasi.blade.php b/resources/views/simulasi/showsimulasi.blade.php index fa480286..22e3f250 100644 --- a/resources/views/simulasi/showsimulasi.blade.php +++ b/resources/views/simulasi/showsimulasi.blade.php @@ -27,10 +27,10 @@ Nilai Marhun Keseluruhan : RM{{ number_format($total_nmarhun, 2, '.', ',') }} - Pinjaman Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',') }} + Pembiayaan Keseluruhan : RM{{ number_format($total_pinjaman, 2, '.', ',') }} - Upah Keseluruhan : RM{{ number_format($total_upah, 2, '.', ',') }} + Keuntungan Keseluruhan : RM{{ number_format($total_upah, 2, '.', ',') }} @@ -60,8 +60,8 @@ Bil Marhun (Paket) Berat (gm) Nilai Marhun (RM) - Pinjaman (RM) - Upah (RM) + Pembiayaan (RM) + Keuntungan (RM) Harga Asas (RM) Caj Lelong (RM) Baki Lelong (RM) 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