Merge branch 'staging' into feature/senior-officer

app/Http/Controllers/PenilaiController.php

@@ -246,11 +246,13 @@ class PenilaiController extends Controller
      */
     public function edit($id)
     {
-        return view('lpj::edit');
+        $permohonan = Permohonan::with('debiture')->find($id);
+        return view('lpj::penilai.edit',compact('permohonan'));
     }
 
 
-    public function storePaparan($id)
+
+    public function storePaparan(Request $request, $id)
     {
         try {
             $permohonan = Permohonan::findOrFail($id);
@@ -269,17 +271,20 @@ class PenilaiController extends Controller
                 ]
             );
 
-            return response()->json([
-                'success' => true,
-                'message' => 'diperbarui ke status paparan dan dikirim ke So untuk proses lebih lanjut.'
-            ], 200);
+            if($request->hasFile('file_paparan')) {
+                $file = $request->file('file_paparan');
+                $path = $file->store('public/file_paparan');
+
+                $penilai = Penilai::where('permohonan_id', $id)->first();
+                $penilai->file_paparan = $path;
+                $penilai->save();
+            }
+
+            return redirect()
+                ->route('penilai.show',['id'=>$id])->with('success', 'diperbarui ke status paparan dan dikirim ke So untuk proses lebih lanjut.');
 
         } catch (\Exception $e) {
-            return response()->json([
-                'success' => false,
-                'message' => 'Terjadi kesalahan saat memproses permohonan.',
-                'error' => $e->getMessage()
-            ], 500);
+            return redirect()->route('penilai.show',['id'=>$id])->with('error', 'Terjadi kesalahan saat memproses permohonan.');
         }
     }
 

app/Http/Controllers/PenilaianController.php

@@ -539,6 +539,10 @@ class PenilaianController extends Controller
                         'approve_so_at' => now(),
                         'keterangan_so'     => $request->message,
                     ]);
+
+                    $permohonan->update([
+                        'tanggal_paparan' => $request->tanggalPaparan
+                    ]);
                 } elseif (Auth::user()->roles[0]->name === 'EO Appraisal') {
                     $status = '2';
                     if (!in_array($permohonan->nilai_plafond_id, [1, 4])) {
@@ -564,12 +568,11 @@ class PenilaianController extends Controller
                     ]);
 
                     $permohonan->update([
-                        'status'         => 'paparan',
-                        'tanggal_paparan' => $request->tanggalPaparan
+                        'status'         => 'paparan'
                     ]);
                 }
                 break;
-                
+
             default:
                 return response()->json([
                     'message' => 'Konteks otorisasi tidak valid.',
@@ -679,7 +682,10 @@ class PenilaianController extends Controller
             },
             'approveSo',
             'approveEo',
-            'approveDd'
+            'approveDd',
+            'authorization.approveSo',
+            'authorization.approveEo',
+            'authorization.approveDd'
         ])->get();