From dadec5a397588785b876563112c11282e34b821e Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Thu, 12 Sep 2024 14:29:12 +0700 Subject: [PATCH] Update Edit Permohonan --- app/Http/Controllers/PermohonanController.php | 39 ++- resources/views/debitur/edit.blade.php | 8 +- resources/views/permohonan/form.blade.php | 269 +++++++++++++----- routes/web.php | 34 +-- 4 files changed, 246 insertions(+), 104 deletions(-) diff --git a/app/Http/Controllers/PermohonanController.php b/app/Http/Controllers/PermohonanController.php index 73d6b37..6e0bf9a 100644 --- a/app/Http/Controllers/PermohonanController.php +++ b/app/Http/Controllers/PermohonanController.php @@ -6,10 +6,15 @@ use Exception; use Illuminate\Http\Request; use Maatwebsite\Excel\Facades\Excel; + use Modules\Location\Models\City; + use Modules\Location\Models\District; + use Modules\Location\Models\Province; + use Modules\Location\Models\Village; use Modules\Lpj\Exports\PermohonanExport; use Modules\Lpj\Http\Requests\PermohonanRequest; use Modules\Lpj\Models\Branch; use Modules\Lpj\Models\Debiture; + use Modules\Lpj\Models\DokumenJaminan; use Modules\Lpj\Models\Permohonan; use Modules\Lpj\Models\StatusPermohonan; use Modules\Lpj\Models\TujuanPenilaian; @@ -47,8 +52,8 @@ } } - public function create(){ - + public function create() + { return view('lpj::permohonan.create'); } @@ -66,13 +71,29 @@ { $permohonan = Permohonan::find($id); $branches = Branch::all(); - $debitur = Debiture::find($permohonan->debiture_id); + $debitur = Debiture::find($permohonan->debiture_id); $tujuanPenilaian = TujuanPenilaian::all(); $status = StatusPermohonan::all(); + $provinces = Province::all(); + $cities = City::where('province_code', $debitur->province_code)->get(); + $districts = District::where('city_code', $debitur->city_code)->get(); + $villages = Village::where('district_code', $debitur->district_code)->get(); + $documents = DokumenJaminan::with('pemilik', 'detail')->where('debiture_id', $id)->get(); return view( 'lpj::permohonan.form', - compact('permohonan', 'branches', 'debitur', 'tujuanPenilaian', 'status'), + compact( + 'permohonan', + 'branches', + 'debitur', + 'tujuanPenilaian', + 'status', + 'provinces', + 'cities', + 'districts', + 'villages', + 'documents' + ), ); } @@ -231,7 +252,8 @@ $filteredRecords = $query->count(); // Get the data for the current page - $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->where('status','=','order')->get(); + $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->where('status', '=', 'order')->get( + ); // Calculate the page count $pageCount = ceil($totalRecords / $request->get('size')); @@ -254,16 +276,17 @@ public function showAuthorization($id) { $permohonan = Permohonan::find($id); - return view('lpj::permohonan.authorization.show',compact('permohonan')); + return view('lpj::permohonan.authorization.show', compact('permohonan')); } - public function updateAuthorization(Request $request, $id){ + public function updateAuthorization(Request $request, $id) + { try { $permohonan = Permohonan::find($id); $permohonan->status = $request->status; $permohonan->keterangan = $request->keterangan; $permohonan->save(); - }catch (Exception $e) { + } catch (Exception $e) { return redirect()->route('authorization.show', $id)->with('error', 'Failed to update permohonan'); } diff --git a/resources/views/debitur/edit.blade.php b/resources/views/debitur/edit.blade.php index 0a8e218..8940f5a 100644 --- a/resources/views/debitur/edit.blade.php +++ b/resources/views/debitur/edit.blade.php @@ -6,21 +6,25 @@ @section('content')
-
+ @if(request()->get('permohonan_id')) + Data Permohonan + @endif Data Debitur Dokumen Jaminan Pemilk Jaminan
- @if(isset($debitur->id)) + @if(isset($debitur->id) && request()->get('permohonan_id') == null) Buat Permohonan @endif @if(request()->get('from') == 'permohonan') Back + @elseif(request()->get('permohonan_id')) + Back @else Back @endif diff --git a/resources/views/permohonan/form.blade.php b/resources/views/permohonan/form.blade.php index 8615b75..baca23a 100644 --- a/resources/views/permohonan/form.blade.php +++ b/resources/views/permohonan/form.blade.php @@ -5,97 +5,212 @@ @endsection @section('content') -
+ @if(isset($permohonan)) +
+
+
+
+ Data Permohonan + Data Debitur + Dokumen Jaminan + Pemilk Jaminan +
+
+ @if(isset($debitur->id) && !isset($permohonan->id)) + Buat Permohonan + @endif -
-
-

- {{ isset($permohonan->id) ? 'Edit' : 'Tambah' }} Permohonan -

-
- Back + @if(request()->get('from') == 'permohonan') + Back + @elseif($permohonan->id) + Back + @else + Back + @endif +
+
+
+ @if(request()->routeIs('permohonan.edit', $permohonan)) +
+ @if(isset($permohonan->id)) + @method('PUT') + @endif + @csrf + +
+ +
+ +

{{ $debitur->name }}

+
+
+ +
+ +
+ + @error('tujuan_penilaian_id') + {{ $message }} + @enderror +
+
+ +
+ +
+ + @error('status') + {{ $message }} + @enderror +
+
+ + +
+ +
+
+ @elseif(request()->routeIs('debitur.edit', $debitur)) + @include('lpj::debitur.components.debitur') + @elseif(request()->routeIs('debitur.pemilik.index', $debitur)) + @include('lpj::debitur.components.pemilik') + @else + @include('lpj::debitur.components.jaminan') + @endif
-
-
- @if(isset($permohonan->id)) - @method('PUT') - @endif - @csrf +
+ @else +
-
- -
- -

{{ $debitur->name }}

-
+
+
+

+ {{ isset($permohonan->id) ? 'Edit' : 'Tambah' }} Permohonan +

+
+ Back
+
+
+ + @if(isset($permohonan->id)) + @method('PUT') + @endif + @csrf -
- -
- - @error('tujuan_penilaian_id') - {{ $message }} - @enderror +
+ +
+ +

{{ $debitur->name }}

+
-
-
- -
- - @error('status') - {{ $message }} +
+ +
+ + @error('tujuan_penilaian_id') + {{ $message }} + @enderror +
+
+ +
+ +
+ + @error('status') + {{ $message }} @enderror
-
- -
- +
+ +
+ +
-
+ @endif @endsection diff --git a/routes/web.php b/routes/web.php index cfa177a..b0bfdee 100644 --- a/routes/web.php +++ b/routes/web.php @@ -185,24 +185,24 @@ Route::get('export', [DebitureController::class, 'export'])->name('export'); - Route::name('jaminan.')->prefix('{id}/jaminan')->group(function () { - Route::get('download/{dokumen}', [DokumenJaminanController::class, 'download'])->name('download'); - Route::get('/', [DokumenJaminanController::class, 'index'])->name('index'); - Route::get('create', [DokumenJaminanController::class, 'create'])->name('create'); - Route::get('{jaminan}/edit', [DokumenJaminanController::class, 'edit'])->name('edit'); - Route::put('{jaminan}', [DokumenJaminanController::class, 'update'])->name('update'); - Route::post('store', [DokumenJaminanController::class, 'store'])->name('store'); - Route::delete('{jaminan}', [DokumenJaminanController::class, 'destroy'])->name('destroy'); - }); + Route::name('jaminan.')->prefix('{id}/jaminan')->group(function () { + Route::get('download/{dokumen}', [DokumenJaminanController::class, 'download'])->name('download'); + Route::get('/', [DokumenJaminanController::class, 'index'])->name('index'); + Route::get('create', [DokumenJaminanController::class, 'create'])->name('create'); + Route::get('{jaminan}/edit', [DokumenJaminanController::class, 'edit'])->name('edit'); + Route::put('{jaminan}', [DokumenJaminanController::class, 'update'])->name('update'); + Route::post('store', [DokumenJaminanController::class, 'store'])->name('store'); + Route::delete('{jaminan}', [DokumenJaminanController::class, 'destroy'])->name('destroy'); + }); - Route::name('pemilik.')->prefix('{id}/pemilik')->group(function () { - Route::get('/', [PemilikJaminanController::class, 'index'])->name('index'); - Route::get('create', [PemilikJaminanController::class, 'create'])->name('create'); - Route::get('{pemilik}/edit', [PemilikJaminanController::class, 'edit'])->name('edit'); - Route::put('{pemilik}', [PemilikJaminanController::class, 'update'])->name('update'); - Route::post('store', [PemilikJaminanController::class, 'store'])->name('store'); - Route::delete('{pemilik}', [PemilikJaminanController::class, 'destroy'])->name('destroy'); - }); + Route::name('pemilik.')->prefix('{id}/pemilik')->group(function () { + Route::get('/', [PemilikJaminanController::class, 'index'])->name('index'); + Route::get('create', [PemilikJaminanController::class, 'create'])->name('create'); + Route::get('{pemilik}/edit', [PemilikJaminanController::class, 'edit'])->name('edit'); + Route::put('{pemilik}', [PemilikJaminanController::class, 'update'])->name('update'); + Route::post('store', [PemilikJaminanController::class, 'store'])->name('store'); + Route::delete('{pemilik}', [PemilikJaminanController::class, 'destroy'])->name('destroy'); + }); }); Route::resource('debitur', DebitureController::class);