Update Module Permohonan

- Update Automaticly get branch id by user login
- change static status permohonan to dynamic and database base
- update create permohonan, update selection debiture to table base

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'),
             );
         }
 

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'],
+                    ),
+                ]);
+            }
+        }
     }

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,
                 ]);
             }
         }