diff --git a/app/Http/Controllers/MarhunController.php b/app/Http/Controllers/MarhunController.php index 21448edd..a7b05cbf 100644 --- a/app/Http/Controllers/MarhunController.php +++ b/app/Http/Controllers/MarhunController.php @@ -31,6 +31,7 @@ use App\Services\MarhunPhotoService; use Illuminate\Support\Facades\Request as FacadesRequest; use App\Models\TempPengesahan; use DateTime; +use App\Models\LogUser; class MarhunController extends Controller { @@ -1485,6 +1486,15 @@ class MarhunController extends Controller } else { // } + $loguser = new LogUser; + $loguser->user_id = $user->id; + $loguser->date = $currentdate; + $loguser->username = $user->username; + $loguser->nama_user = 'System'; + $loguser->norujukan = $request->norujukan; + $loguser->nota = 'Sah Semakan Marhun' ; + $loguser->save(); + $terimalel->disahkan_oleh = $user['id']; $terimalel->disahkan_pada = $currentdate; $terimalel->status = 1; @@ -1500,10 +1510,42 @@ class MarhunController extends Controller $updatelelongbid->update(); } } elseif ($request->jenis_button == 'tidaksah') { - $deletepengesahan = Pengesahan::where('lelongbid_id', $request->lelongbid_id) - ->where('lelong_id', $request->lelong_id) - ->where('norujukan', $request->norujukan) - ->delete(); + foreach ($pengesahan as $terimalel) { + if($terimalel->status_ubah == 2){//jika tambah marhun + $deletepengesahan = Pengesahan::where('lelongbid_id', $request->lelongbid_id) + ->where('lelong_id', $request->lelong_id) + ->where('norujukan', $request->norujukan) + ->delete(); + + $deletemarhun = LelongBidMarhun::where('id', $terimalel['lelongbidmarhun_id']) + ->where('lelongbid_id', $request->lelongbid_id) + ->delete(); + + $loguser = new LogUser; + $loguser->user_id = $user->id; + $loguser->date = $currentdate; + $loguser->username = $user->username; + $loguser->nama_user = 'System'; + $loguser->norujukan = $request->norujukan; + $loguser->nota = 'Tidak Sah Tambah Marhun' ; + $loguser->save(); + } + else{ + $deletepengesahan = Pengesahan::where('lelongbid_id', $request->lelongbid_id) + ->where('lelong_id', $request->lelong_id) + ->where('norujukan', $request->norujukan) + ->delete(); + + $loguser = new LogUser; + $loguser->user_id = $user->id; + $loguser->date = $currentdate; + $loguser->username = $user->username; + $loguser->nama_user = 'System'; + $loguser->norujukan = $request->norujukan; + $loguser->nota = 'Tidak Sah Pengesahan' ; + $loguser->save(); + } + } } return redirect() diff --git a/resources/views/marhun/marhun.blade.php b/resources/views/marhun/marhun.blade.php index 8342f101..13662da1 100644 --- a/resources/views/marhun/marhun.blade.php +++ b/resources/views/marhun/marhun.blade.php @@ -234,11 +234,12 @@ @endif @else - @endif + + @endif @else - {{-- --}} + @endif