Merge remote-tracking branch 'composer/feature/senior-officer' into staging

# Conflicts:
#	resources/views/penilaian/otorisator/show.blade.php

app/Http/Controllers/PenilaiController.php

@@ -13,6 +13,7 @@ use Maatwebsite\Excel\Facades\Excel;
 use Modules\Lpj\Exports\KertasKerjaExport;
 use Modules\Lpj\Http\Controllers\SurveyorController;
 use Modules\Location\Models\Province;
+
 class PenilaiController extends Controller
 {
     public $user;
@@ -607,7 +608,7 @@ class PenilaiController extends Controller
         }
 
 
-          $pdf =Pdf::loadView('lpj::penilai.components.print-out', compact(
+        $pdf = PDF::loadView('lpj::penilai.components.print-out', compact(
             'permohonan',
             'forminspeksi',
             'lpjData',
@@ -615,12 +616,21 @@ class PenilaiController extends Controller
             'basicData',
             'inspeksi',
             'lpj'
-          ));
+        ));
 
         $pdf->setPaper('A4', 'portrait');
 
         return $pdf->download('laporan.pdf');
 
+        // return  view('lpj::penilai.components.print-out', compact(
+        //     'permohonan',
+        //     'forminspeksi',
+        //     'lpjData',
+        //     'formFoto',
+        //     'basicData',
+        //     'inspeksi',
+        //     'lpj'
+        // ));
     }
 
 }