From 15753afcff18148c330671389fc877de5e4e40e6 Mon Sep 17 00:00:00 2001 From: faiqahzaman <91926774+faiqahzaman@users.noreply.github.com> Date: Sun, 20 Mar 2022 17:02:58 +0800 Subject: [PATCH] tangguh lelong edit add delete siappppp --- app/Http/Controllers/LelongController.php | 6 +- app/Http/Controllers/MarhunController.php | 69 ++++++++++++++++------- resources/views/marhun/marhun.blade.php | 17 ++++-- routes/web.php | 2 +- 4 files changed, 65 insertions(+), 29 deletions(-) diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index 184fd764..a5e82712 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -32,9 +32,6 @@ use App\Models\LelKarat_temp; use App\Models\Resit; use Carbon\Carbon; - - - class LelongController extends Controller { /** @@ -349,9 +346,10 @@ class LelongController extends Controller public function delete($id) { $lelong = Lelong::where('id','=',$id)->first(); - // dd($role); $lelong->delete(); + + // $gadai = Gadai:: return redirect()->route('lelong.senarailelong') ->with('success','Padam Lelong Berjaya'); } diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 19b908b6..241a3253 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -347,7 +347,6 @@ class MarhunController extends Controller $pengesahan->disahkan_oleh = $user->id; $pengesahan->disahkan_pada = $currentdate; $pengesahan->update(); - // dd($pengesahan); $gadaimarhun = GadaiMarhun::where('norujukan', $pengesahan->norujukan)->delete(); $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->get(); @@ -401,61 +400,93 @@ class MarhunController extends Controller $tangguhlelong->nota = 'Ditangguh Kerana Perubahan Mutu/Karat Marhun'; $tangguhlelong->save(); - $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->delete(); + // $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->delete(); } - $this->pcdelete($request->pengesahan_id); + $this->pcdelete($request->pengesahan_id, $pengesahan->lelongbid_id); + + // $lelongbidmarhunlast = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->get(); + + // $pengesahanlast = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id') + // ->where('lelongbidmarhun.id', $lelongbidmarhunlast->id) + // ->where('lelongbid_id', $pengesahan->lelongbid_id) + // ->where('pengesahan.id', $request->pengesahan_id) + // ->first(); + + // $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id') + // ->where('lelongbid_id','=', $pengesahan->lelongbid_id) + // ->get(); + + // $lelongbid = LelongBid::where('lelongbid_id', $lelongbidmarhunlast->lelongbid_id)->first(); + // $txtmarhun = ",1 " . $lelongbidmarhunlast->marhun ; + // $lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun); + // $lelongbid->berat = $lelongbid->berat - $lelongbidmarhunlast->berat_emastambahan; + // $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhunlast->harga_asastambahan; + // $lelongbid->save(); return redirect()->route('pengesahan.senarailelongubahmutu')->with('success','Pengesahan Mutu Marhun Berjaya'); } - public function submitdeletes($id, $lelong_id){ + public function submitdelete(Request $request){ + // dd($request->all()); $user = Auth::user(); $currentdate = Carbon::now(); $currentdate = $currentdate->toDateTimeString(); + $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id') - ->where('lelongbid_id','=',$id) - ->where('lelongbid.lelong_id', $lelong_id) + ->where('lelongbidmarhun.id','=',$request->lelongbidmarhun_id) + ->where('lelongbid.id', $request->lelongbid_id) ->first(); + $id = $request->lelongbid_id; + $lelong_id = $marhun->lelong_id; + $pengesahan = new Pengesahan; - $pengesahan->lelong_id = $lelong_id; - $pengesahan->lelongbid_id = $id; - $pengesahan->lelongbidmarhun_id = $marhun->lelongbidmarhun_id; + $pengesahan->lelong_id = $marhun->lelong_id; + $pengesahan->lelongbid_id = $request->lelongbid_id; + $pengesahan->lelongbidmarhun_id = $request->lelongbidmarhun_id; $pengesahan->norujukan = $marhun->norujukan; $pengesahan->diminta_oleh = $user->id; $pengesahan->diminta_pada = $currentdate; $pengesahan->status_ubah = 3; $pengesahan->save(); - return redirect()->route('pengesahan.pcdelete',[$id, $lelong_id]) + return redirect()->route('marhun.show', compact('id', 'lelong_id')) ->with('success','Permohonan Pengesahan Padam Marhun Telah Berjaya Dihantar'); } - public function pcdelete($id) + public function pcdelete($id, $lelongbid_id) { - $lelongbidmarhun = LelongBidMarhun::where('id', $id)->first(); - - //save in table pengesahan first + $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $lelongbid_id)->first(); + $pengesahan = Pengesahan::join('lelongbidmarhun', 'pengesahan.lelongbid_id', '=', 'lelongbidmarhun.lelongbid_id') - ->where('lelongbidmarhun.id', $id) - ->where('lelongbid_id', $lelongbid_id) + ->where('pengesahan.lelongbidmarhun_id', $lelongbidmarhun->id) + ->where('pengesahan.lelongbid_id', $lelongbid_id) ->select('pengesahan.id as pengesahan_id') ->first(); - $lelongbid = LelongBid::where('id', $lelongbidmarhun->lelongbid_id)->first(); - // dd($lelongbid); + if($pengesahan != null) + { + $lelongbidmarhun->delete(); + } + + $marhun = LelongBidMarhun::join('lelongbid', 'lelongbidmarhun.lelongbid_id', '=', 'lelongbid.id') + ->where('lelongbid_id','=',$lelongbid_id) + ->get(); + + $lelongbid = LelongBid::where('id', $lelongbid_id)->first(); $txtmarhun = ",1 " . $lelongbidmarhun->marhun ; $lelongbid->marhun = str_replace( $txtmarhun,"",$lelongbid->marhun); - // $lelongbid->marhun = $lelongbid->marhun ."1 " . $request->marhuntambahan . "," ; $lelongbid->berat = $lelongbid->berat - $lelongbidmarhun->berat_emastambahan; $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan; $lelongbid->save(); + $marhundelete = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->delete(); + // return redirect()->route('pengesahan.perubahanmutumarhun') // ->with('success','Pengesahan Padam Marhun Telah Berjaya'); } diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php index 8710bb14..3fac747b 100644 --- a/resources/views/marhun/marhun.blade.php +++ b/resources/views/marhun/marhun.blade.php @@ -10,10 +10,11 @@

{{ $message }}

@endif -
+ @csrf - + + @@ -44,7 +45,7 @@ @endforeach @@ -192,8 +193,14 @@ buttons: { Delete: { btnClass: 'btn-warning', - action: function () { - location.href = this.$target.attr('href'); + action: function (e) { + // location.href = this.$target.attr('href'); + let lelongbidmarhun = $(this)[0].$target[0].dataset.lelongbidmarhun; + let lelongbid = $(this)[0].$target[0].dataset.lelongbid; + $('#lelongbid_id').val(lelongbid); + $('#lelongbidmarhun_id').val(lelongbidmarhun); + $("#formdelete").submit(); + } }, Batal: { diff --git a/routes/web.php b/routes/web.php index 216235f3..d391365e 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}/{lelong_id}',['as'=>'marhun.show','uses'=>'MarhunController@show']); - Route::post('/submitdelete/{id}/{lelong_id}',['as'=>'marhun.submitdelete','uses'=>'MarhunController@submitdelete']); + Route::post('/submitdelete',['as'=>'marhun.submitdelete','uses'=>'MarhunController@submitdelete']); Route::post('/kemaskini',['as'=>'marhun.kemaskini','uses'=>'MarhunController@kemaskini']); Route::get('/semakan',['as'=>'marhun.semakan','uses'=>'MarhunController@semakan']);
{{ $item->nota }} - +