🔧(services): Selaraskan fallback path foto pada PreviewLaporanService dan tambah logging

- Menyelaraskan resolusi path file foto di PreviewLaporanService dengan logika fallback seperti pada komponen foto:
  - Menggunakan `originalPath = $path['path']` sebagai path utama
  - Jika `statusLpj == 1` dan file asli tidak ditemukan, maka:
    - Ekstrak dua bagian terakhir dari path (contoh: `251051/251051_2_2.png`)
    - Bangun `fallbackPath` dengan pola `surveyor/001/{lastTwoParts}`
  - Tentukan `pathToUse`:
    - Apabila `fallbackPath` ada dan file fallback ditemukan, gunakan `fallbackPath`
    - Jika tidak, tetap gunakan `originalPath`
  - Resolusi final: `storage_path('app/public/' . $pathToUse)`

- Menambahkan logging untuk setiap operasi penting dan setiap titik pengembalian:
  - `Log::warning` saat path kosong terdeteksi dalam daftar paths
  - `Log::info` saat fallback kandidat dibangun dari `originalPath`
  - `Log::warning` saat file tidak ditemukan pada original maupun fallback (dengan menyertakan ketiganya: original, fallback, resolved)
  - `Log::info` saat file berhasil ditambahkan ke daftar unduhan
  - `Log::warning` saat tidak ada file valid setelah resolusi path
  - `Log::info` saat mengunduh single file
  - `Log::info` saat zip file berhasil dibuat (dengan jumlah file)
  - `Log::error` saat zip file gagal dibuat

- Memindahkan logika resolusi path di dalam loop pengolahan `$paths` untuk setiap item:
  - Mengganti setting langsung `storage_path('app/public/' . $path['path'])` dengan resolusi path yang bisa fallback
  - Menjaga struktur kontrol dengan `continue` jika file final tetap tidak ditemukan

- Menambahkan komentar level-fungsi (docblock) pada `previewLaporan`:
  - Menjelaskan tanggung jawab fungsi dalam menghasilkan PDF atau unduhan foto
  - Menjelaskan skenario fallback path dan tujuan mengurangi gambar hilang
  - Mendokumentasikan parameter dan bentuk nilai kembali respons

app/Exports/JenisLampiranExport.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace Modules\Lpj\app\Exports;
+
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithColumnFormatting;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use Modules\Lpj\app\Models\JenisLampiran;
+
+class JenisLampiranExport implements WithColumnFormatting, WithHeadings, FromCollection, WithMapping
+{
+    public function collection()
+    {
+        return JenisLampiran::all();
+    }
+
+    public function map($row): array
+    {
+        return [
+            $row->id,
+            $row->nama,
+            $row->deskripsi,
+            $row->created_at
+        ];
+    }
+
+    public function headings(): array
+    {
+        return [
+            'ID',
+            'Nama',
+            'Deskripsi',
+            'Created At'
+        ];
+    }
+
+    public function columnFormats(): array
+    {
+        return [
+            'A' => NumberFormat::FORMAT_NUMBER,
+            'D' => NumberFormat::FORMAT_DATE_DATETIME
+        ];
+    }
+}

app/Exports/LaporanAdminKreditExport.php

@@ -0,0 +1,70 @@
+<?php
+
+namespace Modules\Lpj\Exports;
+
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithColumnFormatting;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Modules\Lpj\Models\LaporanAdminKredit;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+
+class LaporanAdminKreditExport implements WithColumnFormatting, WithHeadings, FromCollection, WithMapping
+{
+    public function collection()
+    {
+        return LaporanAdminKredit::with('debiture')->get();
+    }
+
+    public function map($row): array
+    {
+        return [
+            $row->id,
+            $row->debiture->cif,
+            $row->debiture->name,
+            $row->debiture->branch->name,
+            $row->kode_register_t24,
+            $row->jenis_agunan,
+            $row->bukti_kepemilikan,
+            $row->alamat_agunan,
+            $row->nama_pemilik,
+            $row->tanggal_kunjungan,
+            $row->nilai_pasar_wajar,
+            $row->nilai_likuidasi,
+            $row->nama_penilai,
+            $row->created_at
+        ];
+    }
+
+    public function headings(): array
+    {
+        return [
+            'ID',
+            'CIF',
+            'Nama Debitur',
+            'Cabang',
+            'Kode Register T24',
+            'Jenis Agunan',
+            'Bukti Kepemilikan',
+            'Alamat Agunan',
+            'Nama Pemilik',
+            'Tanggal Kunjungan',
+            'Nilai Pasar Wajar',
+            'Nilai Likuidasi',
+            'Nama Penilai',
+            'Created At'
+        ];
+    }
+
+    public function columnFormats(): array
+    {
+        return [
+            'A' => NumberFormat::FORMAT_NUMBER,
+            'B' => NumberFormat::FORMAT_NUMBER,
+            'J' => NumberFormat::FORMAT_DATE_DDMMYYYY,
+            'K' => NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1,
+            'L' => NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1,
+            'M' => NumberFormat::FORMAT_DATE_DATETIME,
+        ];
+    }
+}

app/Exports/LaporanHasilPenilaianJaminanInternalExternalExport.php

@@ -0,0 +1,305 @@
+<?php
+
+namespace Modules\Lpj\Exports;
+
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithTitle;
+use Maatwebsite\Excel\Concerns\WithCustomStartCell;
+use Maatwebsite\Excel\Concerns\WithEvents;
+use Maatwebsite\Excel\Events\AfterSheet;
+use Modules\Lpj\Models\Permohonan;
+use Modules\Lpj\Models\Branch;
+use Illuminate\Support\Facades\Auth;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
+
+class LaporanHasilPenilaianJaminanInternalExternalExport implements FromCollection, WithHeadings, WithMapping, WithTitle, WithCustomStartCell, WithEvents
+{
+    protected $request;
+
+    public function __construct($request)
+    {
+        $this->request = $request;
+    }
+
+    public function collection()
+    {
+        $query = Permohonan::query();
+        $query = $query->where('status', 'done');
+
+        // Apply date range filter if provided
+        if ($this->request->has('start_date') || $this->request->has('end_date')) {
+             $startDate = $this->request->start_date ?? '1900-01-01';
+            $endDate = $this->request->end_date ?? now()->toDateString();
+
+            $query->where(function ($q) use ($startDate, $endDate) {
+
+                $q->whereHas('penilaian', function ($q2) use ($startDate, $endDate) {
+                    $q2->whereBetween('tanggal_kunjungan', [$startDate, $endDate]);
+                });
+
+                // OR check if has penawaran with date in range
+                $q->orWhereHas('penawaran', function ($q3) use ($startDate, $endDate) {
+                    $q3->whereBetween('tanggal_penilaian_sebelumnya', [$startDate, $endDate]);
+                });
+            });
+        }
+
+        // Apply branch filter if provided
+        if ($this->request->has('branch_id') && !empty($this->request->branch_id)) {
+            $query->where('branch_id', $this->request->branch_id);
+        }
+
+        if ($this->request->has('penilai_id') && !empty($this->request->penilai_id)) {
+            $request = $this->request; // Store in a local variable
+            $query->whereHas('penilaian._user_penilai.userPenilaiTeam', function ($q) use ($request) {
+                $q->where('user_id', $request->penilai_id);
+            });
+        }
+
+        // Apply search filter if provided
+        if ($this->request->has('search') && !empty($this->request->search)) {
+            $search = $this->request->search;
+            $query->where(function ($q) use ($search) {
+                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
+                $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                 $q->orWhereRelation('debiture', DB::raw('LOWER(name)'), 'LIKE', '%' . strtolower($search) . '%');
+
+                $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('jenisFasilitasKredit', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('jenisPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhere('status', 'LIKE', '%' . $search . '%');
+            });
+        }
+
+        // Default ordering
+        $query->orderBy('nomor_registrasi', 'asc');
+
+        return $query->get();
+    }
+
+    protected $rowNumber = 0;
+
+    public function map($permohonan): array
+    {
+        $this->rowNumber++;
+        $luas_tanah = 0;
+        $luas_bangunan = 0;
+        $nilai_tanah = 0;
+        $nilai_bangunan = 0;
+        $npw = 0;
+        $nilai_liquidasi = 0;
+
+        if (isset($permohonan->penilai->lpj)) {
+            $lpj = json_decode($permohonan->penilai->lpj, true);
+            $npw = str_replace('.', '', $lpj['total_nilai_pasar_wajar'] ?? 0);
+
+            $luas_tanah = $lpj['luas_tanah'] ?? 0;
+            $luas_bangunan = $lpj['luas_bangunan'] ?? 0;
+            $nilai_tanah = str_replace('.', '', $lpj['nilai_tanah_2'] ?? 0);
+            $nilai_bangunan = str_replace('.', '', $lpj['nilai_bangunan_2'] ?? 0);
+            $nilai_liquidasi = str_replace('.', '', $lpj['likuidasi_nilai_2'] ?? 0);
+        }
+
+        return [
+            $this->rowNumber,
+            $permohonan->nomor_registrasi,
+            $permohonan->tanggal_permohonan ?? '',
+            $permohonan->debiture->branch->name ?? '',
+            $permohonan->user->name ?? $permohonan->mig_nama_ao ?? '',
+            $permohonan->debiture->cif ?? '',
+            $permohonan->debiture->name ?? '',
+            $permohonan->tujuanPenilaian->name,
+            $permohonan->jenisPenilaian->name ?? '',
+            $permohonan->jenisFasilitasKredit->name,
+            $permohonan->documents->pluck('jenisJaminan.name')->unique()->implode(', '),
+            $permohonan->documents->map(function ($document) {
+                return formatAlamat($document);
+            })->unique()->implode(', '),
+            $permohonan->documents->flatMap(function ($document) {
+                return $document->detail->map(function ($detail) {
+                    return (!empty($detail->dokumen_nomor) && is_array($detail->dokumen_nomor))
+                        ? ($detail->jenisLegalitasJaminan->name ?? '') . "\n" . implode(', ', $detail->dokumen_nomor)
+                        : null;
+                });
+            })->filter()->unique()->implode(', '),
+            $permohonan->documents->pluck('pemilik.name')->unique()->implode(', '),
+            $luas_tanah . ' m²',
+            formatRupiah($nilai_tanah, 2),
+            $luas_bangunan . ' m²',
+            formatRupiah($nilai_bangunan, 2),
+            formatRupiah($permohonan->nilai_njop ?? 0, 2),
+            formatRupiah($npw, 2),
+            formatRupiah($nilai_liquidasi, 2),
+            $permohonan->documents->map(function ($document) {
+                return formatTanggalIndonesia($document->created_at);
+            })->first(),
+            '', // tanggal_spk
+            '', // nomor_spk
+            '', // tanggal_rencana_kunjungan
+            $permohonan->penilaian && $permohonan->penilaian->tanggal_kunjungan
+    ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan)
+    : '',
+            '', // tanggal_delivered
+            '', // jangka_waktu_sla
+            ($permohonan->approval_dd_at || $permohonan->approval_eo_at) ?
+                formatTanggalIndonesia($permohonan->approval_dd_at ?? $permohonan->approval_eo_at) : '',
+            $permohonan->penilaian && $permohonan->penilaian->tanggal_kunjungan
+    ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan)
+    : '',
+            $permohonan->penilaian->_user_penilai->userPenilaiTeam->name ?? '',
+            $permohonan->approveSo->name ?? '',
+            '', // saran
+            ''  // catatan
+        ];
+    }
+
+    public function headings(): array
+    {
+        return [
+            'No',
+            'Nomor Registrasi',
+            'Tanggal Permohonan',
+            'Cabang',
+            'Pemohon',
+            'CIF',
+            'Nama Debitur',
+            'Jenis Penilaian',
+            'Tujuan Penilaian',
+            'Jenis Fasilitas Kredit',
+            'Jenis Agunan',
+            'Alamat Agunan',
+            'Bukti Kepemilikan',
+            'Nama Pemilik',
+            'Luas Tanah',
+            'Nilai Tanah',
+            'Luas Bangunan',
+            'Nilai Bangunan',
+            'Nilai NJOP',
+            'Nilai Pasar Wajar',
+            'Nilai Likuidasi',
+            'Tanggal Dokumen Diterima',
+            'Tanggal SPK',
+            'Nomor SPK',
+            'Tanggal Rencana Kunjungan',
+            'Tanggal Kunjungan',
+            'Tanggal Delivered',
+            'Jangka Waktu SLA',
+            'Tanggal Laporan',
+            'Tanggal Review',
+            'Nama Penilai',
+            'Nama Team Leader',
+            'Saran',
+            'Catatan'
+        ];
+    }
+
+    /**
+     * @return string
+     */
+    public function title(): string
+    {
+        return 'Laporan Hasil Penilaian Jaminan Internal & External';
+    }
+
+    /**
+     * @return string
+     */
+    public function startCell(): string
+    {
+        return 'A7';
+    }
+
+    /**
+     * @return array
+     */
+    public function registerEvents(): array
+    {
+        return [
+            AfterSheet::class => function (AfterSheet $event) {
+                // Get the sheet
+                $sheet = $event->sheet->getDelegate();
+
+                // Set the title
+                $sheet->setCellValue('A1', 'LAPORAN PENILAIAN JAMINAN');
+                $sheet->getStyle('A1')->getFont()->setBold(true)->setSize(16);
+
+                // Merge cells for title
+                $sheet->mergeCells('A1:AH1');
+                $sheet->getStyle('A1')->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+
+                // Set the branch information if filtered
+                $branchInfo = '';
+                if ($this->request->has('branch_id') && !empty($this->request->branch_id)) {
+                    $branch = Branch::find($this->request->branch_id);
+                    if ($branch) {
+                        $branchInfo = 'Cabang: ' . $branch->name;
+                        $sheet->setCellValue('A2', $branchInfo);
+                        $sheet->mergeCells('A2:AH2');
+                        $sheet->getStyle('A2')->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+                        $sheet->getStyle('A2')->getFont()->setBold(true);
+                    }
+                }
+
+                // Set the period
+                $startDate = $this->request->start_date ?? '';
+                $endDate = $this->request->end_date ?? '';
+
+                $rowIndex = $branchInfo ? 3 : 2;
+
+                if ($startDate && $endDate) {
+                    $startDateFormatted = Carbon::parse($startDate)->format('d F Y');
+                    $endDateFormatted = Carbon::parse($endDate)->format('d F Y');
+                    $sheet->setCellValue('A' . $rowIndex, 'Periode: ' . $startDateFormatted . ' - ' . $endDateFormatted);
+                } else {
+                    $sheet->setCellValue('A' . $rowIndex, 'Periode: Semua Data');
+                }
+                $sheet->mergeCells('A' . $rowIndex . ':AH' . $rowIndex);
+                $sheet->getStyle('A' . $rowIndex)->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+
+                // Set the date of export
+                $rowIndex++;
+                $sheet->setCellValue('A' . $rowIndex, 'Tanggal Export: ' . Carbon::now()->format('d F Y H:i:s'));
+
+                // Set the user who exported
+                $rowIndex++;
+                $userName = Auth::user() ? Auth::user()->name : 'System';
+                $sheet->setCellValue('A' . $rowIndex, 'Diexport oleh: ' . $userName);
+
+                // Add a blank line
+                $rowIndex++;
+                $sheet->setCellValue('A' . $rowIndex, '');
+
+                // Style the header row
+                $headerRange = 'A7:' . $sheet->getHighestColumn() . '7';
+                $sheet->getStyle($headerRange)->getFont()->setBold(true);
+                $sheet->getStyle($headerRange)->getFill()
+                      ->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID)
+                      ->getStartColor()->setARGB('FFCCCCCC');
+
+                // Auto-size columns - fixed to handle columns beyond Z
+                $highestColumn = $sheet->getHighestColumn();
+                $highestColumnIndex = \PhpOffice\PhpSpreadsheet\Cell\Coordinate::columnIndexFromString($highestColumn);
+
+                for ($i = 1; $i <= $highestColumnIndex; $i++) {
+                    $currentColumn = \PhpOffice\PhpSpreadsheet\Cell\Coordinate::stringFromColumnIndex($i);
+                    $sheet->getColumnDimension($currentColumn)->setAutoSize(true);
+                }
+
+                // Add borders to all cells with data
+                $dataRange = 'A7:' . $sheet->getHighestColumn() . $sheet->getHighestRow();
+                $sheet->getStyle($dataRange)->getBorders()->getAllBorders()->setBorderStyle(\PhpOffice\PhpSpreadsheet\Style\Border::BORDER_THIN);
+
+                // Center align the header row
+                $sheet->getStyle($headerRange)->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+
+                // Set text wrap for header cells
+                $sheet->getStyle($headerRange)->getAlignment()->setWrapText(true);
+            },
+        ];
+    }
+}

app/Exports/LaporanPembatalanExport.php

@@ -0,0 +1,102 @@
+<?php
+
+    namespace Modules\Lpj\Exports;
+
+    use Illuminate\Http\Request;
+    use Illuminate\Support\Facades\Auth;
+    use Maatwebsite\Excel\Concerns\FromCollection;
+    use Maatwebsite\Excel\Concerns\WithHeadings;
+    use Maatwebsite\Excel\Concerns\WithMapping;
+    use Modules\Lpj\Models\PermohonanPembatalan;
+
+    class LaporanPembatalanExport implements FromCollection, WithHeadings, WithMapping
+    {
+        protected $request;
+
+        public function __construct(Request $request)
+        {
+            $this->request = $request;
+        }
+
+        public function collection()
+        {
+            $query = PermohonanPembatalan::where('status', 'batal');
+
+            if (!Auth::user()->hasAnyRole(['administrator'])) {
+                $query = $query->whereHas('permohonan', function ($q) {
+                    $q->where('branch_id', Auth::user()->branch_id);
+                });
+            }
+
+            // Apply search filter if provided
+            if ($this->request->has('search') && !empty($this->request->get('search'))) {
+                $search = $this->request->get('search');
+                $query->where(function ($q) use ($search) {
+                    $q->whereHas('permohonan', function ($subq) use ($search) {
+                        $subq->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
+                        $subq->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
+                        $subq->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
+                    });
+                    $q->orWhere('alasan', 'LIKE', '%' . $search . '%');
+                    $q->orWhere('status', 'LIKE', '%' . $search . '%');
+                });
+            }
+
+            // Filter by date range if provided
+            if ($this->request->has('start_date') || $this->request->has('end_date')) {
+                $query->whereBetween('created_at', [
+                    $this->request->get('start_date') ?? '1900-01-01',
+                    $this->request->get('end_date') ?? now()->toDateString()
+                ]);
+            }
+
+            // Filter by status if provided
+            if ($this->request->has('status') && !empty($this->request->get('status'))) {
+                $query->where('status', $this->request->get('status'));
+            }
+
+            // Filter by branch if provided
+            if ($this->request->has('branch_id') && !empty($this->request->get('branch_id'))) {
+                $query->whereHas('permohonan', function ($q) {
+                    $q->where('branch_id', $this->request->get('branch_id'));
+                });
+            }
+
+            return $query->orderBy('created_at', 'desc')
+                         ->get();
+        }
+
+        public function headings(): array
+        {
+            return [
+                'No. Registrasi',
+                'Tanggal Permohonan',
+                'Tanggal Pembatalan',
+                'Cabang',
+                'Pemohon',
+                'Debitur',
+                'Alasan Pembatalan',
+                'Status',
+                'Diajukan Oleh',
+                'Disetujui Oleh',
+                'Tanggal Disetujui'
+            ];
+        }
+
+        public function map($pembatalan): array
+        {
+            return [
+                $pembatalan->permohonan->nomor_registrasi ?? '-',
+                $pembatalan->permohonan->tanggal_permohonan ? date('d-m-Y', strtotime($pembatalan->permohonan->tanggal_permohonan)) : '-',
+                date('d-m-Y', strtotime($pembatalan->created_at)),
+                $pembatalan->permohonan->branch->name ?? '-',
+                $pembatalan->permohonan->user->name ?? '-',
+                $pembatalan->permohonan->debiture->name ?? '-',
+                $pembatalan->alasan_pembatalan,
+                $pembatalan->status,
+                $pembatalan->user->name ?? '-',
+                $pembatalan->authorized_by ? $pembatalan->authorizedUser->name : '-',
+                $pembatalan->authorized_at ? formatTanggalIndonesia(strtotime($pembatalan->authorized_at),1) : '-'
+            ];
+        }
+    }

app/Exports/LaporanPenilaiJaminanExport.php

@@ -0,0 +1,310 @@
+<?php
+
+namespace Modules\Lpj\Exports;
+
+
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\ShouldAutoSize;
+use Illuminate\Database\Eloquent\Builder;
+use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
+use Modules\Lpj\Models\Debiture;
+use Modules\Lpj\Models\Permohonan;
+use Modules\Lpj\Helpers\Lpj;
+use Illuminate\Support\Facades\DB;
+
+class LaporanPenilaiJaminanExport implements FromCollection, WithHeadings, WithMapping, ShouldAutoSize
+{
+
+    protected $request;
+
+    public function __construct($request)
+    {
+        $this->request = $request;
+    }
+
+
+       public function collection()
+    {
+        $query = Permohonan::query();
+        $query = $query->where('status', 'done');
+
+        // Apply date range filter if provided
+        if ($this->request->has('start_date') || $this->request->has('end_date')) {
+             $startDate = $this->request->start_date ?? '1900-01-01';
+            $endDate = $this->request->end_date ?? now()->toDateString();
+
+            $query->where(function ($q) use ($startDate, $endDate) {
+
+                $q->whereHas('penilaian', function ($q2) use ($startDate, $endDate) {
+                    $q2->whereBetween('tanggal_kunjungan', [$startDate, $endDate]);
+                });
+
+                // OR check if has penawaran with date in range
+                $q->orWhereHas('penawaran', function ($q3) use ($startDate, $endDate) {
+                    $q3->whereBetween('tanggal_penilaian_sebelumnya', [$startDate, $endDate]);
+                });
+            });
+        }
+
+        // Filter by laporan type if provided
+        if ($this->request->has('laporan') && is_array($this->request->laporan) && !empty($this->request->laporan)) {
+            foreach ($this->request->laporan as $type) {
+                $query->whereHas('penilai', function ($q) use ($type) {
+                    $q->where('type_penilai', 'LIKE', '%' . $type . '%');
+                });
+            }
+        }
+
+        // Apply branch filter if provided
+        if ($this->request->has('branch_id') && !empty($this->request->branch_id)) {
+            $query->where('branch_id', $this->request->branch_id);
+        }
+
+        // Filter by selected IDs if provided
+        if ($this->request->has('selected_ids') && !empty($this->request->selected_ids)) {
+            $selectedIds = is_array($this->request->selected_ids) ? $this->request->selected_ids : explode(',', $this->request->selected_ids);
+            $query->whereIn('id', $selectedIds);
+        }
+
+        // Apply search filter if provided
+        if ($this->request->has('search') && !empty($this->request->search)) {
+            $search = $this->request->search;
+            $query->where(function ($q) use ($search) {
+                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
+                $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
+                   $q->orWhereRelation('debiture', DB::raw('LOWER(name)'), 'LIKE', '%' . strtolower($search) . '%');
+                $q->orWhereRelation('jenisFasilitasKredit', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('jenisPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhere('status', 'LIKE', '%' . $search . '%');
+            });
+        }
+
+        // Default ordering
+        $query->orderBy('nomor_registrasi', 'asc');
+
+        return $query->get();
+    }
+
+    protected $rowNumber = 0;
+       public function map($permohonan): array
+    {
+        $this->rowNumber++;
+        $luas_tanah = 0;
+        $luas_bangunan = 0;
+        $nilai_tanah = 0;
+        $nilai_bangunan = 0;
+        $npw = 0;
+        $nilai_liquidasi = 0;
+
+        if (isset($permohonan->penilai->lpj)) {
+            $lpj = json_decode($permohonan->penilai->lpj, true);
+            $npw = str_replace('.', '', $lpj['total_nilai_pasar_wajar'] ?? 0);
+
+            $luas_tanah = $lpj['luas_tanah'] ?? 0;
+            $luas_bangunan = $lpj['luas_bangunan'] ?? 0;
+            $nilai_tanah = str_replace('.', '', $lpj['nilai_tanah_2'] ?? 0);
+            $nilai_bangunan = str_replace('.', '', $lpj['nilai_bangunan_2'] ?? 0);
+            $nilai_liquidasi = str_replace('.', '', $lpj['likuidasi_nilai_2'] ?? 0);
+        }
+
+        return [
+            $this->rowNumber,
+            $permohonan->nomor_registrasi,
+            $permohonan->tanggal_permohonan ?? '',
+            $permohonan->debiture->branch->name ?? '',
+            $permohonan->user->name ?? $permohonan->mig_nama_ao ?? '',
+            $permohonan->debiture->cif ?? '',
+            $permohonan->debiture->name ?? '',
+            $permohonan->tujuanPenilaian->name,
+            $permohonan->jenisPenilaian->name ?? '',
+            $permohonan->jenisFasilitasKredit->name,
+            $permohonan->documents->pluck('jenisJaminan.name')->unique()->implode(', '),
+            $permohonan->documents->map(function ($document) {
+                return formatAlamat($document);
+            })->unique()->implode(', '),
+            $permohonan->documents->flatMap(function ($document) {
+                return $document->detail->map(function ($detail) {
+                    return (!empty($detail->dokumen_nomor) && is_array($detail->dokumen_nomor))
+                        ? ($detail->jenisLegalitasJaminan->name ?? '') . "\n" . implode(', ', $detail->dokumen_nomor)
+                        : null;
+                });
+            })->filter()->unique()->implode(', '),
+            $permohonan->documents->pluck('pemilik.name')->unique()->implode(', '),
+            $luas_tanah . ' m²',
+            formatRupiah($nilai_tanah, 2),
+            $luas_bangunan . ' m²',
+            formatRupiah($nilai_bangunan, 2),
+            formatRupiah($permohonan->nilai_njop ?? 0, 2),
+            formatRupiah($npw, 2),
+            formatRupiah($nilai_liquidasi, 2),
+            $permohonan->documents->map(function ($document) {
+                return formatTanggalIndonesia($document->created_at);
+            })->first(),
+            '', // tanggal_spk
+            '', // nomor_spk
+            '', // tanggal_rencana_kunjungan
+            $permohonan->penilaian && $permohonan->penilaian->tanggal_kunjungan
+    ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan)
+    : '',
+            '', // tanggal_delivered
+            '', // jangka_waktu_sla
+            ($permohonan->approval_dd_at || $permohonan->approval_eo_at) ?
+                formatTanggalIndonesia($permohonan->approval_dd_at ?? $permohonan->approval_eo_at) : '',
+            $permohonan->penilaian && $permohonan->penilaian->tanggal_kunjungan
+    ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan)
+    : '',
+            $permohonan->penilaian->_user_penilai->userPenilaiTeam->name ?? '',
+            $permohonan->approveSo->name ?? '',
+            $permohonan->penilai->type_penilai?? '',
+        ];
+    }
+
+
+
+    public function headings(): array
+    {
+        return [
+            'No',
+            'Nomor Registrasi',
+            'Tanggal Permohonan',
+            'Cabang',
+            'Pemohon',
+            'CIF',
+            'Nama Debitur',
+            'Jenis Penilaian',
+            'Tujuan Penilaian',
+            'Jenis Fasilitas Kredit',
+            'Jenis Agunan',
+            'Alamat Agunan',
+            'Bukti Kepemilikan',
+            'Nama Pemilik',
+            'Luas Tanah',
+            'Nilai Tanah',
+            'Luas Bangunan',
+            'Nilai Bangunan',
+            'Nilai NJOP',
+            'Nilai Pasar Wajar',
+            'Nilai Likuidasi',
+            'Tanggal Dokumen Diterima',
+            'Tanggal SPK',
+            'Nomor SPK',
+            'Tanggal Rencana Kunjungan',
+            'Tanggal Kunjungan',
+            'Tanggal Delivered',
+            'Jangka Waktu SLA',
+            'Tanggal Laporan',
+            'Tanggal Review',
+            'Nama Penilai',
+            'Nama Team Leader',
+            'Laporan',
+
+        ];
+    }
+
+    /**
+     * @return string
+     */
+    public function title(): string
+    {
+        return 'Laporan Hasil Penilaian Jaminan Internal & External';
+    }
+
+    /**
+     * @return string
+     */
+    public function startCell(): string
+    {
+        return 'A7';
+    }
+
+     public function registerEvents(): array
+    {
+        return [
+            AfterSheet::class => function (AfterSheet $event) {
+                // Get the sheet
+                $sheet = $event->sheet->getDelegate();
+
+                // Set the title
+                $sheet->setCellValue('A1', 'LAPORAN PENILAIAN JAMINAN');
+                $sheet->getStyle('A1')->getFont()->setBold(true)->setSize(16);
+
+                // Merge cells for title
+                $sheet->mergeCells('A1:AH1');
+                $sheet->getStyle('A1')->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+
+                // Set the branch information if filtered
+                $branchInfo = '';
+                if ($this->request->has('branch_id') && !empty($this->request->branch_id)) {
+                    $branch = Branch::find($this->request->branch_id);
+                    if ($branch) {
+                        $branchInfo = 'Cabang: ' . $branch->name;
+                        $sheet->setCellValue('A2', $branchInfo);
+                        $sheet->mergeCells('A2:AH2');
+                        $sheet->getStyle('A2')->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+                        $sheet->getStyle('A2')->getFont()->setBold(true);
+                    }
+                }
+
+                // Set the period
+                $startDate = $this->request->start_date ?? '';
+                $endDate = $this->request->end_date ?? '';
+
+                $rowIndex = $branchInfo ? 3 : 2;
+
+                if ($startDate && $endDate) {
+                    $startDateFormatted = Carbon::parse($startDate)->format('d F Y');
+                    $endDateFormatted = Carbon::parse($endDate)->format('d F Y');
+                    $sheet->setCellValue('A' . $rowIndex, 'Periode: ' . $startDateFormatted . ' - ' . $endDateFormatted);
+                } else {
+                    $sheet->setCellValue('A' . $rowIndex, 'Periode: Semua Data');
+                }
+                $sheet->mergeCells('A' . $rowIndex . ':AH' . $rowIndex);
+                $sheet->getStyle('A' . $rowIndex)->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+
+                // Set the date of export
+                $rowIndex++;
+                $sheet->setCellValue('A' . $rowIndex, 'Tanggal Export: ' . Carbon::now()->format('d F Y H:i:s'));
+
+                // Set the user who exported
+                $rowIndex++;
+                $userName = Auth::user() ? Auth::user()->name : 'System';
+                $sheet->setCellValue('A' . $rowIndex, 'Diexport oleh: ' . $userName);
+
+                // Add a blank line
+                $rowIndex++;
+                $sheet->setCellValue('A' . $rowIndex, '');
+
+                // Style the header row
+                $headerRange = 'A7:' . $sheet->getHighestColumn() . '7';
+                $sheet->getStyle($headerRange)->getFont()->setBold(true);
+                $sheet->getStyle($headerRange)->getFill()
+                      ->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID)
+                      ->getStartColor()->setARGB('FFCCCCCC');
+
+                // Auto-size columns - fixed to handle columns beyond Z
+                $highestColumn = $sheet->getHighestColumn();
+                $highestColumnIndex = \PhpOffice\PhpSpreadsheet\Cell\Coordinate::columnIndexFromString($highestColumn);
+
+                for ($i = 1; $i <= $highestColumnIndex; $i++) {
+                    $currentColumn = \PhpOffice\PhpSpreadsheet\Cell\Coordinate::stringFromColumnIndex($i);
+                    $sheet->getColumnDimension($currentColumn)->setAutoSize(true);
+                }
+
+                // Add borders to all cells with data
+                $dataRange = 'A7:' . $sheet->getHighestColumn() . $sheet->getHighestRow();
+                $sheet->getStyle($dataRange)->getBorders()->getAllBorders()->setBorderStyle(\PhpOffice\PhpSpreadsheet\Style\Border::BORDER_THIN);
+
+                // Center align the header row
+                $sheet->getStyle($headerRange)->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+
+                // Set text wrap for header cells
+                $sheet->getStyle($headerRange)->getAlignment()->setWrapText(true);
+            },
+        ];
+    }
+}

app/Exports/LaporanPenilaianJaminanExport.php

@@ -0,0 +1,260 @@
+<?php
+
+namespace Modules\Lpj\Exports;
+
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithTitle;
+use Maatwebsite\Excel\Concerns\WithCustomStartCell;
+use Maatwebsite\Excel\Concerns\WithEvents;
+use Maatwebsite\Excel\Events\AfterSheet;
+use Modules\Lpj\Models\Permohonan;
+use Modules\Lpj\Models\Branch;
+use Illuminate\Support\Facades\Auth;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
+class LaporanPenilaianJaminanExport implements FromCollection, WithHeadings, WithMapping, WithTitle, WithCustomStartCell, WithEvents
+{
+    protected $request;
+
+    public function __construct($request)
+    {
+        $this->request = $request;
+    }
+
+    public function collection()
+    {
+        $query = Permohonan::query();
+        $query = $query->where('status', 'done');
+
+        // Apply date range filter if provided
+        if ($this->request->has('start_date') || $this->request->has('end_date')) {
+
+            $startDate = $this->request->start_date ?? '1900-01-01';
+            $endDate = $this->request->end_date ?? now()->toDateString();
+
+            $query->where(function ($q) use ($startDate, $endDate) {
+
+                $q->whereHas('penilaian', function ($q2) use ($startDate, $endDate) {
+                    $q2->whereBetween('tanggal_kunjungan', [$startDate, $endDate]);
+                });
+
+                // OR check if has penawaran with date in range
+                $q->orWhereHas('penawaran', function ($q3) use ($startDate, $endDate) {
+                    $q3->whereBetween('tanggal_penilaian_sebelumnya', [$startDate, $endDate]);
+                });
+            });
+
+        }
+
+        // Apply branch filter if provided
+        if ($this->request->has('branch_id') && !empty($this->request->branch_id)) {
+            $query->where('branch_id', $this->request->branch_id);
+        }
+
+        if ($this->request->has('penilai_id') && !empty($this->request->penilai_id)) {
+            $request = $this->request; // Store in a local variable
+            $query->whereHas('penilaian._user_penilai.userPenilaiTeam', function ($q) use ($request) {
+                $q->where('user_id', $request->penilai_id);
+            });
+        }
+
+        // Apply search filter if provided
+        if ($this->request->has('search') && !empty($this->request->search)) {
+            $search = $this->request->search;
+            $query->where(function ($q) use ($search) {
+                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
+                $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
+                   $q->orWhereRelation('debiture', DB::raw('LOWER(name)'), 'LIKE', '%' . strtolower($search) . '%');
+                $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('jenisFasilitasKredit', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('jenisPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhere('status', 'LIKE', '%' . $search . '%');
+            });
+        }
+
+        // Default ordering
+        $query->orderBy('nomor_registrasi', 'asc');
+
+        dd($query->toSql(), $query->getBindings());
+
+        return $query->with(['debiture.branch'])->get();
+    }
+
+    protected $rowNumber = 0;
+
+    public function map($permohonan): array
+    {
+        $this->rowNumber++;
+        $luas_tanah = 0;
+        $luas_bangunan = 0;
+        $nilai_tanah = 0;
+        $nilai_bangunan = 0;
+        $npw = 0;
+        $nilai_liquidasi = 0;
+
+        if (isset($permohonan->penilai->lpj)) {
+            $lpj = json_decode($permohonan->penilai->lpj, true);
+            $npw = str_replace('.', '', $lpj['total_nilai_pasar_wajar'] ?? 0);
+
+            $luas_tanah = $lpj['luas_tanah'] ?? 0;
+            $luas_bangunan = $lpj['luas_bangunan'] ?? 0;
+            $nilai_tanah = str_replace('.', '', $lpj['nilai_tanah_2'] ?? 0);
+            $nilai_bangunan = str_replace('.', '', $lpj['nilai_bangunan_2'] ?? 0);
+            $nilai_liquidasi = str_replace('.', '', $lpj['likuidasi_nilai_2'] ?? 0);
+        }
+
+        return [
+            $this->rowNumber,
+            $permohonan->nomor_registrasi,
+            $permohonan->tanggal_permohonan,
+            $permohonan->debiture->branch->name,
+            $permohonan->debiture->name,
+            $permohonan->creator->name,
+            $permohonan->tujuanPenilaian->name,
+            $permohonan->documents->pluck('jenisJaminan.name')->unique()->implode(', '),
+            $permohonan->documents->map(function ($document) {
+                return formatAlamat($document);
+            })->unique()->implode(', '),
+            $luas_tanah . ' m²',
+            formatRupiah($nilai_tanah, 2),
+            $luas_bangunan . ' m²',
+            formatRupiah($nilai_bangunan, 2),
+            ($permohonan->approval_dd_at || $permohonan->approval_eo_at) ?
+                formatTanggalIndonesia($permohonan->approval_dd_at ?? $permohonan->approval_eo_at) : '',
+            $permohonan->penilaian->tanggal_kunjungan ?
+                formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan) : '',
+            formatRupiah($npw, 2),
+            formatRupiah($nilai_liquidasi, 2),
+            $permohonan->penilaian->_user_penilai->userPenilaiTeam->name,
+        ];
+    }
+
+    public function headings(): array
+    {
+        return [
+            'No',
+            'Nomor Registrasi',
+            'Tanggal Permohonan',
+            'Cabang',
+            'Nama Debitur',
+            'Pemohon',
+            'Tujuan Penilaian',
+            'Jenis Agunan',
+            'Alamat Agunan',
+            'Luas Tanah',
+            'Nilai Tanah',
+            'Luas Bangunan',
+            'Nilai Bangunan',
+            'Tanggal Laporan',
+            'Tanggal Review',
+            'Nilai Pasar Wajar',
+            'Nilai Likuidasi',
+            'Nama Penilai',
+        ];
+    }
+
+    /**
+     * @return string
+     */
+    public function title(): string
+    {
+        return 'Laporan Penilaian Jaminan';
+    }
+
+    /**
+     * @return string
+     */
+    public function startCell(): string
+    {
+        return 'A7';
+    }
+
+    /**
+     * @return array
+     */
+    public function registerEvents(): array
+    {
+        return [
+            AfterSheet::class => function (AfterSheet $event) {
+                // Get the sheet
+                $sheet = $event->sheet->getDelegate();
+
+                // Set the title
+                $sheet->setCellValue('A1', 'LAPORAN PENILAIAN JAMINAN');
+                $sheet->getStyle('A1')->getFont()->setBold(true)->setSize(16);
+
+                // Merge cells for title
+                $sheet->mergeCells('A1:R1');
+                $sheet->getStyle('A1')->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+
+                // Set the branch information if filtered
+                $branchInfo = '';
+                if ($this->request->has('branch_id') && !empty($this->request->branch_id)) {
+                    $branch = Branch::find($this->request->branch_id);
+                    if ($branch) {
+                        $branchInfo = 'Cabang: ' . $branch->name;
+                        $sheet->setCellValue('A2', $branchInfo);
+                        $sheet->mergeCells('A2:R2');
+                        $sheet->getStyle('A2')->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+                        $sheet->getStyle('A2')->getFont()->setBold(true);
+                    }
+                }
+
+                // Set the period
+                $startDate = $this->request->start_date ?? '';
+                $endDate = $this->request->end_date ?? '';
+
+                $rowIndex = $branchInfo ? 3 : 2;
+
+                if ($startDate && $endDate) {
+                    $startDateFormatted = Carbon::parse($startDate)->format('d F Y');
+                    $endDateFormatted = Carbon::parse($endDate)->format('d F Y');
+                    $sheet->setCellValue('A' . $rowIndex, 'Periode: ' . $startDateFormatted . ' - ' . $endDateFormatted);
+                } else {
+                    $sheet->setCellValue('A' . $rowIndex, 'Periode: Semua Data');
+                }
+                $sheet->mergeCells('A' . $rowIndex . ':R' . $rowIndex);
+                $sheet->getStyle('A' . $rowIndex)->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+
+                // Set the date of export
+                $rowIndex++;
+                $sheet->setCellValue('A' . $rowIndex, 'Tanggal Export: ' . Carbon::now()->format('d F Y H:i:s'));
+
+                // Set the user who exported
+                $rowIndex++;
+                $userName = Auth::user() ? Auth::user()->name : 'System';
+                $sheet->setCellValue('A' . $rowIndex, 'Diexport oleh: ' . $userName);
+
+                // Add a blank line
+                $rowIndex++;
+                $sheet->setCellValue('A' . $rowIndex, '');
+
+                // Style the header row
+                $headerRange = 'A7:' . $sheet->getHighestColumn() . '7';
+                $sheet->getStyle($headerRange)->getFont()->setBold(true);
+                $sheet->getStyle($headerRange)->getFill()
+                      ->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID)
+                      ->getStartColor()->setARGB('FFCCCCCC');
+
+                // Auto-size columns
+                foreach (range('A', $sheet->getHighestColumn()) as $column) {
+                    $sheet->getColumnDimension($column)->setAutoSize(true);
+                }
+
+                // Add borders to all cells with data
+                $dataRange = 'A7:' . $sheet->getHighestColumn() . $sheet->getHighestRow();
+                $sheet->getStyle($dataRange)->getBorders()->getAllBorders()->setBorderStyle(\PhpOffice\PhpSpreadsheet\Style\Border::BORDER_THIN);
+
+                // Center align the header row
+                $sheet->getStyle($headerRange)->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+
+                // Set text wrap for header cells
+                $sheet->getStyle($headerRange)->getAlignment()->setWrapText(true);
+            },
+        ];
+    }
+}

app/Exports/LaporanPermohonanExport.php

@@ -0,0 +1,98 @@
+<?php
+
+    namespace Modules\Lpj\Exports;
+
+    use Maatwebsite\Excel\Concerns\FromCollection;
+    use Maatwebsite\Excel\Concerns\WithHeadings;
+    use Maatwebsite\Excel\Concerns\WithMapping;
+    use Modules\Lpj\Models\Permohonan;
+    use Illuminate\Support\Facades\Auth;
+
+    class LaporanPermohonanExport implements FromCollection, WithHeadings, WithMapping
+    {
+        protected $request;
+
+        public function __construct($request)
+        {
+            $this->request = $request;
+        }
+
+        public function collection()
+        {
+            $query = Permohonan::query();
+
+            // Apply role-based filtering
+            if (!Auth::user()->hasAnyRole(['administrator'])) {
+                $query->where('branch_id', Auth::user()->branch_id);
+            }
+
+
+            // Apply date range filter if provided
+            if ($this->request->has('start_date') || $this->request->has('end_date')) {
+                $query->whereBetween('tanggal_permohonan', [
+                    $this->request->start_date ?? '1900-01-01',
+                    $this->request->end_date ?? now()->toDateString()
+                ]);
+            }
+
+            // Apply status filter if provided
+            if ($this->request->has('status') && !empty($this->request->status)) {
+                $query->where('status', $this->request->status);
+            }
+
+            // Apply branch filter if provided
+            if ($this->request->has('branch_id') && !empty($this->request->branch_id)) {
+                $query->where('branch_id', $this->request->branch_id);
+            }
+
+            // Apply search filter if provided
+            if ($this->request->has('search') && !empty($this->request->search)) {
+                $search = $this->request->search;
+                $query->where(function ($q) use ($search) {
+                    $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
+                    $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('jenisFasilitasKredit', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('jenisPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhere('status', 'LIKE', '%' . $search . '%');
+                });
+            }
+
+            // Default ordering
+            $query->orderBy('nomor_registrasi', 'asc');
+
+            return $query->get();
+        }
+
+        public function map($permohonan): array
+        {
+            return [
+                $permohonan->id,
+                $permohonan->nomor_registrasi,
+                $permohonan->tanggal_permohonan,
+                $permohonan->user ? $permohonan->user->name : '',
+                $permohonan->branch ? $permohonan->branch->name : '',
+                $permohonan->tujuanPenilaian ? $permohonan->tujuanPenilaian->name : '',
+                $permohonan->jenisFasilitasKredit ? $permohonan->jenisFasilitasKredit->name : '',
+                $permohonan->jenisPenilaian ? $permohonan->jenisPenilaian->name : '',
+                $permohonan->status,
+            ];
+        }
+
+        public function headings(): array
+        {
+            return [
+                'ID',
+                'Nomor Registrasi',
+                'Tanggal Permohonan',
+                'Pemohon',
+                'Cabang',
+                'Tujuan Penilaian',
+                'Jenis Fasilitas Kredit',
+                'Jenis Penilaian',
+                'Status',
+            ];
+        }
+    }

app/Exports/LaporanUserLimitExport.php

@@ -0,0 +1,232 @@
+<?php
+
+namespace Modules\Lpj\Exports;
+
+use Maatwebsite\Excel\Concerns\FromCollection;
+use Maatwebsite\Excel\Concerns\WithHeadings;
+use Maatwebsite\Excel\Concerns\WithMapping;
+use Maatwebsite\Excel\Concerns\WithTitle;
+use Maatwebsite\Excel\Concerns\WithCustomStartCell;
+use Maatwebsite\Excel\Concerns\WithEvents;
+use Maatwebsite\Excel\Events\AfterSheet;
+use Modules\Lpj\Models\Permohonan;
+use Modules\Lpj\Models\Branch;
+use Illuminate\Support\Facades\Auth;
+use Carbon\Carbon;
+use Illuminate\Support\Facades\DB;
+
+class LaporanUserLimitExport implements FromCollection, WithHeadings, WithMapping, WithTitle, WithCustomStartCell, WithEvents
+{
+    protected $request;
+
+    public function __construct($request)
+    {
+        $this->request = $request;
+    }
+
+    public function collection()
+    {
+        $query = Permohonan::query();
+        $query = $query->where('status', 'done');
+
+        // Apply date range filter if provided
+        if ($this->request->has('start_date') || $this->request->has('end_date')) {
+             $startDate = $this->request->start_date ?? '1900-01-01';
+            $endDate = $this->request->end_date ?? now()->toDateString();
+
+            $query->where(function ($q) use ($startDate, $endDate) {
+
+                $q->whereHas('penilaian', function ($q2) use ($startDate, $endDate) {
+                    $q2->whereBetween('tanggal_kunjungan', [$startDate, $endDate]);
+                });
+
+                // OR check if has penawaran with date in range
+                $q->orWhereHas('penawaran', function ($q3) use ($startDate, $endDate) {
+                    $q3->whereBetween('tanggal_penilaian_sebelumnya', [$startDate, $endDate]);
+                });
+            });
+        }
+
+        // Apply branch filter if provided
+        if ($this->request->has('branch_id') && !empty($this->request->branch_id)) {
+            $query->where('branch_id', $this->request->branch_id);
+        }
+
+        if ($this->request->has('penilai_id') && !empty($this->request->penilai_id)) {
+            $request = $this->request; // Store in a local variable
+            $query->whereHas('penilaian._user_penilai.userPenilaiTeam', function ($q) use ($request) {
+                $q->where('user_id', $request->penilai_id);
+            });
+        }
+
+        // Apply search filter if provided
+        if ($this->request->has('search') && !empty($this->request->search)) {
+            $search = $this->request->search;
+            $query->where(function ($q) use ($search) {
+                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
+                $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                 $q->orWhereRelation('debiture', DB::raw('LOWER(name)'), 'LIKE', '%' . strtolower($search) . '%');
+
+                $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('jenisFasilitasKredit', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('jenisPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhere('status', 'LIKE', '%' . $search . '%');
+            });
+        }
+
+        // Default ordering
+        $query->orderBy('nomor_registrasi', 'asc');
+
+        return $query->get();
+    }
+
+    protected $rowNumber = 0;
+
+    public function map($permohonan): array
+    {
+        $this->rowNumber++;
+        $npw = 0;
+
+        if (isset($permohonan->penilai->lpj)) {
+            $lpj = json_decode($permohonan->penilai->lpj, true);
+            $npw = str_replace('.', '', $lpj['total_nilai_pasar_wajar'] ?? 0);
+        }
+
+        return [
+            $this->rowNumber,
+            $permohonan->nomor_registrasi,
+            $permohonan->debiture->branch->name ?? '',
+            $permohonan->debiture->name ?? '',
+            $permohonan->user->name ?? $permohonan->mig_nama_ao ?? '',
+            $permohonan->tanggal_permohonan ?? '',
+            $permohonan->penilaian->_user_penilai->userPenilaiTeam->name ?? '',
+            $permohonan->penilaian && $permohonan->penilaian->tanggal_kunjungan
+    ? formatTanggalIndonesia($permohonan->penilaian->tanggal_kunjungan)
+    : '',
+             formatRupiah($npw, 2),
+        ];
+    }
+
+    public function headings(): array
+    {
+        return [
+            'No',
+            'Nomor Registrasi',
+            'Cabang',
+            'Nama Debitur',
+            'Pemohon',
+            'Tanggal Permohonan',
+            'Nama Penilai',
+            'Tanggal Laporan',
+            'Nilai Pasar Wajar',
+
+        ];
+    }
+
+    /**
+     * @return string
+     */
+    public function title(): string
+    {
+        return 'Laporan User Limit';
+    }
+
+    /**
+     * @return string
+     */
+    public function startCell(): string
+    {
+        return 'A7';
+    }
+
+    /**
+     * @return array
+     */
+    public function registerEvents(): array
+    {
+        return [
+            AfterSheet::class => function (AfterSheet $event) {
+                // Get the sheet
+                $sheet = $event->sheet->getDelegate();
+
+                // Set the title
+                $sheet->setCellValue('A1', 'LAPORAN PENILAIAN JAMINAN');
+                $sheet->getStyle('A1')->getFont()->setBold(true)->setSize(16);
+
+                // Merge cells for title
+                $sheet->mergeCells('A1:AH1');
+                $sheet->getStyle('A1')->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+
+                // Set the branch information if filtered
+                $branchInfo = '';
+                if ($this->request->has('branch_id') && !empty($this->request->branch_id)) {
+                    $branch = Branch::find($this->request->branch_id);
+                    if ($branch) {
+                        $branchInfo = 'Cabang: ' . $branch->name;
+                        $sheet->setCellValue('A2', $branchInfo);
+                        $sheet->mergeCells('A2:AH2');
+                        $sheet->getStyle('A2')->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+                        $sheet->getStyle('A2')->getFont()->setBold(true);
+                    }
+                }
+
+                // Set the period
+                $startDate = $this->request->start_date ?? '';
+                $endDate = $this->request->end_date ?? '';
+
+                $rowIndex = $branchInfo ? 3 : 2;
+
+                if ($startDate && $endDate) {
+                    $startDateFormatted = Carbon::parse($startDate)->format('d F Y');
+                    $endDateFormatted = Carbon::parse($endDate)->format('d F Y');
+                    $sheet->setCellValue('A' . $rowIndex, 'Periode: ' . $startDateFormatted . ' - ' . $endDateFormatted);
+                } else {
+                    $sheet->setCellValue('A' . $rowIndex, 'Periode: Semua Data');
+                }
+                $sheet->mergeCells('A' . $rowIndex . ':AH' . $rowIndex);
+                $sheet->getStyle('A' . $rowIndex)->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+
+                // Set the date of export
+                $rowIndex++;
+                $sheet->setCellValue('A' . $rowIndex, 'Tanggal Export: ' . Carbon::now()->format('d F Y H:i:s'));
+
+                // Set the user who exported
+                $rowIndex++;
+                $userName = Auth::user() ? Auth::user()->name : 'System';
+                $sheet->setCellValue('A' . $rowIndex, 'Diexport oleh: ' . $userName);
+
+                // Add a blank line
+                $rowIndex++;
+                $sheet->setCellValue('A' . $rowIndex, '');
+
+                // Style the header row
+                $headerRange = 'A7:' . $sheet->getHighestColumn() . '7';
+                $sheet->getStyle($headerRange)->getFont()->setBold(true);
+                $sheet->getStyle($headerRange)->getFill()
+                      ->setFillType(\PhpOffice\PhpSpreadsheet\Style\Fill::FILL_SOLID)
+                      ->getStartColor()->setARGB('FFCCCCCC');
+
+                // Auto-size columns - fixed to handle columns beyond Z
+                $highestColumn = $sheet->getHighestColumn();
+                $highestColumnIndex = \PhpOffice\PhpSpreadsheet\Cell\Coordinate::columnIndexFromString($highestColumn);
+
+                for ($i = 1; $i <= $highestColumnIndex; $i++) {
+                    $currentColumn = \PhpOffice\PhpSpreadsheet\Cell\Coordinate::stringFromColumnIndex($i);
+                    $sheet->getColumnDimension($currentColumn)->setAutoSize(true);
+                }
+
+                // Add borders to all cells with data
+                $dataRange = 'A7:' . $sheet->getHighestColumn() . $sheet->getHighestRow();
+                $sheet->getStyle($dataRange)->getBorders()->getAllBorders()->setBorderStyle(\PhpOffice\PhpSpreadsheet\Style\Border::BORDER_THIN);
+
+                // Center align the header row
+                $sheet->getStyle($headerRange)->getAlignment()->setHorizontal(\PhpOffice\PhpSpreadsheet\Style\Alignment::HORIZONTAL_CENTER);
+
+                // Set text wrap for header cells
+                $sheet->getStyle($headerRange)->getAlignment()->setWrapText(true);
+            },
+        ];
+    }
+}

app/Http/Controllers/ActivityController.php

@@ -73,7 +73,8 @@ class ActivityController extends Controller
     public function updateTeamAssingment(Request $request)
     {
         try {
-            // Validasi input
+
+            // dd($request->all());
             $validatedData = $request->validate([
                 'id' => 'required|integer', // penilaian_id
                 'team_member_id' => 'nullable|integer',
@@ -81,6 +82,7 @@ class ActivityController extends Controller
                 'permohonan_id' => 'required|integer',
                 'user_id' => 'required|integer',
                 'team_id' => 'required|integer',
+                'penugasan' => 'required|string',
             ], [
                 'team_member_id.required_without' => 'Field team harus diisi.',
                 '.required_without' => 'Field  harus diisi.',
@@ -93,68 +95,115 @@ class ActivityController extends Controller
             $permohonanId = $validatedData['permohonan_id'];
             $userId = $validatedData['user_id'];
             $teamId = $validatedData['team_id'];
+            $penugasan = $validatedData['penugasan'];
 
             // Cek apakah permohonan ada
             $permohonan = Permohonan::findOrFail($permohonanId);
 
             // Validasi status permohonan
-            if ($permohonan->status !== 'assign' && $permohonan->status !== 'proses-survey') {
-                return response()->json([
-                    'status' => 'error',
-                    'message' => 'Tidak dapat mengganti tim, status permohonan tidak memungkinkan.',
-                ]);
-            }
+            // if ($permohonan->status !== 'assign' && $permohonan->status !== 'proses-survey' && $permohonan->status !== 'survey' && $permohonan->status !== 'proses-laporan') {
+            //     return response()->json([
+            //         'status' => 'error',
+            //         'message' => 'Tidak dapat mengganti tim, status permohonan tidak memungkinkan.',
+            //     ]);
+            // }
 
             // Ambil tim berdasarkan penilaian_id dan user_id
-            $teams = PenilaianTeam::where('penilaian_id', $penilaianId)
+
+            if ($penugasan === 'sama') {
+                $teams = PenilaianTeam::where('penilaian_id', $penilaianId)
                 ->where('user_id', $userId)
                 ->get();
+                // Cek apakah tim ditemukan
+                if ($teams->isEmpty()) {
+                    return response()->json([
+                        'status' => 'error',
+                        'message' => 'Data tim tidak ditemukan.',
+                    ]);
+                }
 
-            // Cek apakah tim ditemukan
-            if ($teams->isEmpty()) {
-                return response()->json([
-                    'status' => 'error',
-                    'message' => 'Data tim tidak ditemukan.',
-                ]);
-            }
+                // Mulai transaksi
+                DB::beginTransaction();
+                $updated = false;
 
-            // Mulai transaksi
-            DB::beginTransaction();
-            $updated = false;
+                $status_permohonan = $permohonan->status;
 
-            // Proses update berdasarkan region_id
-            if ($regionId) {
-                foreach ($teams as $team) {
-                    if ($team->role === 'surveyor') {
-                        $team->update([
-                            'team_id' => $regionId,
-                            'user_id' => null]);
-                        $permohonan->update([
-                            'status' => 'registered']);
-                        $updated = true;
+                // Proses update berdasarkan region_id
+                if ($regionId) {
+                    foreach ($teams as $team) {
+                        if ($team->role === 'surveyor') {
+                            $team->update([
+                                'team_id' => $regionId,
+                                'user_id' => null,
+                                'status' =>  $status_permohonan,
+                            ]);
+                            $permohonan->update([
+                                'status' =>  'reassign'
+                            ]);
+                            $updated = true;
+                        }
+
+                        if ($team->role === 'penilai') {
+                            $team->update([
+                                'team_id' => $regionId,
+                                'user_id' => null,
+                                'status' =>  $status_permohonan
+                            ]);
+                            $permohonan->update([
+                                'status' =>  'reassign',
+                                'region_id' => $regionId,
+                            ]);
+                            $updated = true;
+                        }
                     }
+                }
 
-                    if ($team->role === 'penilai') {
-                        $team->update([
-                            'team_id' => $regionId,
-                            'user_id' => null,
-                        ]);
-                        $permohonan->update([
-                            'status' => 'registered',
-                            'region_id' => $regionId,
-                        ]);
-                        $updated = true;
+                // Proses update berdasarkan team_member_id
+                if ($teamMemberId) {
+                    foreach ($teams as $team) {
+                        if ($team->role === 'surveyor' || $team->role === 'penilai') {
+                            $team->update(['user_id' => $teamMemberId]);
+                            $updated = true;
+                        }
                     }
                 }
             }
 
-            // Proses update berdasarkan team_member_id
-            if ($teamMemberId) {
-                foreach ($teams as $team) {
-                    if ($team->role === 'surveyor' || $team->role === 'penilai') {
-                        $team->update(['user_id' => $teamMemberId]);
-                        $updated = true;
-                    }
+            if ($penugasan === 'surveyor' || $penugasan === 'penilai') {
+                $teams = PenilaianTeam::where('penilaian_id', $penilaianId)
+                ->where('user_id', $userId)
+                ->where('role', $penugasan)
+                ->first();
+
+                // Cek apakah tim ditemukan
+                if (!$teams) {
+                    return response()->json([
+                        'status' => 'error',
+                        'message' => 'Data tim tidak ditemukan.',
+                    ]);
+                }
+
+                // Mulai transaksi
+                DB::beginTransaction();
+                $updated = false;
+
+                // Proses update berdasarkan region_id
+                if ($regionId) {
+                    $teams->update([
+                        'team_id' => $regionId,
+                        'user_id' => null
+                    ]);
+                    $permohonan->update([
+                        'status' => $status_permohonan,
+                        'region_id' => $regionId,
+                    ]);
+                    $updated = true;
+                }
+
+                // Proses update berdasarkan team_member_id
+                if ($teamMemberId) {
+                    $teams->update(['user_id' => $teamMemberId]);
+                    $updated = true;
                 }
             }
 
@@ -257,6 +306,7 @@ class ActivityController extends Controller
         $query = Permohonan::query();
 
         // Apply search filter if provided
+        $query = $query->orderBy('nomor_registrasi', 'desc');
         if ($request->has('search') && !empty($request->get('search'))) {
             $search = $request->get('search');
             $query->where(function ($q) use ($search) {
@@ -275,7 +325,9 @@ class ActivityController extends Controller
             });
         }
 
-        // Default sorting if no sort provided
+
+
+        // Apply sorting if provided
         if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
             $order  = $request->get('sortOrder');
             $column = $request->get('sortField');
@@ -284,20 +336,13 @@ class ActivityController extends Controller
             $query->orderBy('nomor_registrasi', 'asc');
         }
 
-        // Get total count of records before pagination
+        // Get the total count of records
         $totalRecords = $query->count();
-
-        // Pagination
-        if ($request->has('page') && $request->has('size')) {
-            $page = (int) $request->get('page', 1);
-            $size = (int) $request->get('size', 10);
-            $offset = ($page - 1) * $size;
-            $query->skip($offset)->take($size);
+        $size         = $request->get('size', 10);
+        if ($size == 0) {
+            $size = 10;
         }
 
-        // Get filtered count
-        $filteredRecords = $query->count();
-
         // Filter by region if user is senior-officer
         if ($regionId) {
             $query->whereHas('region', function ($q) use ($regionId) {
@@ -306,43 +351,42 @@ class ActivityController extends Controller
         }
 
         // Filter for specific roles
-        if (in_array($userRole, ['surveyor', 'surveyor-penilai'])) {
+        if (in_array($userRole, ['surveyor', 'penilai'])) {
             $query->whereHas('penilaian.userPenilai', function ($q) use ($user) {
                 $q->where('user_id', $user->id);
             });
         }
 
-        $totalRecords = $query->count();
 
-        // Pagination
+
+        // Apply pagination if provided
         if ($request->has('page') && $request->has('size')) {
-            $page = (int) $request->get('page', 1);
-            $size = (int) $request->get('size', 10);
-            $offset = ($page - 1) * $size;
+            $page   = $request->get('page');
+            $size   = $request->get('size');
+            $offset = ($page - 1) * $size; // Calculate the offset
+
             $query->skip($offset)->take($size);
         }
 
-        // Get filtered count
+        // Get the filtered count of records
         $filteredRecords = $query->count();
 
         // Get data with necessary relationships
-        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian', 'dokumenjaminan'])->get();
+        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian', 'dokumenjaminan','nilaiPlafond'])->get();
 
-        // Calculate total pages
-        $pageCount = ceil($totalRecords / $request->get('size', 10));
+        // Calculate the page count
+        $pageCount = ceil($totalRecords / $size);
 
+        // Calculate the current page number
+        $currentPage = max(1, $request->get('page', 1));
 
-
-
-        // Calculate total pages
-        $pageCount = ceil($totalRecords / $request->get('size', 10));
-
+        // Return the response data as a JSON object
         return response()->json([
             'draw'            => $request->get('draw'),
             'recordsTotal'    => $totalRecords,
             'recordsFiltered' => $filteredRecords,
             'pageCount'       => $pageCount,
-            'page'            => $request->get('page', 1),
+            'page'            => $currentPage,
             'totalCount'      => $totalRecords,
             'data'            => $data,
         ]);
@@ -392,7 +436,23 @@ class ActivityController extends Controller
             $q->where('user_id', $id);
         })
         ->whereHas('permohonan', function ($q) {
-            $q->whereNotIn('status', ['done']);
+            $q->whereIn('status', [
+                'assign',
+                'survey-completed',
+                'proses-laporan',
+                'paparan',
+                'proses-paparan',
+                'revisi-laporan',
+                'revisi-paparan',
+                'survey',
+                'proses-survey',
+                'request-reschedule',
+                'reschedule',
+                'rejected-reschedule',
+                'approved-reschedule',
+                'revisi-survey',
+                'revisi-pembayaran'
+            ]);
         });
 
 
@@ -428,26 +488,40 @@ class ActivityController extends Controller
             $jeniAsset = null;
             $statusPembayaran = trim(strtolower($item->permohonan->status_bayar ?? ''));
             $tujuanPenilaian = $item->permohonan->tujuanPenilaian->name ?? null;
+            $plafond = $item->permohonan->nilaiPlafond->name ?? null;
+
             $now = Carbon::now();
+            $type_report = $item->permohonan->penilai->type ?? "";
 
-            // $plafond = $item->permohonan->nilaiPlafond->name ?? null;
-            // $type_report = $item->permohonan->penilai->type_penilai;
+            $hari = $hariPaparan = 0;
 
-            // $hari = 0;
-            // if ($plafond == '< 1M') {
-            //     $item->paparan = 'Tidak Ada';
-            // }else if($plafond == '2 M - 5 M'){
-            //     $hari = 2;
-            // }else if($plafond == '5 M - 10 M'){
-            //     $hari = 3;
-            // }
+            if ($type_report == "sederhana") {
+                $hari = 2;
+                $item->paparan = 'Tidak Ada';
+            } else {
+                if ($plafond == '< 2M') {
+                    $item->paparan = 'Tidak Ada';
+                    $hari = 3;
+                } elseif ($plafond == '2 M - 5 M') {
+                    $hari = 3;
+                    $hariPaparan = 2;
+                } else {
+                    $hari = 5;
+                    $hariPaparan = 3;
+                }
+            }
+
+            if ($tujuanPenilaian == 'RAP') {
+                $hari = 2;
+                $hariPaparan = 2;
+            }
 
 
             if ($item->permohonan && $item->permohonan->debiture) {
                 $jeniAsset = $item->permohonan->debiture->documents->first() ?? null;
             }
 
-            $hariTambahan = 0;
+            /*$hariTambahan = 0;
 
             if ($tujuanPenilaian == 'RAP') {
                 $hariTambahan = 2;
@@ -457,33 +531,50 @@ class ActivityController extends Controller
                 } else {
                     $hariTambahan = 2; // H+2 untuk yang belum bayar
                 }
-            }
+            }*/
 
             $tanggalMulai = $item->waktu_penilaian;
 
             if ($tanggalMulai) {
+                if (!$tanggalMulai instanceof Carbon) {
+                    $tanggalMulai = Carbon::parse($tanggalMulai);
+                }
+                $hariKerjaBerikutnya = hitungHariKerja($tanggalMulai->toDateString(), $tanggalMulai->copy()->addDays(1));
+                $hariKerjaBerikutnya = max($hariKerjaBerikutnya, 1);
+                $tanggalMulai = $tanggalMulai->copy()->addDays($hariKerjaBerikutnya);
+
                 // Konversi string tanggal ke objek Carbon jika belum
                 if (!$tanggalMulai instanceof Carbon) {
                     $tanggalMulai = Carbon::parse($tanggalMulai);
                 }
 
                 // Hitung tanggal selesai berdasarkan hari tambahan
-                $tanggalSelesai = $tanggalMulai->copy()->addDays($hariTambahan);
+                $tanggalSelesai = $tanggalMulai->copy()->addDays($hari);
+                $tanggalPaparan = $tanggalMulai->copy()->addDays($hariPaparan);
 
                 // Hitung hari kerja
                 $hariKerja = hitungHariKerja($tanggalMulai->toDateString(), $tanggalSelesai->toDateString());
+                $hariKerja = max($hariKerja, $hari);
+
+                $hariKerjaPaparan = hitungHariKerja($tanggalMulai->toDateString(), $tanggalPaparan->toDateString());
+                $hariKerjaPaparan = max($hariKerjaPaparan, $hariPaparan);
 
                 // Set due date SLA
                 $dueDateSla = $tanggalMulai->copy()->addDays($hariKerja);
+                $dueDateSlaPaparan = $tanggalMulai->copy()->addDays($hariKerjaPaparan);
 
                 // Cek apakah sudah melewati due date
-                if ($now->greaterThan($dueDateSla)) {
+                /*if ($now->greaterThan($dueDateSla)) {
                     $item->due_date_sla = null;
                 } else {
                     $item->due_date_sla = $dueDateSla->toDateString();
-                }
+                }*/
+
+                $item->due_date_sla = $dueDateSla->toDateString();
+                $item->paparan = $dueDateSlaPaparan->toDateString();
             } else {
                 $item->due_date_sla = null;
+                $item->paparan = null;
 
             }
 

app/Http/Controllers/BankDataController.php

@@ -0,0 +1,311 @@
+<?php
+
+    namespace Modules\Lpj\Http\Controllers;
+
+    use Illuminate\Http\Request;
+    use Illuminate\Routing\Controller;
+    use Log;
+    use Modules\Location\Models\Province;
+    use Modules\Lpj\Http\Requests\BankDataRequest;
+    use Modules\Lpj\Models\BankData;
+    use Modules\Lpj\Models\Inspeksi;
+    use Modules\Lpj\Models\JenisJaminan;
+    use Modules\Lpj\Services\BankDataService;
+
+    class BankDataController extends Controller
+    {
+        protected $bankDataService;
+        protected $user;
+
+        public function __construct(BankDataService $bankDataService)
+        {
+            $this->bankDataService = $bankDataService;
+        }
+
+        public function index(Request $request)
+        {
+            $provinces    = Province::all();
+            $jenisJaminan = JenisJaminan::all();
+
+            //insert data pembanding
+
+            $inspeksi = Inspeksi::all();
+
+            foreach ($inspeksi as $item) {
+                if (isset($item->data_pembanding)) {
+                    $data_pembanding = json_decode($item->data_pembanding);
+
+                    $objekPenilaian = $data_pembanding->objek_penilaian;
+                    if (isset($objekPenilaian)) {
+                        $_lat = $objekPenilaian->kordinat_lat;
+                        $_lng = $objekPenilaian->kordinat_lng;
+
+                        if (!empty($_lat) && !empty($_lng) && $_lng !== null && $_lat !== null && $_lat !== '' && $_lng !== '') {
+                            $_lat = floatval($_lat);
+                            $_lng = floatval($_lng);
+                            if ($_lat >= -90 && $_lat <= 90 && $_lng >= -180 && $_lng <= 180) {
+
+                                $_data          = [
+                                    'address'          => $objekPenilaian->address,
+                                    'village_code'     => $objekPenilaian->village_code,
+                                    'district_code'    => $objekPenilaian->district_code,
+                                    'city_code'        => $objekPenilaian->city_code,
+                                    'province_code'    => $objekPenilaian->province_code,
+                                    'tahun'            => $item->created_at->format('Y'),
+                                    //
+                                    'luas_tanah'       => isset($objekPenilaian->luas_tanah)  && is_numeric($objekPenilaian->luas_tanah) ? $objekPenilaian->luas_tanah : 0,
+                                    'luas_bangunan'    => isset($objekPenilaian->luas_bangunan) && is_numeric($objekPenilaian->luas_bangunan) ? $objekPenilaian->luas_bangunan : 0,
+                                    //
+                                    'tahun_bangunan'   => isset($objekPenilaian->tahun_bangunan) && is_numeric($objekPenilaian->tahun_bangunan) ? $objekPenilaian->tahun_bangunan : 0,
+                                    //
+                                    'harga'            => isset($objekPenilaian->harga) && is_numeric($objekPenilaian->harga) ? $objekPenilaian->harga : 0,
+                                    'harga_diskon'     => isset($objekPenilaian->harga_diskon) && is_numeric($objekPenilaian->harga_diskon) ? $objekPenilaian->harga_diskon : 0,
+                                    'diskon'           => isset($objekPenilaian->diskon) && is_numeric(str_replace(',', '.', $objekPenilaian->diskon)) ? str_replace(',', '.', $objekPenilaian->diskon) : 0,
+                                    'total'            => isset($objekPenilaian->total) && is_numeric($objekPenilaian->total) ? $objekPenilaian->total : 0,
+                                    'harga_penawaran'  => isset($objekPenilaian->harga_penawaran) && is_numeric($objekPenilaian->harga_penawaran) ? $objekPenilaian->harga_penawaran : 0,
+                                    'nama_nara_sumber' => $objekPenilaian->nama_nara_sumber,
+                                    'peruntukan'       => $objekPenilaian->peruntukan ?? "",
+                                    //
+                                    'penawaran'        => $objekPenilaian->penawaran ?? "",
+                                    //
+                                    'telepon'          => $objekPenilaian->telepon ?? "",
+                                    'hak_properti'     => $objekPenilaian->hak_properti ?? "",
+                                    'jenis_aset'       => $objekPenilaian->jenis_aset ?? "",
+                                    'foto_objek'       => $objekPenilaian->foto_objek ?? "",
+                                    'tanggal'          => $objekPenilaian->tanggal ?? null,
+                                    'kategori'         => 'penilaian',
+                                ];
+
+
+                                BankData::updateOrCreate(
+                                    [
+                                        'kordinat_lat' => $_lat,
+                                        'kordinat_lng' => $_lng,
+                                        'kategori'     => 'penilaian'
+                                    ],
+                                    $_data
+                                );
+                            }
+                        } else {
+                            // Invalid coordinates
+                            Log::warning("Invalid coordinates: Lat: $_lat, Lng: $_lng");// Do something to handle this situation, such as logging an error or skipping the record
+                        }
+                    }
+
+                    foreach ($data_pembanding->data_pembanding as $dataPembanding) {
+                        $lat = $dataPembanding->kordinat_lat;
+                        $lng = $dataPembanding->kordinat_lng;
+
+                        if (!empty($lat) && !empty($lng) && $lng !== null && $lat !== null && $lat !== '' && $lng !== '') {
+                            $lat = floatval($lat);
+                            $lng = floatval($lng);
+
+                            if ($lat >= -90 && $lat <= 90 && $lng >= -180 && $lng <= 180) {
+                                $data = [
+                                    'address'          => $dataPembanding->address,
+                                    'village_code'     => $dataPembanding->village_code,
+                                    'district_code'    => $dataPembanding->district_code,
+                                    'city_code'        => $dataPembanding->city_code,
+                                    'province_code'    => $dataPembanding->province_code,
+                                    'tahun'            => isset($dataPembanding->tahun) && is_numeric($dataPembanding->tahun) ? $dataPembanding->tahun : 0,
+                                    'luas_tanah'       => isset($dataPembanding->luas_tanah) && is_numeric($dataPembanding->luas_tanah) ? $dataPembanding->luas_tanah : 0,
+                                    'luas_bangunan'    => isset($dataPembanding->luas_bangunan) && is_numeric($dataPembanding->luas_bangunan) ? $dataPembanding->luas_bangunan : 0,
+                                    'tahun_bangunan'   => isset($dataPembanding->tahun_bangunan) && is_numeric($dataPembanding->tahun_bangunan) ? $dataPembanding->tahun_bangunan : 0,
+                                    'harga'            => isset($dataPembanding->harga) && is_numeric($dataPembanding->harga) ? $dataPembanding->harga : 0,
+                                    'harga_diskon'     => isset($dataPembanding->harga_diskon) && is_numeric($dataPembanding->harga_diskon) ? $dataPembanding->harga_diskon : 0,
+                                    'diskon'           => isset($dataPembanding->diskon) && is_numeric(str_replace(',', '.', $dataPembanding->diskon)) ? str_replace(',', '.', $dataPembanding->diskon) : 0,
+                                    'total'            => isset($dataPembanding->total) && is_numeric($dataPembanding->total) ? $dataPembanding->total : 0,
+                                    'harga_penawaran'  => isset($dataPembanding->harga_penawaran) && is_numeric($dataPembanding->harga_penawaran) ? $dataPembanding->harga_penawaran : 0,
+                                    'nama_nara_sumber' => $dataPembanding->nama_nara_sumber,
+                                    'peruntukan'       => $dataPembanding->peruntukan,
+                                    'penawaran'        => $dataPembanding->penawaran,
+                                    'telepon'          => $dataPembanding->telepon,
+                                    'hak_properti'     => $dataPembanding->hak_properti,
+                                    'jenis_aset'       => $dataPembanding->jenis_aset,
+                                    'foto_objek'       => $dataPembanding->foto_objek,
+                                    'tanggal'          => $dataPembanding->tanggal,
+                                    'kategori'         => 'data_pembanding',
+                                ];
+
+                                BankData::updateOrCreate(
+                                    [
+                                        'kordinat_lat' => $lat,
+                                        'kordinat_lng' => $lng,
+                                        'kategori'     => 'data_pembanding'
+                                    ],
+                                    $data
+                                );
+                            }
+                        } else {
+                            // Invalid coordinates
+                            Log::warning("Invalid coordinates: Lat: $lat, Lng: $lng");// Do something to handle this situation, such as logging an error or skipping the record
+                        }
+                    }
+                }
+            }
+
+            return view('lpj::bank-data.index', compact('provinces', 'jenisJaminan'));
+        }
+
+        public function create()
+        {
+            return view('lpj::bank-data.create');
+        }
+
+        public function store(BankDataRequest $request)
+        {
+            $data     = $request->validated();
+            $bankData = $this->bankDataService->createBankData($data);
+            return redirect()
+                ->route('lpj.bank-data.show', $bankData->id)
+                ->with('success', 'Bank data created successfully.');
+        }
+
+        public function show($id)
+        {
+            $bankData = $this->bankDataService->findBankData($id);
+            return view('lpj::bank-data.show', compact('bankData'));
+        }
+
+        public function edit($id)
+        {
+            $bankData = $this->bankDataService->findBankData($id);
+            return view('lpj::bank-data.edit', compact('bankData'));
+        }
+
+        public function update(BankDataRequest $request, $id)
+        {
+            $data     = $request->validated();
+            $bankData = $this->bankDataService->updateBankData($id, $data);
+            return redirect()
+                ->route('lpj.bank-data.show', $bankData->id)
+                ->with('success', 'Bank data updated successfully.');
+        }
+
+        public function destroy($id)
+        {
+            $this->bankDataService->deleteBankData($id);
+            return redirect()->route('lpj.bank-data.index')->with('success', 'Bank data deleted successfully.');
+        }
+
+        public function dataForDatatables(Request $request)
+        {
+            if (is_null($this->user) || !$this->user->can('bank-data.view')) {
+                //abort(403, 'Sorry! You are not allowed to view bank data.');
+            }
+
+            // Retrieve data from the database
+            $query = BankData::query();
+
+            // Apply search filter if provided
+            if ($request->has('search') && !empty($request->get('search'))) {
+                $search = $request->get('search');
+                $search = json_decode($search, true);
+                if (is_array($search)) {
+
+                    if ($search['province_code']) {
+                        $query->ofProvince($search['province_code']);
+                    }
+
+                    if ($search['kategori']) {
+                        $query->where('kategori', $search['kategori']);
+                    }
+
+                    if ($search['city_code']) {
+                        $query->ofCity($search['city_code']);
+                    }
+
+                    if ($search['district_code']) {
+                        $query->ofDistrict($search['district_code']);
+                    }
+
+                    if ($search['village_code']) {
+                        $query->ofVillage($search['village_code']);
+                    }
+
+                    if ($search['jenis_asset']) {
+                        $query->ofAssetType($search['jenis_asset']);
+                    }
+
+                    if ($search['tahun']) {
+                        $query->where('tahun', $search['tahun']);
+                    }
+
+                    if ($search['start_date'] && $search['end_date']) {
+                        $query->betweenDates($search['start_date'], $search['end_date']);
+                    }
+                } else {
+                    $search = $request->get('search');
+                    $query->where(function ($q) use ($search) {
+                        $q->where('jenis_aset', 'LIKE', '%' . $search . '%');
+                    });
+                }
+            }
+
+            // Apply sorting if provided
+            if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+                $order  = $request->get('sortOrder');
+                $column = $request->get('sortField');
+                $query->orderBy($column, $order);
+            }
+
+            // Get the total count of records
+            $totalRecords = $query->count();
+
+            // Apply pagination if provided
+            if ($request->has('page') && $request->has('size')) {
+                $page   = $request->get('page');
+                $size   = $request->get('size');
+                $offset = ($page - 1) * $size; // Calculate the offset
+
+                $query->skip($offset)->take($size);
+            }
+
+            // Get the filtered count of records
+            $filteredRecords = $query->count();
+
+            // Get the data for the current page
+            $data = $query->get();
+
+            // Format the data as needed
+            $formattedData = $data->map(function ($item) {
+                return [
+                    'id'            => $item->id,
+                    'jenis_aset'    => $item->jenis_aset,
+                    'tanggal'       => $item->tanggal ? $item->tanggal->format('d-m-Y') : '-',
+                    'tahun'         => $item->tahun,
+                    'luas_tanah'    => $item->luas_tanah,
+                    'luas_bangunan' => $item->luas_bangunan,
+                    'harga'         => $item->harga,
+                    'sumber'        => $item->kategori ? ucwords(str_replace('_', ' ', $item->kategori)) : '-',
+                    'kategori'        => $item->kategori ?? 'data_pembanding',
+                    'nilai_pasar'   => $item->nilai_pasar,
+                    'location'      => $item->kordinat_lat . ', ' . $item->kordinat_lng,
+                    'address'       => formatAlamat($item),
+                    'photos'        => json_decode($item->foto_objek, true) ?: [$item->foto_objek],
+                    // Add more fields as needed
+                ];
+            });
+
+            // Calculate the page count
+            $pageCount = ceil($totalRecords / $request->get('size'));
+
+            // Calculate the current page number
+            $currentPage = $request->get('page', 1);
+
+            // Ensure current page doesn't exceed page count
+            $currentPage = min($currentPage, $pageCount);
+
+
+            // Return the response data as a JSON object
+            return response()->json([
+                'draw'            => $request->get('draw'),
+                'recordsTotal'    => $totalRecords,
+                'recordsFiltered' => $filteredRecords,
+                'pageCount'       => $pageCount,
+                'page'            => $currentPage,
+                'totalCount'      => $totalRecords,
+                'data'            => $formattedData,
+            ]);
+        }
+    }

app/Http/Controllers/CategoryDaftarPustakaController.php

@@ -0,0 +1,152 @@
+<?php
+
+namespace Modules\Lpj\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Modules\Lpj\Models\CategoryDaftarPustaka;
+use Modules\Lpj\Http\Requests\CategoryDaftarPustakaRequest;
+
+class CategoryDaftarPustakaController extends Controller
+{
+     public $user;
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        return view('lpj::category-daftar-pustaka.index');
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create()
+    {
+        return view('lpj::category-daftar-pustaka.create');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(CategoryDaftarPustakaRequest $request)
+    {
+        $validated = $request->validated();
+        if ($validated) {
+            try {
+                CategoryDaftarPustaka::create($validated);
+                return redirect()->route('category-daftar-pustaka.index')->with('success', 'Data Berhasil Disimpan');
+            } catch (\Throwable $th) {
+                return redirect()->route('category-daftar-pustaka.index')->with('error', $th->getMessage());
+            }
+        }
+
+    }
+
+    /**
+     * Show the specified resource.
+     */
+    public function show($id)
+    {
+        $category = CategoryDaftarPustaka::where('id', $id)->first();
+        return view('lpj::category-daftar-pustaka.show', compact('category'));
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit($id)
+    {
+        return view('lpj::category-daftar-pustaka.create', ['category' => CategoryDaftarPustaka::where('id', $id)->first()]);
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(CategoryDaftarPustakaRequest $request, $id)
+    {
+        $validated = $request->validated();
+        if ($validated) {
+            try {
+                CategoryDaftarPustaka::where('id', $id)->update($validated);
+                return redirect()->route('category-daftar-pustaka.index')->with('success', 'Data Berhasil Disimpan');
+            } catch (\Throwable $th) {
+                return redirect()->route('category-daftar-pustaka.index')->with('error', $th->getMessage());
+            }
+        }
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy($id)
+    {
+        try {
+            CategoryDaftarPustaka::where('id', $id)->delete();
+            return response()->json(['success' => true, 'message' => 'Data Berhasil Dihapus']);
+        } catch (\Throwable $th) {
+            return response()->json(['success' => false, 'message' => $th->getMessage()]);
+        }
+    }
+
+    public function dataForDatatables(Request $request)
+    {
+        if (is_null($this->user) || !$this->user->can('jenis_aset.view')) {
+            //abort(403, 'Sorry! You are not allowed to view users.');
+        }
+
+        // Retrieve data from the database
+        $query = CategoryDaftarPustaka::query();
+
+        // Apply search filter if provided
+        if ($request->has('search') && !empty($request->get('search'))) {
+            $search = $request->get('search');
+            $query->where(function ($q) use ($search) {
+                $q->where('code', 'LIKE', "%$search%");
+                $q->orWhere('name', 'LIKE', "%$search%");
+            });
+        }
+
+        // Apply sorting if provided
+        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+            $order  = $request->get('sortOrder');
+            $column = $request->get('sortField');
+            $query->orderBy($column, $order);
+        }
+
+        // Get the total count of records
+        $totalRecords = $query->count();
+
+        // Apply pagination if provided
+        if ($request->has('page') && $request->has('size')) {
+            $page   = $request->get('page');
+            $size   = $request->get('size');
+            $offset = ($page - 1) * $size; // Calculate the offset
+
+            $query->skip($offset)->take($size);
+        }
+
+        // Get the filtered count of records
+        $filteredRecords = $query->count();
+
+        // Get the data for the current page
+        $data = $query->get();
+
+        // Calculate the page count
+        $pageCount = ceil($totalRecords / $request->get('size'));
+
+        // Calculate the current page number
+        $currentPage = 0 + 1;
+
+        // Return the response data as a JSON object
+        return response()->json([
+            'draw'            => $request->get('draw'),
+            'recordsTotal'    => $totalRecords,
+            'recordsFiltered' => $filteredRecords,
+            'pageCount'       => $pageCount,
+            'page'            => $currentPage,
+            'totalCount'      => $totalRecords,
+            'data'            => $data,
+        ]);
+    }
+}

app/Http/Controllers/DaftarPustakaController.php

@@ -0,0 +1,129 @@
+<?php
+
+namespace Modules\Lpj\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Modules\Lpj\Models\CategoryDaftarPustaka;
+use Modules\Lpj\Services\DaftarPustakaService;
+use Modules\Lpj\Http\Requests\DaftarPustakaRequest;
+
+class DaftarPustakaController extends Controller
+{
+    private $daftarPustaka;
+
+    public function __construct()
+    {
+        $this->daftarPustaka = app(DaftarPustakaService::class);
+    }
+
+    /**
+     * Display a listing of the resource.
+     */
+    public function index(Request $request)
+{
+    $categories = CategoryDaftarPustaka::all();
+    $daftar_pustaka = $this->daftarPustaka->getAllDaftarPustaka($request);
+
+    return view('lpj::daftar-pustaka.index', [
+        'categories' => $categories,
+        'daftar_pustaka' => $daftar_pustaka,
+        'page' => $daftar_pustaka->currentPage(),
+        'pageCount' => $daftar_pustaka->lastPage(),
+        'limit' => $daftar_pustaka->perPage(),
+        'total' => $daftar_pustaka->total(),
+    ]);
+}
+
+
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create()
+    {
+        $categories = CategoryDaftarPustaka::all();
+        // dd($categories);
+        return view('lpj::daftar-pustaka.create', compact('categories'));
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(DaftarPustakaRequest $request)
+    {
+
+        $validate = $request->validated();
+        // dd($validate);
+        $file = $request->file('attachment');
+        if ($validate) {
+            try {
+                // Save to database
+                $this->daftarPustaka->storeDaftarPustaka($validate, $file);
+                return redirect()
+                    ->route('daftar-pustaka.index')
+                    ->with('success', 'Daftar Pustaka created successfully');
+            } catch (Exception $e) {
+                return redirect()
+                    ->route('daftar-pustaka.create')
+                    ->with('error', 'Failed to create daftar pustaka');
+            }
+        }
+
+    }
+
+    /**
+     * Show the specified resource.
+     */
+    public function show($id)
+    {
+        $daftarPustaka = $this->daftarPustaka->getDaftarPustakaById($id);
+        $categories = CategoryDaftarPustaka::all();
+
+        return view('lpj::daftar-pustaka.show', compact('daftarPustaka', 'categories'));
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit($id)
+    {
+        $daftarPustaka = $this->daftarPustaka->getDaftarPustakaById($id);
+        $categories = CategoryDaftarPustaka::all();
+        return view('lpj::daftar-pustaka.create', compact('daftarPustaka', 'categories'));
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(DaftarPustakaRequest $request, $id)
+    {
+        $validate = $request->validated();
+        if ($validate) {
+            try {
+                // Save to database
+                $file = $request->file('attachment');
+                $this->daftarPustaka->updateDaftarPustaka($validate, $file, $id);
+                return redirect()
+                    ->route('daftar-pustaka.index')
+                    ->with('success', 'Daftar Pustaka updated successfully');
+            } catch (Exception $e) {
+                return redirect()
+                    ->route('daftar-pustaka.create')
+                    ->with('error', 'Failed to update daftar pustaka');
+            }
+        }
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy($id)
+    {
+        try {
+            $this->daftarPustaka->deleteDaftarPustaka($id);
+            return response()->json(['success' => true, 'message' => 'Daftar Pustaka deleted successfully']);
+        } catch (Exception $e) {
+            return response()->json(['success' => false, 'message' => 'Failed to delete daftar pustaka']);
+        }
+    }
+}

app/Http/Controllers/DashboardController.php

@@ -0,0 +1,36 @@
+<?php
+
+namespace Modules\Lpj\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Modules\Lpj\Services\DashboardService;
+
+class DashboardController extends Controller
+{
+    public $dashboardService;
+    public function __construct(DashboardService $dashboardService)
+    {
+        $this->dashboardService = $dashboardService;
+    }
+    /**
+     * Display a listing of the resource.
+     */
+    public function index(Request $request)
+    {
+        // nilai default
+        $start_date = $request->input('start_date', now()->startOfYear()->format('Y-m-d'));
+        $end_date = $request->input('end_date', now()->format('Y-m-d'));
+
+        $validate = $request->validate([
+            'start_date' => 'nullable|date_format:Y-m-d',
+            'end_date' => 'nullable|date_format:Y-m-d',
+        ]);
+
+        $dashboard = $this->dashboardService->getDashboardData($start_date, $end_date);
+
+        // dd($dashboard);
+        return view('lpj::dashboard.index', compact('dashboard'));
+    }
+
+}

app/Http/Controllers/DebitureController.php

@@ -19,6 +19,7 @@
     use Modules\Lpj\Models\JenisJaminan;
     use Modules\Lpj\Models\JenisLegalitasJaminan;
     use Modules\Lpj\Models\PemilikJaminan;
+    use Illuminate\Support\Facades\Auth;
 
     class DebitureController extends Controller
     {
@@ -93,13 +94,29 @@
         public function destroy($id)
         {
             try {
-                // Delete from database
+                // Periksa apakah pengguna adalah administrator
+                if (!auth()->user()->hasRole('administrator')) {
+                    return response()->json(['success' => false, 'message' => 'Hanya administrator yang dapat menghapus debitur'], 403);
+                }
+
+                // Temukan debitur
                 $debitur = Debiture::find($id);
+
+                if (!$debitur) {
+                    return response()->json(['success' => false, 'message' => 'Debitur tidak ditemukan'], 404);
+                }
+
+                // Periksa apakah debitur memiliki permohonan aktif
+                if ($debitur->permohonan()->exists()) {
+                    return response()->json(['success' => false, 'message' => 'Tidak dapat menghapus debitur yang masih memiliki permohonan aktif'], 400);
+                }
+
+                // Hapus dari database
                 $debitur->delete();
 
-                echo json_encode(['success' => true, 'message' => 'Debitur deleted successfully']);
+                return response()->json(['success' => true, 'message' => 'Debitur berhasil dihapus']);
             } catch (Exception $e) {
-                echo json_encode(['success' => false, 'message' => 'Failed to delete debitur']);
+                return response()->json(['success' => false, 'message' => 'Gagal menghapus debitur: ' . $e->getMessage()], 500);
             }
         }
 
@@ -112,6 +129,10 @@
             // Retrieve data from the database
             $query = Debiture::query();
 
+            if (!Auth::user()->hasAnyRole(['administrator'])) {
+                $query = $query->where('branch_id', Auth::user()->branch_id);
+            }
+
             // Apply search filter if provided
             if ($request->has('search') && !empty($request->get('search'))) {
                 $search = $request->get('search');
@@ -151,7 +172,7 @@
             $filteredRecords = $query->count();
 
             // Get the data for the current page
-            $data = $query->with('branch')->get();
+            $data = $query->with(['branch','permohonan'])->get();
 
             // Calculate the page count
             $pageCount = ceil($totalRecords / $request->get('size'));

app/Http/Controllers/DokumenJaminanController.php

@@ -4,10 +4,12 @@
 
     use App\Http\Controllers\Controller;
     use Exception;
+    use Illuminate\Http\Request;
     use Illuminate\Http\JsonResponse;
     use Illuminate\Support\Collection;
     use Illuminate\Support\Facades\DB;
     use Illuminate\Support\Facades\Storage;
+    use Illuminate\Http\UploadedFile;
     use Log;
     use Modules\Location\Models\City;
     use Modules\Location\Models\District;
@@ -89,7 +91,7 @@
                                 'jenis_legalitas_jaminan_id' => $value,
                                 'name'                       => $request->name[$key],
                                 'keterangan'                 => $request->keterangan[$key],
-                                'details'                    => isset($request->custom_field[$value]) ? json_encode($request->custom_field[$value]) : ''
+                                'details'                    => isset($request->custom_field[$key]) ? json_encode($request->custom_field[$key]) : ''
                             ];
 
                             $dokumenJaminan = [];
@@ -103,7 +105,7 @@
                                             $file_name,
                                         );
                                         $dokumenJaminan[] = 'jaminan/' . $debitur->id . '/' . $document->id . '/' . $file_name;
-                                        $dokumenNomor[]   = $request->dokumen_nomor[$key][$index] ?? '';
+                                        $dokumenNomor[]   = $request->dokumen_nomor[$key][$index] ?? '-';
                                     }
                                 }
                             }
@@ -248,7 +250,7 @@
                                 'jenis_legalitas_jaminan_id' => $value,
                                 'name'                       => $request->name[$key],
                                 'keterangan'                 => $request->keterangan[$key],
-                                'details'                    => isset($request->custom_field[$value]) ? json_encode($request->custom_field[$value]) : ''
+                                'details' => isset($request->custom_field[$key]) ? json_encode(array_values($request->custom_field[$key])) : ''
                             ];
 
                             $dokumenJaminan = [];
@@ -256,60 +258,111 @@
 
                             if (isset($request->dokumen_jaminan[$key]) && is_array($request->dokumen_jaminan[$key])) {
                                 foreach ($request->dokumen_jaminan[$key] as $index => $file) {
-                                    if ($file) {
+                                    if ($file instanceof \Illuminate\Http\UploadedFile) {
+                                        // Jika file baru diupload
                                         $file_name = $file->getClientOriginalName();
                                         $file->storeAs(
                                             'public/jaminan/' . $debitur->id . '/' . $document->id . '/',
                                             $file_name,
                                         );
                                         $dokumenJaminan[] = 'jaminan/' . $debitur->id . '/' . $document->id . '/' . $file_name;
-                                        $dokumenNomor[]   = $request->dokumen_nomor[$key][$index] ?? '';
+                                    }  elseif (is_string($file) && !empty($file)) {
+                                        // Jika file tidak diubah, gunakan path yang sudah ada
+                                        $dokumenJaminan[] = $file;
+                                    } else {
+                                        // Jika file kosong atau null, tambahkan placeholder atau skip
+                                        $dokumenJaminan[] = null; // atau skip dengan continue;
                                     }
+
+                                    // Selalu update dokumen_nomor, baik file diubah atau tidak
+                                    $dokumenNomor[] = $request->dokumen_nomor[$key][$index] ?? '-';
                                 }
                             }
 
+
+                            // Setelah loop, periksa apakah ada dokumen yang dihapus
+                            $existingDetail = $existingDetails->get($request->detail_dokumen_jaminan_id[$key] ?? null);
+
+                            if ($existingDetail) {
+                                $existingDokumen = json_decode($existingDetail->dokumen_jaminan, true) ?? [];
+                                $existingNomor = json_decode($existingDetail->dokumen_nomor, true) ?? [];
+
+                                $newDokumenJaminan = [];
+                                $newDokumenNomor = [];
+
+                                $allFilesDeleted = true;
+
+                                foreach ($existingDokumen as $index => $existingFile) {
+                                    if (isset($request->dokumen_jaminan[$key][$index])) {
+                                        $allFilesDeleted = false;
+                                        $file = $request->dokumen_jaminan[$key][$index];
+                                        if ($file instanceof \Illuminate\Http\UploadedFile) {
+                                            // File baru diupload
+                                            $file_name = $file->getClientOriginalName();
+                                            $file->storeAs('public/jaminan/' . $debitur->id . '/' . $document->id . '/', $file_name);
+                                            $newDokumenJaminan[] = 'jaminan/' . $debitur->id . '/' . $document->id . '/' . $file_name;
+                                            $newDokumenNomor[] = $request->dokumen_nomor[$key][$index] ?? '-';
+                                        } elseif (is_string($file) && !empty($file)) {
+                                            // File tidak diubah
+                                            $newDokumenJaminan[] = $existingFile;
+                                            $newDokumenNomor[] = $request->dokumen_nomor[$key][$index] ?? $existingNomor[$index];
+                                        }
+                                    } else {
+                                        // File dihapus, hapus dari storage jika ada
+                                        if (Storage::exists('public/' . $existingFile)) {
+                                            Storage::delete('public/' . $existingFile);
+                                        }
+                                    }
+                                }
+
+                                // Tambahkan file baru yang mungkin ditambahkan
+                                foreach ($request->dokumen_jaminan[$key] ?? [] as $index => $file) {
+                                    if ($file instanceof UploadedFile) {
+                                        $allFilesDeleted = false;
+                                        $file_name = $file->getClientOriginalName();
+                                        $path = 'jaminan/' . $debitur->id . '/' . $document->id . '/' . $file_name;
+                                        if (!in_array($path, $newDokumenJaminan)) {
+                                            $file->storeAs('public/' . dirname($path), $file_name);
+                                            $newDokumenJaminan[] = $path;
+                                            $newDokumenNomor[] = $request->dokumen_nomor[$key][$index] ?? '-';
+                                        }
+                                    } elseif (is_string($file) && !empty($file) && !in_array($file, $newDokumenJaminan)) {
+                                        $allFilesDeleted = false;
+                                        $newDokumenJaminan[] = $file;
+                                        $newDokumenNomor[] = $request->dokumen_nomor[$key][$index] ?? '-';
+                                    }
+                                }
+
+                                if ($allFilesDeleted) {
+                                    $dokumenJaminan = [];
+                                    $dokumenNomor = [];
+                                } else {
+                                    $dokumenJaminan = $newDokumenJaminan;
+                                    $dokumenNomor = $newDokumenNomor;
+                                }
+                            }
+
+
+
                             if (!empty($dokumenJaminan)) {
                                 $detailData['dokumen_jaminan'] = json_encode($dokumenJaminan);
-                                $detailData['dokumen_nomor']   = json_encode($dokumenNomor);
+                                $detailData['dokumen_nomor'] = json_encode($dokumenNomor);
+                            } else if(empty($dokumenJaminan)){
+                                $detailData['dokumen_jaminan'] = null;
+                                $detailData['dokumen_nomor'] = null;
                             }
 
                             if (isset($request->detail_dokumen_jaminan_id[$key])) {
                                 $detailId       = $request->detail_dokumen_jaminan_id[$key];
                                 $detailDocument = $existingDetails->get($detailId);
-                                if ($detailDocument) {
-                                    // Merge new files with existing ones
-                                    if (!empty($dokumenJaminan)) {
-                                        $existingFiles                 = json_decode(
-                                            $detailDocument->dokumen_jaminan,
-                                            true,
-                                        ) ?: [];
-                                        $existingNomor                 = json_decode(
-                                            $detailDocument->dokumen_nomor,
-                                            true,
-                                        ) ?: [];
-                                        $mergedFiles                   = array_merge($existingFiles, $dokumenJaminan);
-                                        $mergedNomor                   = array_merge($existingNomor, $dokumenNomor);
-                                        $detailData['dokumen_jaminan'] = json_encode($mergedFiles);
-                                        $detailData['dokumen_nomor']   = json_encode($mergedNomor);
-                                    }
-                                    $detailDocument->update($detailData);
-                                    $existingDetails->forget($detailId);
-                                }
+                                $detailDocument->update($detailData);
+
                             } else {
                                 DetailDokumenJaminan::create($detailData);
                             }
                         }
                     }
 
-                    // Delete any remaining existing details that weren't updated
-                    foreach ($existingDetails as $detail) {
-                        $files = json_decode($detail->dokumen_jaminan, true) ?: [];
-                        foreach ($files as $file) {
-                            Storage::delete('public/' . $file);
-                        }
-                        $detail->delete();
-                    }
-
                     DB::commit();
                     return redirect()->route('debitur.jaminan.index', $id)->with(
                         'success',
@@ -341,6 +394,7 @@
             $jenisLegalitasJaminan = JenisLegalitasJaminan::all();
 
             $_jenisJaminan = JenisJaminan::find($document->jenis_jaminan_id);
+
             $legalitas     = '';
             if ($_jenisJaminan) {
                 $legalitasJaminan = json_decode($_jenisJaminan->jenis_legalitas_jaminan_id, true);
@@ -352,7 +406,9 @@
 
 
                 // Remove values from $legalitasJaminan that are in $currentLegalitasJaminan
-                $legalitasJaminan = array_diff($legalitasJaminan, $currentLegalitasJaminan->pluck('code')->toArray());
+                $legalitasJaminan = is_array($legalitasJaminan)
+                ? array_diff($legalitasJaminan, $currentLegalitasJaminan->pluck('code')->toArray())
+                : [];
 
                 $legalitas = JenisLegalitasJaminan::whereIn('code', $legalitasJaminan)->get();
             }
@@ -385,16 +441,37 @@
         )
         {
             try {
+                // Periksa apakah pengguna adalah admin
+                if (!auth()->user()->hasRole('administrator')) {
+                    return response()->json(['success' => false, 'message' => 'Hanya administrator yang dapat menghapus dokumen jaminan'], 403);
+                }
+
                 $jaminan = DokumenJaminan::find($jaminan_id);
+
+                if (!$jaminan) {
+                    return response()->json(['success' => false, 'message' => 'Dokumen Jaminan tidak ditemukan'], 404);
+                }
+
+                // Periksa apakah dokumen jaminan terkait dengan permohonan aktif
+                if ($jaminan->permohonan()->exists()) {
+                    return response()->json(['success' => false, 'message' => 'Tidak dapat menghapus dokumen jaminan yang terkait dengan permohonan aktif'], 400);
+                }
+
+                DB::beginTransaction();
+
                 $details = DetailDokumenJaminan::where('dokumen_jaminan_id', $jaminan->id)->get();
                 foreach ($details as $detail) {
                     Storage::delete('public/' . $detail->dokumen_jaminan);
                     $detail->delete();
                 }
                 $jaminan->delete();
-                echo json_encode(['success' => true, 'message' => 'Dokumen Jaminan deleted successfully']);
+
+                DB::commit();
+
+                return response()->json(['success' => true, 'message' => 'Dokumen Jaminan berhasil dihapus']);
             } catch (Exception $e) {
-                echo json_encode(['success' => false, 'message' => 'Failed to delete Dokumen Jaminan']);
+                DB::rollBack();
+                return response()->json(['success' => false, 'message' => 'Gagal menghapus Dokumen Jaminan: ' . $e->getMessage()], 500);
             }
         }
 
@@ -413,7 +490,7 @@
 
             if ($zip->open($zipFilePath, ZipArchive::CREATE) === true) {
                 foreach ($documents as $document) {
-                    $jenisJaminan = $document->debiture->permohonan->nomor_registrasi ?? 'Uncategorized';
+                    $jenisJaminan = $document->permohonan->nomor_registrasi ?? 'Uncategorized';
                     $folderName   = $this->sanitizeFolderName($jenisJaminan);
 
                     foreach ($document->detail as $detail) {
@@ -551,4 +628,40 @@
             $combinedLegalitas = array_merge($existingLegalitas, $newLegalitas);
             return response()->json($combinedLegalitas);
         }
+
+        public function clearDetail(Request $request)
+        {
+            try {
+                DB::beginTransaction();
+
+                $detailId = $request->input('detail_id');
+                $detail   = DetailDokumenJaminan::findOrFail($detailId);
+
+                // Delete associated files
+                if ($detail->dokumen_jaminan) {
+                    $dokumen_jaminan = is_array(json_decode($detail->dokumen_jaminan))
+                        ? json_decode($detail->dokumen_jaminan)
+                        : [$detail->dokumen_jaminan];
+
+                    foreach ($dokumen_jaminan as $dokumen) {
+                        if (Storage::exists($dokumen)) {
+                            Storage::delete($dokumen);
+                        }
+                    }
+                }
+
+                // Delete the detail record
+                $detail->delete();
+
+                DB::commit();
+
+                return response()->json(['success' => true, 'message' => 'Detail berhasil dihapus']);
+            } catch (\Exception $e) {
+                DB::rollBack();
+                return response()->json([
+                    'success' => false,
+                    'message' => 'Gagal menghapus detail: ' . $e->getMessage()
+                ], 500);
+            }
+        }
     }

app/Http/Controllers/JenisLampiranController.php

@@ -0,0 +1,172 @@
+<?php
+
+    namespace Modules\Lpj\Http\Controllers;
+
+    use Exception;
+    use Illuminate\Http\Request;
+    use Illuminate\Routing\Controller;
+    use Illuminate\Support\Facades\Auth;
+    use Illuminate\Support\Facades\DB;
+    use Maatwebsite\Excel\Facades\Excel;
+    use Modules\Lpj\Exports\JenisLampiranExport;
+    use Modules\Lpj\Http\Requests\JenisLampiranRequest;
+    use Modules\Lpj\Models\JenisLampiran;
+
+    class JenisLampiranController extends Controller
+    {
+        public function index()
+        {
+            $jenisLampirans = JenisLampiran::all();
+            return view('lpj::jenis_lampiran.index', compact('jenisLampirans'));
+        }
+
+        public function store(JenisLampiranRequest $request)
+        {
+            DB::beginTransaction();
+            try {
+                $validated               = $request->validated();
+                $validated['created_by'] = Auth::id();
+
+                $jenisLampiran = JenisLampiran::create($validated);
+
+                DB::commit();
+                return redirect()
+                    ->route('basicdata.jenis-lampiran.index')
+                    ->with('success', 'Jenis Lampiran berhasil ditambahkan.');
+            } catch (Exception $e) {
+                DB::rollBack();
+                return redirect()
+                    ->back()
+                    ->with('error', 'Gagal menambahkan Jenis Lampiran: ' . $e->getMessage())
+                    ->withInput();
+            }
+        }
+
+        public function create()
+        {
+            return view('lpj::jenis_lampiran.create');
+        }
+
+        public function show($id)
+        {
+            $jenisLampiran = JenisLampiran::findOrFail($id);
+            return view('lpj::jenis_lampiran.show', compact('jenisLampiran'));
+        }
+
+        public function edit($id)
+        {
+            $jenisLampiran = JenisLampiran::findOrFail($id);
+            return view('lpj::jenis_lampiran.create', compact('jenisLampiran'));
+        }
+
+        public function update(JenisLampiranRequest $request, $id)
+        {
+            DB::beginTransaction();
+            try {
+                $jenisLampiran           = JenisLampiran::findOrFail($id);
+                $validated               = $request->validated();
+                $validated['updated_by'] = Auth::id();
+
+                $jenisLampiran->update($validated);
+
+                DB::commit();
+                return redirect()
+                    ->route('basicdata.jenis-lampiran.index')
+                    ->with('success', 'Jenis Lampiran berhasil diperbarui.');
+            } catch (Exception $e) {
+                DB::rollBack();
+                return redirect()
+                    ->back()
+                    ->with('error', 'Gagal memperbarui Jenis Lampiran: ' . $e->getMessage())
+                    ->withInput();
+            }
+        }
+
+        public function destroy($id)
+        {
+            DB::beginTransaction();
+            try {
+                $jenisLampiran             = JenisLampiran::findOrFail($id);
+                $jenisLampiran->deleted_by = Auth::id();
+                $jenisLampiran->save();
+
+                $jenisLampiran->delete();
+
+                DB::commit();
+                echo json_encode(['success' => true, 'message' => 'Jenis Lampiran berhasil dihapus.']);
+
+            } catch (Exception $e) {
+                DB::rollBack();
+                echo json_encode([
+                    'success' => false,
+                    'message' => 'Gagal menghapus Jenis Lampiran: ' . $e->getMessage()
+                ]);
+            }
+        }
+
+        public function dataForDatatables(Request $request)
+        {
+            // Retrieve data from the database
+            $query = JenisLampiran::query();
+
+            // Apply search filter if provided
+            if ($request->has('search') && !empty($request->get('search'))) {
+                $search = $request->get('search');
+                $query->where(function ($q) use ($search) {
+                    $q->where('nama', 'LIKE', "%$search%")
+                      ->orWhere('deskripsi', 'LIKE', "%$search%");
+                });
+            }
+
+            // Apply sorting if provided
+            if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+                $order  = $request->get('sortOrder');
+                $column = $request->get('sortField');
+                $query->orderBy($column, $order);
+            }
+
+            // Get the total count of records
+            $totalRecords = $query->count();
+
+            // Apply pagination if provided
+            if ($request->has('page') && $request->has('size')) {
+                $page   = $request->get('page');
+                $size   = $request->get('size');
+                $offset = ($page - 1) * $size; // Calculate the offset
+
+                $query->skip($offset)->take($size);
+            }
+
+            // Get the filtered count of records
+            $filteredRecords = $query->count();
+
+            // Get the data for the current page
+            $data = $query->get();
+
+            // Calculate the page count
+            $pageCount = ceil($totalRecords / $request->get('size'));
+
+            // Calculate the current page number
+            $currentPage = $request->get('page', 1);
+
+            // Return the response data as a JSON object
+            return response()->json([
+                'draw'            => $request->get('draw'),
+                'recordsTotal'    => $totalRecords,
+                'recordsFiltered' => $filteredRecords,
+                'pageCount'       => $pageCount,
+                'page'            => $currentPage,
+                'totalCount'      => $totalRecords,
+                'data'            => $data,
+            ]);
+        }
+
+        public function export()
+        {
+            if (is_null($this->user) || !$this->user->can('jenis_lampiran.export')) {
+                abort(403, 'Sorry! You are not allowed to export jenis lampiran.');
+            }
+
+            return Excel::download(new JenisLampiranExport, 'jenis_lampiran.xlsx');
+        }
+    }

app/Http/Controllers/JenisLegalitasJaminanController.php

@@ -150,4 +150,16 @@
         {
             return Excel::download(new JenisLegalitasJaminanExport, 'jenis_legalitas_jaminan.xlsx');
         }
+
+        public function getCustomFields($id)
+        {
+            $jenisLegalitasJaminan = JenisLegalitasJaminan::findOrFail($id);
+            if(!$jenisLegalitasJaminan->custom_fields) {
+                return response()->json([]);
+            }
+            
+            $customFields = CustomField::whereIn('id', $jenisLegalitasJaminan->custom_fields)->get();
+
+            return response()->json($customFields);
+        }
     }

app/Http/Controllers/LampiranDokumenController.php

@@ -0,0 +1,45 @@
+<?php
+
+    namespace Modules\Lpj\Http\Controllers;
+
+    use App\Http\Controllers\Controller;
+    use Illuminate\Http\Request;
+    use Illuminate\Support\Facades\Storage;
+    use Modules\Lpj\Models\LampiranDokumen;
+
+    class LampiranDokumenController extends Controller
+    {
+        public function download($id)
+        {
+            $lampiran = LampiranDokumen::findOrFail($id);
+            return Storage::download($lampiran->path_file, $lampiran->nama_file);
+        }
+
+        public function upload(Request $request)
+        {
+            $request->validate([
+                'permohonan_id'     => 'required|exists:permohonan,id',
+                'jenis_lampiran_id' => 'required|exists:jenis_lampiran,id',
+                'nama_file'         => 'nullable|string|max:255',
+                'file'              => 'required|file|max:10240',
+                'keterangan'        => 'nullable|string|max:255',
+            ]);
+
+            $lampiran = LampiranDokumen::uploadLampiran($request->all());
+
+            if ($lampiran) {
+                return redirect()->back()->with('success', 'Lampiran uploaded successfully');
+            } else {
+                return redirect()->back()->with('error', 'Unauthorized or upload failed');
+            }
+        }
+
+        public function delete(LampiranDokumen $lampiran)
+        {
+            if ($lampiran->deleteLampiran()) {
+                return redirect()->back()->with('success', 'Lampiran deleted successfully');
+            } else {
+                return redirect()->back()->with('error', 'Unauthorized or delete failed');
+            }
+        }
+    }

app/Http/Controllers/LaporanAdminKreditController.php

@@ -0,0 +1,180 @@
+<?php
+
+    namespace Modules\Lpj\Http\Controllers;
+
+    use App\Http\Controllers\Controller;
+    use Illuminate\Http\Request;
+    use Illuminate\Support\Facades\Auth;
+    use Maatwebsite\Excel\Facades\Excel;
+    use Modules\Lpj\Exports\LaporanAdminKreditExport;
+    use Modules\Lpj\Models\LaporanAdminKredit;
+    use Modules\Lpj\Models\Permohonan;
+
+    class LaporanAdminKreditController extends Controller
+    {
+        public $user;
+
+        /**
+         * Display a listing of the resource.
+         */
+        public function index()
+        {
+            $permohonan = Permohonan::where(['status' => 'done'])->get();
+            foreach ($permohonan as $_permohonan) {
+                $npw = 0;
+                if (isset($_permohonan->penilai->lpj)) {
+                    $npw = json_decode($_permohonan->penilai->lpj, true);
+                    $npw = $npw['total_nilai_pasar_wajar'] ?? 0;
+                }
+
+                $dataAdk = [
+                    'jenis_agunan'      => $_permohonan->documents->pluck('jenisJaminan.name')->unique()->implode(', '),
+                    'alamat_agunan'     => $_permohonan->documents->map(function ($document) {
+                        return formatAlamat($document);
+                    })->unique()->implode(', '),
+                    'nama_pemilik'      => $_permohonan->documents->pluck('pemilik.name')->unique()->implode(', '),
+                    'tanggal_kunjungan' => $_permohonan->penilaian->tanggal_kunjungan,
+                    'nama_penilai'      => $_permohonan->penilaian->_user_penilai->userPenilaiTeam->name,
+                    'nilai_likuidasi'   => $_permohonan->nilai_liquidasi,
+                    'nilai_pasar_wajar' => str_replace('.', '', $npw),
+                    'bukti_kepemilikan' => $_permohonan->documents->flatMap(function ($document) {
+                        return $document->detail->map(function ($detail) {
+                            return (!empty($detail->dokumen_nomor) && is_array($detail->dokumen_nomor))
+                                ? ($detail->jenisLegalitasJaminan->name ?? '') . "\n" . implode(', ', $detail->dokumen_nomor)
+                                : null;
+                        });
+                    })->filter()->unique()->implode(', '),
+                ];
+
+                LaporanAdminKredit::updateOrCreate([
+                    'debiture_id' => $_permohonan->debiture_id,
+                ], $dataAdk);
+            }
+
+
+            $laporans = LaporanAdminKredit::with('debiture')->paginate(10);
+            return view('lpj::laporan_admin_kredit.index', compact('laporans'));
+        }
+
+        public function dataForDatatables(Request $request)
+        {
+            if (is_null($this->user) || !$this->user->can('laporan-admin-kredit.view')) {
+                //abort(403, 'Sorry! You are not allowed to view laporan admin kredit.');
+            }
+
+            // Retrieve data from the database
+            $query = LaporanAdminKredit::query();
+
+            if ($request->has('tanggal_awal') && $request->has('tanggal_akhir')) {
+                $query->whereBetween('tanggal_kunjungan', [$request->tanggal_awal, $request->tanggal_akhir]);
+            }
+
+            // Apply search filter if provided
+            if ($request->has('search') && !empty($request->get('search'))) {
+                $search  = $request->get('search');
+                $search_ = json_decode($search);
+
+                if (isset($search_->search)) {
+                    $query->where(function ($q) use ($search_) {
+                        $q->where('kode_register_t24', 'LIKE', '%' . $search_->search . '%')
+                          ->orWhere('jenis_agunan', 'LIKE', '%' . $search_->search . '%')
+                          ->orWhere('nama_pemilik', 'LIKE', '%' . $search_->search . '%')
+                          ->orWhereHas('debiture', function ($query) use ($search_) {
+                              $query->where('name', 'LIKE', '%' . $search_->search . '%');
+                          });
+                    });
+                }
+
+                if (isset($search_->tanggal_awal) && isset($search_->tanggal_akhir)) {
+                    $query->whereBetween('tanggal_kunjungan', [$search_->tanggal_awal, $search_->tanggal_akhir]);
+                }
+            }
+
+            // Apply sorting if provided
+            if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+                $order  = $request->get('sortOrder');
+                $column = $request->get('sortField');
+                $query->orderBy($column, $order);
+            }
+
+            // Get the total count of records
+            $totalRecords = $query->count();
+
+            // Apply pagination if provided
+            if ($request->has('page') && $request->has('size')) {
+                $page   = $request->get('page');
+                $size   = $request->get('size');
+                $offset = ($page - 1) * $size; // Calculate the offset
+
+                $query->skip($offset)->take($size);
+            }
+
+            // Get the filtered count of records
+            $filteredRecords = $query->count();
+
+            // Get the data for the current page
+            $data = $query->with(['debiture.branch'])->get();
+
+            // Calculate the page count
+            $pageCount = ceil($totalRecords / $request->get('size'));
+
+            // Calculate the current page number
+            $currentPage = $request->get('page', 1);
+
+            // Return the response data as a JSON object
+            return response()->json([
+                'draw'            => $request->get('draw'),
+                'recordsTotal'    => $totalRecords,
+                'recordsFiltered' => $filteredRecords,
+                'pageCount'       => $pageCount,
+                'page'            => $currentPage,
+                'totalCount'      => $totalRecords,
+                'data'            => $data,
+            ]);
+        }
+
+        public function export()
+        {
+            return Excel::download(new LaporanAdminKreditExport, 'laporan_admin_kredit.xlsx');
+        }
+
+        public function edit($id)
+        {
+            $laporanAdminKredit = LaporanAdminKredit::with('debiture.branch')->find($id);
+            return view('lpj::laporan_admin_kredit.form', compact('laporanAdminKredit'));
+        }
+
+        public function update(Request $request, $id)
+        {
+            $request->validate([
+                'kode_register_t24' => 'nullable',
+                'cif' => 'required',
+            ]);
+
+            try {
+                $laporanAdminKredit = LaporanAdminKredit::find($id);
+
+                // Update only the editable fields
+                $laporanAdminKredit->update([
+                    'kode_register_t24' => $request->kode_register_t24,
+                    'updated_by' => Auth::id(),
+                ]);
+
+                // Update CIF in the debiture table if needed
+                if ($laporanAdminKredit->debiture) {
+                    $laporanAdminKredit->debiture->update([
+                        'cif' => $request->cif,
+                        'updated_by' => Auth::id(),
+                    ]);
+                }
+
+                return redirect()
+                    ->route('laporan-admin-kredit.index')
+                    ->with('success', 'Laporan Admin Kredit updated successfully');
+            } catch (Exception $e) {
+                return redirect()
+                    ->route('laporan-admin-kredit.edit', $id)
+                    ->with('error', 'Failed to update Laporan Admin Kredit');
+            }
+        }
+    }

app/Http/Controllers/LaporanBiayaInternalExternalController.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Modules\Lpj\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+
+class LaporanBiayaInternalExternalController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     */
+    public function showLaporanBiayaInternal()
+    {
+        return view('lpj::laporan-biaya.internal');
+    }
+
+    public function showLaporanBiayaExternal()
+    {
+        return view('lpj::laporan-biaya.external');
+    }
+
+}

app/Http/Controllers/LaporanController.php

@@ -75,11 +75,9 @@ class LaporanController extends Controller
         }
 
         // Retrieve data from the database
-        $query = Permohonan::query()->whereIn('status',['proses-laporan','done', 'paparan', 'proses-paparan'])->whereNotNull('approval_so_at')->whereNotNull('approval_eo_at')->where(function ($q) {
-            $q->whereIn('nilai_plafond_id', [1,4])
-              ->whereNotNull('approval_dd_at')
-              ->orWhereIn('nilai_plafond_id', [2,3]);
-        });
+        $query = Permohonan::query()
+            ->whereIn('status',['proses-laporan','done', 'paparan', 'proses-paparan']);
+
 
         $query = $query->orderBy('nomor_registrasi', 'desc');
         // Apply search filter if provided
@@ -123,7 +121,7 @@ class LaporanController extends Controller
         $filteredRecords = $query->count();
 
         // Get the data for the current page
-        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian','jenisFasilitasKredit', 'documents.inspeksi','penilai'])->get();
+        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian','jenisFasilitasKredit', 'documents.inspeksi','penilai','documents.detail','noc'])->get();
 
         // Calculate the page count
         $pageCount = ceil($totalRecords / $size);

app/Http/Controllers/LaporanDebitureController.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Modules\Lpj\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Modules\Lpj\Models\Debiture;
+use Modules\Lpj\Services\LaporanDebitureService;
+
+class LaporanDebitureController extends Controller
+{
+    private $laporanDebitureService;
+    public function __construct()
+    {
+        $this->laporanDebitureService = app(LaporanDebitureService::class);
+    }
+
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        $debiture = Debiture::all();
+        return view('lpj::laporan-debiture.index', compact('debiture'));
+    }
+
+
+    public function dataTableForDebiture(Request $request)
+    {
+        return $this->laporanDebitureService->dataForDatatables($request);
+    }
+
+}

app/Http/Controllers/LaporanExternalController.php

@@ -0,0 +1,173 @@
+<?php
+
+namespace Modules\Lpj\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Modules\Lpj\Models\LaporanExternal;
+use Modules\Lpj\Http\Requests\LaporanExternalRequest;
+use Modules\Lpj\Models\Permohonan;
+
+class LaporanExternalController extends Controller
+{
+    public $user;
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        $laporanExternals = LaporanExternal::with('permohonan')->paginate(10);
+        return view('lpj::laporan_external.index', compact('laporanExternals'));
+    }
+
+    /**
+     * Show the form for creating a new resource.
+     */
+    public function create()
+    {
+        return view('lpj::laporan_external.create');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(LaporanExternalRequest $request)
+    {
+        $validatedData = $request->validated();
+
+        if ($request->hasFile('file_resume')) {
+            $validatedData['file_resume'] = $request->file('file_resume')->store('laporan_external/resume', 'public');
+        }
+
+        if ($request->hasFile('file_laporan')) {
+            $validatedData['file_laporan'] = $request->file('file_laporan')->store('laporan_external/laporan', 'public');
+        }
+
+        LaporanExternal::create($validatedData);
+
+        return redirect()->route('laporan-external.index')->with('success', 'Laporan External berhasil ditambahkan.');
+    }
+
+    /**
+     * Show the specified resource.
+     */
+    public function show(LaporanExternal $laporanExternal)
+    {
+        return view('lpj::laporan_external.show', compact('laporanExternal'));
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit(LaporanExternal $laporanExternal)
+    {
+        $permohonan = Permohonan::find($laporanExternal->permohonan_id);
+        return view('lpj::laporan_external.create', compact('laporanExternal','permohonan'));
+    }
+
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(LaporanExternalRequest $request, LaporanExternal $laporanExternal)
+    {
+        $validatedData = $request->validated();
+
+        if ($request->hasFile('file_resume')) {
+            $validatedData['file_resume'] = $request->file('file_resume')->store('laporan_external/resume', 'public');
+        }
+
+        if ($request->hasFile('file_laporan')) {
+            $validatedData['file_laporan'] = $request->file('file_laporan')->store('laporan_external/laporan', 'public');
+        }
+
+        $laporanExternal->update($validatedData);
+
+        return redirect()->route('laporan-external.index')->with('success', 'Laporan External berhasil diperbarui.');
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy(LaporanExternal $laporanExternal)
+    {
+        $laporanExternal->delete();
+
+        return redirect()->route('laporan-external.index')->with('success', 'Laporan External berhasil dihapus.');
+    }
+
+    public function dataForDatatables(Request $request)
+    {
+        if (is_null($this->user) || !$this->user->can('jenis_aset.view')) {
+            //abort(403, 'Sorry! You are not allowed to view users.');
+        }
+
+        // Retrieve data from the database
+        $query = LaporanExternal::query();
+
+        // Apply search filter if provided
+        if ($request->has('search') && !empty($request->get('search'))) {
+            $search = $request->get('search');
+            $query->where(function ($q) use ($search) {
+                $q->where('nomor_laporan', 'LIKE', "%$search%")
+                  ->orWhere('tanggal_laporan', 'LIKE', "%$search%")
+                  ->orWhereHas('permohonan', function($q) use ($search) {
+                      $q->where('nomor_permohonan', 'LIKE', "%$search%");
+                  })
+                  ->orWhere('tgl_final_laporan', 'LIKE', "%$search%")
+                  ->orWhere('nilai_pasar', 'LIKE', "%$search%")
+                  ->orWhere('indikasi_nilai_likuidasi', 'LIKE', "%$search%")
+                  ->orWhere('indikasi_nilai_pasar_tanah', 'LIKE', "%$search%")
+                  ->orWhere('estimasi_harga_tanah', 'LIKE', "%$search%")
+                  ->orWhere('estimasi_harga_bangunan', 'LIKE', "%$search%")
+                  ->orWhere('indikasi_nilai_pasar_bangunan', 'LIKE', "%$search%")
+                  ->orWhere('indikasi_nilai_pasar_sarana_pelengkap', 'LIKE', "%$search%")
+                  ->orWhere('indikasi_nilai_pasar_mesin', 'LIKE', "%$search%")
+                  ->orWhere('indikasi_nilai_pasar_kendaraan_alat_berat', 'LIKE', "%$search%")
+                  ->orWhere('file_resume', 'LIKE', "%$search%")
+                  ->orWhere('file_laporan', 'LIKE', "%$search%");
+            });
+        }
+
+        // Apply sorting if provided
+        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+            $order  = $request->get('sortOrder');
+            $column = $request->get('sortField');
+            $query->orderBy($column, $order);
+        }
+
+        // Get the total count of records
+        $totalRecords = $query->count();
+
+        // Apply pagination if provided
+        if ($request->has('page') && $request->has('size')) {
+            $page   = $request->get('page');
+            $size   = $request->get('size');
+            $offset = ($page - 1) * $size; // Calculate the offset
+
+            $query->skip($offset)->take($size);
+        }
+
+        // Get the filtered count of records
+        $filteredRecords = $query->count();
+
+        // Get the data for the current page
+        $data = $query->with(['permohonan.debiture','permohonan.penawaran.tujuanPenilaianKjpp','permohonan.dokumenjaminan.jenisjaminan'])->get();
+
+        // Calculate the page count
+        $pageCount = ceil($totalRecords / $request->get('size'));
+
+        // Calculate the current page number
+        $currentPage = 0 + 1;
+
+        // Return the response data as a JSON object
+        return response()->json([
+            'draw'            => $request->get('draw'),
+            'recordsTotal'    => $totalRecords,
+            'recordsFiltered' => $filteredRecords,
+            'pageCount'       => $pageCount,
+            'page'            => $currentPage,
+            'totalCount'      => $totalRecords,
+            'data'            => $data,
+        ]);
+    }
+}

app/Http/Controllers/LaporanHasilPenilaianJaminanInternalExternalController.php

@@ -0,0 +1,213 @@
+<?php
+
+namespace Modules\Lpj\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Maatwebsite\Excel\Facades\Excel;
+use Modules\Lpj\Exports\LaporanHasilPenilaianJaminanInternalExternalExport;
+use Modules\Lpj\Models\Permohonan;
+use Illuminate\Support\Facades\DB;
+
+class LaporanHasilPenilaianJaminanInternalExternalController extends Controller
+{
+    public $user;
+
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        return view('lpj::laporan_hasil_penilaian_jaminan_internal_external.index');
+    }
+
+    public function dataForDatatables(Request $request)
+    {
+        if (is_null($this->user) || !$this->user->can('laporan-admin-kredit.view')) {
+            //abort(403, 'Sorry! You are not allowed to view laporan admin kredit.');
+        }
+
+        // Retrieve data from the database
+        $query = Permohonan::query();
+        $query = $query->where('status', 'done');
+
+        // Apply search filter if provided
+        if ($request->has('search') && !empty($request->get('search'))) {
+            $search = json_decode($request->get('search'));
+
+            if (isset($search->start_date) || isset($search->end_date)) {
+                $query->whereBetween('tanggal_permohonan', [
+                    $search->start_date ?? '1900-01-01',
+                    $search->end_date ?? now()->toDateString()
+                ]);
+            }
+
+            // Filter by branch if provided
+            if (isset($search->branch_id) && !empty($search->branch_id)) {
+                $query->where('branch_id', $search->branch_id);
+            }
+
+            if (isset($search->penilai_id) && !empty($search->penilai_id)) {
+                $query->whereHas('penilaian._user_penilai.userPenilaiTeam', function ($q) use ($search) {
+                    $q->where('user_id', $search->penilai_id);
+                });
+            }
+
+            if (isset($search->search)) {
+
+                $query->where(function ($q) use ($search) {
+                    $q->where('nomor_registrasi', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhereRelation('debiture', DB::raw('LOWER(name)'), 'LIKE', '%' . strtolower($search->search) . '%');
+                    $q->orWhereRelation('jenisFasilitasKredit', 'name', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhereRelation('jenisPenilaian', 'name', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhere('status', 'LIKE', '%' . $search->search . '%');
+                });
+            }
+        }
+
+        // Apply sorting if provided
+        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+            $order  = $request->get('sortOrder');
+            $column = $request->get('sortField');
+            $query->orderBy($column, $order);
+        }
+
+        // Get the total count of records
+        $totalRecords = $query->count();
+
+        // Apply pagination if provided
+        if ($request->has('page') && $request->has('size')) {
+            $page   = $request->get('page');
+            $size   = $request->get('size');
+            $offset = ($page - 1) * $size; // Calculate the offset
+
+            $query->skip($offset)->take($size);
+        }
+
+        // Get the filtered count of records
+        $filteredRecords = $query->count();
+
+        // Get the data for the current page
+        $data = $query->with(['debiture.branch'])->get();
+
+        $data = $data->map(function ($permohonan) {
+            $luas_tanah      = 0;
+            $luas_bangunan   = 0;
+            $nilai_tanah     = 0;
+            $nilai_bangunan  = 0;
+            $npw             = 0;
+            $nilai_liquidasi = 0;
+
+            if (isset($permohonan->penilai->lpj)) {
+                $lpj = json_decode($permohonan->penilai->lpj, true);
+                $npw = str_replace('.', '', $lpj['total_nilai_pasar_wajar'] ?? 0);
+
+                $luas_tanah    = $lpj['luas_tanah'] ?? 0;
+                $luas_bangunan = $lpj['luas_bangunan'] ?? 0;
+                // Calculate nilai_tanah dynamically by looking for all keys that start with 'nilai_tanah_'
+                $nilai_tanah = str_replace('.', '', $lpj['nilai_tanah_2'] ?? 0);
+
+                $nilai_bangunan  = str_replace('.', '', $lpj['nilai_bangunan_2'] ?? 0);
+                $nilai_liquidasi = str_replace('.', '', $lpj['likuidasi_nilai_2'] ?? 0);
+            }
+
+            return [
+                'id'                        => $permohonan->id,
+                'nomor_registrasi'          => $permohonan->nomor_registrasi,
+                'jenis_penilaian'           => $permohonan->jenisPenilaian?->name,
+                'tujuan_penilaian'          => $permohonan->tujuanPenilaian?->name,
+                'jenis_fasilitas_kredit'    => $permohonan->jenisFasilitasKredit?->name,
+                'branch'                    => $permohonan->debiture->branch?->name,
+                'pemohon'                   => $permohonan->creator?->name,
+                'cif'                       => $permohonan->debiture->cif,
+                'name'                      => $permohonan->debiture?->name,
+                'jenis_agunan'              => $permohonan->documents?->pluck('jenisJaminan.name')
+                                                                     ->unique()
+                                                                     ->implode(', '),
+                'alamat_agunan'             => $permohonan->documents?->map(function ($document) {
+                    return formatAlamat($document);
+                })->unique()->implode(', '),
+                'bukti_kepemilikan' => (function () use ($permohonan) {
+                    $legalitasItems = $permohonan->documents?->flatMap(function ($document) {
+                        return $document->detail->map(function ($detail) {
+                            // Jika tidak ada jenis legalitas jaminan, lewati
+                            if (empty($detail->jenisLegalitasJaminan)) {
+                                return null;
+                            }
+
+                            // Hanya tampilkan detail yang memiliki dokumen_jaminan
+                            if (empty($detail->dokumen_jaminan)) {
+                                return null;
+                            }
+
+                            // Tampilkan nama legalitas jaminan saja
+                            return $detail->jenisLegalitasJaminan->name ?? '';
+                        });
+                    })->filter()->unique()->values()->toArray();
+
+                    // Buat daftar bernomor
+                    $result = '';
+                    foreach ($legalitasItems as $index => $item) {
+                        $result .= ($index + 1) . '. ' . $item . "\n";
+                    }
+
+                    return $result;
+                })(),
+                'nama_pemilik'              => $permohonan->documents?->pluck('pemilik.name')
+                                                                     ->unique()
+                                                                     ->implode(', '),
+                'luas_tanah'                => $luas_tanah . ' m²',
+                'nilai_tanah'               => formatRupiah($nilai_tanah, 2),
+                'luas_bangunan'             => $luas_bangunan . ' m²',
+                'nilai_bangunan'            => formatRupiah($nilai_bangunan, 2),
+                'nilai_njop'                => formatRupiah($permohonan->nilai_njop, 2),
+                'nilai_pasar_wajar'         => formatRupiah($npw, 2),
+                'nilai_likuidasi'           => formatRupiah($nilai_liquidasi, 2),
+                'tanggal_documen_diterima'  => $permohonan->documents?->map(function ($document) {
+                    return $document->created_at->format('d-m-Y');
+                }),
+                'tanggal_spk'               => '',
+                'nomor_spk'                 => '',
+                'tanggal_rencana_kunjunagn' => '',
+                'tanggal_kunjungan'         => '',
+                'taggal_delivered'          => '',
+                'jangka_waktu_sla'          => '',
+                'nama_penilai'              => $permohonan->penilaian?->_user_penilai?->userPenilaiTeam?->name,
+                'nama_team_leader'          => $permohonan->penilaian?->teams,
+                'saran'                     => '',
+                'catatan'                   => '',
+
+
+                'tanggal_permohonan' => $permohonan->tanggal_permohonan,
+                'tanggal_laporan'    => $permohonan->approval_dd_at ?? $permohonan->approval_eo_at ?? '',
+                'tanggal_review'     => $permohonan->penilaian?->tanggal_kunjungan ?? '',
+            ];
+        });
+
+        // Calculate the page count
+        $pageCount = ceil($totalRecords / $request->get('size'));
+
+        // Calculate the current page number
+        $currentPage = $request->get('page') ?: 1;
+
+        // Return the response data as a JSON object
+        return response()->json([
+            'draw'            => $request->get('draw'),
+            'recordsTotal'    => $totalRecords,
+            'recordsFiltered' => $filteredRecords,
+            'pageCount'       => $pageCount,
+            'page'            => $currentPage,
+            'totalCount'      => $totalRecords,
+            'data'            => $data,
+        ]);
+    }
+
+    public function export(Request $request)
+    {
+        return Excel::download(new LaporanHasilPenilaianJaminanInternalExternalExport($request), 'laporan_hasil_penilaian_jaminan_internal_external.xlsx');
+    }
+}

app/Http/Controllers/LaporanMonitoringSoController.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace Modules\Lpj\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Modules\Lpj\Services\LaporanMonitoringSoService;
+
+class LaporanMonitoringSoController extends Controller
+{
+
+    private $laporanMonitoringSoService;
+
+    public function __construct(LaporanMonitoringSoService $laporanMonitoringSoService)
+    {
+        $this->laporanMonitoringSoService = $laporanMonitoringSoService;
+    }
+
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        $user = auth()->user()->load('roles');
+        $result = $this->laporanMonitoringSoService->progresPengerjaanLaporan($user);
+        return view('lpj::laporan-monitoring.index', compact('result'));
+    }
+
+    /**
+     * Show details data.
+     * @return Response
+     */
+
+    public function show($id){
+        return view('lpj::laporan-monitoring.show', compact('id'));
+    }
+
+
+    public function dataForDatatablePenilai(Request $request, $id){
+        return $this->laporanMonitoringSoService->showDetailsPermohonan($request, $id);
+    }
+
+}

app/Http/Controllers/LaporanPembatalanController.php

@@ -0,0 +1,140 @@
+<?php
+
+    namespace Modules\Lpj\Http\Controllers;
+
+    use App\Http\Controllers\Controller;
+    use Illuminate\Http\Request;
+    use Illuminate\Support\Facades\Auth;
+    use Illuminate\Support\Facades\DB;
+    use Maatwebsite\Excel\Facades\Excel;
+    use Modules\Lpj\Exports\LaporanPembatalanExport;
+    use Modules\Lpj\Models\PermohonanPembatalan;
+
+    class LaporanPembatalanController extends Controller
+    {
+        public $user;
+
+        public function index()
+        {
+            return view('lpj::laporan_pembatalan.index');
+        }
+
+        public function export(Request $request)
+        {
+            return Excel::download(new LaporanPembatalanExport($request), 'laporan_pembatalan.xlsx');
+        }
+
+        public function dataForDatatables(Request $request)
+        {
+            if (is_null($this->user) || !$this->user->can('debitur.view')) {
+                //abort(403, 'Sorry! You are not allowed to view users.');
+            }
+
+            // Retrieve data from the database
+            $query = PermohonanPembatalan::query();
+
+
+            if (!Auth::user()->hasAnyRole(['administrator'])) {
+                $query = $query->whereHas('permohonan', function ($q) {
+                    $q->where('branch_id', Auth::user()->branch_id);
+                });
+            }
+
+            $query = $query->orderBy('created_at', 'desc');
+
+            // Apply search filter if provided
+            if ($request->has('search') && !empty($request->get('search'))) {
+                $search = json_decode($request->get('search'));
+
+                if (isset($search->start_date) || isset($search->end_date)) {
+                    $query->whereBetween('created_at', [
+                        $search->start_date ?? '1900-01-01',
+                        $search->end_date ?? now()->toDateString()
+                    ]);
+                }
+
+                // Filter by branch if provided
+                if (isset($search->branch_id) && !empty($search->branch_id)) {
+                    $query->whereHas('permohonan', function ($q) use ($search) {
+                        $q->where('branch_id', $search->branch_id);
+                    });
+                }
+
+                if (isset($search->search)) {
+                    $query->where(function ($q) use ($search) {
+                        $q->whereHas('permohonan', function ($subq) use ($search) {
+                            $subq->where('nomor_registrasi', 'LIKE', '%' . $search->search . '%');
+                            $subq->orWhereRelation('user', 'name', 'LIKE', '%' . $search->search . '%');
+                            $subq->orWhereRelation('branch', 'name', 'LIKE', '%' . $search->search . '%');
+                        });
+                        $q->orWhere('alasan_pembatalan', 'LIKE', '%' . $search->search . '%');
+                        $q->orWhere('status', 'LIKE', '%' . $search->search . '%');
+                    });
+                }
+            }
+
+            // Apply sorting if provided
+            if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+                $order  = $request->get('sortOrder');
+                $column = $request->get('sortField');
+                $query->orderBy($column, $order);
+            }
+
+            // Get the total count of records
+            $totalRecords = $query->count();
+            $size         = $request->get('size', 10);
+            if ($size == 0) {
+                $size = 10;
+            }
+
+            // Apply pagination if provided
+            if ($request->has('page') && $request->has('size')) {
+                $page   = $request->get('page');
+                $size   = $request->get('size');
+                $offset = ($page - 1) * $size; // Calculate the offset
+
+                $query->skip($offset)->take($size);
+            }
+
+            // Get the filtered count of records
+            $filteredRecords = $query->count();
+
+            // Get the data for the current page
+            $data = $query->get();
+
+            $data = $data->map(function ($item) {
+                return [
+                    'id'                 => $item->id,
+                    'nomor_registrasi'   => $item->permohonan->nomor_registrasi ?? '-',
+                    'tanggal_permohonan' => $item->permohonan->tanggal_permohonan ? date('d-m-Y', strtotime($item->permohonan->tanggal_permohonan)) : '-',
+                    'tanggal_pembatalan' => date('d-m-Y', strtotime($item->created_at)),
+                    'cabang'             => $item->permohonan->branch->name ?? '-',
+                    'pemohon'            => $item->permohonan->user->name ?? '-',
+                    'debitur'            => $item->permohonan->debiture->name ?? '-',
+                    'alasan_pembatalan'  => $item->alasan_pembatalan,
+                    'status'             => $item->status,
+                    'diajukan_oleh'      => $item->user->name ?? '-',
+                    'disetujui_oleh'     => $item->authorized_by ? $item->authorizedUser->name : '-',
+                    'tanggal_disetujui'  => $item->authorized_at ? formatTanggalIndonesia(strtotime($item->authorized_at),1) : '-'
+                ];
+            });
+
+
+            // Calculate the page count
+            $pageCount = ceil($totalRecords / $size);
+
+            // Calculate the current page number
+            $currentPage = max(1, $request->get('page', 1));
+
+            // Return the response data as a JSON object
+            return response()->json([
+                'draw'            => $request->get('draw'),
+                'recordsTotal'    => $totalRecords,
+                'recordsFiltered' => $filteredRecords,
+                'pageCount'       => $pageCount,
+                'page'            => $currentPage,
+                'totalCount'      => $totalRecords,
+                'data'            => $data,
+            ]);
+        }
+    }

app/Http/Controllers/LaporanPenilaiJaminanController.php

@@ -0,0 +1,226 @@
+<?php
+
+namespace Modules\Lpj\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Modules\Lpj\Models\Permohonan;
+use Modules\Lpj\Models\StatusPermohonan;
+use Modules\Lpj\Exports\LaporanPenilaiJaminanExport;
+use Maatwebsite\Excel\Facades\Excel;
+use Modules\Lpj\Models\Branch;
+use Modules\Lpj\Services\PreviewLaporanService;
+use Modules\Lpj\Models\Inspeksi;
+use Modules\Lpj\Models\Penilai;
+
+class LaporanPenilaiJaminanController extends Controller
+{
+    public $user;
+    /**
+     * Display a listing of the resource.
+     */
+
+    protected $previewLaporanService;
+
+    public function __construct(PreviewLaporanService $previewLaporanService)
+    {
+        $this->previewLaporanService = $previewLaporanService;
+    }
+
+    public function index()
+    {
+        $status_permohonan = StatusPermohonan::all();
+        return view('lpj::laporan-penilai-jaminan.index', compact('status_permohonan'));
+    }
+
+
+    /**
+     * Show the specified resource.
+     */
+    public function show($permohonan_id, $dokumen_id, $jaminan_id)
+    {
+        $back = route('laporan-penilai-jaminan.index');
+        return $this->previewLaporanService->previewLaporan($permohonan_id, $dokumen_id, $jaminan_id, $back);
+    }
+
+
+
+    public function dataForDatatables(Request $request)
+    {
+
+        $user = auth()->user();
+
+
+        // Check permissions
+        if (is_null($this->user) || !$this->user->can('debitur.view')) {
+            // abort(403, 'Sorry! You are not allowed to view users.');
+        }
+
+        $userRole = $user->roles->pluck('name')->first();
+        $regionId = null;
+
+        // If user is senior-officer, get their regionId
+        if ($userRole === 'senior-officer') {
+            $userTeam = TeamsUsers::with('team')->firstWhere('user_id', $user->id);
+            $regionId = $userTeam?->team->regions_id;
+        }
+        $paramsSearch = null;
+        // dd($startDate);
+        // Retrieve data from the database
+        $query = Permohonan::query();
+        $query = $query->where('status', 'done')->orderBy('tanggal_permohonan', 'desc');
+        // Apply search filter if provided
+        if ($request->has('search') && !empty($request->get('search'))) {
+            $search = json_decode($request->get('search'));
+
+            if (!empty($search->start_date) || !empty($search->end_date)) {
+                $startDate = $search->start_date ?? '1900-01-01';
+                $endDate = $search->end_date ?? now()->toDateString();
+
+                $query->where(function ($q) use ($startDate, $endDate) {
+
+                    $q->whereHas('penilaian', function ($q2) use ($startDate, $endDate) {
+                        $q2->whereBetween('tanggal_kunjungan', [$startDate, $endDate]);
+                    });
+
+                    // OR check if has penawaran with date in range
+                    $q->orWhereHas('penawaran', function ($q3) use ($startDate, $endDate) {
+                        $q3->whereBetween('tanggal_penilaian_sebelumnya', [$startDate, $endDate]);
+                    });
+                });
+
+
+            }
+
+
+            if (isset($search->branch_id) && !empty($search->branch_id)) {
+                $query->where('branch_id', $search->branch_id);
+            }
+
+            if (isset($search->laporan) && is_array($search->laporan) && !empty($search->laporan)) {
+                foreach ($search->laporan as $type) {
+                    $query->whereHas('penilai', function ($q) use ($type) {
+                        $q->where('type_penilai', 'LIKE', '%' . $type . '%');
+                    });
+                }
+            }
+
+
+            // dd($search->search);
+
+            if (isset($search->search)) {
+
+                $query->where(function ($q) use ($search) {
+                    $q->where('nomor_registrasi', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhereRelation('debiture', DB::raw('LOWER(name)'), 'LIKE', '%' . strtolower($search->search) . '%');
+
+                    $q->orWhereRelation('jenisFasilitasKredit', 'name', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhereRelation('jenisPenilaian', 'name', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhere('status', 'LIKE', '%' . $search->search . '%');
+                });
+            }
+
+        }
+
+        // Apply sorting if provided
+        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+            $order  = $request->get('sortOrder');
+            $column = $request->get('sortField');
+            $query->orderBy($column, $order);
+        }
+
+
+        // Get the total count of records
+        $totalRecords = $query->count();
+
+        // Apply pagination if provided
+        if ($request->has('page') && $request->has('size')) {
+            $page   = $request->get('page');
+            $size   = $request->get('size');
+            $offset = ($page - 1) * $size; // Calculate the offset
+
+            $query->skip($offset)->take($size);
+        }
+
+        // Get the filtered count of records
+        $filteredRecords = $query->count();
+
+
+        // Get data with necessary relationships
+        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian', 'dokumenjaminan.jenisJaminan','nilaiPlafond', 'penilai', 'dokumenjaminan.inspeksi'])->get();
+
+        // Calculate the page count
+        $pageCount = ceil($totalRecords / $size);
+
+        // Calculate the current page number
+        $currentPage = max(1, $request->get('page', 1));
+
+        // Return the response data as a JSON object
+        return response()->json([
+            'draw'            => $request->get('draw'),
+            'recordsTotal'    => $totalRecords,
+            'recordsFiltered' => $filteredRecords,
+            'pageCount'       => $pageCount,
+            'page'            => $currentPage,
+            'totalCount'      => $totalRecords,
+            'data'            => $data,
+        ]);
+    }
+
+    public function export(Request $request)
+    {
+        $startDate = $request->input('start_date');
+        $endDate = $request->input('end_date');
+
+        // Validate the date format
+        if (isset($startDate) && isset($endDate)) {
+            $startDate = date('Y-m-d', strtotime($startDate));
+            $endDate = date('Y-m-d', strtotime($endDate));
+
+            if ($startDate > $endDate) {
+                return redirect()->back()->with('error', 'Tanggal awal tidak boleh lebih kecil dari tanggal akhir');
+            }
+        }
+        // name the file
+        $filename = $this->createNameLaporan($request);
+
+        return Excel::download(
+            new LaporanPenilaiJaminanExport($request),
+            $filename
+        );
+    }
+
+
+    public function createNameLaporan($request)
+    {
+        $startDate = $request->start_date ?? null;
+        $endDate = $request->end_date ?? null;
+        $branchId = $request->branch_id ?? null;
+        $laporan = $request->laporan ?? null;
+
+        // Initialize filename parts
+        $parts = ['Laporan Penilai Jaminan'];
+        if ($startDate && $endDate) {
+            $parts[] = "{$startDate}_{$endDate}";
+        }
+        if ($laporan) {
+            $parts[] = $laporan;
+        }
+        if ($branchId) {
+            $parts[] = $this->getBranchId($branchId);
+        }
+        // Return concatenated filename with extension
+        return implode('_', $parts) . '.xlsx';
+    }
+
+    public function getBranchId($branchId)
+    {
+        $branchesName = Branch::find($branchId)->name ?? null;
+        return $branchesName;
+    }
+}

app/Http/Controllers/LaporanPenilaianJaminanController.php

@@ -0,0 +1,180 @@
+<?php
+
+namespace Modules\Lpj\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Modules\Lpj\Exports\LaporanPenilaianJaminanExport;
+use Modules\Lpj\Models\Permohonan;
+use Modules\Lpj\Models\Penilaian;
+use Modules\Lpj\Models\PenawaranTender;
+use Maatwebsite\Excel\Facades\Excel;
+use Illuminate\Support\Facades\DB;
+
+class LaporanPenilaianJaminanController extends Controller
+{
+    public $user;
+
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        return view('lpj::laporan_penilaian_jaminan.index');
+    }
+
+    public function dataForDatatables(Request $request)
+    {
+        if (is_null($this->user) || !$this->user->can('laporan-admin-kredit.view')) {
+            //abort(403, 'Sorry! You are not allowed to view laporan admin kredit.');
+        }
+
+        // Retrieve data from the database
+        $query = Permohonan::query();
+        $query = $query->where('status', 'done');
+
+        // Apply search filter if provided
+        if ($request->has('search') && !empty($request->get('search'))) {
+            $search = json_decode($request->get('search'));
+
+
+            if (!empty($search->start_date) || !empty($search->end_date)) {
+                $startDate = $search->start_date ?? '1900-01-01';
+                $endDate = $search->end_date ?? now()->toDateString();
+
+                $query->where(function ($q) use ($startDate, $endDate) {
+                    $q->whereHas('penilaian', function ($q2) use ($startDate, $endDate) {
+                        $q2->whereBetween('tanggal_kunjungan', [$startDate, $endDate]);
+                    })
+                    ->orWhereHas('penawaran', function ($q3) use ($startDate, $endDate) {
+                        $q3->whereBetween('tanggal_penilaian_sebelumnya', [$startDate, $endDate]);
+                    });
+                });
+            }
+
+            // Filter by branch if provided
+            if (isset($search->branch_id) && !empty($search->branch_id)) {
+                $query->where('branch_id', $search->branch_id);
+            }
+
+            if (isset($search->penilai_id) && !empty($search->penilai_id)) {
+                $query->whereHas('penilaian._user_penilai.userPenilaiTeam', function ($q) use ($search) {
+                    $q->where('user_id', $search->penilai_id);
+                });
+            }
+
+            if (isset($search->search)) {
+
+                $query->where(function ($q) use ($search) {
+                    $q->where('nomor_registrasi', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search->search . '%');
+                     $q->orWhereRelation('debiture', DB::raw('LOWER(name)'), 'LIKE', '%' . strtolower($search->search) . '%');
+
+                    $q->orWhereRelation('jenisFasilitasKredit', 'name', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhereRelation('jenisPenilaian', 'name', 'LIKE', '%' . $search->search . '%');
+                    $q->orWhere('status', 'LIKE', '%' . $search->search . '%');
+                });
+            }
+        }
+
+        // Apply sorting if provided
+        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+            $order  = $request->get('sortOrder');
+            $column = $request->get('sortField');
+            $query->orderBy($column, $order);
+        }
+
+        // Get the total count of records
+        $totalRecords = $query->count();
+
+        // Apply pagination if provided
+        if ($request->has('page') && $request->has('size')) {
+            $page   = $request->get('page');
+            $size   = $request->get('size');
+            $offset = ($page - 1) * $size; // Calculate the offset
+
+            $query->skip($offset)->take($size);
+        }
+
+        // Get the filtered count of records
+        $filteredRecords = $query->count();
+
+        // Get the data for the current page
+        $data = $query->with(['debiture.branch'])->get();
+
+        $data = $data->map(function ($permohonan) {
+            $luas_tanah    = 0;
+            $luas_bangunan = 0;
+            $nilai_tanah     = 0;
+            $nilai_bangunan  = 0;
+            $npw = 0;
+            $nilai_liquidasi = 0;
+            if (isset($permohonan->penilai->lpj)) {
+                $lpj = json_decode($permohonan->penilai->lpj, true);
+                $npw = str_replace('.', '', $lpj['total_nilai_pasar_wajar'] ?? 0);
+
+                $luas_tanah    = $lpj['luas_tanah'] ?? 0;
+                $luas_bangunan = $lpj['luas_bangunan'] ?? 0;
+                // Calculate nilai_tanah dynamically by looking for all keys that start with 'nilai_tanah_'
+                $nilai_tanah     = str_replace('.', '', $lpj['nilai_tanah_2'] ?? 0);
+
+                $nilai_bangunan  = str_replace('.', '', $lpj['nilai_bangunan_2'] ?? 0);
+                $nilai_liquidasi = str_replace('.', '', $lpj['likuidasi_nilai_2'] ?? 0);
+            }
+
+            return [
+                'id'                => $permohonan->id,
+                'nomor_registrasi'  => $permohonan->nomor_registrasi,
+                'tanggal_permohonan' => $permohonan->tanggal_permohonan,
+                'branch'            => $permohonan->debiture?->branch?->name,
+                'name'              => $permohonan->debiture?->name,
+                'pemohon'           => $permohonan->creator?->name,
+                'tujuan_penilaian'  => $permohonan->tujuanPenilaian?->name,
+                'jenis_agunan'      => $permohonan->documents?->pluck('jenisJaminan.name')->unique()->implode(', '),
+                'alamat_agunan'     => $permohonan->documents?->map(function ($document) {
+                    return formatAlamat($document);
+                })->unique()->implode(', '),
+                'luas_tanah'        => $luas_tanah . ' m²',
+                'nilai_tanah'       => formatRupiah($nilai_tanah, 2),
+                'luas_bangunan'     => $luas_bangunan . ' m²',
+                'nilai_bangunan'    => formatRupiah($nilai_bangunan, 2),
+                'tanggal_laporan'   => $permohonan->approval_dd_at ?? $permohonan->approval_eo_at ?? '',
+                'tanggal_review'    => $permohonan->penilaian?->tanggal_kunjungan ?? '',
+                'nilai_pasar_wajar' => formatRupiah($npw, 2),
+                'nilai_likuidasi'   => formatRupiah($nilai_liquidasi, 2),
+                'nama_penilai'      => $permohonan->penilaian?->_user_penilai?->userPenilaiTeam?->name,
+            ];
+        });
+
+        // Calculate the page count
+        $pageCount = ceil($totalRecords / $request->get('size'));
+
+        // Calculate the current page number
+        $currentPage = $request->get('page', 1);
+
+        // Return the response data as a JSON object
+        return response()->json([
+            'draw'            => $request->get('draw'),
+            'recordsTotal'    => $totalRecords,
+            'recordsFiltered' => $filteredRecords,
+            'pageCount'       => $pageCount,
+            'page'            => $currentPage,
+            'totalCount'      => $totalRecords,
+            'data'            => $data,
+        ]);
+    }
+
+    public function export(Request $request)
+    {
+        $startDate = $request->start_date;
+        $endDate = $request->end_date;
+        // name of the file
+        $fileName = 'laporan_penilaian_jaminan_' . $startDate . '_' . $endDate . '.xlsx';
+        return Excel::download(new LaporanPenilaianJaminanExport($request), $fileName);
+    }
+
+
+}

app/Http/Controllers/LaporanPermohonanController.php

@@ -0,0 +1,124 @@
+<?php
+
+    namespace Modules\Lpj\Http\Controllers;
+
+    use App\Http\Controllers\Controller;
+    use Illuminate\Http\Request;
+    use Illuminate\Support\Facades\DB;
+    use Modules\Lpj\Models\Permohonan;
+    use Modules\Lpj\Models\StatusPermohonan;
+    use Modules\Lpj\Exports\LaporanPermohonanExport;
+    use Maatwebsite\Excel\Facades\Excel;
+    use Illuminate\Support\Facades\Auth;
+
+    class LaporanPermohonanController extends Controller
+    {
+        public $user;
+        public function index()
+        {
+            return view('lpj::laporan_permohonan.index');
+        }
+
+        public function export(Request $request)
+        {
+            return Excel::download(new LaporanPermohonanExport($request), 'laporan_permohonan.xlsx');
+        }
+
+        public function dataForDatatables(Request $request)
+        {
+            if (is_null($this->user) || !$this->user->can('debitur.view')) {
+                //abort(403, 'Sorry! You are not allowed to view users.');
+            }
+
+            // Retrieve data from the database
+            $query = Permohonan::query();
+
+            if (!Auth::user()->hasAnyRole(['administrator'])) {
+                $query = $query->where('branch_id', Auth::user()->branch_id);
+            }
+
+            $query = $query->orderBy('nomor_registrasi', 'desc');
+
+            // Apply search filter if provided
+            if ($request->has('search') && !empty($request->get('search'))) {
+                $search = json_decode($request->get('search'));
+
+                if (isset($search->start_date) || isset($search->end_date)) {
+                    $query->whereBetween('tanggal_permohonan', [
+                        $search->start_date ?? '1900-01-01',
+                        $search->end_date ?? now()->toDateString()
+                    ]);
+                }
+
+                // Filter by status if provided
+                if (isset($search->status) && !empty($search->status)) {
+                    $query->where('status', $search->status);
+                }
+
+                // Filter by branch if provided
+                if (isset($search->branch_id) && !empty($search->branch_id)) {
+                    $query->where('branch_id', $search->branch_id);
+                }
+
+                if(isset($search->search)) {
+
+                    $query->where(function ($q) use ($search) {
+                        $q->where('nomor_registrasi', 'LIKE', '%' . $search->search . '%');
+                        $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search->search . '%');
+                        $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search->search . '%');
+                        $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search->search . '%');
+                        $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search->search . '%');
+                        $q->orWhereRelation('jenisFasilitasKredit', 'name', 'LIKE', '%' . $search->search . '%');
+                        $q->orWhereRelation('jenisPenilaian', 'name', 'LIKE', '%' . $search->search . '%');
+                        $q->orWhere('status', 'LIKE', '%' . $search->search . '%');
+                    });
+                }
+            }
+
+            // Apply sorting if provided
+            if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+                $order  = $request->get('sortOrder');
+                $column = $request->get('sortField');
+                $query->orderBy($column, $order);
+            }
+
+            // Get the total count of records
+            $totalRecords = $query->count();
+            $size         = $request->get('size', 10);
+            if ($size == 0) {
+                $size = 10;
+            }
+
+            // Apply pagination if provided
+            if ($request->has('page') && $request->has('size')) {
+                $page   = $request->get('page');
+                $size   = $request->get('size');
+                $offset = ($page - 1) * $size; // Calculate the offset
+
+                $query->skip($offset)->take($size);
+            }
+
+            // Get the filtered count of records
+            $filteredRecords = $query->count();
+
+            // Get the data for the current page
+            $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian','documents','jenisFasilitasKredit', 'jenisPenilaian'])->get();
+
+            // Calculate the page count
+            $pageCount = ceil($totalRecords / $size);
+
+            // Calculate the current page number
+            $currentPage = max(1, $request->get('page', 1));
+
+            // Return the response data as a JSON object
+            return response()->json([
+                'draw'            => $request->get('draw'),
+                'recordsTotal'    => $totalRecords,
+                'recordsFiltered' => $filteredRecords,
+                'pageCount'       => $pageCount,
+                'page'            => $currentPage,
+                'totalCount'      => $totalRecords,
+                'data'            => $data,
+            ]);
+        }
+    }

app/Http/Controllers/LaporanSLAPenilaiController.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Modules\Lpj\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Modules\Lpj\Services\LaporanSLAPenilaiService;
+
+class LaporanSLAPenilaiController extends Controller
+{
+    private $laporanSLAPenilaiService;
+
+    public function __construct()
+    {
+        $this->laporanSLAPenilaiService = app(LaporanSLAPenilaiService::class);
+    }
+
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        return view('lpj::laporan-sla-penilai.index');
+    }
+
+    public function dataForDatatableSLaPenilai(Request $request)
+    {
+        return $this->laporanSLAPenilaiService->dataForDatatables($request);
+    }
+
+
+}

app/Http/Controllers/LaporanUserController.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace Modules\Lpj\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+    use Maatwebsite\Excel\Facades\Excel;
+use Modules\Lpj\Exports\LaporanUserLimitExport;
+use Modules\Lpj\Services\LaporanUserService;
+
+class LaporanUserController extends Controller
+{
+
+
+    private $laporanUserService;
+
+    public function __construct(LaporanUserService $laporanUserService)
+    {
+        $this->laporanUserService = $laporanUserService;
+    }
+
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        // $user = $this->laporanUserService->getUserPemohon();
+        return view('lpj::laporan-user.index');
+    }
+
+    public function searchUserPemohon(Request $request)
+    {
+        $search = $request->get('search');
+        $user = $this->laporanUserService->getUserPemohon($search);
+        return response()->json($user);
+    }
+
+    public function dataTableForUserPemohon(Request $request)
+    {
+        return $this->laporanUserService->dataForDatatables($request);
+    }
+
+     public function export(Request $request)
+    {
+        $startDate = $request->start_date;
+        $endDate = $request->end_date;
+        // name of the file
+        $fileName = 'laporan_user_limit' . $startDate . '_' . $endDate . '.xlsx';
+        return Excel::download(new LaporanUserLimitExport($request), $fileName);
+    }
+}

app/Http/Controllers/NocController.php

@@ -6,6 +6,7 @@
     use Illuminate\Http\Request;
     use Illuminate\Support\Facades\Auth;
     use Modules\Lpj\Http\Requests\NocRequest;
+    use Modules\Lpj\Models\Noc;
     use Modules\Lpj\Models\PenawaranTender;
     use Modules\Lpj\Models\Permohonan;
     use Modules\Lpj\Models\PersetujuanPenawaran;
@@ -18,9 +19,20 @@
          * Display a listing of the resource.
          */
         public function index()
+        {
+            return redirect()->route('noc.pembayaran.index');
+        }
+
+        public function pembayaran()
         {
             $persetujuanPenawarans = PersetujuanPenawaran::all();
-            return view('lpj::noc.index', compact('persetujuanPenawarans'));
+            return view('lpj::noc.pembayaran', compact('persetujuanPenawarans'));
+        }
+
+        public function penyelesaian()
+        {
+            $persetujuanPenawarans = PersetujuanPenawaran::all();
+            return view('lpj::noc.penyelesaian', compact('persetujuanPenawarans'));
         }
 
         /**
@@ -43,34 +55,43 @@
                 $status = "persetujuan-penawaran";
             }
 
-            $persetujuanPenawaran = PersetujuanPenawaran::updateOrCreate(
-                ['penawaran_id' => $validated['penawaran_id']],
-                $validated,
+
+            $dataNoc = [
+                'nominal_bayar'      => $validated['nominal_bayar'],
+                'tanggal_pembayaran' => $validated['tanggal_pembayaran'] ?? date('Y-m-d'),
+                'status_bayar'       => $validated['nominal_bayar'] < $validated['total_harus_bayar'] ? false : true,
+                'catatan_noc'        => $validated['catatan_noc'],
+            ];
+            $noc     = Noc::updateOrCreate(
+                [
+                    'permohonan_id'            => $validated['permohonan_id'],
+                    'persetujuan_penawaran_id' => $validated['persetujuan_penawaran_id'],
+                ],
+                $dataNoc,
             );
 
-            $folderPath = 'noc/' . $validated['penawaran_id'];
+            $folderPath = 'noc/' . request()->get('persetujuan_penawaran_id') . '/bukti_ksl/';
 
             if ($request->hasFile('bukti_ksl')) {
-                $persetujuanPenawaran->bukti_ksl = $request->file('bukti_ksl')->store(
+                $noc->bukti_ksl = $request->file('bukti_ksl')->store(
                     $folderPath,
                     'public',
                 );
             }
+            $noc->save();
 
-            $persetujuanPenawaran->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_bayar');
-                if($permohonan->jenis_penilaian_id==2) {
+                $permohonan->status_bayar = request()->get('status_pembayar');
+                if ($permohonan->jenis_penilaian_id == 2) {
                     $permohonan->status = $status;
                 }
                 $permohonan->save();
 
                 // andy add, update status penawaran.status='spk'
                 // $penawaran = PenawaranTender::where('nomor_registrasi',$permohonan->nomor_registrasi)->first();
-                if($permohonan->jenis_penilaian_id==2) {
+                if ($permohonan->jenis_penilaian_id == 2) {
                     PenawaranTender::where('nomor_registrasi', $permohonan->nomor_registrasi)->update([
                         'status'     => $status,
                         'updated_by' => Auth::id(),
@@ -78,10 +99,10 @@
                     ]);
                 }
                 // andy add, update status penawaran.status='spk'
-            }
+            }*/
 
             return redirect()
-                ->route('noc.index')->with('success', 'Penyelesaian KSL berhasil disimpan.');
+                ->route('noc.index')->with('success', 'NOC berhasil disimpan.');
         }
 
         /**
@@ -89,13 +110,58 @@
          */
         public function update(NocRequest $request, PersetujuanPenawaran $persetujuanPenawaran)
         {
-            $validated               = $request->validated();
-            $validated['updated_by'] = Auth::id();
+            $validated = $request->validated();
+
+            if($request->get('is_memo')){
+
+                $memo = Noc::find($request->get('is_memo'));
+
+                $folderPath = 'noc/' . request()->get('persetujuan_penawaran_id') . '/memo_penyelesaian/';
+
+                if ($request->hasFile('memo_penyelesaian')) {
+                    $memo->memo_penyelesaian = $request->file('memo_penyelesaian')->store(
+                        $folderPath,
+                        'public',
+                    );
+                }
+
+                $memo->catatan_noc = $validated['catatan_noc'];
+                $memo->save();
+
+
+                return redirect()
+                    ->route('laporan.index')->with('success', 'Memo Penyelesaian updated successfully');
+            }
+            $dataNoc   = [
+                'nominal_penyelesaian' => $validated['nominal_penyelesaian'],
+                'tanggal_penyelesaian' => $validated['tanggal_penyelesaian'] ?? date('Y-m-d'),
+                'status_pelunasan'     => ((int)$validated['nominal_bayar'] + (int)$validated['nominal_penyelesaian']) === (int)$validated['total_harus_bayar'] ? true : false,
+                'catatan_noc'          => $validated['catatan_noc'],
+            ];
+
+
+            $noc = Noc::updateOrCreate(
+                [
+                    'permohonan_id'            => $validated['permohonan_id'],
+                    'permohonan_id'            => $validated['permohonan_id'],
+                    'persetujuan_penawaran_id' => $validated['persetujuan_penawaran_id'],
+                ],
+                $dataNoc,
+            );
+
+            $folderPath = 'noc/' . request()->get('persetujuan_penawaran_id') . '/bukti_penyelesaian/';
+
+            if ($request->hasFile('bukti_penyelesaian')) {
+                $noc->bukti_penyelesaian = $request->file('bukti_penyelesaian')->store(
+                    $folderPath,
+                    'public',
+                );
+            }
+            $noc->save();
 
-            $persetujuanPenawaran->update($validated);
 
             return redirect()
-                ->route('noc.index')->with('success', 'Persetujuan Penawaran updated successfully');
+                ->route('noc.index')->with('success', 'NOC updated successfully');
         }
 
         /**
@@ -109,16 +175,16 @@
         /**
          * Display the specified resource.
          */
-        public function show($id) {}
+        public function show(Noc $noc) {
+           return view('lpj::noc.memo', compact('noc'));
+        }
 
         /**
          * Show the form for editing the specified resource.
          */
         public function edit($id)
         {
-            $persetujuanPenawaran = PersetujuanPenawaran::where('id', $id)->with(
-                ['penawaran.detail', 'penawaran.permohonan.debiture','permohonan'],
-            )->first();
+            $persetujuanPenawaran = PersetujuanPenawaran::where('id', $id)->first();
             return view('lpj::noc.form', compact('persetujuanPenawaran'));
         }
 
@@ -134,6 +200,12 @@
         }
 
         public function dataForDatatables(Request $request)
+        {
+            // Redirect to pembayaran datatables by default
+            return $this->dataForDatatablesPembayaran($request);
+        }
+
+        public function dataForDatatablesPembayaran(Request $request)
         {
             if (is_null($this->user) || !$this->user->can('noc.view')) {
                 //abort(403, 'Sorry! You are not allowed to view persetujuan penawaran.');
@@ -142,6 +214,11 @@
             // Retrieve data from the database
             $query = PersetujuanPenawaran::query();
 
+            // Filter for pembayaran (where memo_penyelesaian is null)
+            $query->whereDoesntHave('noc', function($q) {
+                $q->whereNotNull('memo_penyelesaian');
+            });
+
             // Apply search filter if provided
             if ($request->has('search') && !empty($request->get('search'))) {
                 $search = $request->get('search');
@@ -173,18 +250,122 @@
             $filteredRecords = $query->count();
 
             // Get the data for the current page
-            $data = $query
-                ->with(
-                    [
-                        'penawaran.permohonan.debiture',
-                        'penawaran.permohonan.branch',
-                        'permohonan.debiture',
-                        'permohonan.branch',
-                        'penawaran.detail',
-                        'penawaran.persetujuan',
-                    ],
-                )->get();
+            $data = $query->get();
 
+            $data = $data->map(function ($persetujuanPenawaran) {
+                return [
+                    'id'                   => $persetujuanPenawaran->id,
+                    'nomor_registrasi'     => $persetujuanPenawaran->permohonan->nomor_registrasi ?? $persetujuanPenawaran->penawaran->nomor_registrasi,
+                    'nama_debitur'         => $persetujuanPenawaran->permohonan->debiture->name ?? $persetujuanPenawaran->penawaran->permohonan->debiture->name,
+                    'cabang'               => $persetujuanPenawaran->permohonan->branch->name ?? $persetujuanPenawaran->penawaran->permohonan->branch->name,
+                    'tanggal_pembayaran'   => dateFormat(
+                        $persetujuanPenawaran->noc->tanggal_pembayaran ?? $persetujuanPenawaran->noc?->created_at,
+                        true,
+                    ),
+                    'nominal_bayar'        => currencyFormat($persetujuanPenawaran->nominal_bayar ?? 0,
+                    ),
+                    'nominal_diterima'     => currencyFormat(
+                        $persetujuanPenawaran->noc->nominal_bayar ?? 0,
+                    ),
+                    'bukti_ksl'            => $persetujuanPenawaran->noc->bukti_ksl ?? $persetujuanPenawaran->bukti_ksl ?? null,
+                    'bukti_bayar'          => $persetujuanPenawaran->bukti_bayar ?? null,
+                    'updated_at'           => dateFormat($persetujuanPenawaran->updated_at, true),
+                ];
+            })->sortBy('updated_at', 1);
+
+            // Calculate the page count
+            $pageCount = ceil($totalRecords / $request->get('size'));
+
+            // Calculate the current page number
+            $currentPage = $request->get('page', 1);
+
+            // Return the response data as a JSON object
+            return response()->json([
+                'draw'            => $request->get('draw'),
+                'recordsTotal'    => $totalRecords,
+                'recordsFiltered' => $filteredRecords,
+                'pageCount'       => $pageCount,
+                'page'            => $currentPage,
+                'totalCount'      => $totalRecords,
+                'data'            => $data,
+            ]);
+        }
+
+        public function dataForDatatablesPenyelesaian(Request $request)
+        {
+            if (is_null($this->user) || !$this->user->can('noc.view')) {
+                //abort(403, 'Sorry! You are not allowed to view persetujuan penawaran.');
+            }
+
+            // Retrieve data from the database
+            $query = PersetujuanPenawaran::query();
+
+            // Filter for penyelesaian (where memo_penyelesaian is not null)
+            $query->whereHas('noc', function($q) {
+                $q->whereNotNull('memo_penyelesaian');
+            });
+
+            // Apply search filter if provided
+            if ($request->has('search') && !empty($request->get('search'))) {
+                $search = $request->get('search');
+                $query->where(function ($q) use ($search) {
+                    $q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%');
+                });
+            }
+
+            // Apply sorting if provided
+            if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+                $order  = $request->get('sortOrder');
+                $column = $request->get('sortField');
+                $query->orderBy($column, $order);
+            }
+
+            // Get the total count of records
+            $totalRecords = $query->count();
+
+            // Apply pagination if provided
+            if ($request->has('page') && $request->has('size')) {
+                $page   = $request->get('page');
+                $size   = $request->get('size');
+                $offset = ($page - 1) * $size; // Calculate the offset
+
+                $query->skip($offset)->take($size);
+            }
+
+            // Get the filtered count of records
+            $filteredRecords = $query->count();
+
+            // Get the data for the current page
+            $data = $query->get();
+
+            $data = $data->map(function ($persetujuanPenawaran) {
+                return [
+                    'id'                   => $persetujuanPenawaran->id,
+                    'nomor_registrasi'     => $persetujuanPenawaran->permohonan->nomor_registrasi ?? $persetujuanPenawaran->penawaran->nomor_registrasi,
+                    'nama_debitur'         => $persetujuanPenawaran->permohonan->debiture->name ?? $persetujuanPenawaran->penawaran->permohonan->debiture->name,
+                    'cabang'               => $persetujuanPenawaran->permohonan->branch->name ?? $persetujuanPenawaran->penawaran->permohonan->branch->name,
+                    'tanggal_pembayaran'   => dateFormat(
+                        $persetujuanPenawaran->noc->tanggal_pembayaran ?? $persetujuanPenawaran->noc?->created_at,
+                        true,
+                    ),
+                    'nominal_bayar'        => currencyFormat($persetujuanPenawaran->nominal_bayar ?? 0,
+                    ),
+                    'nominal_diterima'     => currencyFormat(
+                        $persetujuanPenawaran->noc->nominal_bayar ?? 0,
+                    ),
+                    'bukti_ksl'            => $persetujuanPenawaran->noc->bukti_ksl ?? $persetujuanPenawaran->bukti_ksl ?? null,
+                    'bukti_bayar'          => $persetujuanPenawaran->bukti_bayar ?? null,
+                    'memo_penyelesaian'    => $persetujuanPenawaran->noc->memo_penyelesaian ?? $persetujuanPenawaran->memo_penyelesaian ?? null,
+                    'nominal_penyelesaian' => currencyFormat(
+                        $persetujuanPenawaran->noc->nominal_penyelesaian ?? $persetujuanPenawaran->nominal_penyelesaian ?? 0,
+                    ),
+                    'bukti_penyelesaian'   => $persetujuanPenawaran->noc->bukti_penyelesaian ?? $persetujuanPenawaran->bukti_penyelesaian ?? null,
+                    'tanggal_penyelesaian' => $persetujuanPenawaran->noc?->tanggal_penyelesaian ? dateFormat(
+                        $persetujuanPenawaran->noc?->tanggal_penyelesaian,
+                        true) : '-',
+                    'updated_at'           => dateFormat($persetujuanPenawaran->updated_at, true),
+                ];
+            })->sortBy('updated_at', 1);
 
             // Calculate the page count
             $pageCount = ceil($totalRecords / $request->get('size'));

app/Http/Controllers/OtorisasiPenawaranController.php

@@ -336,8 +336,9 @@
 		
 		public function show($id)
 		{
-			$prosespenawaran  = PenawaranTender::find($id);
-			return view('lpj::otorisasipenawaran.show', compact('id','prosespenawaran'));
+			$prosespenawaran  = PenawaranTender::with(['permohonan','tujuanPenilaianKjpp'])->find($id);
+            $permohonan = $prosespenawaran->permohonan;
+			return view('lpj::otorisasipenawaran.show', compact('id','prosespenawaran','permohonan'));
 		}
 		
 		public function penawaranulang(Request $request, $id): JsonResponse

app/Http/Controllers/PembatalanController.php

@@ -61,12 +61,18 @@
                 // Update Permohonan Pembatalan
                 if($request->status=='approved'){
                     $pembatalan->status = 'approved';
+                    $pembatalan->authorized_at = now();
+                    $pembatalan->authorized_by = auth()->user()->id;
+                    $pembatalan->authorized_status = 1;
                     $pembatalan->save();
 
                     $permohonan->status = 'batal';
                     $permohonan->save();
                 } else{
                     $pembatalan->status = 'rejected';
+                    $pembatalan->authorized_at = now();
+                    $pembatalan->authorized_by = auth()->user()->id;
+                    $pembatalan->authorized_status = 3;
                     $pembatalan->save();
                 }
 

app/Http/Controllers/PembayaranController.php

@@ -110,7 +110,9 @@ class PembayaranController extends Controller
     public function edit($id)
     {
         $permohonan = Permohonan::find($id);
-        return view('lpj::pembayaran.form', compact('permohonan'));
+
+        $persetujuanPenawaran = PersetujuanPenawaran::where('permohonan_id', $permohonan->id)->first();
+        return view('lpj::pembayaran.form', compact('permohonan', 'persetujuanPenawaran'));
     }
 
     public function store(PersetujuanPenawaranRequest $request)
@@ -119,27 +121,44 @@ class PembayaranController extends Controller
         $validated['created_by'] = Auth::id();
         $validated['status']     = '0';
 
-        if (isset($validated['penawaran_id'])) {
-            $persetujuanPenawaran = PersetujuanPenawaran::create(
-                ['penawaran_id' => $validated['penawaran_id']],
-                $validated,
-            );
+        $persetujuanPenawaran = PersetujuanPenawaran::where('permohonan_id', $validated['permohonan_id'] ?? null)->first();
+        $permohonan = Permohonan::find(request()->get('permohonan_id'));
+        if ($persetujuanPenawaran) {
+            // if (isset($validated['penawaran_id'])) {
+
+            // $persetujuanPenawaran = PersetujuanPenawaran::create(
+            //     ['penawaran_id' => $validated['penawaran_id']],
+            //     $validated,
+            // );
+
+            $persetujuanPenawaran->fill($validated);
+
+            if ($request->hasFile('bukti_bayar')) {
+                $folderPath                     = 'persetujuan_penawaran/' . $validated['penawaran_id'];
+                $persetujuanPenawaran->bukti_bayar = $request->file('bukti_bayar')->store($folderPath, 'public');
+            }
+
+            $persetujuanPenawaran->save();
+
+            $permohonan->approve_bayar_by = null;
+            $permohonan->approve_bayar_at = null;
+            $permohonan->status = 'done';
+            $permohonan->save();
         } else {
             $persetujuanPenawaran = PersetujuanPenawaran::create(
                 $validated
             );
+
+            $folderPath = 'persetujuan_penawaran/' . $validated['penawaran_id'];
+
+            if ($request->hasFile('bukti_bayar')) {
+                $persetujuanPenawaran->bukti_bayar = $request->file('bukti_bayar')->store($folderPath, 'public');
+            }
+            $persetujuanPenawaran->save();
         }
 
-        $folderPath = 'persetujuan_penawaran/' . $validated['penawaran_id'];
-
-        if ($request->hasFile('bukti_bayar')) {
-            $persetujuanPenawaran->bukti_bayar = $request->file('bukti_bayar')->store($folderPath, 'public');
-        }
-
-        $persetujuanPenawaran->save();
-
         // Update the status of the related permohonan to 'spk'
-        $permohonan = Permohonan::find(request()->get('permohonan_id'));
+
         if ($permohonan) {
             $permohonan->status_bayar = request()->get('status_bayar');
             $permohonan->save();
@@ -183,12 +202,15 @@ class PembayaranController extends Controller
                 if ($permohonan) {
 
                     if ($request->type === 'revisi') {
+                        $data['status'] = 'revisi-pembayaran';
                         $data['status_bayar'] = 'belum_bayar';
                     } else {
                         $data['status_bayar'] = 'sudah_bayar';
+                        $data['status'] = 'proses-laporan';
                     }
 
                     if ($permohonan->jenis_penilaian_id == 2) {
+                        $data['status_bayar'] = 'sudah_bayar';
                         $data['status'] = 'spk';
                     }
 
@@ -203,7 +225,6 @@ class PembayaranController extends Controller
                             $data['keterangan']
                         );
 
-                        $data['status'] = 'proses-laporan';
                     }
 
                     $permohonan->update($data);
@@ -233,12 +254,18 @@ class PembayaranController extends Controller
             // abort(403, 'Sorry! You are not allowed to view users.');
         }
 
-        $query = Permohonan::query()->where(['status_bayar' => 'belum_bayar', 'jenis_penilaian_id' => 1])
-            ->whereNotIn('id', function ($subquery) {
+        $query = Permohonan::query()->where(function ($query) {
+            $query->where(['status_bayar' => 'belum_bayar', 'jenis_penilaian_id' => 1])
+                  ->orWhere('status', 'revisi-pembayaran');
+        })
+        ->where(function ($query) {
+            $query->whereNotIn('id', function ($subquery) {
                 $subquery->select('permohonan_id')
                          ->from('persetujuan_penawaran')
                          ->whereNotNull('permohonan_id');
             });
+        });
+
 
         // Pencarian berdasarkan parameter search
         if ($request->has('search') && !empty($request->get('search'))) {

app/Http/Controllers/PenilaianController.php

@@ -10,6 +10,7 @@ use Illuminate\Support\Facades\DB;
 use Modules\Lpj\Http\Requests\PenilaianRequest;
 use Modules\Lpj\Models\Authorization;
 use Modules\Lpj\Models\JenisPenilaian;
+use Modules\Lpj\Models\LaporanAdminKredit;
 use Modules\Lpj\Models\Penilaian;
 use Modules\Lpj\Models\PenilaianTeam;
 use Modules\Lpj\Models\Permohonan;
@@ -193,6 +194,8 @@ class PenilaianController extends Controller
             DB::beginTransaction();
             $penilaian = Penilaian::where('nomor_registrasi', $request->nomor_registrasi)->first();
 
+            $surveyTeam = null;
+            $penilaiTeam = null;
             $penilaianId = $penilaian->id;
 
             $penilainTeam = PenilaianTeam::where('penilaian_id', $penilaianId)->get();
@@ -204,6 +207,7 @@ class PenilaianController extends Controller
                         'user_id' => $request->surveyor_id,
                         'role'    => 'surveyor',
                     ]);
+                    $surveyTeam = $item->team_id;
                 }
 
                 if ($item->role === 'penilai' && $item->user_id === null) {
@@ -211,10 +215,21 @@ class PenilaianController extends Controller
                         'user_id' => $request->penilai_id,
                         'role'    => 'penilai',
                     ]);
+
+                }
+
+                if ($item->role === 'penilai' && $surveyTeam) {
+                    $penilaiTeam = $item->team_id;
                 }
             }
 
             $permohonan = Permohonan::where('nomor_registrasi', $request->nomor_registrasi);
+
+            if ($surveyTeam && $penilaiTeam) {
+                $permohonan->update([
+                    'region_id' => $penilaiTeam,
+                ]);
+            }
             $permohonan->update([
                 'status' => 'assign',
             ]);
@@ -253,7 +268,7 @@ class PenilaianController extends Controller
         $teamPenilai = $userTeam->flatMap(function ($team) {
             return $team->teamsUsers->filter(function ($teamUser) {
                 return $teamUser->user->roles->contains(function ($role) {
-                    return $role->name === 'surveyor' || $role->name === 'surveyor-penilai' || $role->name === 'administrator';
+                    return $role->name === 'surveyor' || $role->name === 'penilai' || $role->name === 'administrator';
                 });
             })->map(function ($teamUser) {
                 return $teamUser->user;
@@ -279,6 +294,8 @@ class PenilaianController extends Controller
             $penilaianTeam = PenilaianTeam::where('penilaian_id', $penilaian->id)->get();
         }
 
+        // dd($penilaianTeam);
+
         return view(
             'lpj::penilaian.form',
             compact(
@@ -347,8 +364,9 @@ class PenilaianController extends Controller
 
         $query->whereIn('status', ['registered', 'registrasi-final', 'reassign']);
 
-        // Filter berdasarkan role
+
         if (Auth::user()->roles[0]->name !== 'administrator') {
+
             $query->whereHas('region.teams.teamsUsers.user', function ($q) {
                 $q->where('id', Auth::user()->id);
             });
@@ -376,7 +394,8 @@ class PenilaianController extends Controller
 
         $filteredRecords = $query->count();
         $data            = $query->with(
-            ['user', 'debiture', 'branch', 'tujuanPenilaian', 'jenisPenilaian', 'region.teams.teamsUsers.user'],
+            ['user', 'debiture', 'branch', 'tujuanPenilaian', 'jenisPenilaian', 'region.teams.teamsUsers.user',
+        ]
         )->get();
 
         $pageCount = ceil($totalRecords / $size);
@@ -433,10 +452,10 @@ class PenilaianController extends Controller
         $header     = $headers[$type] ?? 'Pelaporan';
         $authorization = null;
         if ($header === 'SLA') {
-            $authorization = Authorization::with(['user'])->find($id);
-            $permohonan = Permohonan::find($authorization->permohonan_id);
+            $authorization = Authorization::with(['user','permohonan.lampiranDokumen.jenisLampiran'])->find($id);
+            $permohonan = Permohonan::with(['lampiranDokumen.jenisLampiran'])->find($authorization->permohonan_id);
         } else {
-            $permohonan = Permohonan::find($id);
+            $permohonan = Permohonan::with(['lampiranDokumen.jenisLampiran'])->find($id);
         }
         if ($header === 'SLA') {
             return view('lpj::penilaian.otorisator.sla', compact('permohonan', 'header', 'authorization'));
@@ -450,7 +469,7 @@ class PenilaianController extends Controller
 
     public function otorisatorUpdate(Request $request, $id, $context)
     {
-        if ($context === 'SLA') {
+        if ($context === 'Freze SLA' || $context === 'Unfreeze SLA') {
             $authorization = Authorization::with(['user'])->find($id);
             if (!$authorization) {
                 return response()->json([
@@ -469,6 +488,7 @@ class PenilaianController extends Controller
         } else {
             $permohonan = Permohonan::find($id);
         }
+
         if (!$permohonan) {
             return response()->json([
                 'message' => 'Data permohonan tidak ditemukan.',
@@ -482,14 +502,14 @@ class PenilaianController extends Controller
 
                 $permohonan->update([
                     'status_bayar' => $newStatus,
-                    'keterangan'   => $request->message,
+                    'keterangan'   => $request->keterangan,
                 ]);
                 break;
 
             case 'pembatalan':
                 $permohonan->update([
                     'status'     => 'batal',
-                    'keterangan' => $request->message,
+                    'keterangan' => $request->keterangan,
                 ]);
                 break;
 
@@ -508,12 +528,41 @@ class PenilaianController extends Controller
                     $status = 'done';
                 }
 
+                if ($status == 'done' && $permohonan->status_bayar === 'sudah_bayar' && $permohonan->penilai->type_penilai === 'standar' || $permohonan->penilai->type_penilai === 'sederhana') {
+                    $_permohonan = Permohonan::with(['documents.jenisJaminan','penilaian._user_penilai','penilai','documents.detail.jenisLegalitasJaminan'])->find($permohonan->id);
+
+                    if (isset($_permohonan->penilai->lpj)) {
+                        $npw = json_decode($_permohonan->penilai->lpj, true);
+                        $npw = $npw['total_nilai_pasar_wajar'] ?? 0;
+                    }
+
+                    $dataAdk = [
+                        'debiture_id'       => $_permohonan->debiture_id,
+                        'jenis_agunan'      => $_permohonan->documents->pluck('jenisJaminan.name')->unique()->implode(', '),
+                        'alamat_agunan'     => $_permohonan->documents->map(function ($document) {
+                            return formatAlamat($document);
+                        })->unique()->implode(', '),
+                        'nama_pemilik'      => $_permohonan->documents->pluck('pemilik.name')->unique()->implode(', '),
+                        'tanggal_kunjungan' => $_permohonan->penilaian->tanggal_kunjungan,
+                        'nama_penilai'      => $_permohonan->penilaian->_user_penilai->userPenilaiTeam->name,
+                        'nilai_likuidasi'   => $_permohonan->nilai_liquidasi,
+                        'nilai_pasar_wajar' => str_replace('.', '', $npw),
+                        'bukti_kepemilikan' => $_permohonan->documents->flatMap(function ($document) {
+                            return $document->detail->map(function ($detail) {
+                                return $detail->jenisLegalitasJaminan->name ?? null;
+                            });
+                        })->filter()->unique()->implode(', '),
+
+                    ];
+                    LaporanAdminKredit::create($dataAdk);
+                }
+
                 if ($approvalField) {
-                    $this->updatePermohonan($permohonan, $status, $approvalField, $request->message);
+                    $this->updatePermohonan($permohonan, $status, $approvalField, $request->keterangan);
                 }
                 break;
 
-            case 'sla':
+            case 'freze sla':
                 if (Auth::user()->roles[0]->name === 'senior-officer' || Auth::user()->roles[0]->name === 'administrator' && $authorization->approve_so === null) {
                     $authorization->update([
                         'status'         => '3',
@@ -524,7 +573,7 @@ class PenilaianController extends Controller
                     ]);
                 } elseif (Auth::user()->roles[0]->name === 'EO Appraisal' || Auth::user()->roles[0]->name === 'administrator'  && $authorization->approve_so && $authorization->approve_eo === null) {
                     $status = '2';
-                    if (!in_array($permohonan->nilai_plafond_id, [1, 4])) {
+                    if (in_array($permohonan->nilai_plafond_id, [1, 2])) {
                         $status = '1';
                         $permohonan->update([
                             'status'         => $authorization->request
@@ -554,20 +603,29 @@ class PenilaianController extends Controller
                 break;
             case 'paparan':
                 if (Auth::user()->roles[0]->name === 'senior-officer' || Auth::user()->roles[0]->name === 'administrator' && $authorization->approve_so === null) {
+                    $status = '3';
+                    if (in_array($permohonan->nilai_plafond_id, [3])) {
+                        $status = '1';
+                        $permohonan->update([
+                            'status'         => $authorization->request
+                        ]);
+                    }
                     $authorization->update([
-                        'status'         => '3',
+                        'status'         => $status,
                         'status_so' => '1',
                         'approve_so'    => Auth::user()->id,
                         'approve_so_at' => now(),
-                        'keterangan_so'     => $request->message,
+                        'keterangan_so'     => $request->keterangan,
                     ]);
 
                     $permohonan->update([
-                        'tanggal_paparan' => $request->tanggalPaparan
+                        'tanggal_paparan' => $request->tanggalPaparan,
+                        'keterangan'      => $request->keterangan
                     ]);
+
                 } elseif (Auth::user()->roles[0]->name === 'EO Appraisal') {
                     $status = '2';
-                    if (!in_array($permohonan->nilai_plafond_id, [1,4])) {
+                    if (in_array($permohonan->nilai_plafond_id, [1,2, 3])) {
                         $status = '1';
                         $permohonan->update([
                             'status'         => $authorization->request
@@ -578,7 +636,7 @@ class PenilaianController extends Controller
                         'status_eo' => '1',
                         'approve_eo'    => Auth::user()->id,
                         'approve_eo_at' => now(),
-                        'keterangan_eo'     => $request->message,
+                        'keterangan_eo'     => $request->keterangan,
                     ]);
                 } elseif (Auth::user()->roles[0]->name === 'DD Appraisal' || Auth::user()->roles[0]->name === 'administrator'  && $authorization->approve_so  && $authorization->approve_dd === null) {
                     $authorization->update([
@@ -586,7 +644,7 @@ class PenilaianController extends Controller
                         'status_dd' => '1',
                         'approve_dd'    => Auth::user()->id,
                         'approve_dd_at' => now(),
-                        'keterangan_dd'     => $request->message,
+                        'keterangan_dd'     => $request->keterangan,
                     ]);
 
                     $permohonan->update([
@@ -594,6 +652,14 @@ class PenilaianController extends Controller
                     ]);
                 }
                 break;
+            case 'unfreeze sla':
+                $authorization->update([
+                    'request'         => 'unfreeze-sla',
+                ]);
+                $permohonan->update([
+                    'status'         => 'unfreeze-sla',
+                ]);
+                break;
 
             default:
                 return response()->json([
@@ -610,6 +676,8 @@ class PenilaianController extends Controller
 
     public function updatePermohonan($permohonan, $status, $approvalField, $message)
     {
+
+
         $permohonan->update([
             'status'         => $status,
             $approvalField   => Auth::user()->id,
@@ -630,7 +698,7 @@ class PenilaianController extends Controller
             'Pelaporan'  => 'proses-laporan',
             'Pembayaran' => 'proses',
             'Pembatalan' => 'batal',
-            'SLA'        => 'freeze',
+            'SLA'        => 'request-freeze',
             'Paparan' => 'proses-paparan',
             default      => '',
         };
@@ -662,7 +730,7 @@ class PenilaianController extends Controller
                 $query->whereRaw('LOWER(status) = ?', [strtolower($status)]);
             } elseif ($status == 'batal') {
                 $query->whereRaw('LOWER(status) = ?', [strtolower($status)]);
-            } elseif ($status == 'freeze') {
+            } elseif ($status == 'request-freeze') {
                 $query->whereRaw('LOWER(status) = ?', [strtolower($status)]);
             } elseif ($status == 'proses-paparan') {
                 $query->whereRaw('LOWER(status) IN (?, ?)', ['proses-paparan', 'paparan']);
@@ -727,7 +795,7 @@ class PenilaianController extends Controller
             'tujuanPenilaian',
             'nilaiPlafond',
             'penilaian.userPenilai' => function ($q) {
-                $q->where('role', 'penilai')->with(['user', 'team.regions'])->first();
+                $q->where('role', 'penilai')->with(['user', 'team.regions']);
             },
             'penilai',
             'approveSo',
@@ -771,7 +839,6 @@ class PenilaianController extends Controller
         $inspeksi = Inspeksi::where('permohonan_id', $id)->where('dokument_id', $documentId)->first();
         $lpj = Penilai::where('permohonan_id', $id)
             ->where('dokument_id', $documentId)
-            ->where('inspeksi_id', $inspeksi->id)
             ->first();
         $penilai = $lpj;
 
@@ -822,8 +889,8 @@ class PenilaianController extends Controller
     private function getViewLaporan($tipe)
     {
         $viewMap = [
-            'sederhana' => 'penilai.components.lpj-sederhana-standard',
-            'standard' => 'penilai.components.lpj-sederhana-standard',
+            'sederhana' => 'penilai.components.lpj-sederhana-standar',
+            'standar' => 'penilai.components.lpj-sederhana-standar',
             'resume' => 'penilai.components.resume',
             'memo' => 'penilai.components.memo',
             'rap' => 'penilai.components.rap-penilai',
@@ -864,7 +931,7 @@ class PenilaianController extends Controller
                 [
                     'permohonan_id' => $request->permohonanId,
                     'dokument_id' => $request->documentId,
-                    'inspeksi_id' => $request->inspeksiId,
+
                 ],
                 [
                     'lpj' => json_encode($data),
@@ -888,28 +955,41 @@ class PenilaianController extends Controller
 
     public function revisiLaporan(Request $request, $id)
     {
-        $permohonan = Permohonan::findOrFail($id);
-        $userRole = Auth::user()->roles[0]->name;
+        // dd($id);
+        if ($request->dataHeader == 'Paparan' || $request->dataHeader == 'Freze SLA') {
+            $authorization = Authorization::find($id);
+            $permohonan = Permohonan::find($authorization->permohonan_id);
+        } else {
+            $permohonan = Permohonan::find($id);
+            $userRole   = Auth::user()->roles[0]->name;
+        }
+
+        if ($permohonan->status === 'proses-paparan') {
+            if ($authorization) {
+                $authorization->delete();
+            }
 
-        if ($permohonan->status === 'proses-paparan' && in_array($userRole, ['EO Appraisal', 'DD Appraisal'])) {
-            Authorization::delete([
-                'permohonan_id' => $permohonan->id,
-                'jenis' => 'paparan',
-                'request' => 'paparan',
-            ]);
             $status = 'revisi-paparan';
+        } elseif ($permohonan->status === 'request-freeze') {
+            if ($authorization) {
+                $authorization->delete();
+            }
+
+            $status = 'reject-freeze';
+        } elseif ($permohonan->status === 'proses-laporan' && $userRole === 'senior-officer') {
+            $status = 'revisi-laporan';
         } elseif ($permohonan->status === 'proses-laporan' && $userRole === 'EO Appraisal') {
             $permohonan->update([
-                'approve_so'    => null,
-                'approve_so_at' => null,
+                'approval_so'    => 0,
+                'approval_so_at' => null,
             ]);
             $status = 'revisi-laporan';
         } elseif ($permohonan->status === 'proses-laporan' && $userRole === 'DD Appraisal') {
             $permohonan->update([
-                'approve_so'    => null,
-                'approve_so_at' => null,
-                'approve_eo'    => null,
-                'approve_eo_at' => null,
+                'approval_so'    => 0,
+                'approval_so_at' => null,
+                'approval_eo'    => 0,
+                'approval_eo_at' => null,
 
             ]);
             $status = 'revisi-laporan';
@@ -923,7 +1003,7 @@ class PenilaianController extends Controller
         // Perbarui status dan informasi lainnya
         $permohonan->update([
             'status' => $status,
-            'keterangan' => $request->message,
+            'keterangan' => $request->keterangan,
             'submitted_at' => now(),
         ]);
 

app/Http/Controllers/PermohonanController.php

@@ -1,481 +1,518 @@
 <?php
 
-namespace Modules\Lpj\Http\Controllers;
+    namespace Modules\Lpj\Http\Controllers;
 
-use App\Http\Controllers\Controller;
-use Barryvdh\DomPDF\Facade\Pdf;
-use Exception;
-use Illuminate\Http\Request;
-use Maatwebsite\Excel\Facades\Excel;
-use Modules\Location\Models\City;
-use Modules\Location\Models\District;
-use Modules\Location\Models\Province;
-use Modules\Location\Models\Village;
-use Modules\Lpj\Models\PermohonanPembatalan;
-use Modules\Lpj\Exports\PermohonanExport;
-use Modules\Lpj\Http\Requests\PermohonanRequest;
-use Modules\Lpj\Models\Branch;
-use Modules\Lpj\Models\Debiture;
-use Modules\Lpj\Models\DokumenJaminan;
-use Modules\Lpj\Models\JenisFasilitasKredit;
-use Modules\Lpj\Models\NilaiPlafond;
-use Modules\Lpj\Models\Permohonan;
-use Modules\Lpj\Models\StatusPermohonan;
-use Modules\Lpj\Models\TujuanPenilaian;
-use Modules\Lpj\Services\PermohonanHistoryService;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\DB;
-use Modules\Lpj\Models\Penilaian;
+    use App\Http\Controllers\Controller;
+    use Exception;
+    use Illuminate\Http\JsonResponse;
+    use Illuminate\Http\Request;
+    use Illuminate\Support\Facades\Auth;
+    use Illuminate\Support\Facades\DB;
+    use Maatwebsite\Excel\Facades\Excel;
+    use Modules\Location\Models\City;
+    use Modules\Location\Models\District;
+    use Modules\Location\Models\Province;
+    use Modules\Location\Models\Village;
+    use Modules\Lpj\Exports\PermohonanExport;
+    use Modules\Lpj\Http\Requests\PermohonanRequest;
+    use Modules\Lpj\Models\Branch;
+    use Modules\Lpj\Models\Debiture;
+    use Modules\Lpj\Models\DokumenJaminan;
+    use Modules\Lpj\Models\JenisFasilitasKredit;
+    use Modules\Lpj\Models\NilaiPlafond;
+    use Modules\Lpj\Models\Penilaian;
+    use Modules\Lpj\Models\Permohonan;
+    use Modules\Lpj\Models\PermohonanPembatalan;
+    use Modules\Lpj\Models\StatusPermohonan;
+    use Modules\Lpj\Models\TujuanPenilaian;
+    use Modules\Lpj\Services\PermohonanHistoryService;
 
-class PermohonanController extends Controller
-{
-    public $user;
-    protected $historyService;
-
-    public function __construct(PermohonanHistoryService $historyService)
+    class PermohonanController extends Controller
     {
-        $this->historyService = $historyService;
-    }
+        public    $user;
+        protected $historyService;
 
-    public function index()
-    {
-        return view('lpj::permohonan.index');
-    }
-
-    public function store(PermohonanRequest $request)
-    {
-        $validate = $request->validated();
-        if ($validate) {
-            try {
-                // Process file upload
-                $filePath = null;
-                if ($request->hasFile('attachment')) {
-                    $file     = $request->file('attachment');
-                    $fileName = time() . '_' . $file->getClientOriginalName();
-                    $filePath = $file->storeAs('permohonan_attachments', $fileName, 'public');
-                }
-
-                // Get keterangan if provided
-                $keterangan = $request->input('keterangan') ?? null;
-
-
-                // Save to database
-                $permohonan = Permohonan::create($validate);
-
-                // Create history
-                $this->historyService->createHistory(
-                    $permohonan,
-                    $validate['status'],
-                    $keterangan,
-                    [],  // beforeRequest is empty for new permohonan
-                    $permohonan->toArray(),
-                    $filePath,
-                );
-
-                $documents = DokumenJaminan::where('permohonan_id', $permohonan->id)->get();
-                if (count($documents) < 1) {
-                    return redirect()->route('debitur.jaminan.create', array_merge(['permohonan_id' => $permohonan->id], ['id' => $permohonan->debiture->id]))->with('success', 'Permohonan created successfully, Lengkapi data jaminan terlebih dahulu');
-                }
-                return redirect()
-                    ->route('permohonan.index')->with('success', 'Permohonan created successfully');
-            } catch (Exception $e) {
-                return redirect()
-                    ->route('permohonan.create')->with('error', 'Failed to create permohonan' . $e->getMessage());
-            }
-        } else {
-            return redirect()
-                ->route('permohonan.create')->with('success', 'error naon iye')->withInput();
+        public function __construct(PermohonanHistoryService $historyService)
+        {
+            $this->historyService = $historyService;
         }
-    }
 
-    public function create()
-    {
-        return view('lpj::permohonan.create');
-    }
+        public function index()
+        {
+            return view('lpj::permohonan.index');
+        }
 
-    public function createPermohonan($debitur)
-    {
-        $branches        = Branch::all();
-        $debitur         = Debiture::find($debitur);
-        $tujuanPenilaian = TujuanPenilaian::all();
-        $status          = StatusPermohonan::all();
-        $fasilitasKredit = JenisFasilitasKredit::all();
-        $plafond         = NilaiPlafond::all();
+        public function store(PermohonanRequest $request)
+        {
+            $validate = $request->validated();
+            if ($validate) {
+                try {
+                    // Process file upload
+                    $filePath = null;
+                    if ($request->hasFile('attachment')) {
+                        $file     = $request->file('attachment');
+                        $fileName = time() . '_' . $file->getClientOriginalName();
+                        $filePath = $file->storeAs('permohonan_attachments', $fileName, 'public');
+                    }
 
-        return view(
-            'lpj::permohonan.form',
-            compact('branches', 'debitur', 'tujuanPenilaian', 'status', 'fasilitasKredit', 'plafond'),
-        );
-    }
+                    // Get keterangan if provided
+                    $keterangan = $request->input('keterangan') ?? null;
 
-    public function edit($id)
-    {
-        $permohonan      = Permohonan::find($id);
-        $branches        = Branch::all();
-        $debitur         = Debiture::find($permohonan->debiture_id);
-        $tujuanPenilaian = TujuanPenilaian::all();
-        $status          = StatusPermohonan::all();
-        $provinces       = Province::all();
-        $cities          = City::where('province_code', $debitur->province_code)->get();
-        $districts       = District::where('city_code', $debitur->city_code)->get();
-        $villages        = Village::where('district_code', $debitur->district_code)->get();
-        $documents       = DokumenJaminan::with('pemilik', 'detail')->where('debiture_id', $id)->get();
 
-        $fasilitasKredit = JenisFasilitasKredit::all();
-        $plafond         = NilaiPlafond::all();
+                    // Save to database
+                    $permohonan = Permohonan::create($validate);
 
-        return view(
-            'lpj::permohonan.form',
-            compact(
-                'permohonan',
-                'branches',
-                'debitur',
-                'tujuanPenilaian',
-                'status',
-                'provinces',
-                'cities',
-                'districts',
-                'villages',
-                'documents',
-                'fasilitasKredit',
-                'plafond',
-            ),
-        );
-    }
+                    // Create history
+                    $this->historyService->createHistory(
+                        $permohonan,
+                        $validate['status'],
+                        $keterangan,
+                        [],  // beforeRequest is empty for new permohonan
+                        $permohonan->toArray(),
+                        $filePath,
+                    );
 
-    public function update(PermohonanRequest $request, $id)
-    {
-        $permohonan    = Permohonan::findOrFail($id);
-        $beforeRequest = $permohonan->toArray();
-
-        $validate = $request->validated();
-        if ($validate) {
-            try {
-                // Update in database
-
-                if ($permohonan->status == 'revisi') {
-                    $validate['status'] = 'order';
+                    $documents = DokumenJaminan::where('permohonan_id', $permohonan->id)->get();
+                    if (count($documents) < 1) {
+                        return redirect()->route(
+                            'debitur.jaminan.create',
+                            array_merge(['permohonan_id' => $permohonan->id], ['id' => $permohonan->debiture->id]),
+                        )->with('success', 'Permohonan created successfully, Lengkapi data jaminan terlebih dahulu');
+                    }
+                    return redirect()
+                        ->route('permohonan.index')->with('success', 'Permohonan created successfully');
+                } catch (Exception $e) {
+                    return redirect()
+                        ->route('permohonan.create')->with('error', 'Failed to create permohonan' . $e->getMessage());
                 }
-                $permohonan->update($validate);
-
-                $documents = DokumenJaminan::where('permohonan_id', $permohonan->id)->get();
-                if (count($documents) < 1) {
-                    return redirect()->route('debitur.jaminan.create', array_merge(['permohonan_id' => $permohonan->id], ['id' => $permohonan->debiture->id]))->with('success', 'Permohonan created successfully, Lengkapi data jaminan terlebih dahulu');
-                }
-
+            } else {
                 return redirect()
-                    ->route('permohonan.index')->with('success', 'Permohonan updated successfully');
-            } catch (Exception $e) {
-                return redirect()
-                    ->route('permohonan.edit', $id)->with('error', 'Failed to update permohonan');
+                    ->route('permohonan.create')->with('success', 'error naon iye')->withInput();
             }
         }
-    }
 
-    public function destroy($id)
-    {
-        try {
-            // Delete from database
+        public function create()
+        {
+            return view('lpj::permohonan.create');
+        }
+
+        public function createPermohonan($debitur)
+        {
+            $branches        = Branch::all();
+            $debitur         = Debiture::find($debitur);
+            $tujuanPenilaian = TujuanPenilaian::all();
+            $status          = StatusPermohonan::all();
+            $fasilitasKredit = JenisFasilitasKredit::all();
+            $plafond         = NilaiPlafond::all();
+
+            return view(
+                'lpj::permohonan.form',
+                compact('branches', 'debitur', 'tujuanPenilaian', 'status', 'fasilitasKredit', 'plafond'),
+            );
+        }
+
+        public function edit($id)
+        {
+            $permohonan      = Permohonan::find($id);
+            $branches        = Branch::all();
+            $debitur         = Debiture::find($permohonan->debiture_id);
+            $tujuanPenilaian = TujuanPenilaian::all();
+            $status          = StatusPermohonan::all();
+            $provinces       = Province::all();
+            $cities          = City::where('province_code', $debitur->province_code)->get();
+            $districts       = District::where('city_code', $debitur->city_code)->get();
+            $villages        = Village::where('district_code', $debitur->district_code)->get();
+            $documents       = DokumenJaminan::with('pemilik', 'detail')->where('debiture_id', $id)->get();
+
+            $fasilitasKredit = JenisFasilitasKredit::all();
+            $plafond         = NilaiPlafond::all();
+
+            return view(
+                'lpj::permohonan.form',
+                compact(
+                    'permohonan',
+                    'branches',
+                    'debitur',
+                    'tujuanPenilaian',
+                    'status',
+                    'provinces',
+                    'cities',
+                    'districts',
+                    'villages',
+                    'documents',
+                    'fasilitasKredit',
+                    'plafond',
+                ),
+            );
+        }
+
+        public function destroy($id)
+        {
+            try {
+                // Delete from database
+                $permohonan = Permohonan::find($id);
+                $permohonan->delete();
+
+                echo json_encode(['success' => true, 'message' => 'Permohonan deleted successfully']);
+            } catch (Exception $e) {
+                echo json_encode(['success' => false, 'message' => 'Failed to delete permohonan']);
+            }
+        }
+
+        public function dataForDatatables(Request $request)
+        {
+            if (is_null($this->user) || !$this->user->can('debitur.view')) {
+                //abort(403, 'Sorry! You are not allowed to view users.');
+            }
+
+            // Retrieve data from the database
+            $query = Permohonan::query();
+
+            if (!Auth::user()->hasAnyRole(['administrator'])) {
+                $query = $query->where('branch_id', Auth::user()->branch_id);
+            }
+
+            $query = $query->orderBy('nomor_registrasi', 'desc');
+            // Apply search filter if provided
+            if ($request->has('search') && !empty($request->get('search'))) {
+                $search = $request->get('search');
+                $query->where(function ($q) use ($search) {
+                    $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
+                    $q->orWhere('mig_mst_lpj_nomor_jaminan', 'LIKE', '%' . $search . '%');
+                    $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhere('status', 'LIKE', '%' . $search . '%');
+                });
+            }
+
+            // Apply sorting if provided
+            if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+                $order  = $request->get('sortOrder');
+                $column = $request->get('sortField');
+                $query->orderBy($column, $order);
+            }
+
+            // Get the total count of records
+            $totalRecords = $query->count();
+            $size         = $request->get('size', 10);
+            if ($size == 0) {
+                $size = 10;
+            }
+
+            // Apply pagination if provided
+            if ($request->has('page') && $request->has('size')) {
+                $page   = $request->get('page');
+                $size   = $request->get('size');
+                $offset = ($page - 1) * $size; // Calculate the offset
+
+                $query->skip($offset)->take($size);
+            }
+
+            // Get the filtered count of records
+            $filteredRecords = $query->count();
+
+            // Get the data for the current page
+            $data = $query->get();
+
+            $data = $data->map(function ($item) {
+                return [
+                    'id'                        => $item->id,
+                    'nomor_registrasi'          => $item->nomor_registrasi,
+                    'mig_mst_lpj_nomor_jaminan' => $item->mig_mst_lpj_nomor_jaminan,
+                    'tanggal_permohonan'        => $item->tanggal_permohonan ? dateFormat(
+                        $item->tanggal_permohonan,
+                    ) : null,
+                    'pemohon'                   => $item->user->name ?? 'N/A',
+                    'branch'                    => $item->branch->name ?? 'N/A',
+                    'debiture'                  => [
+                        'name' => $item->debiture->name,
+                    ],
+                    'tujuan_penilaian'          => [
+                        'code' => $item->tujuanPenilaian->code ?? null,
+                        'name' => $item->tujuanPenilaian->name ?? null,
+                    ],
+                    'status'                    => $item->status,
+                    'documents'                 => count($item->documents),
+                    'keterangan'                => $item->keterangan,
+                    'penilaian'                 => [
+                        'id'                => $item->penilaian->id ?? null,
+                        'waktu_penilaian'   => $item->penilaian->waktu_penilaian ?? null,
+                        'rejected_note'     => $item->penilaian->rejected_note ?? null,
+                        'authorized_status' => $item->penilaian->authorized_status ?? null,
+                    ],
+                    'registrasi_catatan'        => $item->registrasi_catatan,
+                ];
+            });
+
+            // Calculate the page count
+            $pageCount = ceil($totalRecords / $size);
+
+            // Calculate the current page number
+            $currentPage = max(1, $request->get('page', 1));
+
+            // Return the response data as a JSON object
+            return response()->json([
+                'draw'            => $request->get('draw'),
+                'recordsTotal'    => $totalRecords,
+                'recordsFiltered' => $filteredRecords,
+                'pageCount'       => $pageCount,
+                'page'            => $currentPage,
+                'totalCount'      => $totalRecords,
+                'data'            => $data,
+            ]);
+        }
+
+        public function export()
+        {
+            return Excel::download(new PermohonanExport(), 'permohonan.xlsx');
+        }
+
+        public function authorization()
+        {
+            return view('lpj::permohonan.authorization.index');
+        }
+
+        public function dataForAuthorization(Request $request)
+        {
+            if (is_null($this->user) || !$this->user->can('debitur.view')) {
+                //abort(403, 'Sorry! You are not allowed to view users.');
+            }
+
+            // Retrieve data from the database
+            $query = Permohonan::query()->with('documents')->has('documents', '>', 0)->where('status', '=', 'order');
+
+            if (!Auth::user()->hasAnyRole(['administrator'])) {
+                $query = $query->where('branch_id', Auth::user()->branch_id);
+            }
+
+            // Apply search filter if provided
+            if ($request->has('search') && !empty($request->get('search'))) {
+                $search = $request->get('search');
+                $query->where(function ($q) use ($search) {
+                    $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
+                    $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhere('status', 'LIKE', '%' . $search . '%');
+                });
+            }
+
+            // Apply sorting if provided
+            if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+                $order  = $request->get('sortOrder');
+                $column = $request->get('sortField');
+                $query->orderBy($column, $order);
+            }
+
+            // Get the total count of records
+            $totalRecords = $query->count();
+
+            // Apply pagination if provided
+            if ($request->has('page') && $request->has('size')) {
+                $page   = $request->get('page');
+                $size   = $request->get('size');
+                $offset = ($page - 1) * $size; // Calculate the offset
+
+                $query->skip($offset)->take($size);
+            }
+
+            // Get the filtered count of records
+            $filteredRecords = $query->count();
+
+            // Get the data for the current page
+            $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
+
+            // Calculate the page count
+            $pageCount = ceil($totalRecords / $request->get('size'));
+
+            // Calculate the current page number
+            $currentPage = 0 + 1;
+
+            // Return the response data as a JSON object
+            return response()->json([
+                'draw'            => $request->get('draw'),
+                'recordsTotal'    => $totalRecords,
+                'recordsFiltered' => $filteredRecords,
+                'pageCount'       => $pageCount,
+                'page'            => $currentPage,
+                'totalCount'      => $totalRecords,
+                'data'            => $data,
+            ]);
+        }
+
+        public function showAuthorization($id)
+        {
             $permohonan = Permohonan::find($id);
-            $permohonan->delete();
-
-            echo json_encode(['success' => true, 'message' => 'Permohonan deleted successfully']);
-        } catch (Exception $e) {
-            echo json_encode(['success' => false, 'message' => 'Failed to delete permohonan']);
-        }
-    }
-
-    public function dataForDatatables(Request $request)
-    {
-        if (is_null($this->user) || !$this->user->can('debitur.view')) {
-            //abort(403, 'Sorry! You are not allowed to view users.');
+            return view('lpj::permohonan.authorization.show', compact('permohonan'));
         }
 
-        // Retrieve data from the database
-        $query = Permohonan::query();
-
-        if (!Auth::user()->hasAnyRole(['administrator'])) {
-            $query = $query->where('branch_id', Auth::user()->branch_id);
-        }
-
-        $query = $query->orderBy('nomor_registrasi', 'desc');
-        // Apply search filter if provided
-        if ($request->has('search') && !empty($request->get('search'))) {
-            $search = $request->get('search');
-            $query->where(function ($q) use ($search) {
-                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
-                $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhere('status', 'LIKE', '%' . $search . '%');
-            });
-        }
-
-        // Apply sorting if provided
-        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
-            $order  = $request->get('sortOrder');
-            $column = $request->get('sortField');
-            $query->orderBy($column, $order);
-        }
-
-        // Get the total count of records
-        $totalRecords = $query->count();
-        $size         = $request->get('size', 10);
-        if ($size == 0) {
-            $size = 10;
-        }
-
-        // Apply pagination if provided
-        if ($request->has('page') && $request->has('size')) {
-            $page   = $request->get('page');
-            $size   = $request->get('size');
-            $offset = ($page - 1) * $size; // Calculate the offset
-
-            $query->skip($offset)->take($size);
-        }
-
-        // Get the filtered count of records
-        $filteredRecords = $query->count();
-
-        // Get the data for the current page
-        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian','documents'])->get();
-
-        // Calculate the page count
-        $pageCount = ceil($totalRecords / $size);
-
-        // Calculate the current page number
-        $currentPage = max(1, $request->get('page', 1));
-
-        // Return the response data as a JSON object
-        return response()->json([
-            'draw'            => $request->get('draw'),
-            'recordsTotal'    => $totalRecords,
-            'recordsFiltered' => $filteredRecords,
-            'pageCount'       => $pageCount,
-            'page'            => $currentPage,
-            'totalCount'      => $totalRecords,
-            'data'            => $data,
-        ]);
-    }
-
-    public function export()
-    {
-        return Excel::download(new PermohonanExport(), 'permohonan.xlsx');
-    }
-
-    public function authorization()
-    {
-        return view('lpj::permohonan.authorization.index');
-    }
-
-    public function dataForAuthorization(Request $request)
-    {
-        if (is_null($this->user) || !$this->user->can('debitur.view')) {
-            //abort(403, 'Sorry! You are not allowed to view users.');
-        }
-
-        // Retrieve data from the database
-        $query = Permohonan::query()->with('documents')->has('documents', '>', 0)->where('status', '=', 'order');
-
-        // Apply search filter if provided
-        if ($request->has('search') && !empty($request->get('search'))) {
-            $search = $request->get('search');
-            $query->where(function ($q) use ($search) {
-                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
-                $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhere('status', 'LIKE', '%' . $search . '%');
-            });
-        }
-
-        // Apply sorting if provided
-        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
-            $order  = $request->get('sortOrder');
-            $column = $request->get('sortField');
-            $query->orderBy($column, $order);
-        }
-
-        // Get the total count of records
-        $totalRecords = $query->count();
-
-        // Apply pagination if provided
-        if ($request->has('page') && $request->has('size')) {
-            $page   = $request->get('page');
-            $size   = $request->get('size');
-            $offset = ($page - 1) * $size; // Calculate the offset
-
-            $query->skip($offset)->take($size);
-        }
-
-        // Get the filtered count of records
-        $filteredRecords = $query->count();
-
-        // Get the data for the current page
-        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get(
-        );
-
-        // Calculate the page count
-        $pageCount = ceil($totalRecords / $request->get('size'));
-
-        // Calculate the current page number
-        $currentPage = 0 + 1;
-
-        // Return the response data as a JSON object
-        return response()->json([
-            'draw'            => $request->get('draw'),
-            'recordsTotal'    => $totalRecords,
-            'recordsFiltered' => $filteredRecords,
-            'pageCount'       => $pageCount,
-            'page'            => $currentPage,
-            'totalCount'      => $totalRecords,
-            'data'            => $data,
-        ]);
-    }
-
-    public function showAuthorization($id)
-    {
-        $permohonan = Permohonan::find($id);
-        return view('lpj::permohonan.authorization.show', compact('permohonan'));
-    }
-
-    public function updateAuthorization(Request $request, $id)
-    {
-        try {
-            $permohonan             = Permohonan::find($id);
-            $permohonan->status     = $request->status;
-            $permohonan->keterangan = $request->keterangan;
-            $permohonan->save();
-        } catch (Exception $e) {
-            return redirect()->route('authorization.show', $id)->with('error', 'Failed to update permohonan');
-        }
-
-        return redirect()->route('authorization.index')->with('success', 'Permohonan updated successfully');
-    }
-
-    public function show($id)
-    {
-        $permohonan = Permohonan::find($id);
-
-        return view('lpj::permohonan.show', compact('permohonan'));
-    }
-
-    public function print($id)
-    {
-        $permohonan = Permohonan::find($id);
-        return view('lpj::permohonan.print', compact('permohonan'));
-
-        //            $pdf = Pdf::loadView('lpj::permohonan.print', compact('permohonan'));
-        //          return $pdf->stream();
-    }
-
-    public function showPembatalan($id)
-    {
-        $permohonan = Permohonan::with(['pembatalan','debiture'])->findOrFail($id);
-        return view('lpj::permohonan.pembatalan-form', compact('permohonan'));
-    }
-
-
-    public function pembatalan(Request $request)
-    {
-        // Validate the request
-        $validatedData = $request->validate([
-            'permohonan_id'     => 'required|exists:permohonan,id',
-            'alasan_pembatalan' => 'required|string',
-            'file_pembatalan'   => 'required|file|mimes:pdf,doc,docx|max:2048',
-        ]);
-
-        // Handle file upload
-        if ($request->hasFile('file_pembatalan')) {
-            $file                             = $request->file('file_pembatalan');
-            $filename                         = time() . '_' . $file->getClientOriginalName();
-            $filePath                         = $file->storeAs('pembatalan', $filename, 'public');
-            $validatedData['file_pembatalan'] = $filePath;
-        }
-
-        // Add created_by
-        $validatedData['created_by'] = auth()->id();
-
-        // Create new PermohonanPembatalan
-        $pembatalan = PermohonanPembatalan::create($validatedData);
-
-        return redirect()->route('permohonan.index')->with('success', 'Pembatalan Permohonan Menunggu Approval');
-    }
-
-    public function storeAproved(Request $request, $id): JsonResponse
-    {
-        $data = [];
-        if (request()->ajax()) {
+        public function updateAuthorization(Request $request, $id)
+        {
             try {
-                $penilaian = Penilaian::findOrFail($id);
-                $penilaian->update([
-                    'authorized_status' => 1,
-                ]);
-
-                $permohonan = Permohonan::findOrFail($request->permohonan_id);
-
-                $permohonan->update([
-                    'status' => 'proses-survey'
-                ]);
-
-                $data['status'] = 'success';
-                $data['message'] = 'Jadwal '.$request->noReg.' berhasil di aprove';
-            } catch (\Exception $e) {
-                $data['status'] = 'error';
-                $data['message'] = 'Gagal membuat jadwal: ' . $e->getMessage();
+                $permohonan             = Permohonan::find($id);
+                $permohonan->status     = $request->status;
+                $permohonan->keterangan = $request->keterangan;
+                $permohonan->save();
+            } catch (Exception $e) {
+                return redirect()->route('authorization.show', $id)->with('error', 'Failed to update permohonan');
             }
 
-        } else {
-            $data['status'] = 'error';
-            $data['message'] = "no ajax request";
+            return redirect()->route('authorization.index')->with('success', 'Permohonan updated successfully');
         }
 
-        return response()->json($data);
-    }
+        public function show($id)
+        {
+            $permohonan = Permohonan::find($id);
 
+            return view('lpj::permohonan.show', compact('permohonan'));
+        }
 
-    public function storeRescheduleSurvey(Request $request, $id)
-    {
-        try {
+        public function print($id)
+        {
+            $permohonan = Permohonan::find($id);
+            return view('lpj::permohonan.print', compact('permohonan'));
+
+            //            $pdf = Pdf::loadView('lpj::permohonan.print', compact('permohonan'));
+            //          return $pdf->stream();
+        }
+
+        public function showPembatalan($id)
+        {
+            $permohonan = Permohonan::with(['pembatalan', 'debiture'])->findOrFail($id);
+            return view('lpj::permohonan.pembatalan-form', compact('permohonan'));
+        }
+
+        public function pembatalan(Request $request)
+        {
+            // Validate the request
             $validatedData = $request->validate([
                 'permohonan_id'     => 'required|exists:permohonan,id',
-                'penilaian_id' => 'nullable',
-                'nomor_registrasi' => 'required',
-                'reschedule_note' =>  'required',
-                'reschedule_date' => 'required',
+                'alasan_pembatalan' => 'required|string',
+                'file_pembatalan'   => 'required|file|mimes:pdf,doc,docx|max:2048',
             ]);
 
-            DB::beginTransaction();
+            // Handle file upload
+            if ($request->hasFile('file_pembatalan')) {
+                $file                             = $request->file('file_pembatalan');
+                $filename                         = time() . '_' . $file->getClientOriginalName();
+                $filePath                         = $file->storeAs('pembatalan', $filename, 'public');
+                $validatedData['file_pembatalan'] = $filePath;
+            }
 
-            $permohonan = Permohonan::findOrFail($request->permohonan_id);
-            $permohonan->update([
-                'status' => 'request-reschedule'
-            ]);
+            // Add created_by
+            $validatedData['created_by'] = auth()->id();
 
-            $penilaian = Penilaian::findOrFail($id);
+            // Create new PermohonanPembatalan
+            $pembatalan = PermohonanPembatalan::create($validatedData);
 
-            $penilaian->update([
-                'reschedule_date' => $request->reschedule_date,
-                'reschedule_note' => $request->reschedule_note,
-            ]);
-
-            DB::commit();
-            return response()->json([
-                'status' => 'success',
-                'message' => 'Proses request reschedule permohonan Nomor registrasi '.$request->nomor_registrasi.' berhasil',
-            ]);
-        } catch (\Exception $e) {
-            DB::rollBack();
-            return response()->json([
-                'status' => 'error',
-                'message' => 'Gagal membuat request reschedule: ' . $e->getMessage(),
-            ]);
+            return redirect()->route('permohonan.index')->with('success', 'Pembatalan Permohonan Menunggu Approval');
         }
-    }
 
-}
+        public function storeAproved(Request $request, $id)
+        : JsonResponse {
+            $data = [];
+            if (request()->ajax()) {
+                try {
+                    $penilaian = Penilaian::findOrFail($id);
+                    $penilaian->update([
+                        'authorized_status' => 1,
+                    ]);
+
+                    $permohonan = Permohonan::findOrFail($request->permohonan_id);
+
+                    $permohonan->update([
+                        'status' => 'proses-survey',
+                    ]);
+
+                    $data['status']  = 'success';
+                    $data['message'] = 'Jadwal ' . $request->noReg . ' berhasil di aprove';
+                } catch (Exception $e) {
+                    $data['status']  = 'error';
+                    $data['message'] = 'Gagal membuat jadwal: ' . $e->getMessage();
+                }
+            } else {
+                $data['status']  = 'error';
+                $data['message'] = "no ajax request";
+            }
+
+            return response()->json($data);
+        }
+
+        public function update(PermohonanRequest $request, $id)
+        {
+            $permohonan    = Permohonan::findOrFail($id);
+            $beforeRequest = $permohonan->toArray();
+
+            $validate = $request->validated();
+            if ($validate) {
+                try {
+                    // Update in database
+
+                    if ($permohonan->status == 'revisi') {
+                        $validate['status'] = 'order';
+                    }
+                    $permohonan->update($validate);
+
+                    $documents = DokumenJaminan::where('permohonan_id', $permohonan->id)->get();
+                    if (count($documents) < 1) {
+                        return redirect()->route(
+                            'debitur.jaminan.create',
+                            array_merge(['permohonan_id' => $permohonan->id], ['id' => $permohonan->debiture->id]),
+                        )->with('success', 'Permohonan created successfully, Lengkapi data jaminan terlebih dahulu');
+                    }
+
+                    return redirect()
+                        ->route('permohonan.index')->with('success', 'Permohonan updated successfully');
+                } catch (Exception $e) {
+                    return redirect()
+                        ->route('permohonan.edit', $id)->with('error', 'Failed to update permohonan');
+                }
+            }
+        }
+
+        public function storeRescheduleSurvey(Request $request, $id)
+        {
+            try {
+                $validatedData = $request->validate([
+                    'permohonan_id'    => 'required|exists:permohonan,id',
+                    'penilaian_id'     => 'nullable',
+                    'nomor_registrasi' => 'required',
+                    'reschedule_note'  => 'required',
+                    'reschedule_date'  => 'required',
+                    'keterangan'       => 'required',
+                ]);
+
+                DB::beginTransaction();
+
+                $permohonan = Permohonan::findOrFail($request->permohonan_id);
+                $permohonan->update([
+                    'status' => 'request-reschedule',
+                ]);
+
+                $penilaian = Penilaian::findOrFail($id);
+
+                $penilaian->update([
+                    'reschedule_date' => $request->reschedule_date,
+                    'reschedule_note' => $request->reschedule_note,
+                ]);
+
+                DB::commit();
+                return response()->json([
+                    'status'  => 'success',
+                    'message' => 'Proses request reschedule permohonan Nomor registrasi ' . $request->nomor_registrasi . ' berhasil',
+                ]);
+            } catch (Exception $e) {
+                DB::rollBack();
+                return response()->json([
+                    'status'  => 'error',
+                    'message' => 'Gagal membuat request reschedule: ' . $e->getMessage(),
+                ]);
+            }
+        }
+
+    }

app/Http/Controllers/PersetujuanPenawaranController.php

@@ -6,6 +6,7 @@
     use Illuminate\Http\Request;
     use Illuminate\Support\Facades\Auth;
     use Modules\Lpj\Http\Requests\PersetujuanPenawaranRequest;
+    use Modules\Lpj\Models\Noc;
     use Modules\Lpj\Models\PenawaranDetailTender;
     use Modules\Lpj\Models\PenawaranDetailTenderLog;
     use Modules\Lpj\Models\PenawaranTender;
@@ -67,6 +68,22 @@
 
             $persetujuanPenawaran->save();
 
+
+            // Save NOC
+            try {
+                $noc = Noc::updateOrCreate([
+                    'permohonan_id' => $persetujuanPenawaran->permohonan_id,
+                    'persetujuan_penawaran_id' => $persetujuanPenawaran->id
+                ],[
+                    'bukti_bayar' => $persetujuanPenawaran->bukti_bayar,
+                ]);
+            } catch (\Exception $e) {
+                \Log::error('Failed to create or update NOC: ' . $e->getMessage());
+                return redirect()
+                    ->route('persetujuan-penawaran.index')
+                    ->with('error', 'Persetujuan Penawaran berhasil disimpan tetapi gagal membuat NOC: ' . $e->getMessage());
+            }
+
             return redirect()
                 ->route('persetujuan-penawaran.index')->with('success', 'Persetujuan Penawaran berhasil disimpan.');
         }

app/Http/Controllers/ProsesPenawaranController.php

@@ -437,7 +437,11 @@ class ProsesPenawaranController extends Controller
     public function show($id)
     {
         $prosespenawaran  = PenawaranTender::find($id);
-        return view('lpj::prosespenawaran.show', compact('id', 'prosespenawaran'));
+        $permohonan = "";
+        if($prosespenawaran){
+            $permohonan = Permohonan::where('nomor_registrasi',$prosespenawaran->nomor_registrasi)->first();
+        }
+        return view('lpj::prosespenawaran.show', compact('id', 'prosespenawaran','permohonan'));
     }
 
     public function updateDraft(Request $request, $id): JsonResponse

app/Http/Controllers/RegistrasiController.php

@@ -1,253 +1,265 @@
 <?php
 
-namespace Modules\Lpj\Http\Controllers;
+    namespace Modules\Lpj\Http\Controllers;
 
-use App\Http\Controllers\Controller;
-use Exception;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Validator;
-use Maatwebsite\Excel\Facades\Excel;
-use Modules\Lpj\Models\JenisPenilaian;
-use Modules\Lpj\Models\Permohonan;
-use Modules\Lpj\Models\Regions;
-use Modules\Lpj\Models\DokumenJaminan;
-use Modules\Lpj\Models\Debiture;
+    use App\Http\Controllers\Controller;
+    use Exception;
+    use Illuminate\Http\JsonResponse;
+    use Illuminate\Http\Request;
+    use Illuminate\Support\Facades\Auth;
+    use Illuminate\Support\Facades\Validator;
+    use Maatwebsite\Excel\Facades\Excel;
+    use Modules\Lpj\Models\Debiture;
+    use Modules\Lpj\Models\DokumenJaminan;
+    use Modules\Lpj\Models\JenisPenilaian;
+    use Modules\Lpj\Models\Penilai;
+    use Modules\Lpj\Models\Permohonan;
+    use Modules\Lpj\Models\Regions;
 
-class RegistrasiController extends Controller
-{
-    public $user;
-
-    public function index()
+    class RegistrasiController extends Controller
     {
-        return view('lpj::registrasi.index');
-    }
+        public $user;
 
-    public function dataForDatatables(Request $request)
-    {
-        if (is_null($this->user) || !$this->user->can('debitur.view')) {
-            //abort(403, 'Sorry! You are not allowed to view users.');
+        public function index()
+        {
+            return view('lpj::registrasi.index');
         }
 
-        // Retrieve data from the database
-        $query = Permohonan::query()
-    ->whereIn('status', ['preregister', 'revisi']);
+        public function dataForDatatables(Request $request)
+        {
+            if (is_null($this->user) || !$this->user->can('debitur.view')) {
+                //abort(403, 'Sorry! You are not allowed to view users.');
+            }
+
+            // Retrieve data from the database
+            $query = Permohonan::query()
+                               ->whereIn('status', ['preregister', 'revisi']);
 
 
-        // Apply search filter if provided
-        if ($request->has('search') && !empty($request->get('search'))) {
-            $search = $request->get('search');
-            $query->where(function ($q) use ($search) {
-                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
-                $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
-                $q->orWhere('status', 'LIKE', '%' . $search . '%');
-            });
+            // Apply search filter if provided
+            if ($request->has('search') && !empty($request->get('search'))) {
+                $search = $request->get('search');
+                $query->where(function ($q) use ($search) {
+                    $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%');
+                    $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
+                    $q->orWhere('status', 'LIKE', '%' . $search . '%');
+                });
+            }
+
+            // Apply sorting if provided
+            if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+                $order  = $request->get('sortOrder');
+                $column = $request->get('sortField');
+                $query->orderBy($column, $order);
+            }
+
+            // Get the total count of records
+            $totalRecords = $query->count();
+
+            // Apply pagination if provided
+            if ($request->has('page') && $request->has('size')) {
+                $page   = $request->get('page');
+                $size   = $request->get('size');
+                $offset = ($page - 1) * $size; // Calculate the offset
+
+                $query->skip($offset)->take($size);
+            }
+
+            // Get the filtered count of records
+            $filteredRecords = $query->count();
+
+            // Get the data for the current page
+            $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
+
+            // Calculate the page count
+            $pageCount = ceil($totalRecords / $request->get('size'));
+
+            // Calculate the current page number
+            $currentPage = 0 + 1;
+
+            // Return the response data as a JSON object
+            return response()->json([
+                'draw'            => $request->get('draw'),
+                'recordsTotal'    => $totalRecords,
+                'recordsFiltered' => $filteredRecords,
+                'pageCount'       => $pageCount,
+                'page'            => $currentPage,
+                'totalCount'      => $totalRecords,
+                'data'            => $data,
+            ]);
         }
 
-        // Apply sorting if provided
-        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
-            $order  = $request->get('sortOrder');
-            $column = $request->get('sortField');
-            $query->orderBy($column, $order);
+        public function edit($id)
+        {
+            return view('lpj::registrasi.edit', compact('id'));
         }
 
-        // Get the total count of records
-        $totalRecords = $query->count();
+        public function setData(Request $request)
+        : JsonResponse
+        {
+            $data  = [];
+            $datas = [];
 
-        // Apply pagination if provided
-        if ($request->has('page') && $request->has('size')) {
-            $page   = $request->get('page');
-            $size   = $request->get('size');
-            $offset = ($page - 1) * $size; // Calculate the offset
+            if (request()->ajax()) {
+                $id    = $request->id;
+                $datas = Permohonan::find($id);
 
-            $query->skip($offset)->take($size);
+                if ($datas) {
+                    $jenisPenilaians = null;
+                    $regions         = null;
+                    $regions         = Regions::pluck('name', 'id');
+                    $jenisPenilaians = JenisPenilaian::pluck('name', 'id');
+
+                    $data['status']                      = 'success';
+                    $data['regions']                     = $regions;
+                    $data['jenisPenilaians']             = $jenisPenilaians;
+                    $data['datas']                       = $datas;
+                    $data['message'] ['message_success'] = ["data successfully found"];
+                } else {
+                    $data['status']                   = 'error';
+                    $data['datas']                    = null;
+                    $data['message'] ['message_data'] = ["data not found"];
+                }
+            } else {
+                $data['status']                  = 'error';
+                $data['message']['message_ajax'] = ["no ajax request"];
+            }
+
+            return response()->json($data);
         }
 
-        // Get the filtered count of records
-        $filteredRecords = $query->count();
+        public function show($id)
+        {
+            $permohonan = Permohonan::find($id);
+            $debitur    = Debiture::find($permohonan->debiture_id);
+            $documents  = DokumenJaminan::with('pemilik', 'detail')->where('permohonan_id', $id)->get();
+            return view('lpj::registrasi.show', compact('id', 'permohonan', 'documents', 'debitur'));
+        }
 
-        // Get the data for the current page
-        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian'])->get();
+        public function storeRevisi(Request $request, $id)
+        {
+            try {
+                $permohonan = Permohonan::find($id);
 
-        // Calculate the page count
-        $pageCount = ceil($totalRecords / $request->get('size'));
+                $permohonan->update([
+                    'status' => 'registered'
+                ]);
 
-        // Calculate the current page number
-        $currentPage = 0 + 1;
+                return redirect()->route('registrasi.index')->with('success', 'Submit Revision successfully');
+            } catch (Exception $e) {
+                return redirect()
+                    ->route('registrasi.index')
+                    ->with('error', 'Failed to create permohonan' . $e->getMessage());
 
-        // Return the response data as a JSON object
-        return response()->json([
-            'draw'            => $request->get('draw'),
-            'recordsTotal'    => $totalRecords,
-            'recordsFiltered' => $filteredRecords,
-            'pageCount'       => $pageCount,
-            'page'            => $currentPage,
-            'totalCount'      => $totalRecords,
-            'data'            => $data,
-        ]);
-    }
+            }
+        }
 
-    public function edit($id)
-    {
-        return view('lpj::registrasi.edit', compact('id'));
-    }
+        public function update(Request $request, $id)
+        : JsonResponse
+        {
+            // init
+            $data     = [];
+            $dataku   = [];
+            $tindakan = null;
+            if (request()->ajax()) {
+                $validator = RegistrasiController::rulesEditnya($request, $id);
 
-    public function setData(Request $request): JsonResponse
-    {
-        $data  = [];
-        $datas = [];
+                if ($validator['fails']) {
+                    $data['message'] = $validator['errors'];
+                    $data['status']  = 'error';
+                } else {
+                    try {
+                        $tindakan = $request->tindakan;
+                        $dataku   = [
+                            'registrasi_by' => Auth::id(),
+                            'registrasi_at' => now(),
+                        ];
 
-        if (request()->ajax()) {
-            $id    = $request->id;
-            $datas = Permohonan::find($id);
+                        if ($tindakan == 0) {
+                            $dataku['jenis_penilaian_id'] = $request->jenis_penilaian;
+                            $dataku['region_id']          = $request->region;
+                            $dataku['status']             = 'registered';
+                            if ($request->catatan2) {
+                                $dataku['registrasi_catatan'] = $request->catatan2;
+                            }
+                        } else {
+                            $dataku['registrasi_catatan'] = $request->catatan;
+                            $dataku['status']             = 'revisi';
+                        }
 
-            if ($datas) {
-                $jenisPenilaians = null;
-                $regions         = null;
-                $regions         = Regions::pluck('name', 'id');
-                $jenisPenilaians = JenisPenilaian::pluck('name', 'id');
+                        $data['dataku'] = $dataku;
 
-                $data['status']                      = 'success';
-                $data['regions']                     = $regions;
-                $data['jenisPenilaians']             = $jenisPenilaians;
-                $data['datas']                       = $datas;
-                $data['message'] ['message_success'] = ["data successfully found"];
+                        $modal = Permohonan::find($id);
+
+                        $modal->update($dataku);
+
+                        if ($modal && $request->jenis_laporan) {
+                            foreach ($modal->documents as $document) {
+                                Penilai::updateOrCreate(
+                                    [
+                                        'permohonan_id' => $id,
+                                        'dokument_id'   => $document->id
+                                    ],
+                                    ['type' => $request->jenis_laporan]
+                                );
+                            }
+                        }
+                        //
+                        $data['status']                      = 'success';
+                        $data['message'] ['message_success'] = ['Regitrasi ' . $modal->nomor_registrasi . ' successfully'];
+                    } catch (Exception $e) {
+                        $data['status']                        = 'error';
+                        $data['message'] ['message_try_catch'] = ['Regitrasi updated failed.'];
+                    }
+                }
             } else {
                 $data['status']                   = 'error';
-                $data['datas']                    = null;
-                $data['message'] ['message_data'] = ["data not found"];
+                $data['message'] ['message_ajax'] = ["no ajax request"];
             }
-        } else {
-            $data['status']                   = 'error';
-            $data['message']['message_ajax'] = ["no ajax request"];
+
+            return response()->json($data);
         }
 
-        return response()->json($data);
-    }
+        public function rulesEditnya($request, $id)
+        {
+            $tindakan         = null;
+            $jenis_penilaian  = null;
+            $validate_catatan = '';
+            $tindakan         = $request->tindakan;
+            $jenis_penilaian  = $request->jenis_penilaian;
 
-    public function update(Request $request, $id): JsonResponse
-    {
-        // init
-        $data     = [];
-        $dataku   = [];
-        $tindakan = null;
-        if (request()->ajax()) {
-            $validator = RegistrasiController::rulesEditnya($request, $id);
+            $validateIt = [
+                // 'name' diambil dari definisi parameter yang di kirim pada POST Data
+                'tindakan' => 'required',
+            ];
 
-            if ($validator['fails']) {
-                $data['message'] = $validator['errors'];
-                $data['status']  = 'error';
-            } else {
-                try {
-                    $tindakan = $request->tindakan;
-                    $dataku   = [
-                        'registrasi_by' => Auth::id(),
-                        'registrasi_at' => now(),
-                    ];
+            $messageIt = [
+                'tindakan.required' => 'Silahkan pilih Tindakan',
+            ];
 
-                    if ($tindakan == 0) {
-                        $dataku['jenis_penilaian_id'] = $request->jenis_penilaian;
-                        $dataku['region_id']          = $request->region;
-                        $dataku['sla']                = $request->sla;
-                        $dataku['status']             = 'registered';
-                        if ($request->catatan2) {
-                            $dataku['registrasi_catatan'] = $request->catatan2;
-                        }
-                    } else {
-                        $dataku['registrasi_catatan'] = $request->catatan;
-                        $dataku['status']             = 'revisi';
-                    }
+            if ($tindakan == 0) {
+                $validateIt['jenis_penilaian']          = ['required'];
+                $messageIt ['jenis_penilaian.required'] = 'Silahkan pilih Jenis Penilaian';
 
-                    $data['dataku'] = $dataku;
-
-                    $modal = Permohonan::find($id);
-
-                    $modal->update($dataku);
-                    //
-                    $data['status']                      = 'success';
-                    $data['message'] ['message_success'] = ['Regitrasi ' . $modal->nomor_registrasi . ' successfully'];
-                } catch (Exception $e) {
-                    $data['status']                        = 'error';
-                    $data['message'] ['message_try_catch'] = ['Regitrasi updated failed.'];
+                // INTERNAL
+                if (1 == $jenis_penilaian) {
+                    $validateIt['region']          = ['required'];
+                    $messageIt ['region.required'] = 'Silahkan pilih Region';
                 }
-            }
-        } else {
-            $data['status']                   = 'error';
-            $data['message'] ['message_ajax'] = ["no ajax request"];
-        }
-
-        return response()->json($data);
-    }
-
-    public function rulesEditnya($request, $id)
-    {
-        $tindakan         = null;
-        $jenis_penilaian  = null;
-        $validate_catatan = '';
-        $tindakan         = $request->tindakan;
-        $jenis_penilaian  = $request->jenis_penilaian;
-
-        $validateIt = [
-            // 'name' diambil dari definisi parameter yang di kirim pada POST Data
-            'tindakan' => 'required',
-        ];
-
-        $messageIt = [
-            'tindakan.required' => 'Silahkan pilih Tindakan',
-        ];
-
-        if ($tindakan == 0) {
-            $validateIt['jenis_penilaian']          = ['required'];
-            $messageIt ['jenis_penilaian.required'] = 'Silahkan pilih Jenis Penilaian';
-
-            // INTERNAL
-            if (1 == $jenis_penilaian) {
-                $validateIt['region']          = ['required'];
-                $messageIt ['region.required'] = 'Silahkan pilih Region';
-            } else {
-                $validateIt['sla']          = ['required'];
-                $messageIt ['sla.required'] = 'Silahkan isi SLA';
+            } else if ($tindakan == 1) {
+                $validateIt['catatan']          = ['required'];
+                $messageIt ['catatan.required'] = 'Silahkan isi Catatan';
             }
 
-        } elseif ($tindakan == 1) {
-            $validateIt['catatan']          = ['required'];
-            $messageIt ['catatan.required'] = 'Silahkan isi Catatan';
-        }
+            $validator = Validator::make($request->all(), $validateIt, $messageIt);
 
-        $validator = Validator::make($request->all(), $validateIt, $messageIt);
-
-        $data['fails']  = $validator->fails();
-        $data['errors'] = $validator->errors();
-
-        return $data;
-    }
-
-    public function show($id)
-    {
-        $permohonan = Permohonan::find($id);
-        $debitur         = Debiture::find($permohonan->debiture_id);
-        $documents       = DokumenJaminan::with('pemilik', 'detail')->where('debiture_id', $id)->get();
-        return view('lpj::registrasi.show', compact('id', 'permohonan', 'documents', 'debitur'));
-    }
-
-    public function storeRevisi(Request $request, $id)
-    {
-        try {
-            $permohonan = Permohonan::find($id);
-
-            $permohonan->update([
-                'status' => 'registered'
-            ]);
-
-            return redirect()->route('registrasi.index')->with('success', 'Submit Revision successfully');
-        } catch (Exception $e) {
-            return redirect()->route('registrasi.index')->with('error', 'Failed to create permohonan' . $e->getMessage());
+            $data['fails']  = $validator->fails();
+            $data['errors'] = $validator->errors();
 
+            return $data;
         }
     }
-}

app/Http/Controllers/RekapHarianSoController.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Modules\Lpj\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use Illuminate\Http\Request;
+use Modules\Lpj\Models\TujuanPenilaian;
+
+class RekapHarianSoController extends Controller
+{
+    /**
+     * Display a listing of the resource.
+     */
+    public function index()
+    {
+        $total_laporan_debitur = 0;
+        $tujuan_penilaian = TujuanPenilaian::all();
+        return view('lpj::rekap-harian-so.index', compact('tujuan_penilaian', 'total_laporan_debitur'));
+    }
+
+
+}

app/Http/Controllers/SLAController.php

@@ -71,7 +71,7 @@ class SLAController extends Controller
             // abort(403, 'Sorry! You are not allowed to view users.');
         }
 
-        $query = Authorization::query()->with('permohonan.debiture','user','approveSo','approveEo','approveDd')->where('jenis','sla');
+        $query = Authorization::query()->with('permohonan.debiture', 'user', 'approveSo', 'approveEo', 'approveDd')->where('jenis', 'sla')->where('request', 'freeze');
 
         // Pencarian berdasarkan parameter search
         if ($request->has('search') && !empty($request->get('search'))) {

app/Http/Controllers/SpkController.php

@@ -148,26 +148,17 @@ use Illuminate\Support\Facades\Auth;
 
         public function edit($id)
         {
-            // dd(Carbon::now()->addDays(1)->format('d F Y'));
-            // dd(Carbon::now()->subDays(1)->format('d F Y')); jenis_laporan_name
-            $penawaran = PenawaranTender::leftJoin('detail_penawaran', 'detail_penawaran.penawaran_id','=','penawaran.id')
-                                     ->leftJoin('jenis_laporan', 'jenis_laporan.id','=','penawaran.jenis_laporan_id')
-                                     ->leftJoin('kjpp', 'kjpp.id','=','detail_penawaran.kjpp_rekanan_id')
-                                     ->leftJoin('tujuan_penilaian_kjpp', 'tujuan_penilaian_kjpp.id','=','penawaran.tujuan_penilaian_kjpp_id')
-                                     ->leftJoin('penilaian', 'penilaian.nomor_registrasi','=','penawaran.nomor_registrasi')
-                                     ->where('detail_penawaran.status','=',1)
-                                     ->where('penawaran.id','=', $id)
-                                     ->select('penawaran.*', 'detail_penawaran.attachment as attachmentku',
-                                                'detail_penawaran.no_proposal as detail_penawaran_no_proposal',
-                                                'detail_penawaran.tgl_proposal as detail_penawaran_tgl_proposal',
-                                                'detail_penawaran.biaya_penawaran as detail_penawaran_biaya_penawaran',
-                                                'kjpp.name as kjpp_name',
-                                                'kjpp.address as kjpp_address',
-                                                'jenis_laporan.name as jenis_laporan_name',
-                                                'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name',
-                                                'jenis_laporan.code as jenis_laporan_code',
-                                                'penilaian.waktu_penilaian as penilaian_waktu_penilain'
-                                    )->first();
+            $penawaran = PenawaranTender::with(['jenisLaporan','tujuanPenilaianKjpp','detail.kjpp','penilaian','persetujuan_penawaran'])->where('id',$id)->first();
+            $penawaran->attachmentku = $penawaran->detail->attachment;
+            $penawaran->detail_penawaran_no_proposal = $penawaran->detail->no_proposal;
+            $penawaran->detail_penawaran_tgl_proposal = $penawaran->detail->tgl_proposal;
+            $penawaran->detail_penawaran_biaya_penawaran = $penawaran->detail->biaya_penawaran;
+            $penawaran->kjpp_name = $penawaran->detail->kjpp->name;
+            $penawaran->kjpp_address = $penawaran->detail->kjpp->address;
+            $penawaran->jenis_laporan_name = $penawaran->jenisLaporan->name;
+            $penawaran->jenis_laporan_code = $penawaran->jenisLaporan->code;
+            $penawaran->tujuan_penilaian_kjpp_name = $penawaran->tujuanPenilaianKjpp->name;
+            $penawaran->penilaian_waktu_penilain = $penawaran->penilaian->waktu_penilaian ?? "";
 
             $permohonan  = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)
                                         ->leftJoin('dokumen_jaminan', 'dokumen_jaminan.permohonan_id','=','permohonan.id')
@@ -236,28 +227,24 @@ use Illuminate\Support\Facades\Auth;
 
         public function update(Request $request, $id): JsonResponse
         {
+
             // init
             $data1 = [];
             // $dataPermohonan = array();
             $dataPenawaran = [];
             // data
 
-            $penawaran = PenawaranTender::leftJoin('detail_penawaran', 'detail_penawaran.penawaran_id','=','penawaran.id')
-                                     ->leftJoin('jenis_laporan', 'jenis_laporan.id','=','penawaran.jenis_laporan_id')
-                                     ->leftJoin('kjpp', 'kjpp.id','=','detail_penawaran.kjpp_rekanan_id')
-                                     ->leftJoin('penilaian', 'penilaian.nomor_registrasi','=','penawaran.nomor_registrasi')
-                                     ->where('detail_penawaran.status','=',1)
-                                     ->where('penawaran.id','=', $id)
-                                     ->select('penawaran.*', 'detail_penawaran.attachment as attachmentku',
-                                                'detail_penawaran.no_proposal as detail_penawaran_no_proposal',
-                                                'detail_penawaran.tgl_proposal as detail_penawaran_tgl_proposal',
-                                                'detail_penawaran.biaya_penawaran as detail_penawaran_biaya_penawaran',
-                                                'kjpp.name as kjpp_name',
-                                                'kjpp.address as kjpp_address',
-                                                'jenis_laporan.name as jenis_laporan_name',
-                                                'jenis_laporan.code as jenis_laporan_code',
-                                                'penilaian.waktu_penilaian as penilaian_waktu_penilain'
-                                    )->first();
+            $penawaran = PenawaranTender::with(['jenisLaporan','tujuanPenilaianKjpp','detail.kjpp','penilaian','persetujuan_penawaran'])->where('id',$id)->first();
+            $penawaran->attachmentku = $penawaran->detail->attachment;
+            $penawaran->detail_penawaran_no_proposal = $penawaran->detail->no_proposal;
+            $penawaran->detail_penawaran_tgl_proposal = $penawaran->detail->tgl_proposal;
+            $penawaran->detail_penawaran_biaya_penawaran = $penawaran->detail->biaya_penawaran;
+            $penawaran->kjpp_name = $penawaran->detail->kjpp->name;
+            $penawaran->kjpp_address = $penawaran->detail->kjpp->address;
+            $penawaran->jenis_laporan_name = $penawaran->jenisLaporan->name;
+            $penawaran->jenis_laporan_code = $penawaran->jenisLaporan->code;
+            $penawaran->tujuan_penilaian_kjpp_name = $penawaran->tujuanPenilaianKjpp->name;
+            $penawaran->penilaian_waktu_penilain = $penawaran->penilaian->waktu_penilaian ?? "";
 
             $permohonan  = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)
                                         ->leftJoin('dokumen_jaminan', 'dokumen_jaminan.permohonan_id','=','permohonan.id')
@@ -398,4 +385,21 @@ use Illuminate\Support\Facades\Auth;
 
             return response()->download(storage_path('app/public/' .$document->spk_dokumen_path));
         }
+
+        public function updateSla(Request $request, $id): JsonResponse
+        {
+
+            $request->validate([
+                'sla' => 'required|integer|min:1',
+            ]);
+
+
+            $penawaran = PenawaranTender::find($id);
+            $permohonan = Permohonan::where('nomor_registrasi','=',$penawaran->nomor_registrasi)->first();
+
+            $permohonan->sla = $request->sla;
+            $permohonan->save();
+
+            return response()->json(['message' => 'SLA updated successfully']);
+        }
     }

app/Http/Controllers/TenderController.php

@@ -815,7 +815,7 @@ class TenderController extends Controller
                 }
             }
 
-            return redirect()->route('tender.penawaran.ulang.index')
+            return redirect()->back()
                 ->with('success', 'Email Penawaran Berhasil Terkirim!');
         } catch (\Exception $e) {
             // Log email gagal untuk setiap KJPP
@@ -871,7 +871,7 @@ class TenderController extends Controller
                 }
             }
 
-            return redirect()->route('tender.penawaran.showKirimEmail', ['noreg' => $noreg])
+            return redirect()->back()
                 ->with('error', 'Email Penawaran Gagal Terkirim!');
         }
     }
@@ -1015,7 +1015,7 @@ class TenderController extends Controller
                 }
             }
 
-            return redirect()->route('tender.penawaran.ulang.index')->with('success', 'Email Penawaran Berhasil Terkirim!');
+            return redirect()->back()->with('success', 'Email Penawaran Berhasil Terkirim!');
         } catch (\Exception $e) {
             // Log email gagal
             foreach ($kjpps as $email) {
@@ -1067,7 +1067,7 @@ class TenderController extends Controller
                 }
             }
 
-            return redirect()->route('tender.penawaran.showKirimEmail', ['noreg' => $noreg])->with('error', 'Email Penawaran Gagal Terkirim!');
+            return redirect()->back()->with('error', 'Email Penawaran Gagal Terkirim!');
         }
     }
 }

app/Http/Requests/BankDataRequest.php

@@ -0,0 +1,57 @@
+<?php
+
+    namespace Modules\Lpj\Http\Requests;
+
+    use Illuminate\Foundation\Http\FormRequest;
+
+    class BankDataRequest extends FormRequest
+    {
+        public function authorize()
+        {
+            return true; // Adjust this based on your authorization logic
+        }
+
+        public function rules()
+        {
+            return [
+                'address'                                   => 'nullable|string|max:255',
+                'village_code'                              => 'nullable|string|max:20',
+                'district_code'                             => 'nullable|string|max:20',
+                'city_code'                                 => 'nullable|string|max:20',
+                'province_code'                             => 'nullable|string|max:20',
+                'tahun'                                     => 'nullable|integer',
+                'luas_tanah'                                => 'nullable|numeric',
+                'luas_bangunan'                             => 'nullable|numeric',
+                'tahun_bangunan'                            => 'nullable|integer',
+                'status_nara_sumber'                        => 'nullable|string|max:50',
+                'harga'                                     => 'nullable|numeric',
+                'harga_diskon'                              => 'nullable|numeric',
+                'diskon'                                    => 'nullable|numeric',
+                'total'                                     => 'nullable|numeric',
+                'nama_nara_sumber'                          => 'nullable|string|max:100',
+                'peruntukan'                                => 'nullable|string|max:100',
+                'penawaran'                                 => 'nullable|string|max:50',
+                'telepon'                                   => 'nullable|string|max:20',
+                'hak_properti'                              => 'nullable|string|max:50',
+                'kordinat_lat'                              => 'nullable|numeric',
+                'kordinat_lng'                              => 'nullable|numeric',
+                'jenis_aset'                                => 'nullable|string|max:50',
+                'foto_objek'                                => 'nullable|image|max:2048',
+                'tanggal'                                   => 'nullable|date',
+                'harga_penawaran'                           => 'nullable|numeric',
+                'nomor_laporan'                             => 'nullable|string|max:50',
+                'tgl_final_laporan'                         => 'nullable|date',
+                'nilai_pasar'                               => 'nullable|numeric',
+                'indikasi_nilai_likuidasi'                  => 'nullable|numeric',
+                'indikasi_nilai_pasar_tanah'                => 'nullable|numeric',
+                'estimasi_harga_tanah'                      => 'nullable|numeric',
+                'estimasi_harga_bangunan'                   => 'nullable|numeric',
+                'indikasi_nilai_pasar_bangunan'             => 'nullable|numeric',
+                'indikasi_nilai_pasar_sarana_pelengkap'     => 'nullable|numeric',
+                'indikasi_nilai_pasar_mesin'                => 'nullable|numeric',
+                'indikasi_nilai_pasar_kendaraan_alat_berat' => 'nullable|numeric',
+                'photos'                                    => 'nullable|array',
+                'photos.*'                                  => 'nullable|image|max:2048',
+            ];
+        }
+    }

app/Http/Requests/CategoryDaftarPustakaRequest.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace Modules\Lpj\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class CategoryDaftarPustakaRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     */
+    public function rules(): array
+    {
+        $rules = [
+            'name' => 'required|max:255',
+        ];
+
+        if ($this->method() == 'PUT') {
+            $rules['code'] = 'required|max:50|unique:category_daftar_pustaka,code,' . $this->id;
+        } else {
+            $rules['code'] = 'required|max:50|unique:category_daftar_pustaka,code';
+        }
+        return $rules;
+    }
+
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+}

app/Http/Requests/CustomFieldRequest.php

@@ -15,7 +15,7 @@ class CustomFieldRequest extends FormRequest
     {
         return [
             'name' => 'required|max:255',
-            'type' => 'required|in:text,select,radio,checkbox',
+            'type' => 'required|in:text,select,radio,checkbox,date,number',
             'label' => 'nullable|max:255',
             'urutan_prioritas' => [
                 'nullable',

app/Http/Requests/DaftarPustakaRequest.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Modules\Lpj\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class DaftarPustakaRequest extends FormRequest
+{
+    /**
+     * Get the validation rules that apply to the request.
+     */
+    public function rules(): array
+    {
+
+        $rules = [
+            'judul' => 'required|max:255',
+            'category_id' => 'required',
+            'deskripsi' => 'nullable',
+        ];
+
+        if ($this->method() == 'PUT') {
+            $rules['attachment'] = 'nullable|mimes:pdf,jpg,jpeg,png,gif';
+        } else {
+            $rules['attachment'] = 'required|mimes:pdf,jpg,jpeg,png,gif';
+        }
+
+        return $rules;
+
+    }
+
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+}

app/Http/Requests/FormSurveyorRequest.php

@@ -626,6 +626,8 @@ class FormSurveyorRequest extends FormRequest
             'foto_bhumi' => 'nullable',
             'foto_argis_region' => 'nullable',
             'foto_tempat' => 'nullable',
+            'upload_gs' => 'nullable',
+            'foto_sentuh_tanahku' => 'nullable',
             'keterangan' => 'nullable|array',
         ];
     }
@@ -687,6 +689,8 @@ class FormSurveyorRequest extends FormRequest
             'foto_bhumi' => 'nullable',
             'foto_argis_region' => 'nullable',
             'foto_tempat' => 'nullable',
+            'upload_gs' => 'nullable',
+            'foto_sentuh_tanahku' => 'nullable',
             'keterangan' => 'nullable|array',
 
         ];

app/Http/Requests/JenisLampiranRequest.php

@@ -0,0 +1,54 @@
+<?php
+
+    namespace Modules\Lpj\Http\Requests;
+
+    use Illuminate\Foundation\Http\FormRequest;
+    use Illuminate\Validation\Rule;
+
+    class JenisLampiranRequest extends FormRequest
+    {
+        /**
+         * Determine if the user is authorized to make this request.
+         *
+         * @return bool
+         */
+        public function authorize()
+        {
+            return true;
+        }
+
+        /**
+         * Get the validation rules that apply to the request.
+         *
+         * @return array
+         */
+        public function rules()
+        {
+            $rules = [
+                'nama' => [
+                    'required',
+                    'string',
+                    'max:255',
+                    Rule::unique('jenis_lampiran')->where(function ($query) {
+                        return $query->whereNull('deleted_at');
+                    })->ignore($this->route('jenis_lampiran')),
+                ],
+                'deskripsi' => 'nullable|string',
+            ];
+
+            return $rules;
+        }
+
+        /**
+         * Get custom messages for validator errors.
+         *
+         * @return array
+         */
+        public function messages()
+        {
+            return [
+                'nama.required' => 'Nama jenis lampiran harus diisi.',
+                'nama.max'      => 'Nama jenis lampiran tidak boleh lebih dari 255 karakter.',
+            ];
+        }
+    }

app/Http/Requests/LaporanExternalRequest.php

@@ -0,0 +1,41 @@
+<?php
+
+    namespace Modules\Lpj\Http\Requests;
+
+    use Illuminate\Foundation\Http\FormRequest;
+
+    class LaporanExternalRequest extends FormRequest
+    {
+        /**
+         * Get the validation rules that apply to the request.
+         */
+        public function rules()
+        : array
+        {
+            return [
+                'permohonan_id'                             => 'required|exists:permohonan,id',
+                'nomor_laporan'                             => 'nullable|string|max:255',
+                'tgl_final_laporan'                         => 'nullable|date',
+                'nilai_pasar'                               => 'nullable|numeric',
+                'indikasi_nilai_likuidasi'                  => 'nullable|numeric',
+                'indikasi_nilai_pasar_tanah'                => 'nullable|numeric',
+                'estimasi_harga_tanah'                      => 'nullable|numeric',
+                'estimasi_harga_bangunan'                   => 'nullable|numeric',
+                'indikasi_nilai_pasar_bangunan'             => 'nullable|numeric',
+                'indikasi_nilai_pasar_sarana_pelengkap'     => 'nullable|numeric',
+                'indikasi_nilai_pasar_mesin'                => 'nullable|numeric',
+                'indikasi_nilai_pasar_kendaraan_alat_berat' => 'nullable|numeric',
+                'file_resume'                               => 'nullable|file|mimes:pdf|max:10240', // 10MB max
+                'file_laporan'                              => 'nullable|file|mimes:pdf|max:10240',
+            ];
+        }
+
+        /**
+         * Determine if the user is authorized to make this request.
+         */
+        public function authorize()
+        : bool
+        {
+            return true;
+        }
+    }

app/Http/Requests/NocRequest.php

@@ -4,20 +4,150 @@
 
     use Illuminate\Foundation\Http\FormRequest;
 
+    /**
+     * Form Request untuk validasi data NOC (Notice of Completion)
+     */
     class NocRequest extends FormRequest
     {
+        /**
+         * Konstanta untuk jenis file yang diizinkan
+         */
+        private const ALLOWED_FILE_TYPES = 'pdf,jpg,jpeg,png';
+
+        /**
+         * Konstanta untuk ukuran file maksimum (dalam KB)
+         */
+        private const MAX_FILE_SIZE = 10240;
+
+        /**
+         * Menentukan apakah pengguna berwenang untuk melakukan request ini
+         *
+         * @return bool
+         */
         public function authorize()
         {
             return true;
         }
 
+        /**
+         * Mengumpulkan semua aturan validasi
+         *
+         * @return array
+         */
         public function rules()
+        {
+            return array_merge(
+                $this->getBasicInfoRules(),
+                $this->getPaymentRules(),
+                $this->getSettlementRules(),
+                $this->getAuthorizationRules(),
+            );
+        }
+
+        /**
+         * Aturan validasi untuk informasi dasar
+         *
+         * @return array
+         */
+        private function getBasicInfoRules()
         {
             return [
-                'penawaran_id'  => 'nullable|exists:penawaran,id',
-                'nominal_bayar' => 'nullable|numeric|min:0',
-                'bukti_ksl'     => 'nullable|file|mimes:pdf,jpg,jpeg,png|max:10240',
-                'status'        => 'nullable|boolean',
+                'permohonan_id'            => 'required|exists:permohonan,id',
+                'persetujuan_penawaran_id' => 'required|exists:persetujuan_penawaran,id',
+                'status'                   => 'nullable|boolean',
+                'created_by'               => 'nullable|exists:users,id',
+                'updated_by'               => 'nullable|exists:users,id',
+            ];
+        }
+
+        /**
+         * Aturan validasi untuk data pembayaran
+         *
+         * @return array
+         */
+        private function getPaymentRules()
+        {
+            $fileRule = 'nullable|file|mimes:' . self::ALLOWED_FILE_TYPES . '|max:' . self::MAX_FILE_SIZE;
+
+            return [
+                'total_harus_bayar'  => 'nullable|numeric|min:0',
+                'nominal_bayar'      => 'nullable|numeric|min:0',
+                'bukti_ksl'          => $fileRule,
+                'bukti_bayar'        => $fileRule,
+                'status_bayar'       => 'nullable|boolean',
+                'tanggal_pembayaran' => 'nullable|date',
+            ];
+        }
+
+        /**
+         * Aturan validasi untuk data penyelesaian
+         *
+         * @return array
+         */
+        private function getSettlementRules()
+        {
+            $fileRule = 'nullable|file|mimes:' . self::ALLOWED_FILE_TYPES . '|max:' . self::MAX_FILE_SIZE;
+
+            return [
+                'nominal_penyelesaian' => 'nullable|numeric|min:0',
+                'status_penyelesaian'  => 'nullable|boolean',
+                'tanggal_penyelesaian' => 'nullable|date',
+                'bukti_penyelesaian'   => $fileRule,
+                'memo_penyelesaian'    => $fileRule,
+                'catatan_noc'          => 'nullable|string',
+            ];
+        }
+
+        /**
+         * Aturan validasi untuk otorisasi
+         *
+         * @return array
+         */
+        private function getAuthorizationRules()
+        {
+            return [
+                'authorized_status' => 'nullable|boolean',
+                'authorized_at'     => 'nullable|date',
+                'authorized_by'     => 'nullable|exists:users,id',
+            ];
+        }
+
+        /**
+         * Pesan khusus untuk validasi
+         *
+         * @return array
+         */
+        public function messages()
+        {
+            return [
+                'permohonan_id.required'            => 'ID Permohonan harus diisi',
+                'permohonan_id.exists'              => 'ID Permohonan tidak valid',
+                'persetujuan_penawaran_id.required' => 'ID Persetujuan Penawaran harus diisi',
+                'persetujuan_penawaran_id.exists'   => 'ID Persetujuan Penawaran tidak valid',
+                'nominal_bayar.numeric'             => 'Nominal Bayar harus berupa angka',
+                'nominal_bayar.min'                 => 'Nominal Bayar minimal 0',
+                'bukti_ksl.file'                    => 'Bukti KSL harus berupa file',
+                'bukti_ksl.mimes'                   => 'Bukti KSL harus berformat pdf, jpg, jpeg, atau png',
+                'bukti_ksl.max'                     => 'Ukuran Bukti KSL maksimal 10MB',
+                'bukti_bayar.file'                  => 'Bukti Bayar harus berupa file',
+                'bukti_bayar.mimes'                 => 'Bukti Bayar harus berformat pdf, jpg, jpeg, atau png',
+                'bukti_bayar.max'                   => 'Ukuran Bukti Bayar maksimal 10MB',
+                'status.boolean'                    => 'Status harus berupa boolean',
+                'status_bayar.boolean'              => 'Status Bayar harus berupa boolean',
+                'tanggal_pembayaran.date'           => 'Format Tanggal Pembayaran tidak valid',
+                'nominal_penyelesaian.numeric'      => 'Nominal Penyelesaian harus berupa angka',
+                'nominal_penyelesaian.min'          => 'Nominal Penyelesaian minimal 0',
+                'status_penyelesaian.boolean'       => 'Status Penyelesaian harus berupa boolean',
+                'tanggal_penyelesaian.date'         => 'Format Tanggal Penyelesaian tidak valid',
+                'bukti_penyelesaian.file'           => 'Bukti Penyelesaian harus berupa file',
+                'bukti_penyelesaian.mimes'          => 'Bukti Penyelesaian harus berformat pdf, jpg, jpeg, atau png',
+                'bukti_penyelesaian.max'            => 'Ukuran Bukti Penyelesaian maksimal 10MB',
+                'memo_penyelesaian.file'            => 'Memo Penyelesaian harus berupa file',
+                'memo_penyelesaian.mimes'           => 'Memo Penyelesaian harus berformat pdf, jpg, jpeg, atau png',
+                'memo_penyelesaian.max'             => 'Ukuran Memo Penyelesaian maksimal 10MB',
+                'authorized_status.boolean'         => 'Status Otorisasi harus berupa boolean',
+                'authorized_at.date'                => 'Format Tanggal Otorisasi tidak valid',
+                'authorized_by.exists'              => 'User Otorisasi tidak valid',
             ];
         }
     }

app/Http/Requests/PermohonanRequest.php

@@ -23,7 +23,7 @@
                 'status'                    => 'nullable|string',
                 'jenis_fasilitas_kredit_id' => 'required|exists:jenis_fasilitas_kredit,id',
                 'nilai_plafond_id'          => 'required|exists:nilai_plafond,id',
-                'status_bayar'              => 'required|string',
+                'status_bayar'              => 'nullable|string',
                 'nilai_njop'                => 'nullable|numeric'
             ];
 

app/Http/Requests/PersetujuanPenawaranRequest.php

@@ -23,8 +23,6 @@
                 'sla_final'                  => 'nullable|numeric|min:0',
                 'file_persetujuan_penawaran' => 'nullable|file|mimes:pdf,doc,docx|max:10240',
                 'surat_representasi'         => 'nullable|file|mimes:pdf,doc,docx|max:10240',
-                'bukti_bayar'                => 'nullable|file|mimes:pdf,jpg,jpeg,png|max:10240',
-                'nominal_bayar'              => 'nullable|numeric|min:0',
                 'status'                     => 'nullable|boolean',
                 'authorized_status'          => 'boolean',
                 'authorized_at'              => 'nullable|date',
@@ -52,9 +50,6 @@
                 'surat_representasi.file'             => 'Surat Representasi harus berupa file.',
                 'surat_representasi.mimes'            => 'Surat Representasi harus berupa file PDF, DOC, atau DOCX.',
                 'surat_representasi.max'              => 'Ukuran Surat Representasi tidak boleh lebih dari 10MB.',
-                'bukti_bayar.file'                    => 'Bukti Bayar harus berupa file.',
-                'bukti_bayar.mimes'                   => 'Bukti Bayar harus berupa file PDF, JPG, JPEG, atau PNG.',
-                'bukti_bayar.max'                     => 'Ukuran Bukti Bayar tidak boleh lebih dari 10MB.',
                 'region_id.required'                  => 'Region ID wajib diisi.',
                 'region_id.exists'                    => 'Region ID tidak valid.',
                 'status.required'                     => 'Status wajib diisi.',
@@ -62,8 +57,6 @@
                 'authorized_status.boolean'           => 'Status otorisasi harus berupa nilai boolean.',
                 'authorized_at.date'                  => 'Tanggal otorisasi harus berupa tanggal yang valid.',
                 'authorized_by.exists'                => 'ID pengguna yang mengotorisasi tidak valid.',
-                'status_bayar.required'               => 'Status bayar wajib diisi.',
-                'status_bayar.in'                     => 'Status bayar harus berupa "sudah_bayar" atau "belum_bayar".',
             ];
         }
     }

app/Http/Requests/TenderPenawaranRequest.php

@@ -13,7 +13,7 @@ class TenderPenawaranRequest extends FormRequest
     {
         $rules = [
             'nama_kjpp_sebelumnya' => 'nullable',
-            'biaya_kjpp_sebelumnya' => 'nullable|numeric',
+            'biaya_kjpp_sebelumnya' => 'nullable',
             'tanggal_penilaian_sebelumnya' => 'nullable',
             'nomor_registrasi' => 'required',
             'kjpp.*' => 'exists:kjpp,id',

app/Models/Analisa.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\AnalisaFactory;
 
-class Analisa extends Model
+class Analisa extends Base
 {
     use HasFactory;
     protected $table = 'analisa';

app/Models/AnalisaFakta.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\AnalisaFaktaFactory;
 
-class AnalisaFakta extends Model
+class AnalisaFakta extends Base
 {
     use HasFactory;
 

app/Models/AnalisaLingkungan.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\AnalisaLingkunganFactory;
 
-class AnalisaLingkungan extends Model
+class AnalisaLingkungan extends Base
 {
     use HasFactory;
 

app/Models/AnalisaTanahBagunan.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\AnalisaTanahBagunanFactory;
 
-class AnalisaTanahBagunan extends Model
+class AnalisaTanahBagunan extends Base
 {
     use HasFactory;
 

app/Models/AnalisaUnit.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\AnalisaUnitFactory;
 
-class AnalisaUnit extends Model
+class AnalisaUnit extends Base
 {
     use HasFactory;
 

app/Models/Authorization.php

@@ -33,9 +33,9 @@ class Authorization extends Model
     ];
 
     protected $casts = [
-        'approve_so' => 'boolean',
-        'approve_eo' => 'boolean',
-        'approve_dd' => 'boolean',
+        // 'approve_so' => 'boolean',
+        // 'approve_eo' => 'boolean',
+        // 'approve_dd' => 'boolean',
         'approve_so_at' => 'datetime',
         'approve_eo_at' => 'datetime',
         'approve_dd_at' => 'datetime',

app/Models/BankData.php

@@ -0,0 +1,104 @@
+<?php
+
+    namespace Modules\Lpj\Models;
+    use Modules\Location\Models\City;
+    use Modules\Location\Models\District;
+    use Modules\Location\Models\Province;
+    use Modules\Location\Models\Village;
+
+    class BankData extends Base
+    {
+
+        protected $table = 'bank_data';
+
+        protected $guarded = ['id'];
+
+        protected $casts = [
+            'tahun'                                     => 'integer',
+            'luas_tanah'                                => 'decimal:2',
+            'luas_bangunan'                             => 'decimal:2',
+            'tahun_bangunan'                            => 'integer',
+            'harga'                                     => 'decimal:2',
+            'harga_diskon'                              => 'decimal:2',
+            'diskon'                                    => 'decimal:2',
+            'total'                                     => 'decimal:2',
+            'kordinat_lat'                              => 'decimal:8',
+            'kordinat_lng'                              => 'decimal:8',
+            'harga_penawaran'                           => 'decimal:2',
+            'tanggal'                                   => 'date',
+            'tgl_final_laporan'                         => 'date',
+            'nilai_pasar'                               => 'decimal:2',
+            'indikasi_nilai_likuidasi'                  => 'decimal:2',
+            'indikasi_nilai_pasar_tanah'                => 'decimal:2',
+            'estimasi_harga_tanah'                      => 'decimal:2',
+            'estimasi_harga_bangunan'                   => 'decimal:2',
+            'indikasi_nilai_pasar_bangunan'             => 'decimal:2',
+            'indikasi_nilai_pasar_sarana_pelengkap'     => 'decimal:2',
+            'indikasi_nilai_pasar_mesin'                => 'decimal:2',
+            'indikasi_nilai_pasar_kendaraan_alat_berat' => 'decimal:2',
+            'photos'                                    => 'array'
+        ];
+
+        // Scope for filtering by asset type
+        public function scopeOfAssetType($query, $assetType)
+        {
+            return $query->where('jenis_aset', $assetType);
+        }
+
+        // Scope for filtering by village
+        public function scopeOfVillage($query, $villageCode)
+        {
+            return $query->where('village_code', $villageCode);
+        }
+
+        // Scope for filtering by district
+        public function scopeOfDistrict($query, $districtCode)
+        {
+            return $query->where('district_code', $districtCode);
+        }
+
+        // Scope for filtering by city
+        public function scopeOfCity($query, $cityCode)
+        {
+            return $query->where('city_code', $cityCode);
+        }
+
+        // Scope for filtering by province
+        public function scopeOfProvince($query, $provinceCode)
+        {
+            return $query->where('province_code', $provinceCode);
+        }
+
+        // Scope for filtering by date
+        public function scopeOfDate($query, $date)
+        {
+            return $query->whereDate('tanggal', $date);
+        }
+
+        // Scope for filtering by date range
+        public function scopeBetweenDates($query, $startDate, $endDate)
+        {
+            return $query->whereBetween('tanggal', [$startDate, $endDate]);
+        }
+
+        public function village()
+        {
+            return $this->belongsTo(Village::class, 'village_code', 'code');
+        }
+
+        public function district()
+        {
+            return $this->belongsTo(District::class, 'district_code', 'code');
+        }
+
+        public function city()
+        {
+            return $this->belongsTo(City::class, 'city_code', 'code');
+        }
+
+        public function province()
+        {
+            return $this->belongsTo(Province::class, 'province_code', 'code');
+        }
+
+    }

app/Models/Base.php

@@ -7,6 +7,7 @@
     use Spatie\Activitylog\LogOptions;
     use Spatie\Activitylog\Traits\LogsActivity;
     use Wildside\Userstamps\Userstamps;
+    use Illuminate\Notifications\Notifiable;
 
 
     /**
@@ -14,7 +15,7 @@
      */
     class Base extends Model
     {
-        use LogsActivity, SoftDeletes, Userstamps;
+        use LogsActivity, SoftDeletes, Userstamps, Notifiable;
 
         protected $connection;
 

app/Models/BentukTanah.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\BentukTanahFactory;
 
-class BentukTanah extends Model
+class BentukTanah extends Base
 {
     use HasFactory;
 

app/Models/BentukUnit.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 // use Modules\Lpj\Database\Factories\BentukUnitFactory;
 
-class BentukUnit extends Model
+class BentukUnit extends Base
 {
     use HasFactory;
 

app/Models/CategoryDaftarPustaka.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+// use Modules\Lpj\Database\Factories\CategoryDaftarPustakaFactory;
+
+class CategoryDaftarPustaka extends Model
+{
+    use HasFactory;
+
+    protected $table = 'category_daftar_pustaka';
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $fillable = [
+        'id',
+        'name',
+        'code',
+    ];
+
+    public function daftarPustaka(){
+        return $this->hasMany(DaftarPustaka::class);
+    }
+
+}

app/Models/DaftarPustaka.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+// use Modules\Lpj\Database\Factories\DaftarPustakaFactory;
+
+class DaftarPustaka extends Model
+{
+    use HasFactory;
+
+    protected $table = 'daftar_pustaka';
+
+    /**
+     * The attributes that are mass assignable.
+     */
+    protected $fillable = [
+        'id',
+        'category_id',
+        'judul',
+        'attachment',
+        'deskripsi',
+    ];
+
+    public function category(){
+        return $this->belongsTo(CategoryDaftarPustaka::class);
+    }
+}

app/Models/Debiture.php

@@ -61,7 +61,12 @@
         }
 
         public function permohonan(){
-            return $this->hasOne(Permohonan::class, 'debiture_id', 'id' );
+            return $this->hasMany(Permohonan::class, 'debiture_id', 'id' );
+        }
+
+        public function laporanAdminKredit(): HasMany
+        {
+            return $this->hasMany(LaporanAdminKredit::class);
         }
 
     }

app/Models/Denah.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\DenahFactory;
 
-class Denah extends Model
+class Denah extends Base
 {
     use HasFactory;
 

app/Models/FasilitasObjek.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 // use Modules\Lpj\Database\Factories\FasilitasObjekFactory;
 
-class FasilitasObjek extends Model
+class FasilitasObjek extends Base
 {
     use HasFactory;
 

app/Models/FotoJaminan.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\FotoJaminanFactory;
 
-class FotoJaminan extends Model
+class FotoJaminan extends Base
 {
     use HasFactory;
 

app/Models/FotoObjekJaminan.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 // use Modules\Lpj\Database\Factories\FotoObjekJaminanFactory;
 
-class FotoObjekJaminan extends Model
+class FotoObjekJaminan extends Base
 {
     use HasFactory;
 

app/Models/GolonganMasySekitar.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\GolonganMasySekitarFactory;
 
-class GolonganMasySekitar extends Model
+class GolonganMasySekitar extends Base
 {
     use HasFactory;
 

app/Models/Inspeksi.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 // use Modules\Lpj\Database\Factories\InspeksiFactory;
 
-class Inspeksi extends Model
+class Inspeksi extends Base
 {
     use HasFactory;
 
@@ -14,7 +14,7 @@ class Inspeksi extends Model
     /**
      * The attributes that are mass assignable.
      */
-    protected $fillable = ['data_form', 'foto_form', 'denah_form','permohonan_id', 'name', 'status', 'authorized_status', 'authorized_at', 'authorized_by', 'created_by', 'updated_by', 'deleted_by','dokument_id','data_pembanding'];
+    protected $fillable = ['data_form', 'foto_form', 'denah_form','permohonan_id', 'name', 'status', 'authorized_status', 'authorized_at', 'authorized_by', 'created_by', 'updated_by', 'deleted_by','dokument_id','data_pembanding','mig_detail_data_jaminan'];
 
     public function permohonan()
     {

app/Models/JenisBangunan.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\JenisBangunanFactory;
 
-class JenisBangunan extends Model
+class JenisBangunan extends Base
 {
     use HasFactory;
 

app/Models/JenisKapal.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 // use Modules\Lpj\Database\Factories\JenisKapalFactory;
 
-class JenisKapal extends Model
+class JenisKapal extends Base
 {
     use HasFactory;
 

app/Models/JenisKendaraan.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 // use Modules\Lpj\Database\Factories\JenisKendaraanFactory;
 
-class JenisKendaraan extends Model
+class JenisKendaraan extends Base
 {
     use HasFactory;
 

app/Models/JenisLampiran.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Modules\Lpj\Models\Base;
+use Modules\Lpj\Models\LampiranDokumen;
+
+class JenisLampiran extends Base
+{
+
+    protected $table = 'jenis_lampiran';
+    protected $fillable = ['nama', 'deskripsi'];
+
+    public function lampiranDokumen()
+    {
+        return $this->hasMany(LampiranDokumen::class);
+    }
+}

app/Models/JenisPenilaian.php

@@ -5,7 +5,7 @@ namespace Modules\Lpj\Models;
 use Illuminate\Database\Eloquent\Model;
 use Modules\Lpj\Database\Factories\JenisPenilaianFactory;
 use Modules\Lpj\Models\Penilaian;
-class JenisPenilaian extends Model
+class JenisPenilaian extends Base
 {
 
     /**

app/Models/JenisPesawat.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 // use Modules\Lpj\Database\Factories\JenisPesawatFactory;
 
-class JenisPesawat extends Model
+class JenisPesawat extends Base
 {
     use HasFactory;
 

app/Models/JenisUnit.php

@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 // use Modules\Lpj\Database\Factories\JenisUnitFactory;
 
-class JenisUnit extends Model
+class JenisUnit extends Base
 {
     use HasFactory;
 

app/Models/KetinggianTanah.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\KetinggianTanahFactory;
 
-class KetinggianTanah extends Model
+class KetinggianTanah extends Base
 {
     use HasFactory;
 

app/Models/KondisiBangunan.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\KondisiBangunanFactory;
 
-class KondisiBangunan extends Model
+class KondisiBangunan extends Base
 {
     use HasFactory;
 

app/Models/KondisiFisikTanah.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\KondisiFisikTanahFactory;
 
-class KondisiFisikTanah extends Model
+class KondisiFisikTanah extends Base
 {
     use HasFactory;
 

app/Models/KonturTanah.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\KonturTanahFactory;
 
-class KonturTanah extends Model
+class KonturTanah extends Base
 {
     use HasFactory;
 

app/Models/LaluLintasLokasi.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\LaluLintasLokasiFactory;
 
-class LaluLintasLokasi extends Model
+class LaluLintasLokasi extends Base
 {
     use HasFactory;
     protected $table = 'lalu_lintas_lokasi';

app/Models/LampiranDokumen.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Storage;
+
+class LampiranDokumen extends Base
+{
+    protected $table = 'lampiran_dokumen';
+
+    protected $fillable = ['permohonan_id', 'nama_file', 'path_file', 'keterangan','jenis_lampiran_id'];
+
+    public function permohonan()
+    {
+        return $this->belongsTo(Permohonan::class);
+    }
+
+    /**
+     * Upload lampiran dokumen for penilai or administrator
+     *
+     * @param int $permohonanId
+     * @param array $fileData
+     * @return LampiranDokumen|null
+     */
+    public static function uploadLampiran($fileData)
+    {
+        $user = Auth::user();
+
+        if ($user && $user->hasAnyRole(['penilai', 'administrator', 'Penilai', 'admin','surveyor'])) {
+            $file = $fileData['file'];
+            $fileName = $fileData['nama_file'] ?? time() . '_' . $file->getClientOriginalName();
+            $filePath = $file->storeAs('lampiran_dokumen', $fileName, 'public');
+
+            return self::create([
+                'permohonan_id' => $fileData['permohonan_id'] ?? null,
+                'jenis_lampiran_id' => $fileData['jenis_lampiran_id'] ?? null,
+                'nama_file'     => $fileName,
+                'path_file'     => $filePath,
+                'keterangan'    => $fileData['keterangan'] ?? null,
+            ]);
+        }
+
+        return null;
+    }
+
+    /**
+     * Delete lampiran dokumen
+     *
+     * @return bool
+     */
+    public function deleteLampiran()
+    {
+        $user = Auth::user();
+
+        if ($user && ($user->hasRole('penilai') || $user->hasRole('administrator'))) {
+            // Delete the file from storage
+            Storage::disk('public')->delete($this->path_file);
+
+            // Delete the database record
+            return $this->delete();
+        }
+
+        return false;
+    }
+
+    public function jenisLampiran()
+    {
+        return $this->belongsTo(JenisLampiran::class);
+    }
+}

app/Models/Lantai.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\LokasiUnitFactory;
 
-class Lantai extends Model
+class Lantai extends Base
 {
     use HasFactory;
 

app/Models/LantaiUnit.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\LantaiUnitFactory;
 
-class LantaiUnit extends Model
+class LantaiUnit extends Base
 {
     use HasFactory;
 

app/Models/Laporan.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 // use Modules\Lpj\Database\Factories\LaporanFactory;
 
-class Laporan extends Model
+class Laporan extends Base
 {
     use HasFactory;
 

app/Models/LaporanAdminKredit.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Relations\BelongsTo;
+
+class LaporanAdminKredit extends Base
+{
+    protected $table = 'laporan_admin_kredit';
+
+    protected $fillable = [
+        'debiture_id',
+        'kode_register_t24',
+        'jenis_agunan',
+        'bukti_kepemilikan',
+        'alamat_agunan',
+        'nama_pemilik',
+        'tanggal_kunjungan',
+        'nilai_pasar_wajar',
+        'nilai_likuidasi',
+        'nama_penilai'
+    ];
+
+    protected $casts = [
+        'tanggal_kunjungan' => 'date',
+        'nilai_pasar_wajar' => 'decimal:2',
+        'nilai_likuidasi' => 'decimal:2',
+    ];
+
+    /**
+     * Get the debiture that owns the laporan admin kredit.
+     */
+    public function debiture(): BelongsTo
+    {
+        return $this->belongsTo(Debiture::class);
+    }
+}

app/Models/LaporanExternal.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+// use Modules\Lpj\Database\Factories\LaporanExternalFactory;
+
+class LaporanExternal extends Base
+{
+    protected $fillable = [
+        'permohonan_id',
+        'nomor_laporan',
+        'tgl_final_laporan',
+        'nilai_pasar',
+        'indikasi_nilai_likuidasi',
+        'indikasi_nilai_pasar_tanah',
+        'estimasi_harga_tanah',
+        'estimasi_harga_bangunan',
+        'indikasi_nilai_pasar_bangunan',
+        'indikasi_nilai_pasar_sarana_pelengkap',
+        'indikasi_nilai_pasar_mesin',
+        'indikasi_nilai_pasar_kendaraan_alat_berat',
+        'file_resume',
+        'file_laporan',
+    ];
+
+    public function permohonan()
+    {
+        return $this->belongsTo(Permohonan::class);
+    }
+}

app/Models/Lingkungan.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\LingkunganFactory;
 
-class Lingkungan extends Model
+class Lingkungan extends Base
 {
     use HasFactory;
 

app/Models/MerupakanDaerah.php

@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 
 // use Modules\Lpj\Database\Factories\MerupakanDaerahFactory;
 
-class MerupakanDaerah extends Model
+class MerupakanDaerah extends Base
 {
     use HasFactory;
 

app/Models/ModelAlatBerat.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 // use Modules\Lpj\Database\Factories\ModelAlatBeratFactory;
 
-class ModelAlatBerat extends Model
+class ModelAlatBerat extends Base
 {
     use HasFactory;
 

app/Models/Noc.php

@@ -0,0 +1,62 @@
+<?php
+
+namespace Modules\Lpj\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+// use Modules\Lpj\Database\Factories\NocFactory;
+
+class Noc extends Base
+{
+    protected $table = 'noc';
+
+    protected $fillable = [
+        'permohonan_id',
+        'persetujuan_penawaran_id',
+        'bukti_bayar',
+        'nominal_bayar',
+        'status_bayar',
+        'tanggal_pembayaran',
+        'nominal_penyelesaian',
+        'status_penyelesaiaan',
+        'tanggal_penyelesaian',
+        'bukti_penyelesaian',
+        'bukti_ksl',
+        'memo_penyelesaian',
+        'catatan_noc',
+        'status',
+        'authorized_status',
+        'authorized_at',
+        'authorized_by',
+    ];
+
+    protected $casts = [
+        'nominal_bayar' => 'decimal:2',
+        'status_bayar' => 'boolean',
+        'tanggal_pembayaran' => 'date',
+        'nominal_penyelesaian' => 'decimal:2',
+        'status_penyelesaiaan' => 'boolean',
+        'tanggal_penyelesaian' => 'date',
+        'status' => 'boolean',
+        'authorized_status' => 'boolean',
+        'authorized_at' => 'datetime',
+    ];
+
+    // Relationship with Permohonan
+    public function permohonan()
+    {
+        return $this->belongsTo(Permohonan::class, 'permohonan_id');
+    }
+
+    // Relationship with PersetujuanPenawaran
+    public function persetujuanPenawaran()
+    {
+        return $this->belongsTo(PersetujuanPenawaran::class, 'persetujuan_penawaran_id');
+    }
+
+    // Relationship with User (for authorized_by)
+    public function authorizedBy()
+    {
+        return $this->belongsTo(User::class, 'authorized_by');
+    }
+}

app/Models/ObjekJaminan.php

@@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Modules\Lpj\Database\Factories\ObjekJaminanFactory;
 
-class ObjekJaminan extends Model
+class ObjekJaminan extends Base
 {
     use HasFactory;