diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index e468383f..85c18f19 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 { /** @@ -348,9 +345,20 @@ class LelongController extends Controller public function delete($id) { + $lelongbid = LelongBid::where('lelong_id', $id) + ->get()->toArray(); + + foreach($lelongbid as $bid) + { + $gadai = Gadai::where('norujukan', $bid['norujukan'])->first(); + $gadai->taglel = 0; + $gadai->update(); + } + $lelong = Lelong::where('id','=',$id)->first(); // dd($role); $lelong->delete(); + 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 765ceebe..bc5c882e 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -46,12 +46,12 @@ class MarhunController extends Controller $user = Auth::user(); $caw = Cawangan::where('caw_code','=',$user->kodcaw)->first(); - $lelongbid = LelongBid::where('caw_id','=',$caw->id)->get(); - $lelongid = LelongBid::select('lelong_id')->where('caw_id','=',$caw->id)->groupBy('lelong_id')->get(); - $lelong = Lelong::whereIn('id', $lelongid)->get(); + $lelongbid = LelongBid::where('lelong_id', '=', $lelong_id) + ->where('caw_id','=', $caw->id) + ->get(); - return view('marhun.senaraimarhun',compact('lelongbid','lelong')); + return view('marhun.senaraimarhun',compact('lelongbid','lelong_id')); } public function kemaskini(Request $request) @@ -97,9 +97,11 @@ class MarhunController extends Controller $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(); } } @@ -124,11 +126,11 @@ class MarhunController extends Controller // } - return redirect()->route('marhun.show',$lelongbid->id) + return redirect()->route('marhun.show', [$lelongbid->id, $lelong->id]) ->with('success','Kemaskini Marhun Berjaya'); } - public function show($id) + public function show($id, $lelong_id) { $lelongbid = LelongBid::where('id','=',$id)->first(); $marhun = LelongBidMarhun::where('lelongbid_id','=',$id)->get(); @@ -136,7 +138,7 @@ class MarhunController extends Controller $karatall = JenisKarat::all(); $emasall = JenisEmas::all(); // dd($lelkarat); - return view('marhun.marhun',compact('marhun','lelongbid','karatall','emasall','lelkarat')); + return view('marhun.marhun',compact('marhun','lelongbid','karatall','emasall','lelkarat', 'lelong_id')); } @@ -157,13 +159,15 @@ class MarhunController extends Controller return view('marhun.senarailelongmarhun',compact('senarai')); } - public function semak($id) + public function semak($id, $lelong_id) { - $lelongbid = LelongBid::where('id','=',$id)->first(); + $lelongbid = LelongBid::where('id','=',$id) + ->where('lelong_id', $lelong_id) + ->first(); $lelongbid->status_semak = 1; $lelongbid->save(); - return redirect()->route('marhun.show',$lelongbid->id) + return redirect()->route('marhun.show',[ $lelongbid->id, $lelong_id ]) ->with('success','Semakan Marhun Berjaya'); } @@ -203,14 +207,12 @@ class MarhunController extends Controller $karat->norujukan = $lelongbid->norujukan; $karat->diminta_oleh = $user->id; $karat->diminta_pada = $currentdate; + $karat->status_ubah = 2; $karat->save(); return redirect()->route('marhun.show',$lelongbid->id) ->with('success','Marhun Berjaya Ditambah'); } - - //Operasi - public function exportmarhundetails($lelong_id) { @@ -261,37 +263,56 @@ class MarhunController extends Controller } + public function senarailelongubahmutu() + { + $lelong = Lelong::where('sts_lelong', 0) + ->get(); - public function sahubahmutu(Request $request) + return view('pengesahan.senarailelongubahmutu',compact('lelong')); + } + + public function sahubahmutu($id) { // dd($request->all()); - $mutumarhun = Pengesahan::join('lelong', 'pengesahan.lelong_id', '=', 'lelong.id') + $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', - 'pengesahan.norujukan' + 'lelong.harga_emas_asas', + 'lelong.jbg', + 'lelong.cajlelong' ) ->get(); - return view('pengesahan.perubahanmutumarhun', compact('mutumarhun')); + return view('pengesahan.perubahanmutumarhun', compact('mutumarhun', 'id')); } - public function mutumarhun($pengesahan_id, $norujukan) + 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) ->get()->toArray(); $lelongbid = LelongBid::where('id', $pengesahan->lelongbid_id)->first(); - $karat = Lelkarat::where('lelong_id', $pengesahan->lelong_id)->get(); + $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(); @@ -300,27 +321,21 @@ class MarhunController extends Controller $total = $karat->harga * $gadaimarhun->berat; $hargaasas = round($total); - // if($gadaimarhun->karat == $marhun['karat']) - // { - // $status = 0; - // } - // else - // { - // $status = 1; - // } + $marhuns[$index1]['old_marhun'] = $gadaimarhun->marhun; $marhuns[$index1]['old_karat'] = $gadaimarhun->karat; - // $marhun[$index1]['status_perubahan'] = $status; $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; } - return view('pengesahan.mutumarhun', compact('marhuns', 'lelongbid', 'pengesahan_id', 'norujukan')); + return view('pengesahan.mutumarhun', compact('marhuns', 'lelongbid', 'pengesahan_id', 'norujukan', 'id')); } public function terimaperubahan(Request $request) { + // dd($request->all()); //update mutu marhun - gadaimarhun $user = Auth::user(); @@ -347,72 +362,164 @@ class MarhunController extends Controller $newmarhun->save(); } - //update status lelongbidmarhun = tangguh + if($request->jenis_button == "terima") + { + $lelongbidmarhuns = LelongBidMarhun::join('pengesahan', 'lelongbidmarhun.lelongbid_id', '=', 'pengesahan.lelongbid_id') + ->where('pengesahan.lelongbid_id', $pengesahan->lelongbid_id) + ->where('pengesahan.id', $request->pengesahan_id) + ->get(); - $tangguhlelong = new TangguhLelong; - $tangguhlelong->lelong_id = $pengesahan->lelong_id; - $tangguhlelong->lelongbid_id = $pengesahan->lelongbid_id; - $tangguhlelong->norujukan = $pengesahan->norujukan; - $tangguhlelong->tarikhtangguh = $currentdate; - $tangguhlelong->ditangguh_oleh = $user->id; - $tangguhlelong->ditangguh_pada = $currentdate; - $tangguhlelong->nota = 'Ditangguh Kerana Perubahan Mutu/Karat Marhun'; - $tangguhlelong->save(); + foreach($lelongbidmarhuns as $bidmarhuns) + { + if($bidmarhuns->status_ubah == 3) + { + $bidmarhuns->delete(); + } + else + { + $bidmarhuns->bil = $bidmarhun->bil; + $bidmarhuns->marhun = $bidmarhun->marhun; + $bidmarhuns->nota = $bidmarhun->nota; + $bidmarhuns->karat = $bidmarhun->karat; + $bidmarhuns->berat = $bidmarhun->berat; + $bidmarhuns->update(); + } + } + } - return redirect()->route('pengesahan.perubahanmutumarhun')->with('success','Pengesahan Mutu Marhun Berjaya'); + else if($request->jenis_button == "tangguhlelong") + { + //add into table tangguhlelong + $tangguhlelong = new TangguhLelong; + $tangguhlelong->lelong_id = $pengesahan->lelong_id; + $tangguhlelong->lelongbid_id = $pengesahan->lelongbid_id; + $tangguhlelong->norujukan = $pengesahan->norujukan; + $tangguhlelong->tarikhtangguh = $currentdate; + $tangguhlelong->ditangguh_oleh = $user->id; + $tangguhlelong->ditangguh_pada = $currentdate; + $tangguhlelong->nota = 'Ditangguh Kerana Perubahan Mutu/Karat Marhun'; + $tangguhlelong->save(); + + // $lelongbidmarhun = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->delete(); + } + + $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 submitdelete($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) - ->get(); + ->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 = $marhun->lelong_id; - $pengesahan->lelongbid = $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',$lelongbid->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(); + + $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->berat = $lelongbid->berat - $lelongbidmarhun->berat_emastambahan; + $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan; + $lelongbid->save(); + if($pengesahan != null) { $lelongbidmarhun->delete(); } - $lelongbid = LelongBid::where('id', $lelongbidmarhun->lelongbid_id)->first(); - // dd($lelongbid); - $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'); + } + + public function senarailelong() + { + $lelong = Lelong::where('sts_lelong', 0) + ->get(); + + return view('pengesahan.senarailelong',compact('lelong')); + } + + public function senaraitangguhlelong($id) + { + $tangguhlelong = TangguhLelong::join('lelongbid', 'tangguhlelong.lelongbid_id', '=', 'lelongbid.id') + ->where('tangguhlelong.lelong_id', $id) + ->get(); + + return view('pengesahan.senaraitangguhlelong',compact('tangguhlelong','id')); + } + + public function lelbidmarhun($id, $norujukan) + { + $marhuns = LelongBidMarhun::join('tangguhlelong', 'lelongbidmarhun.lelongbid_id', '=', 'tangguhlelong.lelongbid_id') + ->where('tangguhlelong.lelong_id', $id) + ->where('tangguhlelong.norujukan', $norujukan) + ->get(); + + $status = Pengesahan::where('lelong_id', $id)->where('norujukan', $norujukan)->first(); + + return view('pengesahan.lelbidmarhun',compact('marhuns', 'id', 'norujukan', 'status')); - return redirect()->route('pengesahan.perubahanmutumarhun') - ->with('success','Pengesahan Padam Marhun Telah Berjaya'); } } diff --git a/app/Models/Pengesahan.php b/app/Models/Pengesahan.php index 9f48811e..cd242860 100644 --- a/app/Models/Pengesahan.php +++ b/app/Models/Pengesahan.php @@ -19,6 +19,7 @@ class Pengesahan extends Model 'disahkan_pada', 'diminta_oleh', 'diminta_pada', - 'status' + 'status', + 'status_ubah' ]; } diff --git a/database/migrations/2022_03_07_061858_create_pengesahan_table.php b/database/migrations/2022_03_07_061858_create_pengesahan_table.php index 4758bf0a..98c764a4 100644 --- a/database/migrations/2022_03_07_061858_create_pengesahan_table.php +++ b/database/migrations/2022_03_07_061858_create_pengesahan_table.php @@ -17,12 +17,14 @@ class CreatePengesahanTable extends Migration $table->id(); $table->unsignedBigInteger('lelong_id')->unsigned(); $table->unsignedBigInteger('lelongbid_id')->unsigned(); + $table->unsignedBigInteger('lelongbidmarhun_id')->unsigned(); $table->string('norujukan'); $table->integer('disahkan_oleh')->nullable(); $table->datetime('disahkan_pada')->nullable(); $table->integer('diminta_oleh'); $table->datetime('diminta_pada'); $table->integer('status')->default(0); //1 = terima + $table->integer('status_ubah')->default(0); //1 = ubah mutu, 2 = tambah marhun, 3 = hapus marhun $table->timestamps(); $table->foreign('lelong_id') @@ -32,6 +34,10 @@ class CreatePengesahanTable extends Migration $table->foreign('lelongbid_id') ->references('id')->on('lelongbid') ->onDelete('cascade'); + + $table->foreign('lelongbidmarhun_id') + ->references('id')->on('lelongbidmarhun') + ->onDelete('cascade'); }); } diff --git a/resources/views/includes/sidebar.blade.php b/resources/views/includes/sidebar.blade.php index d0cf44b5..55945b00 100644 --- a/resources/views/includes/sidebar.blade.php +++ b/resources/views/includes/sidebar.blade.php @@ -115,13 +115,13 @@
{{ $message }}
@endif - @@ -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/resources/views/marhun/senaraimarhun.blade.php b/resources/views/marhun/senaraimarhun.blade.php index 3a10f52d..f763a136 100644 --- a/resources/views/marhun/senaraimarhun.blade.php +++ b/resources/views/marhun/senaraimarhun.blade.php @@ -29,7 +29,7 @@{{ $message }}
+{{ $message }}
+{{ $message }}
+{{ $message }}
+