diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php index a5e82712..85c18f19 100644 --- a/app/Http/Controllers/LelongController.php +++ b/app/Http/Controllers/LelongController.php @@ -345,11 +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(); - // $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 241a3253..bc5c882e 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -469,23 +469,24 @@ class MarhunController extends Controller ->select('pengesahan.id as pengesahan_id') ->first(); - 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->berat = $lelongbid->berat - $lelongbidmarhun->berat_emastambahan; $lelongbid->hargaasas = $lelongbid->hargaasas - $lelongbidmarhun->harga_asastambahan; $lelongbid->save(); + + if($pengesahan != null) + { + $lelongbidmarhun->delete(); + } - $marhundelete = LelongBidMarhun::where('lelongbid_id', $pengesahan->lelongbid_id)->delete(); + $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/lelong/senarailelong.blade.php b/resources/views/lelong/senarailelong.blade.php index 52363bb3..32afb642 100644 --- a/resources/views/lelong/senarailelong.blade.php +++ b/resources/views/lelong/senarailelong.blade.php @@ -50,7 +50,13 @@ @endif @endhasrole - + @hasrole('operasi') + + @if($lel->sts_lelong == 0) + + + @endif + @endhasrole @endforeach