Merge branch 'staging' of https://git.putrakuningan.com/daengdeni/lpj into andydev

app/Http/Controllers/PermohonanController.php

@@ -108,7 +108,6 @@
         public function update(PermohonanRequest $request, $id)
         {
             $validate = $request->validated();
-
             if ($validate) {
                 try {
                     // Update in database
@@ -116,6 +115,7 @@
                     if ($permohonan->status == 'revisi') {
                         $validate['status'] = 'order';
                     }
+
                     $permohonan->update($validate);
                     return redirect()
                         ->route('permohonan.index')->with('success', 'Permohonan updated successfully');

app/Http/Requests/PermohonanRequest.php

@@ -17,7 +17,7 @@
                 'nomor_registrasi'          => 'nullable|string|max:10',
                 'tanggal_permohonan'        => 'nullable|date',
                 'user_id'                   => 'nullable|exists:users,id',
-                'branch_id'                 => 'required|exists:branches,id',
+                'branch_id'                 => 'nullable|exists:branches,id',
                 'tujuan_penilaian_id'       => 'required|exists:tujuan_penilaian,id',
                 'debiture_id'               => 'required|exists:debitures,id',
                 'status'                    => 'nullable|string',
@@ -49,6 +49,7 @@
                     'tanggal_permohonan' => date('Y-m-d'),
                     'user_id'            => auth()->user()->id,
                     'branch_id'          => auth()->user()->branch_id,
+                    'status'             => 'order'
                 ]);
             }
         }