diff --git a/app/Http/Controllers/PermohonanController.php b/app/Http/Controllers/PermohonanController.php
index d45c873..1392157 100644
--- a/app/Http/Controllers/PermohonanController.php
+++ b/app/Http/Controllers/PermohonanController.php
@@ -11,6 +11,7 @@
     use Modules\Lpj\Models\Branch;
     use Modules\Lpj\Models\Debiture;
     use Modules\Lpj\Models\Permohonan;
+    use Modules\Lpj\Models\StatusPermohonan;
     use Modules\Lpj\Models\TujuanPenilaian;
 
     class PermohonanController extends Controller
@@ -24,7 +25,6 @@
 
         public function store(PermohonanRequest $request)
         {
-
             $validate = $request->validated();
 
             if ($validate) {
@@ -37,7 +37,7 @@
                 } catch (Exception $e) {
                     return redirect()
                         ->route('permohonan.create')
-                        ->with('error', 'Failed to create permohonan'. $e->getMessage());
+                        ->with('error', 'Failed to create permohonan' . $e->getMessage());
                 }
             } else {
                 return redirect()
@@ -47,26 +47,19 @@
             }
         }
 
-        public function create()
+        public function create(){
+
+            return view('lpj::permohonan.create');
+        }
+
+        public function createPermohonan($debitur)
         {
             $branches        = Branch::all();
-            $debitures       = Debiture::all();
+            $debitur         = Debiture::find($debitur);
             $tujuanPenilaian = TujuanPenilaian::all();
-            $status          = [
-                'order'       => 'Order',
-                'revisi'      => 'Revisi',
-                'register'    => 'Register',
-                'assign'      => 'Assign',
-                'survey'      => 'Survey',
-                'finalisasi'  => 'Proses Laporan',
-                'approved'    => 'Diterima',
-                'rejected'    => 'Ditolak',
-                'cancel'      => 'Dibatalkan',
-                'finished'    => 'Selesai',
-                'not_started' => 'Belum dimulai',
-            ];
+            $status          = StatusPermohonan::all();
 
-            return view('lpj::permohonan.form', compact('branches', 'debitures', 'tujuanPenilaian','status'));
+            return view('lpj::permohonan.form', compact('branches', 'debitur', 'tujuanPenilaian', 'status'));
         }
 
         public function edit($id)
@@ -75,23 +68,11 @@
             $branches        = Branch::all();
             $debitures       = Debiture::all();
             $tujuanPenilaian = TujuanPenilaian::all();
-            $status          = [
-                'order'       => 'Order',
-                'revisi'      => 'Revisi',
-                'register'    => 'Register',
-                'assign'      => 'Assign',
-                'survey'      => 'Survey',
-                'finalisasi'  => 'Proses Laporan',
-                'approved'    => 'Diterima',
-                'rejected'    => 'Ditolak',
-                'cancel'      => 'Dibatalkan',
-                'finished'    => 'Selesai',
-                'not_started' => 'Belum dimulai',
-            ];
+            $status          = StatusPermohonan::all();
 
             return view(
                 'lpj::permohonan.form',
-                compact('permohonan', 'branches', 'debitures', 'tujuanPenilaian','status'),
+                compact('permohonan', 'branches', 'debitures', 'tujuanPenilaian', 'status'),
             );
         }
 
diff --git a/app/Http/Requests/JenisJaminanRequest.php b/app/Http/Requests/JenisJaminanRequest.php
index 4e2da8f..0295054 100644
--- a/app/Http/Requests/JenisJaminanRequest.php
+++ b/app/Http/Requests/JenisJaminanRequest.php
@@ -2,6 +2,7 @@
 
     namespace Modules\Lpj\Http\Requests;
 
+    use Haruncpi\LaravelIdGenerator\IdGenerator;
     use Illuminate\Foundation\Http\FormRequest;
 
     class JenisJaminanRequest extends FormRequest
@@ -12,16 +13,10 @@
         public function rules()
         : array
         {
-            $rules = [
+            return [
+                'code' => 'required|max:5',
                 'name' => 'required|max:255',
             ];
-
-            if ($this->method() == 'PUT') {
-                $rules['code'] = 'required|max:50|unique:jenis_jaminan,code,' . $this->id;
-            } else {
-                $rules['code'] = 'required|max:50|unique:jenis_jaminan,code';
-            }
-            return $rules;
         }
 
         /**
@@ -32,4 +27,16 @@
         {
             return true;
         }
+
+        public function prepareForValidation()
+        : void
+        {
+            if ($this->method() == 'POST') {
+                $this->merge([
+                    'code' => IdGenerator::generate(
+                        ['table' => 'jenis_jaminan', 'length' => 5, 'prefix' => 'JJ', 'field' => 'code'],
+                    ),
+                ]);
+            }
+        }
     }
diff --git a/app/Http/Requests/PermohonanRequest.php b/app/Http/Requests/PermohonanRequest.php
index 5a576dd..e4c4bd8 100644
--- a/app/Http/Requests/PermohonanRequest.php
+++ b/app/Http/Requests/PermohonanRequest.php
@@ -40,10 +40,11 @@
             if (!$this->id) {
                 $this->merge([
                     'nomor_registrasi'   => IdGenerator::generate(
-                        ['table' => 'permohonan', 'length' => 10, 'prefix'=>'REG', 'field' => 'nomor_registrasi'],
+                        ['table' => 'permohonan', 'length' => 10, 'prefix' => 'REG', 'field' => 'nomor_registrasi'],
                     ),
                     'tanggal_permohonan' => date('Y-m-d'),
                     'user_id'            => auth()->user()->id,
+                    'branch_id'          => auth()->user()->branch_id,
                 ]);
             }
         }
diff --git a/database/migrations/2024_08_23_073834_create_permohonan_jaminan_table.php b/database/migrations/2024_08_23_073834_create_permohonan_jaminan_table.php
new file mode 100644
index 0000000..ad46f00
--- /dev/null
+++ b/database/migrations/2024_08_23_073834_create_permohonan_jaminan_table.php
@@ -0,0 +1,38 @@
+<?php
+
+    use Illuminate\Database\Migrations\Migration;
+    use Illuminate\Database\Schema\Blueprint;
+    use Illuminate\Support\Facades\Schema;
+    use Modules\Lpj\Models\DokumenJaminan;
+    use Modules\Lpj\Models\Permohonan;
+
+    return new class extends Migration {
+        /**
+         * Run the migrations.
+         */
+        public function up()
+        : void
+        {
+            Schema::create('permohonan_jaminan', function (Blueprint $table) {
+                $table->id();
+                $table->foreignIdFor(Permohonan::class)->constrained('permohonan');
+                $table->foreignIdFor(DokumenJaminan::class)->constrained('dokumen_jaminan');
+                $table->boolean('status')->default(true)->nullable();
+                $table->timestamps();
+                $table->softDeletes();
+
+                $table->unsignedBigInteger('created_by')->nullable();
+                $table->unsignedBigInteger('updated_by')->nullable();
+                $table->unsignedBigInteger('deleted_by')->nullable();
+            });
+        }
+
+        /**
+         * Reverse the migrations.
+         */
+        public function down()
+        : void
+        {
+            Schema::dropIfExists('permohonan_jaminan');
+        }
+    };
diff --git a/resources/views/debitur/edit.blade.php b/resources/views/debitur/edit.blade.php
index a8cca46..8e2935a 100644
--- a/resources/views/debitur/edit.blade.php
+++ b/resources/views/debitur/edit.blade.php
@@ -10,12 +10,16 @@
         <div class="card pb-2.5">
             <div class="card-header" id="basic_settings">
                 <div class="card-title flex flex-row gap-1.5">
-                    <a href="{{ route('debitur.edit',$debitur->id) }}" class="btn btn-xs {{ request()->routeIs('debitur.edit') ? 'btn-outline btn-primary' : 'btn-light' }}">Data Debitur</a>
-                    <a href="{{ route('debitur.jaminan.index',$debitur->id) }}" class="btn btn-xs {{ request()->routeIs('debitur.jaminan.index') ? 'btn-outline btn-primary' : 'btn-light' }}">Dokumen Jaminan</a>
-                    <a href="{{ route('debitur.pemilik.index',$debitur->id) }}" class="btn btn-xs {{ request()->routeIs('debitur.pemilik.index') ? 'btn-outline btn-primary' : 'btn-light' }}">Pemilk Jaminan</a>
+                    <a href="{{ route('debitur.edit',array_merge(request()->query(),['debitur'=>$debitur->id])) }}" class="btn btn-xs {{ request()->routeIs('debitur.edit') ? 'btn-outline btn-primary' : 'btn-light' }}">Data Debitur</a>
+                    <a href="{{ route('debitur.jaminan.index',array_merge(request()->query(),['id'=>$debitur->id])) }}" class="btn btn-xs {{ request()->routeIs('debitur.jaminan.index') ? 'btn-outline btn-primary' : 'btn-light' }}">Dokumen Jaminan</a>
+                    <a href="{{ route('debitur.pemilik.index',array_merge(request()->query(),['id'=>$debitur->id])) }}" class="btn btn-xs {{ request()->routeIs('debitur.pemilik.index') ? 'btn-outline btn-primary' : 'btn-light' }}">Pemilk Jaminan</a>
                 </div>
                 <div class="flex items-center gap-2">
-                    <a href="{{ route('debitur.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
+                    @if(request()->get('from') == 'permohonan')
+                        <a href="{{ route('permohonan.create') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
+                    @else
+                        <a href="{{ route('debitur.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
+                    @endif
                 </div>
             </div>
             <div class="card-body">
diff --git a/resources/views/permohonan/create.blade.php b/resources/views/permohonan/create.blade.php
new file mode 100644
index 0000000..eaf9e31
--- /dev/null
+++ b/resources/views/permohonan/create.blade.php
@@ -0,0 +1,184 @@
+@extends('layouts.main')
+
+@section('breadcrumbs')
+    {{ Breadcrumbs::render(request()->route()->getName()) }}
+@endsection
+
+@section('content')
+    <div class="grid">
+        <div class="card card-grid min-w-full" data-datatable="false" data-datatable-page-size="5" data-datatable-state-save="false" id="debitur-table" data-api-url="{{ route('debitur.datatables') }}">
+            <div class="card-header py-5 flex-wrap">
+                <h3 class="card-title">
+                    Daftar Debitur
+                </h3>
+                <div class="flex flex-wrap gap-2 lg:gap-5">
+                    <div class="flex">
+                        <label class="input input-sm"> <i class="ki-filled ki-magnifier"> </i>
+                            <input placeholder="Search Debitur" id="search" type="text" value="">
+                        </label>
+                    </div>
+                </div>
+            </div>
+            <div class="card-body">
+                <div class="scrollable-x-auto">
+                    <table class="table table-auto table-border align-middle text-gray-700 font-medium text-sm" data-datatable-table="true">
+                        <thead>
+                        <tr>
+                            <th class="w-14">
+                                <input class="checkbox checkbox-sm" data-datatable-check="true" type="checkbox"/>
+                            </th>
+                            <th class="min-w-[50px]" data-datatable-column="cif">
+                                <span class="sort"> <span class="sort-label"> Cif </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[50px]" data-datatable-column="nomor_rekening">
+                                <span class="sort"> <span class="sort-label"> Nomor Rekening </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[50px]" data-datatable-column="name">
+                                <span class="sort"> <span class="sort-label"> Debitur </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[50px]" data-datatable-column="branch">
+                                <span class="sort"> <span class="sort-label"> Cabang </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[50px]" data-datatable-column="email">
+                                <span class="sort"> <span class="sort-label"> Email </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[50px]" data-datatable-column="phone">
+                                <span class="sort"> <span class="sort-label"> Phone </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[50px]" data-datatable-column="address">
+                                <span class="sort"> <span class="sort-label"> Alamat </span>
+                                    <span class="sort-icon"> </span> </span>
+                            </th>
+                            <th class="min-w-[50px] text-center" data-datatable-column="actions">Action</th>
+                        </tr>
+                        </thead>
+                    </table>
+                </div>
+                <div class="card-footer justify-center md:justify-between flex-col md:flex-row gap-3 text-gray-600 text-2sm font-medium">
+                    <div class="flex items-center gap-2">
+                        Show
+                        <select class="select select-sm w-16" data-datatable-size="true" name="perpage"> </select> per page
+                    </div>
+                    <div class="flex items-center gap-4">
+                        <span data-datatable-info="true"> </span>
+                        <div class="pagination" data-datatable-pagination="true">
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+@endsection
+
+@push('scripts')
+    <script src="https://cdn.jsdelivr.net/npm/sweetalert2@11"></script>
+    <script type="text/javascript">
+        window.addEventListener('DOMContentLoaded', function () {
+
+        })
+        function deleteData(data) {
+            Swal.fire({
+                title: 'Are you sure?',
+                text: "You won't be able to revert this!",
+                icon: 'warning',
+                showCancelButton: true,
+                confirmButtonColor: '#3085d6',
+                cancelButtonColor: '#d33',
+                confirmButtonText: 'Yes, delete it!'
+            }).then((result) => {
+                if (result.isConfirmed) {
+                    $.ajaxSetup({
+                        headers: {
+                            'X-CSRF-TOKEN': '{{ csrf_token()  }}'
+                        }
+                    });
+
+                    $.ajax(`debitur/${data}`, {
+                        type: 'DELETE'
+                    }).then((response) => {
+                        swal.fire('Deleted!', 'User has been deleted.', 'success').then(() => {
+                            window.location.reload();
+                        });
+                    }).catch((error) => {
+                        console.error('Error:', error);
+                        Swal.fire('Error!', 'An error occurred while deleting the file.', 'error');
+                    });
+                }
+            })
+        }
+    </script>
+    <script type="module">
+        const element = document.querySelector('#debitur-table');
+        const searchInput = document.getElementById('search');
+
+        const apiUrl = element.getAttribute('data-api-url');
+        const dataTableOptions = {
+            apiEndpoint: apiUrl,
+            pageSize: 5,
+            columns: {
+                select: {
+                    render: (item, data, context) => {
+                        const checkbox = document.createElement('input');
+                        checkbox.className = 'checkbox checkbox-sm';
+                        checkbox.type = 'checkbox';
+                        checkbox.value = data.id.toString();
+                        checkbox.setAttribute('data-datatable-row-check', 'true');
+                        return checkbox.outerHTML.trim();
+                    },
+                },
+                cif: {
+                    title: 'CIF',
+                },
+                nomor_rekening: {
+                    title: 'Nomor Rekening',
+                },
+                name: {
+                    title: 'Debitur',
+                },
+                branch: {
+                    title: 'Cabang',
+                    render: (item, data, context) => {
+                        return `${data.branch.name}`;
+                    },
+                },
+                email: {
+                    title: 'Email',
+                },
+                phone: {
+                    title: 'Phone',
+                },
+                address: {
+                    title: 'Alamat',
+                },
+                actions: {
+                    title: 'Status',
+                    render: (item, data) => {
+                        return `<div class="flex flex-nowrap justify-center gap-1.5">
+                            <a class="btn btn-sm btn-icon btn-outline btn-warning" href="/debitur/${data.id}/edit?from=permohonan">
+                                <i class="ki-outline ki-eye"></i>
+                            </a>
+                            <a class="btn btn-sm btn-outline btn-info   " href="/permohonan/${data.id}/create">
+                                <i class="ki-outline ki-notepad-edit"></i> Buat Permohonan
+                            </a>
+                        </div>`;
+                    },
+                }
+            },
+        };
+
+        let dataTable = new KTDataTable(element, dataTableOptions);
+        dataTable.showSpinner();
+        // Custom search functionality
+        searchInput.addEventListener('input', function () {
+            const searchValue = this.value.trim();
+            dataTable.search(searchValue, true);
+
+        });
+    </script>
+@endpush
diff --git a/resources/views/permohonan/form.blade.php b/resources/views/permohonan/form.blade.php
index 091c4d5..8dbe82f 100644
--- a/resources/views/permohonan/form.blade.php
+++ b/resources/views/permohonan/form.blade.php
@@ -50,33 +50,6 @@
                         </div>
                     </div>
 
-                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                        <label class="form-label max-w-56">
-                            Branch
-                        </label>
-                        <div class="flex flex-wrap items-baseline w-full">
-                            <select class="input tomselect w-full @error('branch_id') border-danger @enderror" name="branch_id" id="branch_id">
-                                <option value="">Pilih Branch</option>
-                                @if(isset($branches))
-                                    @foreach($branches as $row)
-                                        @if(isset($permohonan))
-                                            <option value="{{ $row->id }}" {{ isset($permohonan->branch_id) && $permohonan->branch_id == $row->id?'selected' : '' }}>
-                                                {{ $row->name }}
-                                            </option>
-                                        @else
-                                            <option value="{{ $row->id }}">
-                                                {{ $row->name }}
-                                            </option>
-                                        @endif
-                                    @endforeach
-                                @endif
-                            </select>
-                            @error('branch_id')
-                            <em class="alert text-danger text-sm">{{ $message }}</em>
-                            @enderror
-                        </div>
-                    </div>
-
                     <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
                         <label class="form-label max-w-56">
                             Tujuan Penilaian
@@ -112,14 +85,14 @@
                             <select class="input tomselect w-full @error('branch_id') border-danger @enderror" name="status" id="status">
                                 <option value="">Pilih Status Permohonan</option>
                                 @if(isset($status))
-                                    @foreach($status as $key => $row)
+                                    @foreach($status as $row)
                                         @if(isset($permohonan))
-                                            <option value="{{ $key }}" {{ isset($permohonan->status) && $permohonan->status == $key ?'selected' : '' }}>
-                                                {{ $row }}
+                                            <option value="{{ $row->slug }}" {{ isset($permohonan->status) && $permohonan->status == $row->slug ?'selected' : '' }}>
+                                                {{ $row->name }}
                                             </option>
                                         @else
-                                            <option value="{{ $key }}">
-                                                {{ $row }}
+                                            <option value="{{ $row->slug }}">
+                                                {{ $row->name }}
                                             </option>
                                         @endif
                                     @endforeach
diff --git a/routes/web.php b/routes/web.php
index ed86d4a..e32b1c8 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -168,7 +168,7 @@
             Route::get('export', [PermohonanController::class, 'export'])->name('export');
         });
 
-            Route::resource('permohonan', PermohonanController::class);
+        Route::resource('permohonan', PermohonanController::class);
 
         Route::name('debitur.')->prefix('debitur')->group(function () {
             Route::get('download/{id}', [DebitureController::class, 'download'])->name('download');