Merge branch 'feature/senior-officer' into lpj-db-migratio

app/Http/Controllers/NocController.php

@@ -20,7 +20,7 @@
          */
         public function index()
         {
-            return redirect()->route('noc.pembayaran');
+            return redirect()->route('noc.pembayaran.index');
         }
 
         public function pembayaran()
@@ -80,7 +80,7 @@
             }
             $noc->save();
 
-            // Update the status of the related permohonan to 'spk'
+            /* Update the status of the related permohonan to 'spk'
             $permohonan = Permohonan::find(request()->get('permohonan_id'));
             if ($permohonan) {
                 $permohonan->status_bayar = request()->get('status_pembayar');
@@ -99,7 +99,7 @@
                     ]);
                 }
                 // andy add, update status penawaran.status='spk'
-            }
+            }*/
 
             return redirect()
                 ->route('noc.index')->with('success', 'NOC berhasil disimpan.');
@@ -175,9 +175,7 @@
         /**
          * Display the specified resource.
          */
-        public function show(Request $request) {
-           $noc = Noc::find($request->get('id'));
-
+        public function show(Noc $noc) {
            return view('lpj::noc.memo', compact('noc'));
         }