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

# Conflicts:
#	app/Http/Controllers/PermohonanController.php
#	routes/breadcrumbs.php
#	routes/web.php

app/Exports/PermohonanExport.php

@@ -28,6 +28,8 @@
                 $row->branch->name,
                 $row->tujuanPenilaian->name,
                 $row->debiture->name,
+                $row->fasilitasKredit->name,
+                $row->plafond->name,
                 $row->status,
                 $row->authorized_at,
                 $row->authorized_status,
@@ -47,7 +49,9 @@
                 'Branch Pemohon',
                 'Tujuan Penilaian',
                 'Debitur',
-                'Status',
+                'Jenis Fasilitas Kredit',
+                'Nilai Plafond',
+                'Status Permohonan',
                 'Tanggal Pengesahan',
                 'Status Pengesahan',
                 'Pengesah',
@@ -61,7 +65,8 @@
             return [
                 'A' => NumberFormat::FORMAT_NUMBER,
                 'C' => NumberFormat::FORMAT_DATE_DATETIME,
-                'L' => NumberFormat::FORMAT_DATE_DATETIME
+                'K' => NumberFormat::FORMAT_DATE_DATETIME,
+                'N' => NumberFormat::FORMAT_DATE_DATETIME
             ];
         }
     }