diff --git a/app/Http/Controllers/JenisLegalitasJaminanController.php b/app/Http/Controllers/JenisLegalitasJaminanController.php
index 9c6f4e9..1bb1446 100644
--- a/app/Http/Controllers/JenisLegalitasJaminanController.php
+++ b/app/Http/Controllers/JenisLegalitasJaminanController.php
@@ -8,6 +8,7 @@
     use Maatwebsite\Excel\Facades\Excel;
     use Modules\Lpj\Exports\JenisLegalitasJaminanExport;
     use Modules\Lpj\Http\Requests\JenisLegalitasJaminanRequest;
+    use Modules\Lpj\Models\customField;
     use Modules\Lpj\Models\JenisLegalitasJaminan;
 
     class JenisLegalitasJaminanController extends Controller
@@ -40,13 +41,15 @@
 
         public function create()
         {
-            return view('lpj::jenis_legalitas_jaminan.create');
+            $customFields = CustomField::orderBy('urutan_prioritas', 'asc')->get();
+            return view('lpj::jenis_legalitas_jaminan.create',compact('customFields'));
         }
 
         public function edit($id)
         {
             $jenisLegalitasJaminan = JenisLegalitasJaminan::find($id);
-            return view('lpj::jenis_legalitas_jaminan.create', compact('jenisLegalitasJaminan'));
+            $customFields = CustomField::orderBy('urutan_prioritas', 'asc')->get();
+            return view('lpj::jenis_legalitas_jaminan.create', compact('jenisLegalitasJaminan', 'customFields'));
         }
 
         public function update(JenisLegalitasJaminanRequest $request, $id)
diff --git a/app/Http/Requests/JenisLegalitasJaminanRequest.php b/app/Http/Requests/JenisLegalitasJaminanRequest.php
index 82fb205..b6ca8a1 100644
--- a/app/Http/Requests/JenisLegalitasJaminanRequest.php
+++ b/app/Http/Requests/JenisLegalitasJaminanRequest.php
@@ -20,6 +20,8 @@
                 'slug'              => 'required|max:255',
                 'custom_field'      => 'nullable|max:255',
                 'custom_field_type' => 'nullable|max:255',
+                'custom_fields'     => 'nullable|array',
+                'custom_fields.*' => 'required|string|max:255',
             ];
         }
 
@@ -46,5 +48,10 @@
                     'slug' => Str::slug($this->name),
                 ]);
             }
+
+            // Ensure custom_fields is always an array
+            if (!is_array($this->custom_fields)) {
+                $this->merge(['custom_fields' => []]);
+            }
         }
     }
diff --git a/app/Models/JenisLegalitasJaminan.php b/app/Models/JenisLegalitasJaminan.php
index dd8f840..aefba67 100644
--- a/app/Models/JenisLegalitasJaminan.php
+++ b/app/Models/JenisLegalitasJaminan.php
@@ -7,5 +7,14 @@
     class JenisLegalitasJaminan extends Base
     {
         protected $table    = 'jenis_legalitas_jaminan';
-        protected $fillable = ['code', 'name','slug','custom_field','custom_field_type'];
+        protected $fillable = ['code', 'name','slug','custom_field','custom_field_type','custom_fields'];
+
+        protected $casts = [
+            'custom_fields' => 'array',
+        ];
+
+        public function customFields()
+        {
+            return $this->hasMany(CustomField::class);
+        }
     }
diff --git a/database/migrations/2025_01_30_091713_add_custom_fields_to_jenis_legalitas_jaminan_table.php b/database/migrations/2025_01_30_091713_add_custom_fields_to_jenis_legalitas_jaminan_table.php
new file mode 100644
index 0000000..b4ba94b
--- /dev/null
+++ b/database/migrations/2025_01_30_091713_add_custom_fields_to_jenis_legalitas_jaminan_table.php
@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('jenis_legalitas_jaminan', function (Blueprint $table) {
+            $table->string('custom_fields')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('jenis_legalitas_jaminan', function (Blueprint $table) {
+            $table->dropColumn('custom_fields');
+        });
+    }
+};
diff --git a/resources/views/jenis_legalitas_jaminan/create.blade.php b/resources/views/jenis_legalitas_jaminan/create.blade.php
index d8e273a..c0e6632 100644
--- a/resources/views/jenis_legalitas_jaminan/create.blade.php
+++ b/resources/views/jenis_legalitas_jaminan/create.blade.php
@@ -10,83 +10,107 @@
             <form action="{{ route('basicdata.jenis-legalitas-jaminan.update', $jenisLegalitasJaminan->id) }}" method="POST">
                 <input type="hidden" name="id" value="{{ $jenisLegalitasJaminan->id }}">
                 @method('PUT')
-        @else
-            <form method="POST" action="{{ route('basicdata.jenis-legalitas-jaminan.store') }}">
-        @endif
-        @csrf
-        <div class="card border border-agi-100 pb-2.5">
-            <div class="card-header bg-agi-50" id="basic_settings">
-                <h3 class="card-title">
-                    {{ isset($jenisLegalitasJaminan->id) ? 'Edit' : 'Tambah' }} Jenis Legalitas Jaminan
-                </h3>
-                <div class="flex items-center gap-2">
-                    <a href="{{ route('basicdata.jenis-legalitas-jaminan.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
-                </div>
-            </div>
-            <div class="card-body grid gap-5">
-                @if(isset($jenisLegalitasJaminan->id))
-                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                    <label class="form-label max-w-56">
-                        Code
-                    </label>
-                    <div class="flex flex-wrap items-baseline w-full">
-                        <input readonly class="input border-warning bg-warning-light  @error('code') border-danger bg-danger-light @enderror" type="text" name="code" value="{{ $jenisLegalitasJaminan->code ?? '' }}">
-                        @error('code')
-                        <em class="alert text-danger text-sm">{{ $message }}</em>
-                        @enderror
-                    </div>
-                </div>
-                @endif
-                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                    <label class="form-label max-w-56">
-                        Name
-                    </label>
-                    <div class="flex flex-wrap items-baseline w-full">
-                        <input class="input  @error('name') border-danger bg-danger-light @enderror" type="text" name="name" value="{{ $jenisLegalitasJaminan->name ?? '' }}">
-                        @error('name')
-                        <em class="alert text-danger text-sm">{{ $message }}</em>
-                        @enderror
-                    </div>
-                </div>
+                @else
+                    <form method="POST" action="{{ route('basicdata.jenis-legalitas-jaminan.store') }}">
+                        @endif
+                        @csrf
+                        <div class="card border border-agi-100 pb-2.5">
+                            <div class="card-header bg-agi-50" id="basic_settings">
+                                <h3 class="card-title">
+                                    {{ isset($jenisLegalitasJaminan->id) ? 'Edit' : 'Tambah' }} Jenis Legalitas Jaminan
+                                </h3>
+                                <div class="flex items-center gap-2">
+                                    <a href="{{ route('basicdata.jenis-legalitas-jaminan.index') }}" class="btn btn-xs btn-info"><i class="ki-filled ki-exit-left"></i> Back</a>
+                                </div>
+                            </div>
+                            <div class="card-body grid gap-5">
+                                @if(isset($jenisLegalitasJaminan->id))
+                                    <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                        <label class="form-label max-w-56">
+                                            Code
+                                        </label>
+                                        <div class="flex flex-wrap items-baseline w-full">
+                                            <input readonly class="input border-warning bg-warning-light  @error('code') border-danger bg-danger-light @enderror" type="text" name="code" value="{{ $jenisLegalitasJaminan->code ?? '' }}">
+                                            @error('code')
+                                            <em class="alert text-danger text-sm">{{ $message }}</em>
+                                            @enderror
+                                        </div>
+                                    </div>
+                                @endif
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        Name
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <input class="input  @error('name') border-danger bg-danger-light @enderror" type="text" name="name" value="{{ $jenisLegalitasJaminan->name ?? '' }}">
+                                        @error('name')
+                                        <em class="alert text-danger text-sm">{{ $message }}</em>
+                                        @enderror
+                                    </div>
+                                </div>
 
-                <!-- Tambahkan inputan custom_field -->
-                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                    <label class="form-label max-w-56">
-                        Custom Field
-                    </label>
-                    <div class="flex flex-wrap items-baseline w-full">
-                        <input class="input @error('custom_field') border-danger bg-danger-light @enderror" type="text" name="custom_field" value="{{ $jenisLegalitasJaminan->custom_field ?? '' }}">
-                        @error('custom_field')
-                        <em class="alert text-danger text-sm">{{ $message }}</em>
-                        @enderror
-                    </div>
-                </div>
+                                <!-- Tambahkan inputan custom_field -->
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        Custom Field
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <input class="input @error('custom_field') border-danger bg-danger-light @enderror" type="text" name="custom_field" value="{{ $jenisLegalitasJaminan->custom_field ?? '' }}">
+                                        @error('custom_field')
+                                        <em class="alert text-danger text-sm">{{ $message }}</em>
+                                        @enderror
+                                    </div>
+                                </div>
 
-                <!-- Tambahkan inputan custom_field_type -->
-                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
-                    <label class="form-label max-w-56">
-                        Custom Field Type
-                    </label>
-                    <div class="flex flex-wrap items-baseline w-full">
-                        <select class="input tomselect @error('custom_field_type') border-danger bg-danger-light @enderror" name="custom_field_type">
-                            <option value="">Pilih Tipe</option>
-                            <option value="text" {{ (isset($jenisLegalitasJaminan) && $jenisLegalitasJaminan->custom_field_type == 'text') ? 'selected' : '' }}>Text</option>
-                            <option value="number" {{ (isset($jenisLegalitasJaminan) && $jenisLegalitasJaminan->custom_field_type == 'number') ? 'selected' : '' }}>Number</option>
-                            <option value="date" {{ (isset($jenisLegalitasJaminan) && $jenisLegalitasJaminan->custom_field_type == 'date') ? 'selected' : '' }}>Date</option>
-                        </select>
-                        @error('custom_field_type')
-                        <em class="alert text-danger text-sm">{{ $message }}</em>
-                        @enderror
-                    </div>
-                </div>
+                                <!-- Tambahkan inputan custom_field_type -->
+                                <div class="flex items-baseline flex-wrap lg:flex-nowrap gap-2.5">
+                                    <label class="form-label max-w-56">
+                                        Custom Field Type
+                                    </label>
+                                    <div class="flex flex-wrap items-baseline w-full">
+                                        <select class="input tomselect @error('custom_field_type') border-danger bg-danger-light @enderror" name="custom_field_type">
+                                            <option value="">Pilih Tipe</option>
+                                            <option value="text" {{ (isset($jenisLegalitasJaminan) && $jenisLegalitasJaminan->custom_field_type == 'text') ? 'selected' : '' }}>Text</option>
+                                            <option value="number" {{ (isset($jenisLegalitasJaminan) && $jenisLegalitasJaminan->custom_field_type == 'number') ? 'selected' : '' }}>Number</option>
+                                            <option value="date" {{ (isset($jenisLegalitasJaminan) && $jenisLegalitasJaminan->custom_field_type == 'date') ? 'selected' : '' }}>Date</option>
+                                        </select>
+                                        @error('custom_field_type')
+                                        <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">
+                                        Custom Fields
+                                    </label>
+                                    <div class="grid grid-cols-3 lg:grid-cols-4 w-full gap-2.5">
+                                        @foreach($customFields as $customField)
+                                            <label class="switch">
+                                                @if ( isset($jenisLegalitasJaminan) && !empty($jenisLegalitasJaminan->custom_fields))
+                                                    <input type="checkbox" @if (in_array($customField->id, $jenisLegalitasJaminan->custom_fields))
+                                                        {{ 'checked' }}
+                                                    @endif
+                                                    value="{{ $customField->id }}" name="custom_fields[]"/>
+                                                @else
+                                                    <input type="checkbox" value="{{ $customField->id }}"
+                                                           name="custom_fields[]"/>
+                                                @endif
+                                                <span class="switch-label">
+                                                    {{ $customField->urutan_prioritas.'. '.$customField->label }}
+                                                </span>
+                                            </label>
+                                        @endforeach
+                                    </div>
+                                </div>
 
-                <div class="flex justify-end">
-                    <button type="submit" class="btn btn-primary">
-                        Save
-                    </button>
-                </div>
-            </div>
-        </div>
-    </form>
+
+                                <div class="flex justify-end">
+                                    <button type="submit" class="btn btn-primary">
+                                        Save
+                                    </button>
+                                </div>
+                            </div>
+                        </div>
+                    </form>
     </div>
 @endsection