Feat: Meningkatkan PermohonanController dengan fitur-fitur baru dan meningkatkan penanganan data

- Merombak PermohonanController agar struktur dan keterbacaannya lebih baik.
- Menambahkan penanganan unggahan file dalam metode penyimpanan.
- Menerapkan validasi data dan penanganan kesalahan untuk membuat dan memperbarui Permohonan.
- Memperkenalkan pagination dan sorting dalam metode dataForDatatables dan dataForAuthorization.
- Menambahkan fungsi ekspor untuk data Permohonan.
- Membuat migrasi baru untuk menambahkan kolom 'nomor_registrasi' ke tabel 'persetujuan_penawaran'.

app/Console/Commands/CleanupInspeksiDataCommand.php

@@ -1,228 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Console\Commands;
-
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-use Modules\Lpj\Jobs\CleanupInspeksiDataJob;
-use Modules\Lpj\Models\Inspeksi;
-use Modules\Lpj\Services\InspeksiCleanupService;
-
-class CleanupInspeksiDataCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'lpj:cleanup-inspeksi 
-                            {--permohonan-id= : ID permohonan yang akan di-cleanup (opsional)}
-                            {--sync : Jalankan secara synchronous}
-                            {--dry-run : Tampilkan preview tanpa menjalankan cleanup}
-                            {--force : Jalankan tanpa konfirmasi}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Cleanup data inspeksi lama yang tidak memiliki dokument_id';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle(): int
-    {
-        Log::info('CleanupInspeksiDataCommand: Memulai proses cleanup data inspeksi', [
-            'options' => $this->options()
-        ]);
-
-        try {
-            $permohonanId = $this->option('permohonan-id');
-            $sync = $this->option('sync');
-            $dryRun = $this->option('dry-run');
-            $force = $this->option('force');
-
-            // Validasi opsi
-            if ($dryRun && $sync) {
-                $this->error('Opsi --dry-run dan --sync tidak dapat digunakan bersamaan.');
-                return Command::FAILURE;
-            }
-
-            // Tampilkan header
-            $this->info('=== Cleanup Data Inspeksi ===');
-            $this->newLine();
-
-            // Ambil data yang akan di-cleanup
-            $cleanupData = $this->getCleanupData($permohonanId);
-
-            if ($cleanupData->isEmpty()) {
-                $this->info('Tidak ada data yang perlu di-cleanup.');
-                return Command::SUCCESS;
-            }
-
-            // Tampilkan preview data
-            $this->displayPreview($cleanupData);
-
-            if ($dryRun) {
-                $this->info('Mode dry-run: Tidak ada perubahan yang dilakukan.');
-                return Command::SUCCESS;
-            }
-
-            // Konfirmasi jika tidak force
-            if (!$force && !$this->confirm('Lanjutkan dengan cleanup?')) {
-                $this->info('Cleanup dibatalkan.');
-                return Command::SUCCESS;
-            }
-
-            // Jalankan cleanup
-            $this->runCleanup($cleanupData, $sync);
-
-            $this->info('Proses cleanup selesai.');
-            return Command::SUCCESS;
-
-        } catch (\Exception $e) {
-            Log::error('CleanupInspeksiDataCommand: Terjadi error saat proses cleanup', [
-                'error' => $e->getMessage(),
-                'trace' => $e->getTraceAsString()
-            ]);
-
-            $this->error('Terjadi kesalahan: ' . $e->getMessage());
-            return Command::FAILURE;
-        }
-    }
-
-    /**
-     * Ambil data yang akan di-cleanup
-     */
-    private function getCleanupData(?int $permohonanId = null)
-    {
-        $this->info('Mencari data yang akan di-cleanup...');
-
-        $query = DB::table('inspeksi as i')
-            ->select(
-                'i.permohonan_id',
-                'i.created_by',
-                DB::raw('COUNT(CASE WHEN i.dokument_id IS NOT NULL AND i.deleted_at IS NULL THEN 1 END) as new_data_count'),
-                DB::raw('COUNT(CASE WHEN i.dokument_id IS NULL AND i.deleted_at IS NULL THEN 1 END) as old_data_count')
-            )
-            ->whereNull('i.deleted_at')
-            ->groupBy('i.permohonan_id', 'i.created_by');
-
-        if ($permohonanId) {
-            $query->where('i.permohonan_id', $permohonanId);
-        }
-
-        $results = $query->havingRaw('new_data_count > 0 AND old_data_count > 0')
-            ->get();
-
-        return $results;
-    }
-
-    /**
-     * Tampilkan preview data
-     */
-    private function displayPreview($cleanupData): void
-    {
-        $this->info('Data yang akan di-cleanup:');
-        $this->table(
-            ['Permohonan ID', 'Created By', 'Data Baru', 'Data Lama'],
-            $cleanupData->map(function ($item) {
-                return [
-                    $item->permohonan_id,
-                    $item->created_by,
-                    $item->new_data_count,
-                    $item->old_data_count
-                ];
-            })->toArray()
-        );
-
-        $totalPermohonan = $cleanupData->count();
-        $totalOldData = $cleanupData->sum('old_data_count');
-
-        $this->info("Total permohonan: {$totalPermohonan}");
-        $this->info("Total data lama yang akan dihapus: {$totalOldData}");
-        $this->newLine();
-    }
-
-    /**
-     * Jalankan cleanup
-     */
-    private function runCleanup($cleanupData, bool $sync): void
-    {
-        $this->info('Memulai proses cleanup...');
-        $this->newLine();
-
-        $progressBar = $this->output->createProgressBar($cleanupData->count());
-        $progressBar->setFormat('Processing: %current%/%max% [%bar%] %percent:3s%% %message%');
-        $progressBar->start();
-
-        $totalDeleted = 0;
-        $totalErrors = 0;
-
-        foreach ($cleanupData as $data) {
-            try {
-                $progressBar->setMessage("Permohonan ID: {$data->permohonan_id}");
-
-                // Ambil data baru untuk mendapatkan dokument_id
-                $newInspeksi = Inspeksi::where('permohonan_id', $data->permohonan_id)
-                    ->where('created_by', $data->created_by)
-                    ->whereNotNull('dokument_id')
-                    ->whereNull('deleted_at')
-                    ->first();
-
-                if (!$newInspeksi) {
-                    $this->warn("Tidak ditemukan data baru untuk permohonan {$data->permohonan_id}");
-                    $progressBar->advance();
-                    continue;
-                }
-
-                // Jalankan cleanup
-                if ($sync) {
-                    // Jalankan sync
-                    $job = new CleanupInspeksiDataJob(
-                        $data->permohonan_id,
-                        $data->created_by,
-                        $newInspeksi->dokument_id
-                    );
-                    $job->handle();
-                } else {
-                    // Dispatch ke queue
-                    CleanupInspeksiDataJob::dispatch(
-                        $data->permohonan_id,
-                        $data->created_by,
-                        $newInspeksi->dokument_id
-                    );
-                }
-
-                $totalDeleted += $data->old_data_count;
-
-            } catch (\Exception $e) {
-                Log::error('CleanupInspeksiDataCommand: Error pada permohonan', [
-                    'permohonan_id' => $data->permohonan_id,
-                    'created_by' => $data->created_by,
-                    'error' => $e->getMessage()
-                ]);
-
-                $this->error("Error pada permohonan {$data->permohonan_id}: {$e->getMessage()}");
-                $totalErrors++;
-            }
-
-            $progressBar->advance();
-        }
-
-        $progressBar->finish();
-        $this->newLine();
-        $this->newLine();
-
-        // Tampilkan hasil
-        $this->info('=== Hasil Cleanup ===');
-        $this->info("Data lama yang dihapus: {$totalDeleted}");
-        $this->info("Error: {$totalErrors}");
-
-        if (!$sync) {
-            $this->info('Job telah di-dispatch ke queue. Monitor progress di log.');
-        }
-    }
-}

app/Console/Commands/CleanupInspeksiStatusCommand.php

@@ -1,192 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Console\Commands;
-
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-use Modules\Lpj\Models\Inspeksi;
-
-class CleanupInspeksiStatusCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'lpj:cleanup-inspeksi-status 
-                            {--permohonan-id= : Filter berdasarkan permohonan ID}
-                            {--created-by= : Filter berdasarkan user ID}
-                            {--detailed : Tampilkan detail data}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Cek status data inspeksi yang memerlukan cleanup';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle(): int
-    {
-        try {
-            $permohonanId = $this->option('permohonan-id');
-            $createdBy = $this->option('created-by');
-            $detailed = $this->option('detailed');
-
-            $this->info('=== Status Data Inspeksi ===');
-            $this->newLine();
-
-            // Ambil statistik umum
-            $this->showGeneralStats();
-
-            // Ambil data yang memerlukan cleanup
-            $this->showCleanupStats($permohonanId, $createdBy);
-
-            if ($detailed) {
-                $this->showDetailedData($permohonanId, $createdBy);
-            }
-
-            return Command::SUCCESS;
-
-        } catch (\Exception $e) {
-            Log::error('CleanupInspeksiStatusCommand: Terjadi error', [
-                'error' => $e->getMessage(),
-                'trace' => $e->getTraceAsString()
-            ]);
-
-            $this->error('Terjadi kesalahan: ' . $e->getMessage());
-            return Command::FAILURE;
-        }
-    }
-
-    /**
-     * Tampilkan statistik umum
-     */
-    private function showGeneralStats(): void
-    {
-        $this->info('Statistik Umum:');
-        
-        $totalData = Inspeksi::count();
-        $activeData = Inspeksi::whereNull('deleted_at')->count();
-        $deletedData = Inspeksi::whereNotNull('deleted_at')->count();
-        $dataWithDokument = Inspeksi::whereNotNull('dokument_id')->count();
-        $dataWithoutDokument = Inspeksi::whereNull('dokument_id')->count();
-
-        $this->table(
-            ['Metrik', 'Jumlah'],
-            [
-                ['Total Data', number_format($totalData)],
-                ['Data Aktif', number_format($activeData)],
-                ['Data Terhapus (Soft)', number_format($deletedData)],
-                ['Data dengan Dokument ID', number_format($dataWithDokument)],
-                ['Data tanpa Dokument ID', number_format($dataWithoutDokument)],
-            ]
-        );
-
-        $this->newLine();
-    }
-
-    /**
-     * Tampilkan statistik cleanup
-     */
-    private function showCleanupStats(?int $permohonanId = null, ?int $createdBy = null): void
-    {
-        $this->info('Data yang Memerlukan Cleanup:');
-
-        $query = DB::table('inspeksi as i')
-            ->select(
-                'i.permohonan_id',
-                'i.created_by',
-                DB::raw('COUNT(CASE WHEN i.dokument_id IS NOT NULL AND i.deleted_at IS NULL THEN 1 END) as new_data_count'),
-                DB::raw('COUNT(CASE WHEN i.dokument_id IS NULL AND i.deleted_at IS NULL THEN 1 END) as old_data_count'),
-                DB::raw('MIN(i.created_at) as oldest_data'),
-                DB::raw('MAX(i.created_at) as newest_data')
-            )
-            ->whereNull('i.deleted_at')
-            ->groupBy('i.permohonan_id', 'i.created_by');
-
-        if ($permohonanId) {
-            $query->where('i.permohonan_id', $permohonanId);
-        }
-
-        if ($createdBy) {
-            $query->where('i.created_by', $createdBy);
-        }
-
-        $results = $query->havingRaw('new_data_count > 0 AND old_data_count > 0')
-            ->orderBy('old_data_count', 'desc')
-            ->limit(20)
-            ->get();
-
-        if ($results->isEmpty()) {
-            $this->info('Tidak ada data yang memerlukan cleanup.');
-            return;
-        }
-
-        $this->table(
-            ['Permohonan ID', 'Created By', 'Data Baru', 'Data Lama', 'Data Terlama', 'Data Terbaru'],
-            $results->map(function ($item) {
-                return [
-                    $item->permohonan_id,
-                    $item->created_by,
-                    $item->new_data_count,
-                    $item->old_data_count,
-                    $item->oldest_data,
-                    $item->newest_data,
-                ];
-            })->toArray()
-        );
-
-        $totalPermohonan = $results->count();
-        $totalOldData = $results->sum('old_data_count');
-
-        $this->info("Total permohonan yang perlu cleanup: {$totalPermohonan}");
-        $this->info("Total data lama yang akan dihapus: {$totalOldData}");
-        $this->newLine();
-    }
-
-    /**
-     * Tampilkan detail data
-     */
-    private function showDetailedData(?int $permohonanId = null, ?int $createdBy = null): void
-    {
-        $this->info('Detail Data (20 data terbaru):');
-
-        $query = Inspeksi::with(['permohonan', 'dokument'])
-            ->whereNull('deleted_at');
-
-        if ($permohonanId) {
-            $query->where('permohonan_id', $permohonanId);
-        }
-
-        if ($createdBy) {
-            $query->where('created_by', $createdBy);
-        }
-
-        $data = $query->orderBy('created_at', 'desc')
-            ->limit(20)
-            ->get();
-
-        if ($data->isEmpty()) {
-            $this->info('Tidak ada data untuk ditampilkan.');
-            return;
-        }
-
-        $this->table(
-            ['ID', 'Permohonan ID', 'Created By', 'Dokument ID', 'Status', 'Created At'],
-            $data->map(function ($item) {
-                return [
-                    $item->id,
-                    $item->permohonan_id,
-                    $item->created_by,
-                    $item->dokument_id ?? '-',
-                    $item->status,
-                    $item->created_at,
-                ];
-            })->toArray()
-        );
-    }
-}

app/Console/Commands/CleanupSingleInspeksiCommand.php

@@ -1,99 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Console\Commands;
-
-use Illuminate\Console\Command;
-use Illuminate\Support\Facades\Log;
-use Modules\Lpj\Jobs\CleanupInspeksiDataJob;
-use Modules\Lpj\Services\InspeksiCleanupService;
-
-class CleanupSingleInspeksiCommand extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'lpj:cleanup-single-inspeksi 
-                            {permohonan-id : ID permohonan yang akan di-cleanup}
-                            {created-by : ID user yang membuat data}
-                            {--sync : Jalankan secara synchronous}
-                            {--force : Jalankan tanpa konfirmasi}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Cleanup data inspeksi untuk 1 permohonan dan user tertentu';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle(): int
-    {
-        Log::info('CleanupSingleInspeksiCommand: Memulai proses cleanup', [
-            'permohonan_id' => $this->argument('permohonan-id'),
-            'created_by' => $this->argument('created-by'),
-            'sync' => $this->option('sync')
-        ]);
-
-        try {
-            $permohonanId = (int) $this->argument('permohonan-id');
-            $createdBy = (int) $this->argument('created-by');
-            $sync = $this->option('sync');
-            $force = $this->option('force');
-
-            // Validasi input
-            if ($permohonanId <= 0) {
-                $this->error('Permohonan ID harus angka positif.');
-                return Command::FAILURE;
-            }
-
-            if ($createdBy <= 0) {
-                $this->error('Created By harus angka positif.');
-                return Command::FAILURE;
-            }
-
-            // Tampilkan info
-            $this->info('=== Cleanup Single Inspeksi ===');
-            $this->info("Permohonan ID: {$permohonanId}");
-            $this->info("Created By: {$createdBy}");
-            $this->info("Mode: " . ($sync ? 'Synchronous' : 'Queue'));
-            $this->newLine();
-
-            // Konfirmasi jika tidak force
-            if (!$force && !$this->confirm('Lanjutkan dengan cleanup?')) {
-                $this->info('Cleanup dibatalkan.');
-                return Command::SUCCESS;
-            }
-
-            // Jalankan cleanup
-            $cleanupService = new InspeksiCleanupService();
-            
-            if ($sync) {
-                $this->info('Menjalankan cleanup secara synchronous...');
-                $cleanupService->cleanupSync($permohonanId, $createdBy);
-                $this->info('Cleanup selesai.');
-            } else {
-                $this->info('Mengirim job ke queue...');
-                $cleanupService->cleanupAsync($permohonanId, $createdBy);
-                $this->info('Job telah di-dispatch ke queue.');
-                $this->info('Monitor progress di log.');
-            }
-
-            return Command::SUCCESS;
-
-        } catch (\Exception $e) {
-            Log::error('CleanupSingleInspeksiCommand: Terjadi error saat proses cleanup', [
-                'permohonan_id' => $this->argument('permohonan-id'),
-                'created_by' => $this->argument('created-by'),
-                'error' => $e->getMessage(),
-                'trace' => $e->getTraceAsString()
-            ]);
-
-            $this->error('Terjadi kesalahan: ' . $e->getMessage());
-            return Command::FAILURE;
-        }
-    }
-}

app/Console/README.md

@@ -1,123 +0,0 @@
-# Console Commands untuk Cleanup Data Inspeksi
-
-## Daftar Command
-
-### 1. `lpj:cleanup-inspeksi`
-Command utama untuk cleanup data inspeksi secara batch.
-
-**Usage:**
-```bash
-php artisan lpj:cleanup-inspeksi [options]
-```
-
-**Options:**
-- `--permohonan-id=ID` - Filter berdasarkan permohonan ID (opsional)
-- `--sync` - Jalankan secara synchronous
-- `--dry-run` - Tampilkan preview tanpa menjalankan cleanup
-- `--force` - Jalankan tanpa konfirmasi
-
-**Contoh Penggunaan:**
-```bash
-# Preview data yang akan di-cleanup
-php artisan lpj:cleanup-inspeksi --dry-run
-
-# Cleanup semua data (dengan konfirmasi)
-php artisan lpj:cleanup-inspeksi
-
-# Cleanup untuk permohonan tertentu
-php artisan lpj:cleanup-inspeksi --permohonan-id=123 --force
-
-# Jalankan secara sync
-php artisan lpj:cleanup-inspeksi --sync --force
-```
-
-### 2. `lpj:cleanup-single-inspeksi`
-Command untuk cleanup 1 permohonan dan user tertentu.
-
-**Usage:**
-```bash
-php artisan lpj:cleanup-single-inspeksi <permohonan-id> <created-by> [options]
-```
-
-**Arguments:**
-- `permohonan-id` - ID permohonan yang akan di-cleanup (required)
-- `created-by` - ID user yang membuat data (required)
-
-**Options:**
-- `--sync` - Jalankan secara synchronous
-- `--force` - Jalankan tanpa konfirmasi
-
-**Contoh Penggunaan:**
-```bash
-# Cleanup untuk permohonan 123 oleh user 456
-php artisan lpj:cleanup-single-inspeksi 123 456
-
-# Jalankan secara sync tanpa konfirmasi
-php artisan lpj:cleanup-single-inspeksi 123 456 --sync --force
-```
-
-### 3. `lpj:cleanup-inspeksi-status`
-Command untuk mengecek status data inspeksi dan melihat statistik cleanup.
-
-**Usage:**
-```bash
-php artisan lpj:cleanup-inspeksi-status [options]
-```
-
-**Options:**
-- `--permohonan-id=ID` - Filter berdasarkan permohonan ID
-- `--created-by=ID` - Filter berdasarkan user ID
-- `--detailed` - Tampilkan detail data
-
-**Contoh Penggunaan:**
-```bash
-# Lihat statistik umum
-php artisan lpj:cleanup-inspeksi-status
-
-# Filter berdasarkan permohonan
-php artisan lpj:cleanup-inspeksi-status --permohonan-id=123
-
-# Tampilkan detail data
-php artisan lpj:cleanup-inspeksi-status --detailed
-```
-
-## Scheduling
-
-Command cleanup otomatis dijalankan setiap hari jam 2 pagi dan setiap minggu. Konfigurasi scheduling ada di `LpjServiceProvider.php`.
-
-## Monitoring
-
-Semua aktivitas cleanup dicatat di log file:
-- `storage/logs/laravel.log` - Log umum
-- `storage/logs/cleanup-inspeksi.log` - Log cleanup harian
-- `storage/logs/cleanup-inspeksi-weekly.log` - Log cleanup mingguan
-
-## Alur Kerja Cleanup
-
-1. **Identifikasi**: Cari data inspeksi yang memiliki:
-   - Data baru dengan `dokument_id` (tidak null)
-   - Data lama tanpa `dokument_id` (null)
-   - Sama `permohonan_id` dan `created_by`
-
-2. **Proses**: Soft delete data lama menggunakan Laravel SoftDeletes
-
-3. **Logging**: Catat setiap operasi untuk audit trail
-
-4. **Transaction**: Gunakan DB transaction untuk konsistensi data
-
-## Troubleshooting
-
-### Command tidak muncul
-Pastikan service provider sudah diregister dengan benar:
-```bash
-php artisan list | grep lpj
-```
-
-### Data tidak ter-cleanup
-- Cek log untuk error
-- Pastikan ada data yang memenuhi kriteria
-- Gunakan `--dry-run` untuk preview
-- Gunakan `--detailed` untuk melihat detail data
-
-### Performance
-Untuk data besar, gunakan mode queue (default) daripada `--sync`

app/Exports/LaporanAdminKreditExport.php

@@ -32,8 +32,6 @@ class LaporanAdminKreditExport implements WithColumnFormatting, WithHeadings, Fr
             $row->nilai_pasar_wajar,
             $row->nilai_likuidasi,
             $row->nama_penilai,
-            $row->kolektibilitas,
-            $row->keterangan,
             $row->created_at
         ];
     }
@@ -54,8 +52,6 @@ class LaporanAdminKreditExport implements WithColumnFormatting, WithHeadings, Fr
             'Nilai Pasar Wajar',
             'Nilai Likuidasi',
             'Nama Penilai',
-            'Kolektibilitas',
-            'Keterangan',
             'Created At'
         ];
     }
@@ -68,9 +64,7 @@ class LaporanAdminKreditExport implements WithColumnFormatting, WithHeadings, Fr
             'J' => NumberFormat::FORMAT_DATE_DDMMYYYY,
             'K' => NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1,
             'L' => NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1,
-            'N' => NumberFormat::FORMAT_TEXT, // Kolektibilitas
-            'O' => NumberFormat::FORMAT_TEXT, // Keterangan
-            'P' => NumberFormat::FORMAT_DATE_DATETIME, // Created At (moved from M to P)
+            'M' => NumberFormat::FORMAT_DATE_DATETIME,
         ];
     }
 }

app/Exports/LaporanSlikExport.php

@@ -1,117 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Exports;
-
-use Maatwebsite\Excel\Concerns\FromQuery;
-use Maatwebsite\Excel\Concerns\WithHeadings;
-use Maatwebsite\Excel\Concerns\WithMapping;
-use Maatwebsite\Excel\Concerns\WithStyles;
-use PhpOffice\PhpSpreadsheet\Worksheet\Worksheet;
-
-class LaporanSlikExport implements FromQuery, WithHeadings, WithMapping, WithStyles
-{
-    protected $query;
-
-    public function __construct($query)
-    {
-        $this->query = $query;
-    }
-
-    public function query()
-    {
-        return $this->query;
-    }
-
-    public function headings(): array
-    {
-        return [
-            'Sandi Bank',
-            'Kode Kantor',
-            'Kode Cabang',
-            'Tahun',
-            'Bulan',
-            'No Rekening',
-            'CIF',
-            'Nama Debitur',
-            'NPWP',
-            'No KTP',
-            'No Telp',
-            'Alamat',
-            'Kode Pos',
-            'Kode Kab/Kota',
-            'Kode Negara Domisili',
-            'Kode Jenis',
-            'Kode Sifat',
-            'Kode Valuta',
-            'Baki Debet',
-            'Kolektibilitas',
-            'Tanggal Mulai',
-            'Tanggal Jatuh Tempo',
-            'Tanggal Selesai',
-            'Tanggal Restrukturisasi',
-            'Kode Sebab Macet',
-            'Tanggal Macet',
-            'Kode Kondisi',
-            'Tanggal Kondisi',
-            'Nilai Agunan',
-            'Jenis Agunan',
-            'Kode Agunan',
-            'Peringkat Agunan',
-            'Fasilitas',
-            'Status Agunan',
-            'Tanggal Lapor',
-            'Status',
-            'Tanggal Dibuat',
-        ];
-    }
-
-    public function map($laporanSlik): array
-    {
-        return [
-            $laporanSlik->sandi_bank,
-            $laporanSlik->kode_kantor,
-            $laporanSlik->kode_cabang,
-            $laporanSlik->tahun,
-            $laporanSlik->bulan,
-            $laporanSlik->no_rekening,
-            $laporanSlik->cif,
-            $laporanSlik->nama_debitur,
-            $laporanSlik->npwp,
-            $laporanSlik->no_ktp,
-            $laporanSlik->no_telp,
-            $laporanSlik->alamat,
-            $laporanSlik->kode_pos,
-            $laporanSlik->kode_kab_kota,
-            $laporanSlik->kode_negara_domisili,
-            $laporanSlik->kode_jenis,
-            $laporanSlik->kode_sifat,
-            $laporanSlik->kode_valuta,
-            $laporanSlik->baki_debet,
-            $laporanSlik->kolektibilitas,
-            $laporanSlik->tanggal_mulai,
-            $laporanSlik->tanggal_jatuh_tempo,
-            $laporanSlik->tanggal_selesai,
-            $laporanSlik->tanggal_restrukturisasi,
-            $laporanSlik->kode_sebab_macet,
-            $laporanSlik->tanggal_macet,
-            $laporanSlik->kode_kondisi,
-            $laporanSlik->tanggal_kondisi,
-            $laporanSlik->nilai_agunan,
-            $laporanSlik->jenis_agunan,
-            $laporanSlik->kode_agunan,
-            $laporanSlik->peringkat_agunan,
-            $laporanSlik->fasilitas,
-            $laporanSlik->status_agunan,
-            $laporanSlik->tanggal_lapor,
-            $laporanSlik->status,
-            $laporanSlik->created_at->format('d/m/Y H:i'),
-        ];
-    }
-
-    public function styles(Worksheet $sheet)
-    {
-        return [
-            1 => ['font' => ['bold' => true]],
-        ];
-    }
-}

app/Exports/LaporanUserLimitExport.php

@@ -1,232 +0,0 @@
-<?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/Exports/NilaiPlafondExport.php

@@ -24,7 +24,6 @@
                 $row->id,
                 $row->code,
                 $row->name,
-                $row->biaya,
                 $row->created_at
             ];
         }
@@ -36,7 +35,6 @@
                 'ID',
                 'Code',
                 'Name',
-                'Biaya',
                 'Created At'
             ];
         }
@@ -46,8 +44,7 @@
         {
             return [
                 'A' => NumberFormat::FORMAT_NUMBER,
-                'D' => NumberFormat::FORMAT_NUMBER_00,
-                'E' => NumberFormat::FORMAT_DATE_DATETIME
+                'D' => NumberFormat::FORMAT_DATE_DATETIME
             ];
         }
     }

app/Exports/SlikExport.php

@@ -1,185 +0,0 @@
-<?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\Slik;
-use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
-
-/**
- * Export class untuk data SLIK (Sistem Layanan Informasi Keuangan)
- * 
- * Class ini menangani export data SLIK ke format Excel dengan:
- * - Mapping data sesuai struktur SLIK
- * - Format kolom yang sesuai (text, number, date)
- * - Header yang informatif
- */
-class SlikExport implements WithColumnFormatting, WithHeadings, FromCollection, WithMapping
-{
-    /**
-     * Mengambil collection data SLIK untuk di-export
-     * 
-     * @return \Illuminate\Support\Collection
-     */
-    public function collection()
-    {
-        return Slik::orderBy('created_at', 'desc')->get();
-    }
-
-    /**
-     * Mapping data SLIK untuk setiap baris dalam Excel
-     * 
-     * @param \Modules\Lpj\Models\Slik $row
-     * @return array
-     */
-    public function map($row): array
-    {
-        return [
-            $row->id,                                           // A - ID
-            $row->sandi_bank,                                   // B - Sandi Bank
-            $row->tahun,                                        // C - Tahun
-            $row->bulan,                                        // D - Bulan
-            $row->flag_detail,                                  // E - Flag Detail
-            $row->kode_register_agunan,                         // F - Kode Register Agunan
-            $row->no_rekening,                                  // G - No Rekening
-            $row->cif,                                          // H - CIF
-            $row->kolektibilitas,                               // I - Kolektibilitas
-            $row->fasilitas,                                    // J - Fasilitas
-            $row->jenis_segmen_fasilitas,                       // K - Jenis Segmen Fasilitas
-            $row->status_agunan,                                // L - Status Agunan
-            $row->jenis_agunan,                                 // M - Jenis Agunan
-            $row->peringkat_agunan,                             // N - Peringkat Agunan
-            $row->lembaga_pemeringkat,                          // O - Lembaga Pemeringkat
-            $row->jenis_pengikatan,                             // P - Jenis Pengikatan
-            $row->tanggal_pengikatan,                           // Q - Tanggal Pengikatan
-            $row->nama_pemilik_agunan,                          // R - Nama Pemilik Agunan
-            $row->bukti_kepemilikan,                            // S - Bukti Kepemilikan
-            $row->alamat_agunan,                                // T - Alamat Agunan
-            $row->lokasi_agunan,                                // U - Lokasi Agunan
-            $row->nilai_agunan,                                 // V - Nilai Agunan
-            $row->nilai_agunan_menurut_ljk,                     // W - Nilai Agunan Menurut LJK
-            $row->tanggal_penilaian_ljk,                        // X - Tanggal Penilaian LJK
-            $row->nilai_agunan_penilai_independen,              // Y - Nilai Agunan Penilai Independen
-            $row->nama_penilai_independen,                      // Z - Nama Penilai Independen
-            $row->tanggal_penilaian_penilai_independen,         // AA - Tanggal Penilaian Penilai Independen
-            $row->jumlah_hari_tunggakan,                        // AB - Jumlah Hari Tunggakan
-            $row->status_paripasu,                              // AC - Status Paripasu
-            $row->prosentase_paripasu,                          // AD - Prosentase Paripasu
-            $row->status_kredit_join,                           // AE - Status Kredit Join
-            $row->diasuransikan,                                // AF - Diasuransikan
-            $row->keterangan,                                   // AG - Keterangan
-            $row->kantor_cabang,                                // AH - Kantor Cabang
-            $row->operasi_data,                                 // AI - Operasi Data
-            $row->kode_cabang,                                  // AJ - Kode Cabang
-            $row->nama_debitur,                                 // AK - Nama Debitur
-            $row->nama_cabang,                                  // AL - Nama Cabang
-            $row->flag,                                         // AM - Flag
-            $row->created_at,                                   // AN - Created At
-        ];
-    }
-
-    /**
-     * Header kolom untuk Excel
-     * 
-     * @return array
-     */
-    public function headings(): array
-    {
-        return [
-            'ID',
-            'Sandi Bank',
-            'Tahun',
-            'Bulan',
-            'Flag Detail',
-            'Kode Register Agunan',
-            'No Rekening',
-            'CIF',
-            'Kolektibilitas',
-            'Fasilitas',
-            'Jenis Segmen Fasilitas',
-            'Status Agunan',
-            'Jenis Agunan',
-            'Peringkat Agunan',
-            'Lembaga Pemeringkat',
-            'Jenis Pengikatan',
-            'Tanggal Pengikatan',
-            'Nama Pemilik Agunan',
-            'Bukti Kepemilikan',
-            'Alamat Agunan',
-            'Lokasi Agunan',
-            'Nilai Agunan',
-            'Nilai Agunan Menurut LJK',
-            'Tanggal Penilaian LJK',
-            'Nilai Agunan Penilai Independen',
-            'Nama Penilai Independen',
-            'Tanggal Penilaian Penilai Independen',
-            'Jumlah Hari Tunggakan',
-            'Status Paripasu',
-            'Prosentase Paripasu',
-            'Status Kredit Join',
-            'Diasuransikan',
-            'Keterangan',
-            'Kantor Cabang',
-            'Operasi Data',
-            'Kode Cabang',
-            'Nama Debitur',
-            'Nama Cabang',
-            'Flag',
-            'Created At',
-        ];
-    }
-
-    /**
-     * Format kolom untuk Excel
-     * 
-     * @return array
-     */
-    public function columnFormats(): array
-    {
-        return [
-            'A' => NumberFormat::FORMAT_NUMBER,                 // ID
-            'B' => NumberFormat::FORMAT_TEXT,                   // Sandi Bank
-            'C' => NumberFormat::FORMAT_TEXT,                   // Tahun
-            'D' => NumberFormat::FORMAT_TEXT,                   // Bulan
-            'E' => NumberFormat::FORMAT_TEXT,                   // Flag Detail
-            'F' => NumberFormat::FORMAT_TEXT,                   // Kode Register Agunan
-            'G' => NumberFormat::FORMAT_TEXT,                   // No Rekening
-            'H' => NumberFormat::FORMAT_TEXT,                   // CIF
-            'I' => NumberFormat::FORMAT_TEXT,                   // Kolektibilitas
-            'J' => NumberFormat::FORMAT_TEXT,                   // Fasilitas
-            'K' => NumberFormat::FORMAT_TEXT,                   // Jenis Segmen Fasilitas
-            'L' => NumberFormat::FORMAT_TEXT,                   // Status Agunan
-            'M' => NumberFormat::FORMAT_TEXT,                   // Jenis Agunan
-            'N' => NumberFormat::FORMAT_TEXT,                   // Peringkat Agunan
-            'O' => NumberFormat::FORMAT_TEXT,                   // Lembaga Pemeringkat
-            'P' => NumberFormat::FORMAT_TEXT,                   // Jenis Pengikatan
-            'Q' => NumberFormat::FORMAT_DATE_DDMMYYYY,          // Tanggal Pengikatan
-            'R' => NumberFormat::FORMAT_TEXT,                   // Nama Pemilik Agunan
-            'S' => NumberFormat::FORMAT_TEXT,                   // Bukti Kepemilikan
-            'T' => NumberFormat::FORMAT_TEXT,                   // Alamat Agunan
-            'U' => NumberFormat::FORMAT_TEXT,                   // Lokasi Agunan
-            'V' => NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1, // Nilai Agunan
-            'W' => NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1, // Nilai Agunan Menurut LJK
-            'X' => NumberFormat::FORMAT_DATE_DDMMYYYY,          // Tanggal Penilaian LJK
-            'Y' => NumberFormat::FORMAT_NUMBER_COMMA_SEPARATED1, // Nilai Agunan Penilai Independen
-            'Z' => NumberFormat::FORMAT_TEXT,                   // Nama Penilai Independen
-            'AA' => NumberFormat::FORMAT_DATE_DDMMYYYY,         // Tanggal Penilaian Penilai Independen
-            'AB' => NumberFormat::FORMAT_NUMBER,                // Jumlah Hari Tunggakan
-            'AC' => NumberFormat::FORMAT_TEXT,                  // Status Paripasu
-            'AD' => NumberFormat::FORMAT_PERCENTAGE_00,         // Prosentase Paripasu
-            'AE' => NumberFormat::FORMAT_TEXT,                  // Status Kredit Join
-            'AF' => NumberFormat::FORMAT_TEXT,                  // Diasuransikan
-            'AG' => NumberFormat::FORMAT_TEXT,                  // Keterangan
-            'AH' => NumberFormat::FORMAT_TEXT,                  // Kantor Cabang
-            'AI' => NumberFormat::FORMAT_TEXT,                  // Operasi Data
-            'AJ' => NumberFormat::FORMAT_TEXT,                  // Kode Cabang
-            'AK' => NumberFormat::FORMAT_TEXT,                  // Nama Debitur
-            'AL' => NumberFormat::FORMAT_TEXT,                  // Nama Cabang
-            'AM' => NumberFormat::FORMAT_TEXT,                  // Flag
-            'AN' => NumberFormat::FORMAT_DATE_DATETIME,         // Created At
-        ];
-    }
-}

app/Helpers/Lpj.php

@@ -1,10 +1,7 @@
 <?php
-    declare(strict_types=1);
-
-    use Illuminate\Support\Facades\Log;
-    use Illuminate\Support\Facades\DB;
 
     use Carbon\Carbon;
+    use Illuminate\Support\Facades\DB;
     use Modules\Location\Models\City;
     use Modules\Location\Models\District;
     use Modules\Location\Models\Province;
@@ -18,118 +15,30 @@
     use Modules\Lpj\Models\Penilaian;
     use Modules\Lpj\Models\TeamsUsers;
     use Modules\Usermanagement\Models\User;
-    use Illuminate\Support\Facades\File;
-    use Illuminate\Support\Facades\Storage;
 
-    /**
-     * Format tanggal ke dalam format Bahasa Indonesia
-     *
-     * Mengubah tanggal menjadi format yang lebih mudah dibaca dalam Bahasa Indonesia.
-     * Contoh: "15 Januari 2024" atau "15 Januari 2024 pukul 14.30 WIB"
-     *
-     * @param string|mixed $date Tanggal yang akan diformat (string tanggal atau null)
-     * @param bool $time Apakah akan menampilkan waktu juga (default: false)
-     * @return string Tanggal yang sudah diformat dalam Bahasa Indonesia
-     *
-     * @example
-     * formatTanggalIndonesia('2024-01-15') // "15 Januari 2024"
-     * formatTanggalIndonesia('2024-01-15 14:30:00', true) // "15 Januari 2024 pukul 14.30 WIB"
-     * formatTanggalIndonesia(null) // ""
-     * formatTanggalIndonesia('invalid-date') // "invalid-date" (return as-is jika error)
-     */
-    function formatTanggalIndonesia($date, $time = false): string
+    function formatTanggalIndonesia($date, $time = false)
     {
-        Log::debug('Memulai format tanggal Indonesia', [
-            'date' => $date,
-            'time' => $time
-        ]);
-
-        // Validasi input null atau kosong
-        if (empty($date)) {
-            Log::debug('Tanggal kosong, return empty string');
-            return '';
-        }
-
         Carbon::setLocale('id');
-
         try {
             $waktu = Carbon::parse($date);
-
             if (!$time) {
-                $result = $waktu->translatedFormat('d F Y');
-                Log::debug('Format tanggal berhasil', ['result' => $result]);
-                return $result;
+                return $waktu->translatedFormat('d F Y');
             }
-
-            $result = $waktu->translatedFormat('d F Y') . ' pukul ' . $waktu->format('H.i') . ' WIB';
-            Log::debug('Format tanggal dengan waktu berhasil', ['result' => $result]);
-            return $result;
-
+            return $waktu->translatedFormat('d F Y') . ' pukul ' . $waktu->format('H.i') . ' WIB';
         } catch (Throwable $e) {
-            Log::warning('Gagal parse tanggal', [
-                'date' => $date,
-                'error' => $e->getMessage()
-            ]);
-            // Return input as-is jika gagal parse
-            return (string) $date;
+            return $date;
         }
+
     }
 
-    /**
-     * Format angka ke dalam format mata uang Rupiah Indonesia
-     *
-     * Mengubah angka menjadi format mata uang Rupiah dengan pemisah ribuan
-     * dan menggunakan koma sebagai pemisah desimal sesuai standar Indonesia.
-     *
-     * @param int|float|string $number Angka yang akan diformat (bisa negatif)
-     * @param int $decimals Jumlah digit desimal (default: 0)
-     * @return string Angka yang sudah diformat dalam format Rupiah
-     *
-     * @example
-     * formatRupiah(1500000) // "Rp 1.500.000"
-     * formatRupiah(1500000.50, 2) // "Rp 1.500.000,50"
-     * formatRupiah(-500000) // "Rp -500.000"
-     * formatRupiah(0) // "Rp 0"
-     * formatRupiah(null) // "Rp 0"
-     */
-    function formatRupiah($number, $decimals = 0, $withSymbol = true): string
+
+    function formatRupiah($number, $decimals = 0)
     {
-        Log::debug('Memulai format Rupiah', [
-            'number' => $number,
-            'decimals' => $decimals,
-            'withSymbol' => $withSymbol
-        ]);
-
-        // Handle null atau kosong
-        if ($number === null || $number === '') {
-            Log::debug('Number null atau kosong, return Rp 0');
-            return $withSymbol ? 'Rp 0' : '0';
-        }
-
-        // Remove dots if present
-        $number = str_replace('.', '', (string) $number);
-
-        // Konversi ke float dan handle error
-        try {
-            $number = (float) $number;
-        } catch (Throwable $e) {
-            Log::warning('Gagal konversi number ke float', [
-                'number' => $number,
-                'error' => $e->getMessage()
-            ]);
-            return $withSymbol ? 'Rp 0' : '0';
-        }
-
-        // Validasi decimals
-        $decimals = max(0, (int) $decimals);
-
-        $formatted = number_format($number, $decimals, ',', '.');
-        $result = $withSymbol ? 'Rp ' . $formatted : $formatted;
-        Log::debug('Format Rupiah berhasil', ['result' => $result]);
-
-        return $result;
+        $number = (float) $number;
+        return 'Rp ' . number_format($number, $decimals, ',', '.');
     }
 
+
     function formatAlamat($alamat)
     {
         return ($alamat->address ? $alamat->address . ', ' : '') . (isset($alamat->village) ? $alamat->village->name . ', ' : '') . (isset($alamat->city) ? $alamat->city->name . ', ' : '') . (isset($alamat->province) ? $alamat->province->name . ', ' : '') . ($alamat->village->postal_code ?? '');
@@ -187,6 +96,8 @@
                 $query->orWhereNull('dokumen_persetujuan');
             },
         )->get();
+        // $sql = DB::getQueryLog();
+
 
         if (sizeof($query) > 0) {
             $allow = false;
@@ -327,6 +238,9 @@
         return $hasil;
     }
 
+    // andy add
+
+
     function hitungHariKerja($tanggalMulai, $tanggalSelesai)
     {
         $tanggalMulai   = Carbon::parse($tanggalMulai)->startOfDay();
@@ -412,8 +326,7 @@
         $day   = str_pad(date('d'), 2, '0', STR_PAD_LEFT);
 
         // Generate random numbers
-        //$randomNumber = str_pad(mt_rand(0, pow(10, $randomLength) - 1), $randomLength, '0', STR_PAD_LEFT);
-	$randomNumber = sprintf('%0' . $randomLength . 'd', mt_rand(0, pow(10, $randomLength) - 1));
+        $randomNumber = str_pad(mt_rand(0, pow(10, $randomLength) - 1), $randomLength, '0', STR_PAD_LEFT);
 
         // Concatenate components to create the custom code
         return $year . $month . $day . $randomNumber;
@@ -617,161 +530,15 @@
         }
     }
 
-    function parsePembandingMigration($keterangan) {
-        $keterangan = preg_replace('/[-]{5,}/', '',$keterangan);   // Hapus ------
-        $keterangan = preg_replace('/[.]{5,}/', '',$keterangan);   // Hapus .....
-
-        $keterangan = preg_replace('/\s+/', ' ',$keterangan);
-        $keterangan = preg_replace('/\s*\n\s*/', "\n",$keterangan);
-
-        // Pecah teks per baris untuk diproses
-        $lines = explode("\n",$keterangan);
-        $cleaned = [];
-
-        foreach ($lines as $line) {
-            $line = trim($line);
-            if (!empty($line)) {
-                // Format angka dalam format Rp. 123.456.789
-                $line = preg_replace_callback('/Rp\.\s*([\d.,]+)/', function($matches) {
-                    $angka = str_replace(['.', ','], '', $matches[1]);
-                    return 'Rp. ' . number_format((int)$angka, 0, ',', '.');
-                }, $line);
-
-                // Jika ada tanda pagar (#), pisahkan menjadi baris baru
-                $line = str_replace('#', "\n#", $line);
-
-                $cleaned[] = $line;
-            }
-        }
-
-        return implode("\n", $cleaned);
-    }
-
-    /**
-     * get full path to internal storage file or external storage file
-     *
-     * @param string $path
-     * @return string
-     */
-
-    function getFilePath($path)
+    function formatNotifikasi($notifikasi)
     {
-        // define base path external storage (use .env) example: 'F:\path\to\storage' in windows
-        $externalBase = env('EXTERNAL_STORAGE_BASE_PATH', 'F:LPJ/lpj/LPJ Gambar/001/');
-
-        $segments = explode('/', $path);
-
-        if(strtoupper($segments[0]) === 'SURVEYOR'){
-            $year = $segments[1];
-            $month = ucfirst(strtolower($segments[2]));
-            $date = $segments[3];
-            $code = $segments[4];
-            $file = $segments[5] ?? '';
-
-            $extenalFullpath = $externalBase . $year . '/' . $month . '/' . $date . '/' . $code . '/' . $file;
-
-            if(File::exists($extenalFullpath)){
-                return $extenalFullpath;
-            }
-        }
-
-        // if not found in external storage, try to find in internal storage
-        if (Storage::exists($path)) {
-            return Storage::url('app/' . $path);
-        }
-        return $path;
-    }
-
-
-    function parseTimestamp(?string $timestamp): ?string
-    {
-        if (!$timestamp) {
-            return null;
-        }
-
-        // Trim whitespace dan normalize
-        $timestamp = trim($timestamp);
-
-        // Log untuk debugging
-        Log::info('Mencoba parsing timestamp: "' . $timestamp . '"');
-
-        // Parsing dengan DateTime native PHP untuk lebih robust
-        try {
-            // Pattern untuk format d/m/Y H:i:s
-            if (preg_match('/^(\d{1,2})\/(\d{1,2})\/(\d{4})\s+(\d{1,2}):(\d{1,2}):(\d{1,2})$/', $timestamp, $matches)) {
-                $day = (int) $matches[1];
-                $month = (int) $matches[2];
-                $year = (int) $matches[3];
-                $hour = (int) $matches[4];
-                $minute = (int) $matches[5];
-                $second = (int) $matches[6];
-
-                // Validasi nilai
-                if ($day >= 1 && $day <= 31 && $month >= 1 && $month <= 12 && $year >= 1900 && $year <= 2100 &&
-                    $hour >= 0 && $hour <= 23 && $minute >= 0 && $minute <= 59 && $second >= 0 && $second <= 59) {
-
-                    // Buat DateTime object langsung
-                    $dateTime = new \DateTime();
-                    $dateTime->setDate($year, $month, $day);
-                    $dateTime->setTime($hour, $minute, $second);
-
-                    $result = $dateTime->format('Y-m-d H:i:s');
-                    Log::info('Berhasil parsing dengan DateTime: ' . $timestamp . ' -> ' . $result);
-                    return $result;
-                }
-            }
-
-            // Pattern untuk format d/m/Y tanpa waktu
-            if (preg_match('/^(\d{1,2})\/(\d{1,2})\/(\d{4})$/', $timestamp, $matches)) {
-                $day = (int) $matches[1];
-                $month = (int) $matches[2];
-                $year = (int) $matches[3];
-
-                // Validasi nilai
-                if ($day >= 1 && $day <= 31 && $month >= 1 && $month <= 12 && $year >= 1900 && $year <= 2100) {
-
-                    // Buat DateTime object langsung
-                    $dateTime = new \DateTime();
-                    $dateTime->setDate($year, $month, $day);
-                    $dateTime->setTime(0, 0, 0);
-
-                    $result = $dateTime->format('Y-m-d H:i:s');
-                    Log::info('Berhasil parsing tanpa waktu dengan DateTime: ' . $timestamp . ' -> ' . $result);
-                    return $result;
-                }
-            }
-        } catch (\Exception $e) {
-            Log::error('Gagal parsing dengan DateTime: ' . $timestamp . '. Error: ' . $e->getMessage());
-        }
-
-        // Fallback ke format Carbon standar untuk format lainnya
-        $formats = [
-            'Y-m-d H:i:s',
-            'Y-m-d',
-            'd-m-Y H:i:s',
-            'd-m-Y',
-            'j-n-Y H:i:s',
-            'j-n-Y',
+        $data       = json_decode(json_encode($notifikasi->data));
+        $message    = $data->message;
+        $data       = $data->data;
+        $notifikasi = [
+            'title'   => 'Permohonan : ' . $data->nomor_registrasi,
+            'message' => $message,
         ];
-
-        foreach ($formats as $format) {
-            try {
-                $carbon = \Carbon\Carbon::createFromFormat($format, $timestamp);
-
-                if ($carbon && $carbon->format($format) === $timestamp) {
-                    // Jika format tidak mengandung waktu, set ke awal hari
-                    if (!str_contains($format, 'H:i:s')) {
-                        $carbon = $carbon->startOfDay();
-                    }
-                    Log::info('Berhasil parsing dengan format ' . $format . ': ' . $timestamp . ' -> ' . $carbon->toDateTimeString());
-                    return $carbon->toDateTimeString();
-                }
-            } catch (\Exception $e) {
-                // Lanjut ke format berikutnya
-                continue;
-            }
-        }
-
-        Log::error('Tidak dapat memparsing timestamp dengan format apapun: "' . $timestamp . '"');
-        return null;
+        return $notifikasi;
     }
+

app/Http/Controllers/ActivityController.php

@@ -55,7 +55,7 @@ class ActivityController extends Controller
                   ->when($teamId, fn ($q) => $q->where('id', $teamId));
             })
             ->where('user_id', '!=', $user->id)
-            ->whereHas('user.roles', fn ($q) => $q->whereIn('name', ['surveyor', 'surveyor-penilai','penilai']))
+            ->whereHas('user.roles', fn ($q) => $q->whereIn('name', ['surveyor', 'surveyor-penilai']))
             ->get();
 
         $teamId = is_array($teamId) ? $teamId : [$teamId];
@@ -306,7 +306,6 @@ 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) {
@@ -325,9 +324,7 @@ class ActivityController extends Controller
             });
         }
 
-
-
-        // Apply sorting if provided
+        // Default sorting if no sort provided
         if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
             $order  = $request->get('sortOrder');
             $column = $request->get('sortField');

app/Http/Controllers/Api/DebiturController.php

@@ -1,183 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Http\Controllers\Api;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-use Exception;
-use Modules\Lpj\Models\Debiture;
-
-/**
- * Controller untuk API pencarian debitur
- * Digunakan untuk autocomplete search pada form pembayaran
- */
-class DebiturController extends Controller
-{
-    /**
-     * Pencarian debitur untuk autocomplete
-     *
-     * @param Request $request
-     * @return JsonResponse
-     */
-    public function search(Request $request): JsonResponse
-    {
-        try {
-            // Log aktivitas pencarian
-            Log::info('API Debitur Search - Request', [
-                'query' => $request->get('q'),
-                'user_id' => Auth::id()
-            ]);
-
-            $query = $request->get('q', '');
-
-            // Validasi minimal 2 karakter untuk pencarian
-            if (strlen($query) < 2) {
-                return response()->json([
-                    'success' => false,
-                    'message' => 'Minimal 2 karakter untuk pencarian',
-                    'data' => []
-                ], 400);
-            }
-
-            // Mulai database transaction
-            DB::beginTransaction();
-
-            try {
-                // Query pencarian debitur
-                // Asumsi tabel debitur dengan kolom: id, code, nama, alamat
-                $debiturs = Debiture::query()
-                    ->select('id', 'cif', 'name', 'address')
-                    ->whereAny(['cif','name'], 'LIKE', "%{$query}%")
-                    ->orderBy('name', 'asc')
-                    ->limit(20) // Batasi hasil maksimal 20
-                    ->get();
-
-                // Format data untuk TomSelect
-                $formattedData = $debiturs->map(function($debitur) {
-                    return [
-                        'id' => $debitur->id,
-                        'kode_debitur' => $debitur->cif,
-                        'name' => $debitur->name,
-                        'address' => $debitur->address
-                    ];
-                });
-
-                DB::commit();
-
-                // Log hasil pencarian
-                Log::info('API Debitur Search - Success', [
-                    'query' => $query,
-                    'results_count' => $formattedData->count(),
-                    'user_id' => Auth::id()
-                ]);
-
-                return response()->json([
-                    'success' => true,
-                    'message' => 'Data debitur berhasil ditemukan',
-                    'data' => $formattedData
-                ]);
-
-            } catch (Exception $e) {
-                DB::rollback();
-                throw $e;
-            }
-
-        } catch (Exception $e) {
-            // Log error
-            Log::error('API Debitur Search - Error', [
-                'query' => $request->get('q'),
-                'error' => $e->getMessage(),
-                'trace' => $e->getTraceAsString(),
-                'user_id' => Auth::id()
-            ]);
-
-            return response()->json([
-                'success' => false,
-                'message' => 'Terjadi kesalahan saat mencari data debitur',
-                'error' => config('app.debug') ? $e->getMessage() : 'Internal Server Error'
-            ], 500);
-        }
-    }
-
-    /**
-     * Get detail debitur berdasarkan code
-     *
-     * @param Request $request
-     * @return JsonResponse
-     */
-    public function getByCode(Request $request): JsonResponse
-    {
-        try {
-            $code = $request->get('code');
-
-            if (empty($code)) {
-                return response()->json([
-                    'success' => false,
-                    'message' => 'Code debitur harus diisi',
-                    'data' => null
-                ], 400);
-            }
-
-            // Log aktivitas get detail
-            Log::info('API Debitur GetByCode - Request', [
-                'code' => $code,
-                'user_id' => Auth::id()
-            ]);
-
-            DB::beginTransaction();
-
-            try {
-                $debitur = DB::table('debitur')
-                    ->select('id', 'code', 'nama', 'alamat', 'telepon', 'email')
-                    ->where('code', $code)
-                    ->where('status', 'aktif')
-                    ->first();
-
-                if (!$debitur) {
-                    DB::rollback();
-                    return response()->json([
-                        'success' => false,
-                        'message' => 'Debitur tidak ditemukan',
-                        'data' => null
-                    ], 404);
-                }
-
-                DB::commit();
-
-                Log::info('API Debitur GetByCode - Success', [
-                    'code' => $code,
-                    'debitur_id' => $debitur->id,
-                    'user_id' => Auth::id()
-                ]);
-
-                return response()->json([
-                    'success' => true,
-                    'message' => 'Data debitur berhasil ditemukan',
-                    'data' => $debitur
-                ]);
-
-            } catch (Exception $e) {
-                DB::rollback();
-                throw $e;
-            }
-
-        } catch (Exception $e) {
-            Log::error('API Debitur GetByCode - Error', [
-                'code' => $request->get('code'),
-                'error' => $e->getMessage(),
-                'trace' => $e->getTraceAsString(),
-                'user_id' => Auth::id()
-            ]);
-
-            return response()->json([
-                'success' => false,
-                'message' => 'Terjadi kesalahan saat mengambil data debitur',
-                'error' => config('app.debug') ? $e->getMessage() : 'Internal Server Error'
-            ], 500);
-        }
-    }
-}

app/Http/Controllers/BankDataController.php

@@ -1,98 +1,102 @@
 <?php
 
-    namespace Modules\Lpj\Http\Controllers;
+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;
+use Illuminate\Http\Request;
+use Illuminate\Routing\Controller;
+use Illuminate\Support\Facades\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
+class BankDataController extends Controller
+{
+    protected $bankDataService;
+    protected $user;
+
+    public function __construct(BankDataService $bankDataService)
     {
-        protected $bankDataService;
-        protected $user;
+        $this->bankDataService = $bankDataService;
+    }
 
-        public function __construct(BankDataService $bankDataService)
-        {
-            $this->bankDataService = $bankDataService;
-        }
+    public function index(Request $request)
+    {
+        $provinces    = Province::all();
+        $jenisJaminan = JenisJaminan::all();
 
-        public function index(Request $request)
-        {
-            $provinces    = Province::all();
-            $jenisJaminan = JenisJaminan::all();
+        //insert data pembanding
 
-            //insert data pembanding
+        $inspeksi = Inspeksi::all();
 
-            $inspeksi = Inspeksi::all();
+        foreach ($inspeksi as $item) {
+            if (isset($item->data_pembanding)) {
+                $data_pembanding = json_decode($item->data_pembanding);
 
-            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;
 
-                    $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) {
 
-                        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',
-                                ];
+                            $_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
+                            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
                     }
+                }
 
+                if (isset($data_pembanding->data_pembanding)) {
                     foreach ($data_pembanding->data_pembanding as $dataPembanding) {
+                        if (!isset($dataPembanding->kordinat_lat) || !isset($dataPembanding->kordinat_lng)) {
+                            continue;
+                        }
                         $lat = $dataPembanding->kordinat_lat;
                         $lng = $dataPembanding->kordinat_lng;
 
@@ -123,7 +127,7 @@
                                     'hak_properti'     => $dataPembanding->hak_properti,
                                     'jenis_aset'       => $dataPembanding->jenis_aset,
                                     'foto_objek'       => $dataPembanding->foto_objek,
-                                    'tanggal'          => $dataPembanding->tanggal,
+                                    'tanggal'          => $dataPembanding->tanggal ?? null,
                                     'kategori'         => 'data_pembanding',
                                 ];
 
@@ -138,174 +142,187 @@
                             }
                         } 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
+                            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');
+        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.');
         }
 
-        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.');
-        }
+        // Retrieve data from the database
+        $query = BankData::query();
 
-        public function show($id)
-        {
-            $bankData = $this->bankDataService->findBankData($id);
-            return view('lpj::bank-data.show', compact('bankData'));
-        }
+        // 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)) {
 
-        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 . '%');
-                    });
+                if ($search['province_code']) {
+                    $query->ofProvince($search['province_code']);
                 }
-            }
 
-            // Apply sorting if provided
-            if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
-                $order  = $request->get('sortOrder');
-                $column = $request->get('sortField');
+                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');
+
+            // Handle special cases for computed fields
+            if ($column === 'location') {
+                $query->orderBy('kordinat_lat', $order)
+                    ->orderBy('kordinat_lng', $order);
+            }
+            // Map frontend column names to database columns
+            else if ($column === 'sumber') {
+                $column = 'kategori'; // Sort by kategori when sumber is requested
+                $query->orderBy($column, $order);
+            } else {
                 $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,
-            ]);
         }
+
+        // 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'       => isset($item->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/BucokController.php

@@ -1,209 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Http\Controllers;
-
-use App\Http\Controllers\Controller;
-use Exception;
-use Illuminate\Http\Request;
-use Maatwebsite\Excel\Facades\Excel;
-use Modules\Lpj\Imports\BucokImport;
-use Modules\Lpj\Models\Bucok;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-
-/**
- * Controller untuk mengelola data Bucok
- *
- * @package Modules\Lpj\Http\Controllers
- */
-class BucokController extends Controller
-{
-    public $user;
-
-      /**
-     * Menampilkan halaman index bucok
-     *
-     * @return \Illuminate\View\View
-     */
-    public function index()
-    {
-        return view('lpj::bucok.index');
-    }
-
-      /**
-     * Menampilkan detail bucok
-     *
-     * @param int $id
-     * @return \Illuminate\View\View
-     */
-    public function show($id)
-    {
-        $bucok = Bucok::findOrFail($id);
-        return view('lpj::bucok.show', compact('bucok'));
-    }
-
-      /**
-     * Data untuk datatables dengan server-side processing
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function dataForDatatables(Request $request)
-    {
-        if (is_null($this->user) || !$this->user->can('bucok.view')) {
-              // abort(403, 'Sorry! You are not allowed to view bucok.');
-        }
-
-          // Retrieve data from the database
-        $query = Bucok::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_tiket', 'LIKE', "%$search%")
-                  ->orWhere('deskripsi', 'LIKE', "%$search%")
-                  ->orWhere('nomor_coa', 'LIKE', "%$search%")
-                  ->orWhere('nama_coa', 'LIKE', "%$search%")
-                  ->orWhere('cost_center', 'LIKE', "%$search%")
-                  ->orWhere('nama_sub_direktorat', 'LIKE', "%$search%")
-                  ->orWhere('nama_direktorat_cabang', 'LIKE', "%$search%")
-                  ->orWhere('penyelesaian', 'LIKE', "%$search%")
-                  ->orWhere('keterangan_gantung', 'LIKE', "%$search%");
-            });
-        }
-
-          // Apply date range filter
-        if ($request->has('start_date') && !empty($request->get('start_date'))) {
-            $query->whereDate('tanggal', '>=', $request->get('start_date'));
-        }
-        if ($request->has('end_date') && !empty($request->get('end_date'))) {
-            $query->whereDate('tanggal', '<=', $request->get('end_date'));
-        }
-
-          // Apply year filter
-        if ($request->has('year') && !empty($request->get('year'))) {
-            $query->byYear($request->get('year'));
-        }
-
-          // Apply month filter
-        if ($request->has('month') && !empty($request->get('month'))) {
-            $query->byMonth($request->get('month'));
-        }
-
-          // Apply cost center filter
-        if ($request->has('cost_center') && !empty($request->get('cost_center'))) {
-            $query->byCostCenter($request->get('cost_center'));
-        }
-
-          // Apply completion status filter
-        if ($request->has('completion_status') && $request->get('completion_status') !== '') {
-            $isCompleted = $request->get('completion_status') == '1';
-            $query->byCompletionStatus($isCompleted);
-        }
-
-          // Apply sorting if provided
-        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
-            $order  = $request->get('sortOrder');
-            $column = $request->get('sortField', 'created_at');
-            $query->orderBy($column, $order);
-        } else {
-            $query->orderBy('created_at', 'desc');
-        }
-
-          // 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 with relationships
-        $data = $query->get();
-
-          // Transform data untuk datatables
-        $transformedData = $data->map(function ($item) {
-            return [
-                'id'                     => $item->id,
-                'no'                     => $item->no,
-                'tanggal'                => $item->tanggal ? dateFormat($item->tanggal,true) : '-',
-                'bulan'                  => $item->bulan,
-                'tahun'                  => $item->tahun,
-                'nomor_tiket'            => $item->nomor_tiket,
-                'nomor_coa'              => $item->nomor_coa,
-                'nama_coa'               => $item->nama_coa,
-                'deskripsi'              => $item->deskripsi,
-                'nominal'                => $item->nominal_formatted,
-                'penyelesaian'           => $item->penyelesaian,
-                'umur_aging'             => $item->umur_aging,
-                'cost_center'            => $item->cost_center,
-                'nama_sub_direktorat'    => $item->nama_sub_direktorat,
-                'nama_direktorat_cabang' => $item->nama_direktorat_cabang,
-                'tanggal_penyelesaian'   => $item->tanggal_penyelesaian ? dateFormat($item->tanggal_penyelesaian,true) : '-',
-                'nominal_penyelesaian'   => $item->nominal_penyelesaian_formatted,
-                'status_penyelesaian'    => $item->status_penyelesaian,
-                'status_badge'           => $item->status_badge,
-                'created_by'             => $item->creator?->name ?? '-',
-                'created_at'             => dateFormat($item->created_at,true)
-            ];
-        });
-
-          // Calculate the page count
-        $pageCount = ceil($totalRecords / ($request->get('size', 10)));
-
-          // 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'            => $transformedData,
-        ]);
-    }
-
-      /**
-     * Import data bucok dari Excel
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function import(Request $request)
-    {
-        $request->validate([
-            'file' => 'required|mimes:xlsx,xls,csv|max:10240'  // Max 10MB
-        ]);
-
-        DB::beginTransaction();
-        try {
-            Log::info('Importing Bucok data', ['user_id' => Auth::id(), 'filename' => $request->file('file')->getClientOriginalName()]);
-
-            $import = new BucokImport();
-            Excel::import($import, $request->file('file'));
-            $statistics = $import->getImportStatistics();
-
-            DB::commit();
-            Log::info('Bucok data imported successfully', ['user_id' => Auth::id()]);
-
-            return redirect()->back()->with('success', 'Data Bucok berhasil diimport. Total: ' . $statistics['total_processed'] . ', Created: ' . $statistics['created'] . ', Updated: ' . $statistics['updated'] . ', Skipped: ' . $statistics['skipped'] . ', Errors: ' . $statistics['errors']);
-        } catch (Exception $e) {
-            DB::rollback();
-            Log::error('Failed to import Bucok data', ['error' => $e->getMessage(), 'user_id' => Auth::id()]);
-
-            return redirect()->back()->with('error', 'Gagal import data: ' . $e->getMessage());
-        }
-    }
-}

app/Http/Controllers/CategoryDaftarPustakaController.php

@@ -1,152 +0,0 @@
-<?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

@@ -1,129 +0,0 @@
-<?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

@@ -1,36 +0,0 @@
-<?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

@@ -129,7 +129,7 @@
             // Retrieve data from the database
             $query = Debiture::query();
 
-            if (!Auth::user()->hasAnyRole(['administrator','admin'])) {
+            if (!Auth::user()->hasAnyRole(['administrator'])) {
                 $query = $query->where('branch_id', Auth::user()->branch_id);
             }
 

app/Http/Controllers/DokumenJaminanController.php

@@ -406,9 +406,7 @@
 
 
                 // Remove values from $legalitasJaminan that are in $currentLegalitasJaminan
-                $legalitasJaminan = is_array($legalitasJaminan)
-                ? array_diff($legalitasJaminan, $currentLegalitasJaminan->pluck('code')->toArray())
-                : [];
+                $legalitasJaminan = array_diff($legalitasJaminan, $currentLegalitasJaminan->pluck('code')->toArray());
 
                 $legalitas = JenisLegalitasJaminan::whereIn('code', $legalitasJaminan)->get();
             }
@@ -443,7 +441,7 @@
             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);
+                    return response()->json(['success' => false, 'message' => 'Hanya administrator yang dapat menghapus dokumen jaminan'], 403);
                 }
 
                 $jaminan = DokumenJaminan::find($jaminan_id);
@@ -453,8 +451,8 @@
                 }
 
                 // Periksa apakah dokumen jaminan terkait dengan permohonan aktif
-                if ($jaminan->permohonan()->exists() && !in_array($jaminan->permohonan->status,['order','revisi'])) {
-                   // return response()->json(['success' => false, 'message' => 'Tidak dapat menghapus dokumen jaminan yang terkait dengan permohonan aktif'], 400);
+                if ($jaminan->permohonan()->exists()) {
+                    return response()->json(['success' => false, 'message' => 'Tidak dapat menghapus dokumen jaminan yang terkait dengan permohonan aktif'], 400);
                 }
 
                 DB::beginTransaction();

app/Http/Controllers/InspeksiController.php

@@ -1,239 +0,0 @@
-<?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 Illuminate\Support\Facades\Log;
-use Modules\Lpj\Models\Inspeksi;
-use Modules\Lpj\Services\InspeksiCleanupService;
-
-/**
- * Controller contoh untuk menunjukkan penggunaan InspeksiCleanupService
- * 
- * Controller ini berisi contoh method untuk membuat dan update data inspeksi
- * dengan otomatis menjalankan cleanup data lama yang tidak memiliki dokument_id
- */
-class InspeksiController extends Controller
-{
-    protected InspeksiCleanupService $cleanupService;
-
-    public function __construct(InspeksiCleanupService $cleanupService)
-    {
-        $this->cleanupService = $cleanupService;
-    }
-
-    /**
-     * Contoh method untuk membuat data inspeksi baru
-     * 
-     * @param Request $request
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function store(Request $request)
-    {
-        $validated = $request->validate([
-            'permohonan_id' => 'required|integer|exists:permohonan,id',
-            'dokument_id' => 'nullable|integer|exists:dokumen_jaminan,id',
-            'data_form' => 'required|json',
-            'foto_form' => 'nullable|json',
-            'denah_form' => 'nullable|json',
-            'name' => 'required|string|max:255',
-            'status' => 'required|string|max:50',
-        ]);
-
-        DB::beginTransaction();
-
-        try {
-            // Buat data inspeksi baru
-            $inspeksi = Inspeksi::create(array_merge($validated, [
-                'created_by' => Auth::id(),
-                'updated_by' => Auth::id(),
-            ]));
-
-            Log::info('InspeksiController: Data inspeksi berhasil dibuat', [
-                'inspeksi_id' => $inspeksi->id,
-                'permohonan_id' => $inspeksi->permohonan_id,
-                'dokument_id' => $inspeksi->dokument_id,
-                'created_by' => $inspeksi->created_by
-            ]);
-
-            // Commit transaksi utama
-            DB::commit();
-
-            // Jalankan cleanup secara async jika ada dokument_id
-            // Ini akan menghapus data lama yang tidak memiliki dokument_id
-            if ($inspeksi->dokument_id) {
-                Log::info('InspeksiController: Memulai cleanup data lama', [
-                    'permohonan_id' => $inspeksi->permohonan_id,
-                    'created_by' => $inspeksi->created_by,
-                    'dokument_id' => $inspeksi->dokument_id
-                ]);
-
-                // Dispatch job cleanup secara async
-                $this->cleanupService->cleanupAsync(
-                    $inspeksi->permohonan_id,
-                    $inspeksi->created_by,
-                    $inspeksi->dokument_id
-                );
-            }
-
-            return response()->json([
-                'success' => true,
-                'message' => 'Data inspeksi berhasil dibuat',
-                'data' => $inspeksi->load(['permohonan', 'dokument'])
-            ], 201);
-
-        } catch (\Exception $e) {
-            DB::rollBack();
-            
-            Log::error('InspeksiController: Gagal membuat data inspeksi', [
-                'error' => $e->getMessage(),
-                'trace' => $e->getTraceAsString()
-            ]);
-
-            return response()->json([
-                'success' => false,
-                'message' => 'Gagal membuat data inspeksi: ' . $e->getMessage()
-            ], 500);
-        }
-    }
-
-    /**
-     * Contoh method untuk update data inspeksi
-     * 
-     * @param Request $request
-     * @param int $id
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function update(Request $request, $id)
-    {
-        $validated = $request->validate([
-            'dokument_id' => 'nullable|integer|exists:dokumen_jaminan,id',
-            'data_form' => 'required|json',
-            'foto_form' => 'nullable|json',
-            'denah_form' => 'nullable|json',
-            'name' => 'required|string|max:255',
-            'status' => 'required|string|max:50',
-        ]);
-
-        DB::beginTransaction();
-
-        try {
-            $inspeksi = Inspeksi::findOrFail($id);
-            
-            // Simpan data lama untuk logging
-            $oldDokumentId = $inspeksi->dokument_id;
-            
-            // Update data
-            $inspeksi->update(array_merge($validated, [
-                'updated_by' => Auth::id(),
-            ]));
-
-            Log::info('InspeksiController: Data inspeksi berhasil diupdate', [
-                'inspeksi_id' => $inspeksi->id,
-                'permohonan_id' => $inspeksi->permohonan_id,
-                'old_dokument_id' => $oldDokumentId,
-                'new_dokument_id' => $inspeksi->dokument_id,
-                'updated_by' => $inspeksi->updated_by
-            ]);
-
-            // Commit transaksi utama
-            DB::commit();
-
-            // Jalankan cleanup jika dokument_id berubah dari null ke ada nilai
-            if (!$oldDokumentId && $inspeksi->dokument_id) {
-                Log::info('InspeksiController: Dokument ID berubah dari null, memulai cleanup', [
-                    'inspeksi_id' => $inspeksi->id,
-                    'permohonan_id' => $inspeksi->permohonan_id,
-                    'created_by' => $inspeksi->created_by,
-                    'new_dokument_id' => $inspeksi->dokument_id
-                ]);
-
-                // Dispatch job cleanup secara async
-                $this->cleanupService->cleanupAsync(
-                    $inspeksi->permohonan_id,
-                    $inspeksi->created_by,
-                    $inspeksi->dokument_id
-                );
-            }
-
-            return response()->json([
-                'success' => true,
-                'message' => 'Data inspeksi berhasil diupdate',
-                'data' => $inspeksi->load(['permohonan', 'dokument'])
-            ]);
-
-        } catch (\Exception $e) {
-            DB::rollBack();
-            
-            Log::error('InspeksiController: Gagal update data inspeksi', [
-                'inspeksi_id' => $id,
-                'error' => $e->getMessage(),
-                'trace' => $e->getTraceAsString()
-            ]);
-
-            return response()->json([
-                'success' => false,
-                'message' => 'Gagal update data inspeksi: ' . $e->getMessage()
-            ], 500);
-        }
-    }
-
-    /**
-     * Contoh method untuk menjalankan cleanup secara manual
-     * 
-     * @param Request $request
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function cleanup(Request $request)
-    {
-        $validated = $request->validate([
-            'permohonan_id' => 'required|integer|exists:permohonan,id',
-            'created_by' => 'required|integer|exists:users,id',
-            'sync' => 'boolean', // Opsional, default false (async)
-        ]);
-
-        try {
-            $permohonanId = $validated['permohonan_id'];
-            $createdBy = $validated['created_by'];
-            $sync = $validated['sync'] ?? false;
-
-            Log::info('InspeksiController: Menjalankan cleanup manual', [
-                'permohonan_id' => $permohonanId,
-                'created_by' => $createdBy,
-                'sync' => $sync
-            ]);
-
-            if ($sync) {
-                // Jalankan secara sync
-                $this->cleanupService->cleanupSync($permohonanId, $createdBy);
-                
-                return response()->json([
-                    'success' => true,
-                    'message' => 'Cleanup selesai dijalankan secara synchronous'
-                ]);
-            } else {
-                // Dispatch ke queue
-                $this->cleanupService->cleanupAsync($permohonanId, $createdBy);
-                
-                return response()->json([
-                    'success' => true,
-                    'message' => 'Cleanup job berhasil di-dispatch ke queue'
-                ]);
-            }
-
-        } catch (\Exception $e) {
-            Log::error('InspeksiController: Gagal menjalankan cleanup manual', [
-                'error' => $e->getMessage(),
-                'trace' => $e->getTraceAsString()
-            ]);
-
-            return response()->json([
-                'success' => false,
-                'message' => 'Gagal menjalankan cleanup: ' . $e->getMessage()
-            ], 500);
-        }
-    }
-}

app/Http/Controllers/LaporanAdminKreditController.php

@@ -3,7 +3,6 @@
     namespace Modules\Lpj\Http\Controllers;
 
     use App\Http\Controllers\Controller;
-    use Exception;
     use Illuminate\Http\Request;
     use Illuminate\Support\Facades\Auth;
     use Maatwebsite\Excel\Facades\Excel;
@@ -150,8 +149,6 @@
             $request->validate([
                 'kode_register_t24' => 'nullable',
                 'cif' => 'required',
-                'keterangan' => 'nullable|string',
-                'kolektibilitas' => 'nullable|string|in:1,2,3,4,5',
             ]);
 
             try {
@@ -160,8 +157,6 @@
                 // Update only the editable fields
                 $laporanAdminKredit->update([
                     'kode_register_t24' => $request->kode_register_t24,
-                    'keterangan' => $request->keterangan,
-                    'kolektibilitas' => $request->kolektibilitas,
                     'updated_by' => Auth::id(),
                 ]);
 
@@ -174,11 +169,11 @@
                 }
 
                 return redirect()
-                    ->route('admin-kredit.laporan.index')
+                    ->route('laporan-admin-kredit.index')
                     ->with('success', 'Laporan Admin Kredit updated successfully');
             } catch (Exception $e) {
                 return redirect()
-                    ->route('admin-kredit.laporan.edit', $id)
+                    ->route('laporan-admin-kredit.edit', $id)
                     ->with('error', 'Failed to update Laporan Admin Kredit');
             }
         }

app/Http/Controllers/LaporanBiayaInternalExternalController.php

@@ -1,23 +0,0 @@
-<?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

@@ -2,10 +2,9 @@
 
 namespace Modules\Lpj\Http\Controllers;
 
+use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Modules\Lpj\Models\Permohonan;
-use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Auth;
 use Modules\Lpj\Http\Controllers\PenilaiController;
 
 class LaporanController extends Controller
@@ -16,6 +15,7 @@ class LaporanController extends Controller
      * Display a listing of the resource.
      */
 
+
     public function __construct(PenilaiController $penilaiController){
         $this->penilaiController = $penilaiController;
     }
@@ -75,12 +75,11 @@ class LaporanController extends Controller
         }
 
         // Retrieve data from the database
-        $query = Permohonan::query()
-            ->whereIn('status',['proses-laporan','done', 'paparan', 'proses-paparan']);
-
-        if (Auth::user()->hasAnyRole(['pemohon-ao','pemohon-eo'])) {
-            $query = $query->where('branch_id', Auth::user()->branch_id);
-        }
+        $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 = $query->orderBy('nomor_registrasi', 'desc');
         // Apply search filter if provided

app/Http/Controllers/LaporanDebitureController.php

@@ -1,33 +0,0 @@
-<?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/LaporanHasilPenilaianJaminanInternalExternalController.php

@@ -4,7 +4,6 @@
 
     use App\Http\Controllers\Controller;
     use Illuminate\Http\Request;
-    use Illuminate\Support\Facades\DB;
     use Maatwebsite\Excel\Facades\Excel;
     use Modules\Lpj\Exports\LaporanHasilPenilaianJaminanInternalExternalExport;
     use Modules\Lpj\Models\Permohonan;
@@ -61,7 +60,6 @@
                         $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 . '%');
@@ -71,7 +69,7 @@
 
             // Apply sorting if provided
             if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
-                $order = $request->get('sortOrder');
+                $order  = $request->get('sortOrder');
                 $column = $request->get('sortField');
                 $query->orderBy($column, $order);
             }
@@ -106,12 +104,12 @@
                     $lpj = json_decode($permohonan->penilai->lpj, true);
                     $npw = str_replace('.', '', $lpj['total_nilai_pasar_wajar'] ?? 0);
 
-                    $luas_tanah = $lpj['luas_tanah'] ?? 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_bangunan  = str_replace('.', '', $lpj['nilai_bangunan_2'] ?? 0);
                     $nilai_liquidasi = str_replace('.', '', $lpj['likuidasi_nilai_2'] ?? 0);
                 }
 

app/Http/Controllers/LaporanMonitoringSoController.php

@@ -1,43 +0,0 @@
-<?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/LaporanPenilaiJaminanController.php

@@ -2,17 +2,14 @@
 
 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\TeamsUsers;
+use App\Http\Controllers\Controller;
+use Maatwebsite\Excel\Facades\Excel;
 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
 {
@@ -20,31 +17,59 @@ class LaporanPenilaiJaminanController extends Controller
     /**
      * 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 form for creating a new resource.
+     */
+    public function create()
+    {
+        return view('lpj::create');
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     */
+    public function store(Request $request)
+    {
+        //
+    }
 
     /**
      * Show the specified resource.
      */
-    public function show($permohonan_id, $dokumen_id, $jaminan_id)
+    public function show($id)
     {
-        $back = route('laporan-penilai-jaminan.index');
-        return $this->previewLaporanService->previewLaporan($permohonan_id, $dokumen_id, $jaminan_id, $back);
+        return view('lpj::laporan-penilai-jaminan.show');
     }
 
+    /**
+     * Show the form for editing the specified resource.
+     */
+    public function edit($id)
+    {
+        return view('lpj::edit');
+    }
 
+    /**
+     * Update the specified resource in storage.
+     */
+    public function update(Request $request, $id)
+    {
+        //
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy($id)
+    {
+        //
+    }
 
     public function dataForDatatables(Request $request)
     {
@@ -69,104 +94,91 @@ class LaporanPenilaiJaminanController extends Controller
         // 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'));
+            $search = $request->get('search');
+            $paramsSearch = json_decode($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 ($search) {
+                $q->where('nomor_registrasi', 'LIKE', '%' . $search . '%')
+                    ->orWhere('tanggal_permohonan', 'LIKE', '%' . $search . '%')
+                    ->orWhereRelation('user', 'name', 'LIKE', '%' . $search . '%')
+                    ->orWhereRelation('debiture', 'name', 'LIKE', '%' . $search . '%')
+                    ->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $search . '%')
+                    ->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
 
-                $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 . '%');
-                    });
+                if (!empty($paramsSearch->tanggal_awal) && !empty($paramsSearch->tanggal_akhir)) {
+                    $q->whereBetween('tanggal_permohonan', [$paramsSearch->tanggal_awal, $paramsSearch->tanggal_akhir]);
                 }
-            }
 
 
-            // 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 . '%');
-                });
-            }
-
+                $statusKeywords = explode(',', $search);
+                foreach ($statusKeywords as $keyword) {
+                    $q->orWhereRelation('penilai', 'type_penilai', 'LIKE', '%' . trim($keyword) . '%');
+                }
+            });
         }
+        $query->where('status', 'done');
 
-        // Apply sorting if provided
+
+
+        // Default sorting if no sort provided
         if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
             $order  = $request->get('sortOrder');
             $column = $request->get('sortField');
             $query->orderBy($column, $order);
+        } else {
+            $query->orderBy('nomor_registrasi', 'asc');
         }
 
-
-        // Get the total count of records
+        // Get total count of records before pagination
         $totalRecords = $query->count();
 
-        // Apply pagination if provided
+        // Pagination
         if ($request->has('page') && $request->has('size')) {
-            $page   = $request->get('page');
-            $size   = $request->get('size');
-            $offset = ($page - 1) * $size; // Calculate the offset
-
+            $page = (int) $request->get('page', 1);
+            $size = (int) $request->get('size', 10);
+            $offset = ($page - 1) * $size;
             $query->skip($offset)->take($size);
         }
 
-        // Get the filtered count of records
+        // Get filtered count
         $filteredRecords = $query->count();
 
 
+
+        $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);
+        }
+
+        // Get filtered count
+        $filteredRecords = $query->count();
+
         // Get data with necessary relationships
-        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian', 'dokumenjaminan.jenisJaminan','nilaiPlafond', 'penilai', 'dokumenjaminan.inspeksi'])->get();
+        $data = $query->with(['user', 'debiture', 'branch', 'tujuanPenilaian', 'penilaian', 'dokumenjaminan.jenisJaminan', 'nilaiPlafond', 'penilai'])->get();
 
-        // Calculate the page count
-        $pageCount = ceil($totalRecords / $size);
+        // Calculate total pages
+        $pageCount = ceil($totalRecords / $request->get('size', 10));
 
-        // Calculate the current page number
-        $currentPage = max(1, $request->get('page', 1));
 
-        // Return the response data as a JSON object
+
+
+        // Calculate total pages
+        $pageCount = ceil($totalRecords / $request->get('size', 10));
+
         return response()->json([
             'draw'            => $request->get('draw'),
             'recordsTotal'    => $totalRecords,
             'recordsFiltered' => $filteredRecords,
             'pageCount'       => $pageCount,
-            'page'            => $currentPage,
+            'page'            => $request->get('page', 1),
             'totalCount'      => $totalRecords,
             'data'            => $data,
         ]);
@@ -174,53 +186,15 @@ class LaporanPenilaiJaminanController extends Controller
 
     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);
+        $tanggalAwal = $request->input('tanggal_awal');
+        $tanggalAkhir = $request->input('tanggal_akhir');
+        $status = $request->input('status');
+        $selectedIds = $request->input('selected_ids');
 
+        $filename = 'laporan_penilai_jaminan_' . date('YmdHis') . '.xlsx';
         return Excel::download(
-            new LaporanPenilaiJaminanExport($request),
+            new LaporanPenilaiJaminanExport($tanggalAwal, $tanggalAkhir, $status, $selectedIds),
             $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

@@ -1,180 +1,161 @@
 <?php
 
-namespace Modules\Lpj\Http\Controllers;
+    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;
+    use App\Http\Controllers\Controller;
+    use Illuminate\Http\Request;
+    use Modules\Lpj\Exports\LaporanPenilaianJaminanExport;
+    use Modules\Lpj\Models\Permohonan;
+    use Maatwebsite\Excel\Facades\Excel;
 
-class LaporanPenilaianJaminanController extends Controller
-{
-    public $user;
-
-    /**
-     * Display a listing of the resource.
-     */
-    public function index()
+    class LaporanPenilaianJaminanController extends Controller
     {
-        return view('lpj::laporan_penilaian_jaminan.index');
-    }
+        public $user;
 
-    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.');
+        /**
+         * Display a listing of the resource.
+         */
+        public function index()
+        {
+            return view('lpj::laporan_penilaian_jaminan.index');
         }
 
-        // Retrieve data from the database
-        $query = Permohonan::query();
-        $query = $query->where('status', 'done');
+        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.');
+            }
 
-        // Apply search filter if provided
-        if ($request->has('search') && !empty($request->get('search'))) {
-            $search = json_decode($request->get('search'));
+            // 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();
+                if (isset($search->start_date) || isset($search->end_date)) {
+                    $query->whereBetween('tanggal_permohonan', [
+                        $search->start_date ?? '1900-01-01',
+                        $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('jenisFasilitasKredit', 'name', 'LIKE', '%' . $search->search . '%');
+                        $q->orWhereRelation('jenisPenilaian', 'name', 'LIKE', '%' . $search->search . '%');
+                        $q->orWhere('status', 'LIKE', '%' . $search->search . '%');
+                    });
+                }
             }
 
-            // Filter by branch if provided
-            if (isset($search->branch_id) && !empty($search->branch_id)) {
-                $query->where('branch_id', $search->branch_id);
+            // Apply sorting if provided
+            if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
+                $order  = $request->get('sortOrder');
+                $column = $request->get('sortField');
+                $query->orderBy($column, $order);
             }
 
-            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);
-                });
+            // 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);
             }
 
-            if (isset($search->search)) {
+            // Get the filtered count of records
+            $filteredRecords = $query->count();
 
-                $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) . '%');
+            // Get the data for the current page
+            $data = $query->with(['debiture.branch'])->get();
 
-                    $q->orWhereRelation('jenisFasilitasKredit', 'name', 'LIKE', '%' . $search->search . '%');
-                    $q->orWhereRelation('jenisPenilaian', 'name', 'LIKE', '%' . $search->search . '%');
-                    $q->orWhere('status', 'LIKE', '%' . $search->search . '%');
-                });
-            }
+            $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,
+            ]);
         }
 
-        // 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 export(Request $request)
+        {
+            return Excel::download(new LaporanPenilaianJaminanExport($request), 'laporan_penilaian_jaminan.xlsx');
         }
-
-        // 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

@@ -32,7 +32,6 @@
 
             // Retrieve data from the database
             $query = Permohonan::query();
-            $query->where('status','done');
 
             if (!Auth::user()->hasAnyRole(['administrator'])) {
                 $query = $query->where('branch_id', Auth::user()->branch_id);

app/Http/Controllers/LaporanSLAPenilaiController.php

@@ -1,32 +0,0 @@
-<?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/LaporanSlikController.php

@@ -1,304 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Http\Controllers;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Support\Facades\Log;
-use Maatwebsite\Excel\Facades\Excel;
-use Modules\Lpj\Models\LaporanSlik;
-use Modules\Lpj\Models\Slik;
-use Modules\Lpj\Exports\LaporanSlikExport;
-
-class LaporanSlikController extends Controller
-{
-    /**
-     * Display a listing of the resource.
-     */
-    public function index()
-    {
-        return view('lpj::laporan-slik.index');
-    }
-
-    /**
-     * Store a newly created resource in storage.
-     */
-    public function store(Request $request): JsonResponse
-    {
-        try {
-            $request->validate([
-                'slik_id' => 'required|exists:sliks,id'
-            ]);
-
-            $slik = Slik::findOrFail($request->slik_id);
-
-            // Cek apakah data sudah ada di laporan_slik
-            $existing = LaporanSlik::where('slik_id', $slik->id)->first();
-            if ($existing) {
-                return response()->json([
-                    'success' => false,
-                    'message' => 'Data sudah ada di laporan SLIK'
-                ], 422);
-            }
-
-            // Copy data dari tabel slik ke laporan_slik
-            $laporanSlik = LaporanSlik::create([
-                'slik_id' => $slik->id,
-                'sandi_bank' => $slik->sandi_bank,
-                'kode_kantor' => $slik->kode_kantor,
-                'kode_cabang' => $slik->kode_cabang,
-                'tahun' => $slik->tahun,
-                'bulan' => $slik->bulan,
-                'no_rekening' => $slik->no_rekening,
-                'cif' => $slik->cif,
-                'kode_jenis' => $slik->kode_jenis,
-                'kode_jenis_ket' => $slik->kode_jenis_ket,
-                'kode_sifat' => $slik->kode_sifat,
-                'kode_sifat_ket' => $slik->kode_sifat_ket,
-                'kode_valuta' => $slik->kode_valuta,
-                'kode_valuta_ket' => $slik->kode_valuta_ket,
-                'baki_debet' => $slik->baki_debet,
-                'kolektibilitas' => $slik->kolektibilitas,
-                'kolektibilitas_ket' => $slik->kolektibilitas_ket,
-                'tanggal_mulai' => $slik->tanggal_mulai,
-                'tanggal_jatuh_tempo' => $slik->tanggal_jatuh_tempo,
-                'tanggal_selesai' => $slik->tanggal_selesai,
-                'tanggal_restrukturisasi' => $slik->tanggal_restrukturisasi,
-                'kode_sebab_macet' => $slik->kode_sebab_macet,
-                'kode_sebab_macet_ket' => $slik->kode_sebab_macet_ket,
-                'tanggal_macet' => $slik->tanggal_macet,
-                'kode_kondisi' => $slik->kode_kondisi,
-                'kode_kondisi_ket' => $slik->kode_kondisi_ket,
-                'tanggal_kondisi' => $slik->tanggal_kondisi,
-                'nilai_agunan' => $slik->nilai_agunan,
-                'nilai_agunan_ket' => $slik->nilai_agunan_ket,
-                'jenis_agunan' => $slik->jenis_agunan,
-                'kode_agunan' => $slik->kode_agunan,
-                'kode_agunan_ket' => $slik->kode_agunan_ket,
-                'peringkat_agunan' => $slik->peringkat_agunan,
-                'peringkat_agunan_ket' => $slik->peringkat_agunan_ket,
-                'nama_debitur' => $slik->nama_debitur,
-                'npwp' => $slik->npwp,
-                'no_ktp' => $slik->no_ktp,
-                'no_telp' => $slik->no_telp,
-                'kode_kab_kota' => $slik->kode_kab_kota,
-                'kode_kab_kota_ket' => $slik->kode_kab_kota_ket,
-                'kode_negara_domisili' => $slik->kode_negara_domisili,
-                'kode_negara_domisili_ket' => $slik->kode_negara_domisili_ket,
-                'kode_pos' => $slik->kode_pos,
-                'alamat' => $slik->alamat,
-                'fasilitas' => $slik->fasilitas,
-                'status_agunan' => $slik->status_agunan,
-                'tanggal_lapor' => $slik->tanggal_lapor,
-                'status' => 'active',
-                'created_by' => auth()->id(),
-                'updated_by' => auth()->id(),
-            ]);
-
-            // Hapus data dari tabel slik setelah berhasil dipindahkan
-            $slik->delete();
-
-            return response()->json([
-                'success' => true,
-                'message' => 'Data berhasil dipindahkan ke laporan SLIK',
-                'data' => $laporanSlik
-            ]);
-
-        } catch (\Exception $e) {
-            Log::error('Error moving SLIK to laporan: ' . $e->getMessage());
-
-            return response()->json([
-                'success' => false,
-                'message' => 'Terjadi kesalahan saat memindahkan data'
-            ], 500);
-        }
-    }
-
-    /**
-     * Data untuk datatables dengan server-side processing
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function dataForDatatables(Request $request)
-    {
-        try {
-            // Retrieve data from the database
-            $query = LaporanSlik::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('sandi_bank', 'LIKE', "%$search%")
-                      ->orWhere('no_rekening', 'LIKE', "%$search%")
-                      ->orWhere('cif', 'LIKE', "%$search%")
-                      ->orWhere('nama_debitur', 'LIKE', "%$search%")
-                      ->orWhere('fasilitas', 'LIKE', "%$search%")
-                      ->orWhere('status_agunan', 'LIKE', "%$search%");
-                });
-            }
-
-            // Apply year filter
-            if ($request->has('year') && !empty($request->get('year'))) {
-                $query->where('tahun', $request->get('year'));
-            }
-
-            // Apply month filter
-            if ($request->has('month') && !empty($request->get('month'))) {
-                $query->where('bulan', $request->get('month'));
-            }
-
-            // Apply sandi bank filter
-            if ($request->has('sandi_bank') && !empty($request->get('sandi_bank'))) {
-                $query->where('sandi_bank', $request->get('sandi_bank'));
-            }
-
-            // Apply kolektibilitas filter
-            if ($request->has('kolektibilitas') && !empty($request->get('kolektibilitas'))) {
-                $query->where('kolektibilitas', $request->get('kolektibilitas'));
-            }
-
-            // Apply status filter
-            if ($request->has('status') && !empty($request->get('status'))) {
-                $query->where('status', $request->get('status'));
-            }
-
-            // Apply sorting if provided
-            if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
-                $order  = $request->get('sortOrder');
-                $column = $request->get('sortField', 'created_at');
-                $query->orderBy($column, $order);
-            } else {
-                $query->orderBy('created_at', 'desc');
-            }
-
-            // 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();
-
-            // Transform data untuk datatables
-            $transformedData = $data->map(function ($item) {
-                return [
-                    'id'                     => $item->id,
-                    'sandi_bank'             => $item->sandi_bank,
-                    'tahun'                  => $item->tahun,
-                    'bulan'                  => $item->bulan,
-                    'no_rekening'            => $item->no_rekening,
-                    'cif'                    => $item->cif,
-                    'nama_debitur'           => $item->nama_debitur,
-                    'kolektibilitas'         => $item->kolektibilitas,
-                    'kolektibilitas_badge'   => $item->kolektibilitas_badge ?? '',
-                    'fasilitas'              => $item->fasilitas,
-                    'nilai_agunan'           => $item->nilai_agunan_formatted ?? '',
-                    'status_agunan'          => $item->status_agunan,
-                    'status_badge'           => $item->status_badge ?? '',
-                    'created_by'             => $item->creator?->name ?? '-',
-                    'created_at'             => dateFormat($item->created_at, true) ?? $item->created_at->format('d/m/Y H:i')
-                ];
-            });
-
-            // Calculate the page count
-            $pageCount = ceil($totalRecords / ($request->get('size', 10)));
-
-            // 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'            => $transformedData,
-            ]);
-
-        } catch (\Exception $e) {
-            Log::error('Error in laporan slik datatables: ' . $e->getMessage());
-
-            return response()->json([
-                'draw'            => $request->get('draw'),
-                'recordsTotal'    => 0,
-                'recordsFiltered' => 0,
-                'pageCount'       => 0,
-                'page'            => 1,
-                'totalCount'      => 0,
-                'data'            => [],
-            ]);
-        }
-    }
-
-    /**
-     * Display the specified resource.
-     *
-     * @param int $id
-     * @return \Illuminate\View\View
-     */
-    public function show($id)
-    {
-        try {
-            $laporanSlik = LaporanSlik::findOrFail($id);
-            return view('lpj::laporan-slik.show', compact('laporanSlik'));
-        } catch (\Exception $e) {
-            Log::error('Error showing laporan slik: ' . $e->getMessage());
-            return back()->with('error', 'Data tidak ditemukan');
-        }
-    }
-
-    /**
-     * Export laporan SLIK to Excel
-     */
-    public function export(Request $request)
-    {
-        try {
-            $query = LaporanSlik::query();
-
-            // Apply filters
-            if ($request->has('search') && $request->search) {
-                $search = $request->search;
-                $query->where(function($q) use ($search) {
-                    $q->where('nama_debitur', 'like', "%{$search}%")
-                      ->orWhere('no_rekening', 'like', "%{$search}%")
-                      ->orWhere('cif', 'like', "%{$search}%");
-                });
-            }
-
-            if ($request->has('year') && $request->year) {
-                $query->where('tahun', $request->year);
-            }
-
-            if ($request->has('month') && $request->month) {
-                $query->where('bulan', $request->month);
-            }
-
-            if ($request->has('status') && $request->status) {
-                $query->where('status', $request->status);
-            }
-
-            $filename = 'laporan-slik-' . now()->format('Y-m-d-His') . '.xlsx';
-
-            return Excel::download(new LaporanSlikExport($query), $filename);
-
-        } catch (\Exception $e) {
-            Log::error('Error exporting laporan slik: ' . $e->getMessage());
-            return back()->with('error', 'Gagal export data: ' . $e->getMessage());
-        }
-    }
-}

app/Http/Controllers/LaporanUserController.php

@@ -1,51 +0,0 @@
-<?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/MemoController.php

@@ -1,558 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Http\Controllers;
-
-use Exception;
-use Modules\Lpj\Models\Noc;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Modules\Lpj\Models\Permohonan;
-use Illuminate\Support\Facades\Log;
-use App\Http\Controllers\Controller;
-use Barryvdh\DomPDF\Facade\Pdf;
-use Illuminate\Support\Facades\Storage;
-
-class MemoController extends Controller
-{
-    public $user;
-
-    /**
-     * Menampilkan halaman index memo penyelesaian
-     *
-     * @return \Illuminate\View\View
-     */
-    public function index()
-    {
-        Log::info('MemoController: Mengakses halaman index memo penyelesaian');
-        return view('lpj::memo.index');
-    }
-
-    /**
-     * Menampilkan form untuk membuat memo penyelesaian dengan data yang dipilih
-     *
-     * @param Request $request
-     * @return \Illuminate\View\View
-     */
-    public function create(Request $request)
-    {
-        Log::info('MemoController: Mengakses halaman create memo penyelesaian');
-
-        $selectedIds = $request->get('selected_ids', []);
-
-        // Pastikan $selectedIds selalu berupa array
-        if (is_string($selectedIds)) {
-            $selectedIds = explode(',', $selectedIds);
-        }
-
-        // Filter array untuk menghilangkan nilai kosong
-        $selectedIds = array_filter($selectedIds, function($id) {
-            return !empty(trim($id));
-        });
-
-        $permohonanList = [];
-        $totalBiayaPJ = 0;
-
-        if (!empty($selectedIds) && count($selectedIds) > 0) {
-            try {
-                $permohonanList = Permohonan::with([
-                    'user',
-                    'debiture',
-                    'branch',
-                    'tujuanPenilaian',
-                    'penilaian',
-                    'jenisFasilitasKredit',
-                    'documents.inspeksi',
-                    'penilai',
-                    'documents.detail',
-                    'noc'
-                ])->whereIn('id', $selectedIds)->get();
-
-                // Hitung total biaya PJ dari nominal_bayar di tabel NOC
-                $totalBiayaPJ = Noc::whereIn('permohonan_id', $selectedIds)
-                    ->sum('nominal_bayar');
-
-                Log::info('MemoController: Total Biaya PJ dihitung: ' . $totalBiayaPJ);
-
-            } catch (Exception $e) {
-                Log::error('MemoController: Error saat mengambil data permohonan - ' . $e->getMessage());
-                return redirect()->back()->with('error', 'Terjadi kesalahan saat memuat data');
-            }
-        }
-
-        return view('lpj::memo.create', compact('permohonanList', 'totalBiayaPJ'));
-    }
-
-    /**
-     * Menyimpan memo penyelesaian yang telah dibuat
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function store(Request $request)
-    {
-        Log::info('MemoController: Memulai proses penyimpanan memo penyelesaian');
-
-        DB::beginTransaction();
-
-        try {
-            // Validasi input
-            $request->validate([
-                'permohonan_ids' => 'required|array',
-                'permohonan_ids.*' => 'exists:permohonan,id',
-                'memo_number' => 'required|string|max:255',
-                'payment_date' => 'required|date',
-                'memo_date' => 'required|date'
-            ]);
-
-            $permohonanIds = $request->permohonan_ids;
-            $memoNumber = $request->memo_number;
-            $paymentDate = $request->payment_date;
-            $memoDate = $request->memo_date;
-
-            // Update status permohonan yang dipilih
-            foreach ($permohonanIds as $permohonanId) {
-                $permohonan = Permohonan::find($permohonanId);
-                if ($permohonan) {
-                    $permohonan->status = 'memo-penyelesaian';
-                    $permohonan->memo_penyelesaian_number = $memoNumber;
-                    $permohonan->memo_penyelesaian_date = $memoDate;
-                    $permohonan->memo_penyelesaian_payment_date = $paymentDate;
-                    $permohonan->memo_penyelesaian_created_at = now();
-                    //$permohonan->save();
-
-                    Log::info('MemoController: Berhasil update permohonan ID: ' . $permohonanId);
-                }
-            }
-
-            DB::commit();
-            Log::info('MemoController: Berhasil menyimpan memo penyelesaian untuk ' . count($permohonanIds) . ' permohonan');
-
-            return redirect()->route('memo.index')
-                ->with('success', 'Memo penyelesaian berhasil dibuat untuk ' . count($permohonanIds) . ' permohonan');
-
-        } catch (Exception $e) {
-            DB::rollback();
-            Log::error('MemoController: Error saat menyimpan memo penyelesaian - ' . $e->getMessage());
-
-            return redirect()->back()
-                ->withInput()
-                ->with('error', 'Terjadi kesalahan saat menyimpan memo penyelesaian: ' . $e->getMessage());
-        }
-    }
-
-    /**
-     * Menampilkan detail memo penyelesaian
-     *
-     * @param int $id
-     * @return \Illuminate\View\View
-     */
-    public function show($id)
-    {
-        Log::info('MemoController: Mengakses detail memo penyelesaian ID: ' . $id);
-
-        $permohonan = Permohonan::with([
-            'user',
-            'debiture',
-            'branch',
-            'tujuanPenilaian',
-            'penilaian',
-            'jenisFasilitasKredit',
-            'documents.inspeksi',
-            'penilai',
-            'documents.detail',
-            'noc'
-        ])->findOrFail($id);
-
-        return view('lpj::memo.show', compact('permohonan'));
-    }
-
-    /**
-     * Mengambil data untuk datatables pada halaman memo penyelesaian
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function dataForDatatables(Request $request)
-    {
-        Log::info('MemoController: Mengambil data untuk datatables');
-
-        if (is_null($this->user) || !$this->user->can('debitur.view')) {
-            Log::warning('MemoController: User tidak memiliki permission untuk melihat data');
-            // abort(403, 'Sorry! You are not allowed to view users.');
-        }
-
-        // Mengambil data dari database dengan kondisi yang sama seperti LaporanController
-        $query = Permohonan::query()
-            ->whereIn('status', ['proses-laporan', 'done', 'paparan', 'proses-paparan', 'memo-penyelesaian'])
-            /*->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]);
-            })*/
-            ->whereHas('noc'); // Hanya tampilkan permohonan yang memiliki NOC
-
-
-        $query = $query->orderBy('nomor_registrasi', 'desc');
-
-        // Apply search filter jika ada
-        if ($request->has('search') && !empty($request->get('search'))) {
-            $searchParams = explode('|', $request->get('search'));
-
-            $filterJenisPenilaian = $searchParams[0] ?? '';
-            $searchTerm = $searchParams[1] ?? '';
-
-            // Filter berdasarkan jenis penilaian
-            if (!empty($filterJenisPenilaian)) {
-                $query->where('jenis_penilaian_id', $filterJenisPenilaian);
-                Log::info('Applied jenis penilaian filter', ['filter' => $filterJenisPenilaian]);
-            }
-
-            $query->where(function ($q) use ($searchTerm) {
-                $q->where('nomor_registrasi', 'LIKE', '%' . $searchTerm . '%');
-                $q->orWhere('tanggal_permohonan', 'LIKE', '%' . $searchTerm . '%');
-                $q->orWhereRelation('user', 'name', 'LIKE', '%' . $searchTerm . '%');
-                $q->orWhereRelation('debiture', 'name', 'LIKE', '%' . $searchTerm . '%');
-                $q->orWhereRelation('tujuanPenilaian', 'name', 'LIKE', '%' . $searchTerm . '%');
-                $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $searchTerm . '%');
-                $q->orWhere('status', 'LIKE', '%' . $searchTerm . '%');
-            });
-        }
-
-        // Apply sorting jika ada
-        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
-            $order  = $request->get('sortOrder');
-            $column = $request->get('sortField');
-            $query->orderBy($column, $order);
-        }
-
-        // Mendapatkan total count records
-        $totalRecords = $query->count();
-        $size = $request->get('size', 10);
-        if ($size == 0) {
-            $size = 10;
-        }
-
-        // Apply pagination jika ada
-        if ($request->has('page') && $request->has('size')) {
-            $page   = $request->get('page');
-            $size   = $request->get('size');
-            $offset = ($page - 1) * $size;
-
-            $query->skip($offset)->take($size);
-        }
-
-        // Mendapatkan filtered count records
-        $filteredRecords = $query->count();
-
-        // Mendapatkan data untuk halaman saat ini
-        $data = $query->with([
-            'user',
-            'debiture',
-            'branch',
-            'tujuanPenilaian',
-            'jenisPenilaian',
-            'penilaian',
-            'jenisFasilitasKredit',
-            'documents.inspeksi',
-            'penilai',
-            'documents.detail',
-            'noc'
-        ])->get();
-
-        // Menghitung page count
-        $pageCount = ceil($totalRecords / $size);
-
-        // Menghitung current page number
-        $currentPage = max(1, $request->get('page', 1));
-
-        Log::info('MemoController: Berhasil mengambil data datatables - Total: ' . $totalRecords . ', Filtered: ' . $filteredRecords);
-
-        // Return response data sebagai JSON object
-        return response()->json([
-            'draw'            => $request->get('draw'),
-            'recordsTotal'    => $totalRecords,
-            'recordsFiltered' => $filteredRecords,
-            'pageCount'       => $pageCount,
-            'page'            => $currentPage,
-            'totalCount'      => $totalRecords,
-            'data'            => $data,
-        ]);
-    }
-
-    /**
-     * Mengambil total biaya PJ berdasarkan permohonan yang dipilih
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function getTotalBiayaPJ(Request $request)
-    {
-        Log::info('MemoController: Mengambil total biaya PJ');
-
-        try {
-            $permohonanIds = $request->get('permohonan_ids', []);
-
-            // Pastikan $permohonanIds selalu berupa array
-            if (is_string($permohonanIds)) {
-                $permohonanIds = explode(',', $permohonanIds);
-            }
-
-            // Filter array untuk menghilangkan nilai kosong
-            $permohonanIds = array_filter($permohonanIds, function($id) {
-                return !empty(trim($id));
-            });
-
-            $totalBiayaPJ = 0;
-
-            if (!empty($permohonanIds) && count($permohonanIds) > 0) {
-                // Hitung total biaya PJ dari nominal_bayar di tabel NOC
-                $totalBiayaPJ = \Modules\Lpj\Models\Noc::whereIn('permohonan_id', $permohonanIds)
-                    ->sum('nominal_bayar');
-            }
-
-            Log::info('MemoController: Total Biaya PJ berhasil dihitung: ' . $totalBiayaPJ);
-
-            return response()->json([
-                'success' => true,
-                'total_biaya_pj' => $totalBiayaPJ,
-                'total_biaya_pj_formatted' => 'Rp ' . number_format($totalBiayaPJ, 0, ',', '.')
-            ]);
-
-        } catch (Exception $e) {
-            Log::error('MemoController: Error saat menghitung total biaya PJ - ' . $e->getMessage());
-
-            return response()->json([
-                'success' => false,
-                'message' => 'Terjadi kesalahan saat menghitung total biaya PJ'
-            ], 500);
-        }
-    }
-
-    /**
-     * Menampilkan preview memo penyelesaian sebelum menyimpan
-     *
-     * @param Request $request
-     * @return \Illuminate\View\View
-     */
-    public function preview(Request $request)
-    {
-        Log::info('MemoController: Mengakses halaman preview memo penyelesaian');
-
-
-        $permohonanIds = $request->permohonan_ids;
-        $memoNumber = $request->memo_number;
-        $paymentDate = $request->payment_date;
-        $memoDate = $request->memo_date;
-
-        try {
-            // Ambil data permohonan yang dipilih
-            $permohonanList = Permohonan::with([
-                'user',
-                'debiture',
-                'branch',
-                'penilaian',
-                'jenisPenilaian',
-                'jenisFasilitasKredit',
-                'documents.inspeksi',
-                'penilai',
-                'documents.detail',
-                'noc'
-            ])->whereIn('id', $permohonanIds);
-
-            // Hitung total biaya PJ dari nominal_bayar di tabel NOC
-            $totalBiayaPJ = Noc::whereIn('permohonan_id', $permohonanIds)
-                ->sum('nominal_bayar');
-
-            // Data untuk template memo
-            $memoData = [
-                'memo_number' => $memoNumber,
-                'memo_date' => $memoDate,
-                'payment_date' => $paymentDate,
-                'total_biaya_pj' => $totalBiayaPJ,
-                'permohonan_list' => $permohonanList->get(),
-                'debitur_count' => $permohonanList->get()->count(),
-                'jaminan_info' => $this->getJaminanInfo($permohonanList->get()),
-                'jenisPenilaian' => $permohonanList->pluck('jenis_penilaian_id')->first()
-            ];
-
-            $permohonanList= $permohonanList->get();
-
-            Log::info('MemoController: Data preview memo berhasil disiapkan');
-
-            return view('lpj::memo.preview', compact('memoData', 'permohonanList', 'totalBiayaPJ'));
-
-        } catch (Exception $e) {
-            Log::error('MemoController: Error saat menyiapkan preview memo - ' . $e->getMessage());
-            return redirect()->back()
-                ->withInput()
-                ->with('error', 'Terjadi kesalahan saat menyiapkan preview memo: ' . $e->getMessage());
-        }
-    }
-
-    /**
-     * Generate PDF memo penyelesaian dan simpan ke database
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\Response|\Illuminate\Http\RedirectResponse
-     */
-    public function generatePdf(Request $request)
-    {
-        Log::info('MemoController: Memulai generate PDF memo penyelesaian');
-
-        DB::beginTransaction();
-
-        try {
-            // Validasi input
-
-            $permohonanIds = $request->permohonan_ids;
-            $memoNumber = $request->memo_number;
-            $paymentDate = $request->payment_date;
-            $memoDate = $request->memo_date;
-
-            // Ambil data permohonan yang dipilih
-            $permohonanList = Permohonan::with([
-                'user',
-                'debiture',
-                'branch',
-                'penilaian',
-                'jenisPenilaian',
-                'jenisFasilitasKredit',
-                'documents.inspeksi',
-                'penilai',
-                'documents.detail',
-                'noc'
-            ])->whereIn('id', $permohonanIds);
-
-            // Hitung total biaya PJ dari nominal_bayar di tabel NOC
-            $totalBiayaPJ = Noc::whereIn('permohonan_id', $permohonanIds)
-                ->sum('nominal_bayar');
-
-            // Data untuk template memo
-            $memoData = [
-                'memo_number' => $memoNumber,
-                'memo_date' => $memoDate,
-                'payment_date' => $paymentDate,
-                'total_biaya_pj' => $totalBiayaPJ,
-                'permohonan_list' => $permohonanList->get(),
-                'debitur_count' => $permohonanList->get()->count(),
-                'jaminan_info' => $this->getJaminanInfo($permohonanList->get()),
-                'jenisPenilaian' => $permohonanList->pluck('jenis_penilaian_id')->first()
-            ];
-
-            $permohonanList= $permohonanList->get();
-
-            // Generate PDF dari template
-            $pdf = Pdf::loadView('lpj::memo.pdf-template', compact('memoData', 'permohonanList', 'totalBiayaPJ'))
-                ->setPaper('a4', 'portrait')
-                ->setOptions([
-                    'defaultFont' => 'Times-Roman',
-                    'isRemoteEnabled' => true,
-                    'isHtml5ParserEnabled' => true,
-                    'isPhpEnabled' => true,
-                    'dpi' => 150,
-                    'defaultPaperSize' => 'a4',
-                    'chroot' => public_path(),
-                ]);
-
-            // Nama file PDF
-            $fileName = 'memo-penyelesaian-' . str_replace(['/', ' '], ['-', '-'], $memoNumber) . '-' . date('Y-m-d-H-i-s') . '.pdf';
-            $filePath = 'memo-penyelesaian/' . $fileName;
-
-            // Simpan PDF ke storage
-            Storage::disk('public')->put($filePath, $pdf->output());
-
-            // Update status permohonan yang dipilih
-            // Update data di tabel NOC untuk setiap permohonan
-            foreach ($permohonanIds as $permohonanId) {
-                // Cari NOC berdasarkan permohonan_id
-                $noc = Noc::where('permohonan_id', $permohonanId)->first();
-
-                if ($noc) {
-                    // Update field memo penyelesaian di tabel NOC
-                    $noc->memo_penyelesaian = $filePath;
-                    $noc->memo_penyelesaian_number = $memoNumber;
-                    $noc->memo_penyelesaian_date = $memoDate;
-                    $noc->memo_penyelesaian_payment_date = $paymentDate;
-                    $noc->memo_penyelesaian_created_at = now();
-                    $noc->save();
-
-                    Log::info('MemoController: Berhasil update NOC untuk permohonan ID: ' . $permohonanId);
-                } else {
-                    Log::warning('MemoController: NOC tidak ditemukan untuk permohonan ID: ' . $permohonanId);
-                }
-            }
-
-            DB::commit();
-            Log::info('MemoController: Berhasil generate PDF dan menyimpan memo penyelesaian untuk ' . count($permohonanIds) . ' permohonan');
-
-            // Return PDF untuk download
-            return $pdf->download('memo-penyelesaian-' . $memoNumber . '.pdf');
-
-        } catch (Exception $e) {
-            DB::rollback();
-            Log::error('MemoController: Error saat generate PDF memo penyelesaian - ' . $e->getMessage());
-
-            return redirect()->back()
-                ->with('error', 'Terjadi kesalahan saat generate PDF memo penyelesaian: ' . $e->getMessage())
-                ->withInput();
-        }
-    }
-
-    /**
-     * Helper function untuk mendapatkan informasi jaminan
-     *
-     * @param $permohonanList
-     * @return string
-     */
-    private function getJaminanInfo($permohonanList)
-    {
-        $jaminanTypes = [];
-        foreach ($permohonanList as $permohonan) {
-            if ($permohonan->tujuanPenilaian) {
-                $jaminanTypes[] = $permohonan->tujuanPenilaian->name;
-            }
-        }
-
-        $uniqueJaminan = array_unique($jaminanTypes);
-        return implode(' & ', $uniqueJaminan);
-    }
-    /**
-     * Download PDF memo penyelesaian
-     *
-     * @param int $id - ID permohonan
-     * @return \Illuminate\Http\Response
-     */
-    public function downloadPdf($id)
-    {
-        Log::info('MemoController: Download PDF memo penyelesaian untuk permohonan ID: ' . $id);
-
-        try {
-            // Cari NOC berdasarkan permohonan_id
-            $noc = Noc::where('permohonan_id', $id)->first();
-
-            if (!$noc || !$noc->memo_penyelesaian) {
-                Log::warning('MemoController: PDF memo penyelesaian tidak ditemukan untuk permohonan ID: ' . $id);
-                return redirect()->back()->with('error', 'File PDF memo penyelesaian tidak ditemukan.');
-            }
-
-            // Cek apakah file ada di storage
-            if (!Storage::disk('public')->exists($noc->memo_penyelesaian)) {
-                Log::warning('MemoController: File PDF tidak ada di storage: ' . $noc->memo_penyelesaian);
-                return redirect()->back()->with('error', 'File PDF tidak ditemukan di server.');
-            }
-
-            // Download file
-            $fileName = 'memo-penyelesaian-' . $noc->memo_penyelesaian_number . '.pdf';
-
-            Log::info('MemoController: Berhasil download PDF memo penyelesaian: ' . $fileName);
-
-            return Storage::disk('public')->download($noc->memo_penyelesaian, $fileName);
-
-        } catch (Exception $e) {
-            Log::error('MemoController: Error saat download PDF memo penyelesaian - ' . $e->getMessage());
-            return redirect()->back()->with('error', 'Terjadi kesalahan saat mengunduh file PDF.');
-        }
-    }
-}

app/Http/Controllers/NilaiPlafondController.php

@@ -5,8 +5,6 @@
     use App\Http\Controllers\Controller;
     use Exception;
     use Illuminate\Http\Request;
-    use Illuminate\Support\Facades\DB;
-    use Illuminate\Support\Facades\Log;
     use Maatwebsite\Excel\Facades\Excel;
     use Modules\Lpj\Exports\NilaiPlafondExport;
     use Modules\Lpj\Http\Requests\NilaiPlafondRequest;
@@ -16,239 +14,137 @@
     {
         public $user;
 
-        /**
-         * Menampilkan halaman daftar Nilai Plafond.
-         * Log setiap akses dan sebelum return view.
-         */
         public function index()
         {
-            Log::info('NilaiPlafondController@index: akses halaman index');
-            return \view('lpj::nilai_plafond.index');
+            return view('lpj::nilai_plafond.index');
         }
 
-        /**
-         * Menyimpan data Nilai Plafond baru termasuk field biaya.
-         * Gunakan validasi dari NilaiPlafondRequest, log proses, dan bungkus dengan transaksi DB.
-         */
         public function store(NilaiPlafondRequest $request)
         {
-            Log::info('NilaiPlafondController@store: mulai proses simpan');
             $validate = $request->validated();
 
             if ($validate) {
-                DB::beginTransaction();
                 try {
-                    $record = NilaiPlafond::create($validate);
-                    DB::commit();
-
-                    Log::info('NilaiPlafondController@store: simpan berhasil', ['id' => $record->id]);
-                    return \redirect()
+                    // Save to database
+                    NilaiPlafond::create($validate);
+                    return redirect()
                         ->route('basicdata.nilai-plafond.index')
-                        ->with('success', 'Nilai Plafond berhasil dibuat');
+                        ->with('success', 'Jenis Aset created successfully');
                 } catch (Exception $e) {
-                    DB::rollBack();
-                    Log::error('NilaiPlafondController@store: simpan gagal', ['error' => $e->getMessage()]);
-
-                    return \redirect()
+                    return redirect()
                         ->route('basicdata.nilai-plafond.create')
-                        ->with('error', 'Gagal membuat Nilai Plafond');
+                        ->with('error', 'Failed to create nilai plafond');
                 }
             }
         }
 
-        /**
-         * Menampilkan form pembuatan Nilai Plafond.
-         * Log akses sebelum return view.
-         */
         public function create()
         {
-            Log::info('NilaiPlafondController@create: akses halaman create');
-            return \view('lpj::nilai_plafond.create');
+            return view('lpj::nilai_plafond.create');
         }
 
-        /**
-         * Menampilkan form edit Nilai Plafond berdasarkan ID.
-         * Gunakan transaksi untuk pembacaan data dan logging.
-         */
         public function edit($id)
         {
-            Log::info('NilaiPlafondController@edit: mulai proses edit', ['id' => $id]);
-
-            DB::beginTransaction();
-            try {
-                $nilaiPlafond = NilaiPlafond::find($id);
-                DB::commit();
-
-                Log::info('NilaiPlafondController@edit: data ditemukan', ['id' => $id]);
-                return \view('lpj::nilai_plafond.create', compact('nilaiPlafond'));
-            } catch (Exception $e) {
-                DB::rollBack();
-                Log::error('NilaiPlafondController@edit: gagal mengambil data', ['id' => $id, 'error' => $e->getMessage()]);
-                return \redirect()
-                    ->route('basicdata.nilai-plafond.index')
-                    ->with('error', 'Gagal mengambil data Nilai Plafond');
-            }
+            $nilaiPlafond = NilaiPlafond::find($id);
+            return view('lpj::nilai_plafond.create', compact('nilaiPlafond'));
         }
 
-        /**
-         * Memperbarui data Nilai Plafond termasuk field biaya.
-         * Validasi input, logging, dan gunakan transaksi DB.
-         */
         public function update(NilaiPlafondRequest $request, $id)
         {
-            Log::info('NilaiPlafondController@update: mulai proses update', ['id' => $id]);
             $validate = $request->validated();
 
             if ($validate) {
-                DB::beginTransaction();
                 try {
+                    // Update in database
                     $nilaiPlafond = NilaiPlafond::find($id);
-                    if (!$nilaiPlafond) {
-                        Log::warning('NilaiPlafondController@update: data tidak ditemukan', ['id' => $id]);
-                        DB::rollBack();
-                        return \redirect()
-                            ->route('basicdata.nilai-plafond.index')
-                            ->with('error', 'Data Nilai Plafond tidak ditemukan');
-                    }
-
                     $nilaiPlafond->update($validate);
-                    DB::commit();
-
-                    Log::info('NilaiPlafondController@update: update berhasil', ['id' => $id]);
-                    return \redirect()
+                    return redirect()
                         ->route('basicdata.nilai-plafond.index')
-                        ->with('success', 'Nilai Plafond berhasil diperbarui');
+                        ->with('success', 'Jenis Aset updated successfully');
                 } catch (Exception $e) {
-                    DB::rollBack();
-                    Log::error('NilaiPlafondController@update: update gagal', ['id' => $id, 'error' => $e->getMessage()]);
-
-                    return \redirect()
+                    return redirect()
                         ->route('basicdata.nilai-plafond.edit', $id)
-                        ->with('error', 'Gagal memperbarui Nilai Plafond');
+                        ->with('error', 'Failed to update nilai plafond');
                 }
             }
         }
 
-        /**
-         * Menghapus data Nilai Plafond berdasarkan ID.
-         * Logging setiap langkah dan gunakan transaksi DB.
-         */
         public function destroy($id)
         {
-            Log::info('NilaiPlafondController@destroy: mulai proses hapus', ['id' => $id]);
-            DB::beginTransaction();
             try {
+                // Delete from database
                 $nilaiPlafond = NilaiPlafond::find($id);
-                if (!$nilaiPlafond) {
-                    DB::rollBack();
-                    Log::warning('NilaiPlafondController@destroy: data tidak ditemukan', ['id' => $id]);
-                    return \response()->json(['success' => false, 'message' => 'Data Nilai Plafond tidak ditemukan']);
-                }
-
                 $nilaiPlafond->delete();
-                DB::commit();
 
-                Log::info('NilaiPlafondController@destroy: hapus berhasil', ['id' => $id]);
-                return \response()->json(['success' => true, 'message' => 'Nilai Plafond berhasil dihapus']);
+                echo json_encode(['success' => true, 'message' => 'Jenis Aset deleted successfully']);
             } catch (Exception $e) {
-                DB::rollBack();
-                Log::error('NilaiPlafondController@destroy: hapus gagal', ['id' => $id, 'error' => $e->getMessage()]);
-                return \response()->json(['success' => false, 'message' => 'Gagal menghapus Nilai Plafond']);
+                echo json_encode(['success' => false, 'message' => 'Failed to delete nilai plafond']);
             }
         }
 
-        /**
-         * Menyediakan data untuk datatables dengan pencarian, sortir, dan paginasi.
-         * Logging proses dan gunakan transaksi DB untuk konsistensi pembacaan.
-         */
         public function dataForDatatables(Request $request)
         {
-            Log::info('NilaiPlafondController@dataForDatatables: mulai proses');
-
             if (is_null($this->user) || !$this->user->can('nilai_plafond.view')) {
                 //abort(403, 'Sorry! You are not allowed to view users.');
             }
 
-            DB::beginTransaction();
-            try {
-                // Retrieve data from the database
-                $query = NilaiPlafond::query();
+            // Retrieve data from the database
+            $query = NilaiPlafond::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;
-
-                DB::commit();
-                Log::info('NilaiPlafondController@dataForDatatables: proses selesai, mengembalikan data');
-
-                // 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,
-                ]);
-            } catch (Exception $e) {
-                DB::rollBack();
-                Log::error('NilaiPlafondController@dataForDatatables: gagal memproses data', ['error' => $e->getMessage()]);
-                return \response()->json([
-                    'draw'            => $request->get('draw'),
-                    'recordsTotal'    => 0,
-                    'recordsFiltered' => 0,
-                    'pageCount'       => 0,
-                    'page'            => 1,
-                    'totalCount'      => 0,
-                    'data'            => [],
-                ]);
+            // 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,
+            ]);
         }
 
-        /**
-         * Mengekspor data Nilai Plafond ke Excel.
-         * Log akses sebelum proses download.
-         */
         public function export()
         {
-            Log::info('NilaiPlafondController@export: mulai proses export');
             return Excel::download(new NilaiPlafondExport, 'nilai_plafond.xlsx');
         }
     }

app/Http/Controllers/NocController.php

@@ -6,10 +6,10 @@
     use Illuminate\Http\Request;
     use Illuminate\Support\Facades\Auth;
     use Modules\Lpj\Http\Requests\NocRequest;
-use Modules\Lpj\Models\Bucok;
-use Modules\Lpj\Models\Noc;
+    use Modules\Lpj\Models\Noc;
+    use Modules\Lpj\Models\PenawaranTender;
+    use Modules\Lpj\Models\Permohonan;
     use Modules\Lpj\Models\PersetujuanPenawaran;
-    use Modules\Lpj\Models\JenisPenilaian;
 
     class NocController extends Controller
     {
@@ -19,22 +19,9 @@ use Modules\Lpj\Models\Noc;
          * Display a listing of the resource.
          */
         public function index()
-        {
-            return redirect()->route('noc.pembayaran.index');
-        }
-
-        public function pembayaran()
         {
             $persetujuanPenawarans = PersetujuanPenawaran::all();
-            $jenisPenilaians = JenisPenilaian::get();
-            return view('lpj::noc.pembayaran', compact('persetujuanPenawarans', 'jenisPenilaians'));
-        }
-
-        public function penyelesaian()
-        {
-            $persetujuanPenawarans = PersetujuanPenawaran::all();
-             $jenisPenilaians = JenisPenilaian::get();
-            return view('lpj::noc.penyelesaian', compact('persetujuanPenawarans', 'jenisPenilaians'));
+            return view('lpj::noc.index', compact('persetujuanPenawarans'));
         }
 
         /**
@@ -49,42 +36,28 @@ use Modules\Lpj\Models\Noc;
         public function store(NocRequest $request)
         {
             $validated               = $request->validated();
-
-
             $validated['updated_by'] = Auth::id();
             if (request()->get('status_bayar') == "sudah_bayar") {
                 $validated['status'] = '1';
+                $status              = "spk";
+            } else {
+                $status = "persetujuan-penawaran";
             }
 
+
             $dataNoc = [
                 'nominal_bayar'      => $validated['nominal_bayar'],
-                'total_pembukuan'    => $validated['total_pembukuan'],
                 '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'] ?? '',
-                'status_kurang_bayar' => $validated['status_kurang_bayar'] ?? '0',
-                'status_lebih_bayar' => $validated['status_lebih_bayar'] ?? '0',
-                'nominal_kurang_bayar' => $validated['nominal_kurang_bayar'] ?? '0',
-                'nominal_lebih_bayar' => $validated['nominal_lebih_bayar'] ?? '0',
-                'bukti_pengembalian' => $validated['bukti_pengembalian'] ?? '',
+                'catatan_noc'        => $validated['catatan_noc'],
             ];
-
-            if($validated['permohonan_id']){
-                $noc     = Noc::updateOrCreate(
+            $noc     = Noc::updateOrCreate(
                 [
                     'permohonan_id'            => $validated['permohonan_id'],
                     'persetujuan_penawaran_id' => $validated['persetujuan_penawaran_id'],
                 ],
                 $dataNoc,
             );
-            } else {
-                $noc     = Noc::updateOrCreate(
-                [
-                    'persetujuan_penawaran_id' => $validated['persetujuan_penawaran_id'],
-                ],
-                $dataNoc,
-            );
-            }
 
             $folderPath = 'noc/' . request()->get('persetujuan_penawaran_id') . '/bukti_ksl/';
 
@@ -96,12 +69,25 @@ use Modules\Lpj\Models\Noc;
             }
             $noc->save();
 
-            $bucok = Bucok::where('nomor_tiket', $noc->nomor_tiket)->orWhere('permohonan_id', $noc->permohonan_id)->first();
-            if($bucok){
-                $bucok->nominal_penyelesaian = $noc->total_pembukuan ?? '';
-                $bucok->tanggal_penyelesaian = $noc->tanggal_pembayaran ?? date('Y-m-d');
-                $bucok->penyelesaian = 'Selesai';
-                $bucok->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_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) {
+                    PenawaranTender::where('nomor_registrasi', $permohonan->nomor_registrasi)->update([
+                        'status'     => $status,
+                        'updated_by' => Auth::id(),
+                        'updated_at' => now(),
+                    ]);
+                }
+                // andy add, update status penawaran.status='spk'
             }
 
             return redirect()
@@ -115,7 +101,6 @@ use Modules\Lpj\Models\Noc;
         {
             $validated = $request->validated();
 
-
             if($request->get('is_memo')){
 
                 $memo = Noc::find($request->get('is_memo'));
@@ -137,7 +122,6 @@ use Modules\Lpj\Models\Noc;
                     ->route('laporan.index')->with('success', 'Memo Penyelesaian updated successfully');
             }
             $dataNoc   = [
-                'total_pembukuan'      => $validated['total_pembukuan'],
                 '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,
@@ -147,7 +131,6 @@ use Modules\Lpj\Models\Noc;
 
             $noc = Noc::updateOrCreate(
                 [
-                    'permohonan_id'            => $validated['permohonan_id'],
                     'permohonan_id'            => $validated['permohonan_id'],
                     'persetujuan_penawaran_id' => $validated['persetujuan_penawaran_id'],
                 ],
@@ -180,7 +163,9 @@ use Modules\Lpj\Models\Noc;
         /**
          * Display the specified resource.
          */
-        public function show(Noc $noc) {
+        public function show(Request $request) {
+           $noc = Noc::find($request->get('id'));
+
            return view('lpj::noc.memo', compact('noc'));
         }
 
@@ -205,12 +190,6 @@ use Modules\Lpj\Models\Noc;
         }
 
         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.');
@@ -219,20 +198,11 @@ use Modules\Lpj\Models\Noc;
             // 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');
                 $query->where(function ($q) use ($search) {
-                    $q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%')
-                        ->orWhereRelation('permohonan', 'nomor_registrasi', 'LIKE', '%' . $search . '%')
-                        ->orWhereRelation('permohonan.debiture','name', 'LIKE', '%' . $search . '%')
-                        ->orWhereRelation('permohonan.jenisPenilaian', 'name', 'LIKE', '%' . $search . '%')
-                        ->orWhere('nomor_tiket', 'LIKE', '%' . $search . '%');
+                    $q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%');
                 });
             }
 
@@ -264,128 +234,20 @@ use Modules\Lpj\Models\Noc;
             $data = $data->map(function ($persetujuanPenawaran) {
                 return [
                     'id'                   => $persetujuanPenawaran->id,
-                    'nomor_registrasi'     => $persetujuanPenawaran->permohonan?->nomor_registrasi ?? $persetujuanPenawaran->penawaran?->nomor_registrasi,
-                    'nomor_tiket'          => $persetujuanPenawaran->nomor_tiket ?? '',
-                    'nama_debitur'         => $persetujuanPenawaran?->permohonan?->debiture->name ?? $persetujuanPenawaran->penawaran?->permohonan?->debiture->name ?? $persetujuanPenawaran->noc?->debiture->name,
-                    'kode_cabang'          => $persetujuanPenawaran?->permohonan?->branch->code ?? $persetujuanPenawaran->penawaran?->permohonan?->branch->code ?? $persetujuanPenawaran->noc?->branch->code,
-                    'cabang'               => $persetujuanPenawaran?->permohonan?->branch->name ?? $persetujuanPenawaran->penawaran?->permohonan?->branch->name ?? $persetujuanPenawaran->noc?->branch->name,
+                    '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(
+                    'nominal_diterima'        => currencyFormat(
                         $persetujuanPenawaran->noc->nominal_bayar ?? 0,
                     ),
-                    'jenis_penilaian'      => $persetujuanPenawaran->permohonan?->jenisPenilaian?->name ?? "",
                     '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)->values();
-
-            // Calculate total nominal diterima from all filtered data (not just current page)
-            $totalNominalDiterima = $data->sum(function ($item) {
-                // Extract numeric value from formatted currency string
-                $nominal = str_replace(['Rp', '.', ',00'], '', $item['nominal_diterima']);
-                return (float) $nominal;
-            });
-
-            // 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,
-                'totalNominalDiterima' => $totalNominalDiterima,
-                '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->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');
-                $query->where(function ($q) use ($search) {
-                     $q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%')
-                        ->orWhereRelation('permohonan', 'nomor_registrasi', 'LIKE', '%' . $search . '%')
-                        ->orWhereRelation('permohonan.debiture','name', 'LIKE', '%' . $search . '%')
-                        ->orWhereRelation('permohonan.jenisPenilaian', 'name', 'LIKE', '%' . $search . '%')
-                        ->orWhere('nomor_tiket', 'LIKE', '%' . $search . '%'); $q->orWhereRelation('penawaran', 'nomor_registrasi', 'LIKE', '%' . $search . '%')
-                        ->orWhereRelation('permohonan', 'nomor_registrasi', 'LIKE', '%' . $search . '%')
-                        ->orWhereRelation('permohonan.debiture','name', 'LIKE', '%' . $search . '%')
-                        ->orWhereRelation('permohonan.jenisPenilaian', 'name', 'LIKE', '%' . $search . '%')
-                        ->orWhere('nomor_tiket', '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 ?? '',
-                    'nomor_tiket'         => $persetujuanPenawaran->nomor_tiket ?? '',
-                    'nama_debitur'         => $persetujuanPenawaran->permohonan?->debiture?->name ?? $persetujuanPenawaran->penawaran?->permohonan?->debiture?->name ?? $persetujuanPenawaran->noc?->debiture?->name,
-                    'kode_cabang'          => $persetujuanPenawaran?->permohonan?->branch?->code ?? $persetujuanPenawaran->penawaran?->permohonan?->branch?->code ?? $persetujuanPenawaran->noc?->branch?->code ?? '',
-                    'cabang'               => $persetujuanPenawaran->permohonan?->branch?->name ?? $persetujuanPenawaran->penawaran?->permohonan?->branch?->name ?? $persetujuanPenawaran->noc?->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,
-                    ),
-                    'jenis_penilaian'      => $persetujuanPenawaran->permohonan?->jenisPenilaian?->name ?? "",
-                    'bukti_ksl'            => $persetujuanPenawaran->noc->bukti_ksl ?? $persetujuanPenawaran->bukti_ksl ?? null,
-                    'bukti_bayar'          => $persetujuanPenawaran->bukti_bayar ?? 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,
@@ -396,15 +258,7 @@ use Modules\Lpj\Models\Noc;
                         true) : '-',
                     'updated_at'           => dateFormat($persetujuanPenawaran->updated_at, true),
                 ];
-            })->sortBy('updated_at', 1)->values();
-
-
-            // Calculate total nominal diterima from all filtered data (not just current page)
-            $totalNominalDiterima = $data->sum(function ($item) {
-                // Extract numeric value from formatted currency string
-                $nominal = str_replace(['Rp', '.', ',00'], '', $item['nominal_diterima']);
-                return (float) $nominal;
-            });
+            })->sortBy('updated_at', 1);
 
             // Calculate the page count
             $pageCount = ceil($totalRecords / $request->get('size'));
@@ -420,7 +274,6 @@ use Modules\Lpj\Models\Noc;
                 'pageCount'       => $pageCount,
                 'page'            => $currentPage,
                 'totalCount'      => $totalRecords,
-                'totalNominalDiterima' => $totalNominalDiterima,
                 'data'            => $data,
             ]);
         }

app/Http/Controllers/PembatalanController.php

@@ -1,143 +1,160 @@
 <?php
 
-    namespace Modules\Lpj\Http\Controllers;
+namespace Modules\Lpj\Http\Controllers;
 
-    use App\Http\Controllers\Controller;
-    use Exception;
-    use Illuminate\Http\Request;
-    use Modules\Lpj\Models\Permohonan;
-    use Modules\Lpj\Models\PermohonanPembatalan;
-    use Modules\Lpj\Services\PermohonanHistoryService;
-    use Illuminate\Support\Facades\Auth;
+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\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\PermohonanPembatalan;
+use Modules\Lpj\Models\StatusPermohonan;
+use Modules\Lpj\Models\TujuanPenilaian;
+use Modules\Lpj\Services\PermohonanHistoryService;
 
-    class PembatalanController extends Controller
+class PembatalanController extends Controller
+{
+    protected $historyService;
+
+    public function __construct(PermohonanHistoryService $historyService)
     {
-        public    $user;
-        protected $historyService;
+        $this->historyService = $historyService;
+    }
 
-        public function __construct(PermohonanHistoryService $historyService)
-        {
-            $this->historyService = $historyService;
-        }
+    public function index()
+    {
+        $user = auth()->user();
+        return view('lpj::pembatalan.index', compact('user'));
+    }
 
-        public function index()
-        {
-            return view('lpj::pembatalan.index');
-        }
+    public function edit($id)
+    {
+        $user = auth()->user();
+        $pembatalan = PermohonanPembatalan::with(['permohonan.debiture', 'permohonan.branch'])->find($id);
 
-        public function edit($id)
-        {
-            $pembatalan = PermohonanPembatalan::with(['permohonan.debiture','permohonan.branch'])->find($id);
+        return view(
+            'lpj::pembatalan.form',
+            compact(
+                'pembatalan',
+                'user'
+            ),
+        );
+    }
 
-            return view(
-                'lpj::pembatalan.form',
-                compact(
-                    'pembatalan'
-                ),
-            );
-        }
+    public function update(Request $request, $id)
+    {
+        $user = auth()->user();
+        $pembatalan = PermohonanPembatalan::findOrFail($id);
+        $permohonan = Permohonan::find($pembatalan->permohonan_id);
+        $beforeRequest = $permohonan->toArray();
 
-        public function update(Request $request, $id)
-        {
-            $pembatalan = PermohonanPembatalan::findOrFail($id);
-            $permohonan = Permohonan::find($pembatalan->permohonan_id);
-            $beforeRequest = $permohonan->toArray();
+        try {
+            // Update Permohonan Pembatalan
+            if ($request->status == 'approved') {
+                $pembatalan->status = 'approved';
+                $pembatalan->authorized_at = now();
+                $pembatalan->authorized_by = $user->id;
+                $pembatalan->authorized_status = 1;
+                $pembatalan->save();
 
-            try {
-                // 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();
-                }
-
-                return redirect()
-                    ->route('pembatalan.index')->with('success', 'Permohonan Pembatalan updated successfully');
-            } catch (Exception $e) {
-                return redirect()
-                    ->route('pembatalan.edit', $id)->with('error', 'Failed to update permohonan Pembatalan');
-            }
-        }
-
-        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.');
+                $permohonan->status = 'batal';
+                $permohonan->save();
+            } else {
+                $pembatalan->status = 'rejected';
+                $pembatalan->authorized_at = now();
+                $pembatalan->authorized_by = $user->id;
+                $pembatalan->authorized_status = 3;
+                $pembatalan->save();
             }
 
-            // Retrieve data from the database
-            $query = PermohonanPembatalan::query();
-            if (Auth::user()->hasAnyRole(['pemohon-ao','pemohon-eo'])) {
-                $query = $query->whereRelation('permohonan', '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 = $request->get('search');
-                $query->where(function ($q) use ($search) {
-                    $q->orWhereRelation('permohonan', 'nomor_registrasi', 'LIKE', '%' . $search . '%');
-                    $q->orWhereRelation('permohonan.debiture', 'name', 'LIKE', '%' . $search . '%');
-                    $q->orWhere('alasan_pembatalan', '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(['permohonan.debiture','permohonan.branch','creator'])->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,
-            ]);
+            return redirect()
+                ->route('pembatalan.index')->with('success', 'Permohonan Pembatalan updated successfully');
+        } catch (Exception $e) {
+            return redirect()
+                ->route('pembatalan.edit', $id)->with('error', 'Failed to update permohonan Pembatalan');
         }
     }
+
+    public function dataForDatatables(Request $request)
+    {
+        $user = auth()->user();
+        if (is_null($user) || !$user->can('debitur.view')) {
+            //abort(403, 'Sorry! You are not allowed to view users.');
+        }
+
+        // Retrieve data from the database
+        $query = PermohonanPembatalan::query()->with(['permohonan']);
+        $query = $query->orderBy('created_at', '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->orWhereRelation('permohonan', 'nomor_registrasi', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('permohonan.debiture', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhere('alasan_pembatalan', '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');
+            // Only allow sorting by existing columns
+            if (in_array($column, ['created_at', 'status', 'alasan_pembatalan'])) {
+                $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(['permohonan.debiture', 'permohonan.branch', 'creator'])->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/PembayaranController.php

@@ -2,17 +2,21 @@
 
 namespace Modules\Lpj\Http\Controllers;
 
-use Exception;
-use Modules\Lpj\Models\Noc;
-use Illuminate\Http\Request;
-use Modules\Lpj\Models\Bucok;
-use Illuminate\Http\JsonResponse;
-use Modules\Lpj\Models\Permohonan;
 use App\Http\Controllers\Controller;
+use Exception;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use Modules\Lpj\Models\PenawaranTender;
-use Modules\Lpj\Models\PersetujuanPenawaran;
+use Illuminate\Support\Facades\Validator;
+use Maatwebsite\Excel\Facades\Excel;
 use Modules\Lpj\Http\Requests\PersetujuanPenawaranRequest;
+use Modules\Lpj\Models\PenawaranTender;
+use Modules\Lpj\Models\Permohonan;
+use Modules\Lpj\Models\PersetujuanPenawaran;
+
+// use Modules\Lpj\Models\JenisPenilaian;
+
+// use Modules\Lpj\Models\Regions;
 
 class PembayaranController extends Controller
 {
@@ -23,14 +27,6 @@ class PembayaranController extends Controller
         return view('lpj::pembayaran.index');
     }
 
-    public function kurang(){
-        return view('lpj::pembayaran.kurang');
-    }
-
-    public function lebih(){
-        return view('lpj::pembayaran.lebih');
-    }
-
     public function approval()
     {
         return view('lpj::pembayaran.approval');
@@ -39,16 +35,13 @@ class PembayaranController extends Controller
     public function dataApprovalForDatatables(Request $request)
     {
         if (is_null($this->user) || !$this->user->can('noc.view')) {
-              //abort(403, 'Sorry! You are not allowed to view persetujuan penawaran.');
+            //abort(403, 'Sorry! You are not allowed to view persetujuan penawaran.');
         }
 
-          // Retrieve data from the database
+        // Retrieve data from the database
         $query = PersetujuanPenawaran::query();
-        if (Auth::user()->hasAnyRole(['pemohon-ao','pemohon-eo'])) {
-            $query = $query->whereRelation('permohonan', 'branch_id', Auth::user()->branch_id);
-        }
 
-          // Apply search filter if provided
+        // Apply search filter if provided
         if ($request->has('search') && !empty($request->get('search'))) {
             $search = $request->get('search');
             $query->where(function ($q) use ($search) {
@@ -56,29 +49,29 @@ class PembayaranController extends Controller
             });
         }
 
-          // Apply sorting if provided
+        // 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
+        // Get the total count of records
         $totalRecords = $query->count();
 
-          // Apply pagination if provided
+        // 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
+            $offset = ($page - 1) * $size; // Calculate the offset
 
             $query->skip($offset)->take($size);
         }
 
-          // Get the filtered count of records
+        // Get the filtered count of records
         $filteredRecords = $query->count();
 
-          // Get the data for the current page
+        // Get the data for the current page
         $data = $query
             ->with(
                 [
@@ -96,13 +89,13 @@ class PembayaranController extends Controller
             )->get();
 
 
-          // Calculate the page count
+        // Calculate the page count
         $pageCount = ceil($totalRecords / $request->get('size'));
 
-          // Calculate the current page number
+        // Calculate the current page number
         $currentPage = $request->get('page', 1);
 
-          // Return the response data as a JSON object
+        // Return the response data as a JSON object
         return response()->json([
             'draw'            => $request->get('draw'),
             'recordsTotal'    => $totalRecords,
@@ -114,130 +107,34 @@ class PembayaranController extends Controller
         ]);
     }
 
-    public function create(){
-        return view('lpj::pembayaran.create');
-    }
-
     public function edit($id)
     {
+        $permohonan = Permohonan::find($id);
 
-        $req = request()->all();
-
-        if(isset($req['tiket'])){
-            $persetujuanPenawaran = PersetujuanPenawaran::find($id);
-            $permohonan = Permohonan::find($persetujuanPenawaran?->permohonan_id);
-        } else {
-            $permohonan = Permohonan::find($id);
-            $persetujuanPenawaran = PersetujuanPenawaran::where('permohonan_id', $permohonan->id)->first();
-        }
-
+        $persetujuanPenawaran = PersetujuanPenawaran::where('permohonan_id', $permohonan->id)->first();
         return view('lpj::pembayaran.form', compact('permohonan', 'persetujuanPenawaran'));
     }
 
-    public function editKurang($id){
-        $noc = Noc::find($id);
-        $permohonan = Permohonan::find($noc->permohonan_id);
-        $persetujuanPenawaran = PersetujuanPenawaran::where('permohonan_id', $permohonan->id)->first();
-        return view('lpj::pembayaran.form-kurang', compact('noc','permohonan','persetujuanPenawaran'));
-    }
-
-    public function editLebih($id){
-        $noc = Noc::find($id);
-        $permohonan = Permohonan::find($noc->permohonan_id);
-        $persetujuanPenawaran = PersetujuanPenawaran::where('permohonan_id', $permohonan->id)->first();
-        return view('lpj::pembayaran.form-lebih', compact('noc','permohonan','persetujuanPenawaran'));
-    }
-
     public function store(PersetujuanPenawaranRequest $request)
     {
-        $req = request()->all();
-
-        if(isset($req['type'])){
-            if($req['type'] == 'create'){
-                $data = [
-                    'nomor_tiket' => $req['nomor_tiket'] ?? '',
-                    'nominal_bayar' => $req['nominal_bayar'] ?? '',
-                    'catatan' => $req['catatan'] ?? ''
-                ];
-
-                if(request()->hasFile('bukti_bayar')){
-                    $folderPath                        = 'persetujuan_penawaran/bukti_bayar/' . $req['nomor_tiket'];
-                    $data['bukti_bayar'] = $request->file('bukti_bayar')->store($folderPath, 'public');
-                }
-
-                $persetujuanPenawaran = PersetujuanPenawaran::create($data);
-                $noc = [
-                    'persetujuan_penawaran_id' => $persetujuanPenawaran->id,
-                    'nomor_tiket' => $req['nomor_tiket'] ?? '',
-                    'debiture_id' => $req['debitur_id'] ?? '',
-                    'branch_id' => Auth::user()->branch_id,
-                ];
-                $noc = Noc::create($noc);
-
-                $bucok = [
-                    'tanggal_penuh'          => $persetujuanPenawaran->created_at ?? $noc->created_at,
-                    'tanggal'                => $persetujuanPenawaran->created_at?->format('d') ?? $noc->created_at?->format('d'),
-                    'bulan'                  => $persetujuanPenawaran->created_at?->format('m') ?? $noc->created_at?->format('m'),
-                    'tahun'                  => $persetujuanPenawaran->created_at?->format('Y') ?? $noc->created_at?->format('Y'),
-                    'nomor_tiket'            => $req['nomor_tiket'] ?? '',
-                    'nominal'                => $req['nominal_bayar'] ?? '',
-                    'nominal_berjalan'       => $req['nominal_bayar'] ?? '',
-                    'penyelesaian'           => 'Belum Selesai',
-                    'nama_sub_direktorat'    => $noc->branch?->name ?? '',
-                    'nama_direktorat_cabang' => $noc->branch?->name ?? '',
-                ];
-
-                Bucok::updateOrCreate([
-                    'nomor_tiket' => $req['nomor_tiket'] ?? '',
-                ], $bucok);
-
-                return redirect()
-                    ->route('pembayaran.index')->with('success', 'Pembayaran berhasil disimpan.');
-            }
-
-            if($req['type'] == 'kurang_bayar'){
-                $noc = Noc::find($req['noc_id']);
-                $noc->nominal_pelunasan = $req['nominal_pelunasan'];
-                if (request()->hasFile('bukti_ksl_kurang_bayar')) {
-                    $folderPath                        = 'persetujuan_penawaran/bukti_ksl_kurang_bayar/' . $req['noc_id'];
-                    $noc->bukti_ksl_kurang_bayar = $request->file('bukti_ksl_kurang_bayar')->store($folderPath, 'public');
-                }
-                $noc->save();
-
-                $persetujuanPenawaran = PersetujuanPenawaran::find($noc->persetujuan_penawaran_id);
-                $persetujuanPenawaran->bukti_ksl_kurang_bayar =  $noc->bukti_ksl_kurang_bayar;
-                $persetujuanPenawaran->nominal_kurang_bayar = $req['nominal_pelunasan'];
-                $persetujuanPenawaran->save();
-                return redirect()
-                    ->route('pembayaran.kurang.index')->with('success', 'Pelunasan Kurang Bayar berhasil disimpan.');
-            }
-
-            if($req['type'] == 'lebih_bayar'){
-                $noc = Noc::find($req['noc_id']);
-                if (request()->hasFile('bukti_ksl_lebih_bayar')) {
-                    $folderPath                        = 'persetujuan_penawaran/bukti_ksl_lebih_bayar/' . $req['noc_id'];
-                    $noc->bukti_ksl_lebih_bayar = $request->file('bukti_ksl_lebih_bayar')->store($folderPath, 'public');
-                }
-                $noc->save();
-
-                return redirect()
-                    ->route('pembayaran.lebih.index')->with('success', 'Pengembalian Lebih Bayar berhasil disimpan.');
-            }
-        }
-
         $validated               = $request->validated();
-        $validated['nominal_bayar']    = $req['nominal_bayar'] ?? 0;
         $validated['created_by'] = Auth::id();
-        $validated['created_at'] = now();
         $validated['status']     = '0';
 
         $persetujuanPenawaran = PersetujuanPenawaran::where('permohonan_id', $validated['permohonan_id'] ?? null)->first();
-        $permohonan           = Permohonan::find(request()->get('permohonan_id'));
+        $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'];
+                $folderPath                     = 'persetujuan_penawaran/' . $validated['penawaran_id'];
                 $persetujuanPenawaran->bukti_bayar = $request->file('bukti_bayar')->store($folderPath, 'public');
             }
 
@@ -245,22 +142,13 @@ class PembayaranController extends Controller
 
             $permohonan->approve_bayar_by = null;
             $permohonan->approve_bayar_at = null;
-            $permohonan->status           = 'proses-laporan';
+            $permohonan->status = 'done';
             $permohonan->save();
         } else {
             $persetujuanPenawaran = PersetujuanPenawaran::create(
                 $validated
             );
 
-            if(isset($validated['nomor_tiket'])){
-                $noc = Noc::where('nomor_tiket',$validated['nomor_tiket'])->first();
-                if($noc){
-                    $noc->persetujuan_penawaran_id = $persetujuanPenawaran->id;
-                    $noc->permohonan_id            = $validated['permohonan_id'];
-                    $noc->save();
-                }
-            }
-
             $folderPath = 'persetujuan_penawaran/' . $validated['penawaran_id'];
 
             if ($request->hasFile('bukti_bayar')) {
@@ -269,47 +157,20 @@ class PembayaranController extends Controller
             $persetujuanPenawaran->save();
         }
 
-            $bucok = [
-                'tanggal_penuh'          => $persetujuanPenawaran->created_at ??  $validated['created_at'],
-                'tanggal'                => $persetujuanPenawaran->created_at?->format('d') ??  $validated['created_at']?->format('d'),
-                'bulan'                  => $persetujuanPenawaran->created_at?->format('m') ??  $validated['created_at']?->format('m'),
-                'tahun'                  => $persetujuanPenawaran->created_at?->format('Y') ??  $validated['created_at']?->format('Y'),
-                'nomor_tiket'            => $req['nomor_tiket'] ?? '',
-                'nominal'                => $req['nominal_bayar'] ?? '',
-                'nominal_berjalan'       => $req['nominal_bayar'] ?? '',
-                'penyelesaian'           => 'Belum Selesai',
-                'nama_sub_direktorat'    => $noc->branch?->name ?? '',
-                'nama_direktorat_cabang' => $noc->branch?->name ?? '',
-                'permohonan_id' => $permohonan->id,
-                'nomor_registrasi' => $permohonan->nomor_registrasi,
-            ];
-
-
-            if(isset($req['nomor_tiket']) && $req['nomor_tiket'] !=''){
-                Bucok::updateOrCreate([
-                    'nomor_registrasi' => $permohonan->nomor_registrasi,
-                    'nomor_tiket' => $req['nomor_tiket'],
-                ], $bucok);
-            } else {
-                Bucok::updateOrCreate([
-                    'nomor_registrasi' => $permohonan->nomor_registrasi
-                ], $bucok);
-            }
-
-          // Update the status of the related permohonan to 'spk'
+        // Update the status of the related permohonan to 'spk'
 
         if ($permohonan) {
             $permohonan->status_bayar = request()->get('status_bayar');
             $permohonan->save();
 
-              // andy add, update status penawaran.status='spk'
-              // $penawaran = PenawaranTender::where('nomor_registrasi',$permohonan->nomor_registrasi)->first();
+            // andy add, update status penawaran.status='spk'
+            // $penawaran = PenawaranTender::where('nomor_registrasi',$permohonan->nomor_registrasi)->first();
             PenawaranTender::where('nomor_registrasi', $permohonan->nomor_registrasi)->update([
                 'status'     => 'noc',
                 'updated_by' => Auth::id(),
                 'updated_at' => now(),
             ]);
-              // andy add, update status penawaran.status='spk'
+            // andy add, update status penawaran.status='spk'
 
         }
 
@@ -319,7 +180,7 @@ class PembayaranController extends Controller
 
     public function update(Request $request, $id): JsonResponse
     {
-          // init
+        // init
         $data     = [];
         $output   = [];
         $tindakan = null;
@@ -335,21 +196,26 @@ class PembayaranController extends Controller
                 }
                 $output['data'] = $data;
 
-                  // Update the status of the related permohonan to 'spk'
+                // Update the status of the related permohonan to 'spk'
                 $permohonan = Permohonan::find($id);
 
                 if ($permohonan) {
 
                     if ($request->type === 'revisi') {
-                        $data['status']       = 'revisi-pembayaran';
+                        $data['status'] = 'revisi-pembayaran';
                         $data['status_bayar'] = 'belum_bayar';
                     } else {
                         $data['status_bayar'] = 'sudah_bayar';
-                        $data['status']       = 'proses-laporan';
+                        $data['status'] = 'proses-laporan';
+                    }
 
-                        if ($permohonan->jenis_penilaian_id == 2) {
+                    if ($permohonan->jenis_penilaian_id == 2) {
+                        if ($request->type === 'revisi') {
+                            $data['status'] = 'revisi-pembayaran';
+                            $data['status_bayar'] = 'belum_bayar';
+                        } else {
                             $data['status_bayar'] = 'sudah_bayar';
-                            $data['status']       = 'spk';
+                            $data['status'] = 'spk';
                         }
                     }
 
@@ -363,12 +229,11 @@ class PembayaranController extends Controller
                             $data['approval_dd_at'],
                             $data['keterangan']
                         );
-
                     }
 
                     $permohonan->update($data);
 
-                    if ($permohonan->jenis_penilaian_id == 2) {
+                    if ($permohonan->jenis_penilaian_id == 2 && $permohonan->status_bayar == 'sudah_bayar') {
                         PenawaranTender::where('nomor_registrasi', $permohonan->nomor_registrasi)->update([
                             'status'     => 'spk',
                             'updated_by' => Auth::id(),
@@ -390,43 +255,47 @@ class PembayaranController extends Controller
     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.');
+            // abort(403, 'Sorry! You are not allowed to view users.');
         }
 
-        $query = PersetujuanPenawaran::query();
-
-        if (Auth::user()->hasAnyRole(['pemohon-ao','pemohon-eo'])) {
-            $query = $query->whereRelation('permohonan', 'branch_id', Auth::user()->branch_id);
-        }
-
-        /*$query->where(function($q) {
-            $q->whereRelation('permohonan', function($query) {
-                $query->where('status_bayar', 'belum_bayar')
-                    ->where('jenis_penilaian_id', 1);
+        $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');
+                });
             });
-        });*/
-        $query->orWhereRelation('permohonan','status_bayar','revisi-pembayaran');
-        $query->orWhere(function($q) {
-            $q->where('permohonan_id',null);
-            $q->where('nomor_tiket','!=',null);
-        });
+
 
         // Pencarian berdasarkan parameter search
         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('jenisPenilaian', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhereRelation('branch', 'name', 'LIKE', '%' . $search . '%');
+                $q->orWhere('status', 'LIKE', '%' . $search . '%');
+            });
         }
 
-          // Sorting berdasarkan sortField dan sortOrder
+        // Sorting berdasarkan sortField dan sortOrder
         if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
             $order  = $request->get('sortOrder');
             $column = $request->get('sortField');
             $query->orderBy($column, $order);
         }
 
-          // Hitung total records
+        // Hitung total records
         $totalRecords = $query->count();
 
-          // Pagination (default page size 10)
+        // Pagination (default page size 10)
         $size = $request->get('size', 10);
         if ($size == 0) {
             $size = 10;
@@ -439,172 +308,20 @@ class PembayaranController extends Controller
             $query->skip($offset)->take($size);
         }
 
-          // Filtered records
+        // Filtered records
         $filteredRecords = $query->count();
 
-          // Ambil data dengan relasi
-        $data = $query->get();
-
-        $data = $data->map(function ($item) {
-            return [
-                'id'         => $item->permohonan?->id ?? $item->id,
-                'nomor_registrasi' => $item->permohonan?->nomor_registrasi,
-                'nomor_tiket' => $item->nomor_tiket ?? '',
-                'debiture' => $item->permohonan?->debiture ?? $item->noc?->debiture,
-                'user'       => $item->permohonan?->user ?? $item->creator,
-                'status_bayar' => $item->permohonan?->status_bayar ?? ($item->nomor_tiket ? 'Sudah Bayar' : ''),
-                'tanggal_permohonan' => $item->permohonan?->tanggal_permohonan ?? '',
-                'branch' => $item->permohonan?->branch ?? $item->noc?->branch,
-                'is_permohonan' => $item->permohonan ?? ''
-            ];
-        });
+        // Ambil data dengan relasi
+        $data = $query->with(['user', 'debiture', 'branch', 'jenisPenilaian'])->get();
 
 
-          // Hitung jumlah halaman
+        // Hitung jumlah halaman
         $pageCount = ceil($totalRecords / $size);
 
-          // Ambil current page
+        // Ambil current page
         $currentPage = max(1, $request->get('page', 1));
 
-          // Return JSON response
-        return response()->json([
-            'draw'            => $request->get('draw'),
-            'recordsTotal'    => $totalRecords,
-            'recordsFiltered' => $filteredRecords,
-            'pageCount'       => $pageCount,
-            'page'            => $currentPage,
-            'totalCount'      => $totalRecords,
-            'data'            => $data,
-        ]);
-    }
-
-    public function dataForDatatablesKurang(Request $request)
-    {
-        if (is_null($this->user) || !$this->user->can('debitur.view')) {
-              // abort(403, 'Sorry! You are not allowed to view users.');
-        }
-
-        $query = Noc::query()->where(function ($query) {
-            $query->where(['status_kurang_bayar' => '1'])
-                ->where('bukti_ksl_kurang_bayar',null);
-        });
-
-          // Sorting berdasarkan sortField dan sortOrder
-        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
-            $order  = $request->get('sortOrder');
-            $column = $request->get('sortField');
-            $query->orderBy($column, $order);
-        }
-
-          // Hitung total records
-        $totalRecords = $query->count();
-
-          // Pagination (default page size 10)
-        $size = $request->get('size', 10);
-        if ($size == 0) {
-            $size = 10;
-        }
-
-        if ($request->has('page') && $request->has('size')) {
-            $page   = $request->get('page', 1);
-            $offset = ($page - 1) * $size;
-
-            $query->skip($offset)->take($size);
-        }
-
-          // Filtered records
-        $filteredRecords = $query->count();
-
-          // Ambil data dengan relasi
-        $data = $query->get();
-
-         $data = $data->map(function ($item) {
-                return [
-                    'id'         => $item->id,
-                    'permohonan' => $item->permohonan,
-                    'pemohon'    => $item->permohonan->user,
-                    'branch'     => $item->permohonan->branch,
-                    'debiture'   => $item->permohonan->debiture,
-                    'nominal_kurang_bayar' => formatRupiah($item->nominal_kurang_bayar,2)
-                ];
-         });
-
-          // Hitung jumlah halaman
-        $pageCount = ceil($totalRecords / $size);
-
-          // Ambil current page
-        $currentPage = max(1, $request->get('page', 1));
-
-          // Return JSON response
-        return response()->json([
-            'draw'            => $request->get('draw'),
-            'recordsTotal'    => $totalRecords,
-            'recordsFiltered' => $filteredRecords,
-            'pageCount'       => $pageCount,
-            'page'            => $currentPage,
-            'totalCount'      => $totalRecords,
-            'data'            => $data,
-        ]);
-    }
-
-    public function dataForDatatablesLebih(Request $request)
-    {
-        if (is_null($this->user) || !$this->user->can('debitur.view')) {
-              // abort(403, 'Sorry! You are not allowed to view users.');
-        }
-
-        $query = Noc::query()->where(function ($query) {
-            $query->where(['status_lebih_bayar' => '1'])
-            ->where('bukti_ksl_lebih_bayar',null);
-        });
-
-          // Sorting berdasarkan sortField dan sortOrder
-        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
-            $order  = $request->get('sortOrder');
-            $column = $request->get('sortField');
-            $query->orderBy($column, $order);
-        }
-
-          // Hitung total records
-        $totalRecords = $query->count();
-
-          // Pagination (default page size 10)
-        $size = $request->get('size', 10);
-        if ($size == 0) {
-            $size = 10;
-        }
-
-        if ($request->has('page') && $request->has('size')) {
-            $page   = $request->get('page', 1);
-            $offset = ($page - 1) * $size;
-
-            $query->skip($offset)->take($size);
-        }
-
-          // Filtered records
-        $filteredRecords = $query->count();
-
-          // Ambil data dengan relasi
-        $data = $query->get();
-
-         $data = $data->map(function ($item) {
-                return [
-                    'id'         => $item->id,
-                    'permohonan' => $item->permohonan,
-                    'pemohon'    => $item->permohonan->user,
-                    'branch'     => $item->permohonan->branch,
-                    'debiture'   => $item->permohonan->debiture,
-                    'nominal_lebih_bayar' => formatRupiah($item->nominal_lebih_bayar,2)
-                ];
-         });
-
-          // Hitung jumlah halaman
-        $pageCount = ceil($totalRecords / $size);
-
-          // Ambil current page
-        $currentPage = max(1, $request->get('page', 1));
-
-          // Return JSON response
+        // Return JSON response
         return response()->json([
             'draw'            => $request->get('draw'),
             'recordsTotal'    => $totalRecords,

app/Http/Controllers/PenilaiController.php

@@ -26,21 +26,18 @@ use Modules\Lpj\Http\Requests\FormSurveyorRequest;
 use Modules\Lpj\Models\Authorization;
 use Modules\Lpj\Models\Debiture;
 use Modules\Lpj\Services\SaveFormInspesksiService;
-use Modules\Lpj\Services\PreviewLaporanService;
 
 class PenilaiController extends Controller
 {
     public $user;
     protected $surveyorController;
     protected $inspeksiService;
-    protected $previewLaporanService;
 
 
-    public function __construct(SurveyorController $surveyorController, SaveFormInspesksiService $inspeksiService, PreviewLaporanService $previewLaporanService)
+    public function __construct(SurveyorController $surveyorController, SaveFormInspesksiService $inspeksiService)
     {
         $this->surveyorController = $surveyorController;
         $this->inspeksiService = $inspeksiService;
-        $this->previewLaporanService = $previewLaporanService;
     }
 
     /**
@@ -155,11 +152,6 @@ class PenilaiController extends Controller
         $jaminanId = $request->query('jaminanId');
 
         $permohonan = $this->surveyorController->getPermohonanJaminanId($id, $documentId, $jaminanId);
-
-        if ($permohonan->status == 'proses-laporan') {
-            //return redirect()->back()->with('error', 'Masih dalam proses laporan');
-        }
-
         $basicData =  $this->surveyorController->getCommonData();
         $noLpSederhana =  $this->generateNoLaporan($permohonan, $documentId, 'lpj');
 
@@ -226,11 +218,6 @@ class PenilaiController extends Controller
         $jaminanId = $request->query('jaminanId');
 
         $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId);
-
-         if ($permohonan->status == 'proses-laporan') {
-            return redirect()->back()->with('error', 'Masih dalam proses laporan');
-        }
-
         $nomorLaporan =     $this->generateNoLaporan($permohonan, $documentId, 'resume');
         $inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
         $noLpresume =  $this->generateNoLaporan($permohonan, $documentId, 'resume');
@@ -266,9 +253,6 @@ class PenilaiController extends Controller
 
         $data = $this->getDataPermohonanWithPenilaiAndInspeksi($req['permohonanId'], $req['documentId'], $req['jaminanId']);
         $permohonan = $data['permohonan'];
-         if ($permohonan->status == 'proses-laporan') {
-            return redirect()->back()->with('error', 'Masih dalam proses laporan');
-        }
 
         $nomorLaporan =     $this->generateNoLaporan($permohonan, $req['documentId'], 'memo');
         $inspeksi = Inspeksi::where('permohonan_id', $req['permohonanId'])->where('dokument_id', $req['documentId'])->first();
@@ -408,11 +392,6 @@ class PenilaiController extends Controller
         $jaminanId = $request->query('jaminanId');
         $provinces = Province::all();
         $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId);
-
-         if ($permohonan->status == 'proses-laporan') {
-            return redirect()->back()->with('error', 'Masih dalam proses laporan');
-        }
-
         $nomorLaporan =     $this->generateNoLaporan($permohonan, $documentId, 'rap');
         $basicData =  $this->surveyorController->getCommonData();
         $inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
@@ -491,9 +470,6 @@ class PenilaiController extends Controller
         $jaminanId = $request->query('jaminanId');
         $provinces = Province::all();
         $permohonan = $this->surveyorController->getPermohonanJaminanId($permohonanId, $documentId, $jaminanId);
-         if ($permohonan->status == 'proses-laporan') {
-            return redirect()->back()->with('error', 'Masih dalam proses laporan');
-        }
         $nomorLaporan =     $this->generateNoLaporan($permohonan, $documentId, 'call-report');
         $basicData =  $this->surveyorController->getCommonData();
         $inspeksi = Inspeksi::where('permohonan_id', $permohonanId)->where('dokument_id', $documentId)->first();
@@ -551,7 +527,13 @@ class PenilaiController extends Controller
         return view('lpj::penilai.components.call-report', compact('permohonan', 'basicData', 'nomorLaporan', 'forminspeksi', 'cities', 'districts', 'villages', 'cekAlamat', 'callReport'));
     }
 
-
+    /**
+     * Remove the specified resource from storage.
+     */
+    public function destroy($id)
+    {
+        //
+    }
 
     public function dataForDatatables(Request $request)
     {
@@ -619,8 +601,7 @@ class PenilaiController extends Controller
             'jenisfasilitasKredit',
             'penilaian.userPenilai',
             'penilai',
-            'nilaiPlafond',
-            'penawaran'
+            'nilaiPlafond'
         ])->get();
 
         // Calculate the page count
@@ -698,17 +679,15 @@ class PenilaiController extends Controller
             'lokasi_lengkap' => $data->lokasi_lengkap ?? '',
         ];
 
-        if(isset($dataPembanding)){
-            // Extract data pembanding
-            if (isset($dataPembanding['data_pembanding'])) {
-                foreach ($dataPembanding['data_pembanding'] as $index => $pembanding) {
-                    if ($index == 0) {
-                        $exportData['pembanding1'] = $pembanding;
-                    } elseif ($index == 1) {
-                        $exportData['pembanding2'] = $pembanding;
-                    } elseif ($index == 2) {
-                        $exportData['pembanding3'] = $pembanding;
-                    }
+        // Extract data pembanding
+        if (isset($dataPembanding['data_pembanding'])) {
+            foreach ($dataPembanding['data_pembanding'] as $index => $pembanding) {
+                if ($index == 0) {
+                    $exportData['pembanding1'] = $pembanding;
+                } elseif ($index == 1) {
+                    $exportData['pembanding2'] = $pembanding;
+                } elseif ($index == 2) {
+                    $exportData['pembanding3'] = $pembanding;
                 }
             }
         }
@@ -841,10 +820,10 @@ class PenilaiController extends Controller
             $permohonan = Permohonan::findOrFail($id);
 
             if ($permohonan->status === 'proses-laporan') {
-                /*return response()->json([
+                return response()->json([
                     'success' => false,
                     'message' => 'Masih proses laporan',
-                ], 400);*/
+                ], 400);
             }
 
             if ($permohonan->status === 'proses-paparan') {
@@ -1006,10 +985,11 @@ class PenilaiController extends Controller
                     ],
                 ];
 
-                Inspeksi::updateOrCreate([
+
+
+                Inspeksi::create([
                     'permohonan_id' => $validatedData['permohonan_id'],
-                    'dokument_id' => $validatedData['dokument_id']
-                ],[
+                    'dokument_id' => $validatedData['dokument_id'],
                     'data_form' => json_encode($newData),
                     'name' => $validatedData['type']
                 ]);
@@ -1124,7 +1104,8 @@ class PenilaiController extends Controller
             $penilai = Penilai::updateOrCreate(
                 [
                     'permohonan_id' => $request->permohonanId,
-                    'dokument_id' =>  $request->input('dokument_id'),
+                    'dokument_id' => $request->documentId,
+
                 ],
                 [
                     'lpj' => json_encode($data),
@@ -1151,9 +1132,20 @@ class PenilaiController extends Controller
     {
         DB::beginTransaction();
         try {
+            $formRequest = new FormSurveyorRequest();
+            $formRequest->setContainer(app());
+            $formRequest->initialize(
+                $request->all(),
+                $request->query->all(),
+                $request->attributes->all(),
+                $request->cookies->all(),
+                $request->files->all(),
+                $request->server->all(),
+                $request->getContent()
+            );
 
-            $validatedData = $request->all();
-            $result = $this->inspeksiService->storeInspeksi($validatedData, $request->input('type'), $request);
+            $validated = $formRequest->validateResolved();
+            $result = $this->surveyorController->store($formRequest);
 
             $data = [
                 'kepada' => $request->input('kepada'),
@@ -1251,10 +1243,9 @@ class PenilaiController extends Controller
 
 
 
-                Inspeksi::updateOrCreate([
+                Inspeksi::create([
                     'permohonan_id' => $validated['permohonan_id'],
-                    'dokument_id' => $validated['dokument_id']
-                ],[
+                    'dokument_id' => $validated['dokument_id'],
                     'data_form' => json_encode($newData),
                     'name' => $validated['type']
                 ]);
@@ -1275,6 +1266,8 @@ class PenilaiController extends Controller
         }
     }
 
+
+
     public function print_out(Request $request)
     {
         $documentId = $request->query('documentId');
@@ -1390,15 +1383,6 @@ class PenilaiController extends Controller
         }
     }
 
-    public function print_out_laporan($permohonan_id, $document_id, $jaminan_id)
-    {
-        // jika tidak ada id kembalikan ke halaman sebelumnya
-        if (!$permohonan_id || !$document_id || !$jaminan_id) {
-            return redirect()->back()->with('error', 'Laporan tidak valid');
-        }
-        return $this->previewLaporanService->printOutLaporan($permohonan_id, $document_id, $jaminan_id);
-    }
-
     private function getViewLaporan($tipe)
     {
         $viewMap = [
@@ -1426,7 +1410,7 @@ class PenilaiController extends Controller
     }
 
 
-    // pengunaan request query by id permohonan, documentId, jaminan , inspeksi
+    // pengunaan request query by id permohonan, dokument, jaminan , inspeksi
     protected function getRequestQueryId(Request $request)
     {
         return [
@@ -1778,24 +1762,4 @@ class PenilaiController extends Controller
             'message' => 'Berhasil Revisi Ke surveyor',
         ], 200);
     }
-
-    public function showLaporanInspeksi(
-        $permohonan_id,
-        $dokumen_id,
-        $jaminan_id,
-        Request $request)
-    {
-        if ($request->type == 'penilai') {
-            $back = route('penilai.show', $permohonan_id);
-        }else{
-            $back = route('surveyor.show', $permohonan_id);
-        }
-
-        return $this->previewLaporanService->previewLaporan($permohonan_id, $dokumen_id, $jaminan_id, $back);
-    }
-
-    public function showInspectionReportReview($permohonan_id, $dokumen_id, $jaminan_id)
-    {
-
-    }
 }

app/Http/Controllers/PenilaianController.php

@@ -517,18 +517,12 @@ class PenilaianController extends Controller
                 $role = Auth::user()->roles[0]->name;
                 $status = 'done';
                 $approvalField = null;
-
-                $lpj_ = optional(json_decode($permohonan->penilai->lpj));
-                $npw = $lpj_->total_nilai_pasar_wajar ?? 0;
-                $npw = str_replace('.', '', $npw);
-
-
                 if ($role === 'senior-officer') {
                     $approvalField = 'approval_so';
-                    $status = $npw <=1000000000 ? 'done' : 'proses-laporan';
+                    $status = in_array($permohonan->nilai_plafond_id, [3]) ? 'done' : 'proses-laporan';
                 } elseif ($role === 'EO Appraisal') {
                     $approvalField = 'approval_eo';
-                    $status = $npw <=5000000000 ? 'done' : 'proses-laporan';
+                    $status = in_array($permohonan->nilai_plafond_id, [2, 1]) ? 'done' : 'proses-laporan';
                 } elseif ($role === 'DD Appraisal') {
                     $approvalField = 'approval_dd';
                     $status = 'done';

app/Http/Controllers/PersetujuanPenawaranController.php

@@ -40,7 +40,6 @@
             $validated               = $request->validated();
             $validated['created_by'] = Auth::id();
             $validated['status']     = '0';
-            $validated['nominal_bayar']     = $validated['biaya_final'];
 
             $persetujuanPenawaran = PersetujuanPenawaran::updateOrCreate(
                 ['penawaran_id' => $validated['penawaran_id']],
@@ -180,8 +179,8 @@
         public function edit($id)
         {
             $permohonan = Permohonan::with(['debiture', 'penawaranTender.detail'])->find($id);
-            $persetujuanPenawaran = PersetujuanPenawaran::where('permohonan_id', $id)->first();
-            return view('lpj::persetujuan_penawaran.form', compact('permohonan', 'persetujuanPenawaran'));
+
+            return view('lpj::persetujuan_penawaran.form', compact('permohonan'));
         }
 
         /**
@@ -202,12 +201,8 @@
             }
 
             // Retrieve data from the database
-            //$query = Permohonan::query()->where(['status' => 'persetujuan-penawaran']);
-            $query = Permohonan::query()
-                ->where(['status' => 'persetujuan-penawaran'])
-                ->whereHas('penawaranTender', function ($q) {
-                    $q->where('status', 'persetujuan-penawaran');
-                });
+            $query = Permohonan::query()->where(['status' => 'persetujuan-penawaran']);
+
             // Apply search filter if provided
             if ($request->has('search') && !empty($request->get('search'))) {
                 $search = $request->get('search');

app/Http/Controllers/RegistrasiFinalController.php

@@ -49,7 +49,7 @@
             $query =PenawaranTender::query()
                                    ->select('penawaran.*', 'tujuan_penilaian_kjpp.name as tujuan_penilaian_kjpp_name')
                                    ->leftJoin('tujuan_penilaian_kjpp', 'tujuan_penilaian_kjpp.id','=','penawaran.tujuan_penilaian_kjpp_id')
-                                   ->where('penawaran.status','=','registrasi-final')
+                                   ->where('penawaran.status','=','spk')
                                    ->withCount('penawarandetails');
 
             // Apply search filter if provided

app/Http/Controllers/RekapHarianSoController.php

@@ -1,22 +0,0 @@
-<?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/SlikController.php

@@ -1,548 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Http\Controllers;
-
-use App\Http\Controllers\Controller;
-use Exception;
-use Illuminate\Http\Request;
-use Illuminate\Validation\ValidationException;
-use Maatwebsite\Excel\Facades\Excel;
-use Modules\Lpj\Exports\SlikExport;
-use Modules\Lpj\Imports\SlikImport;
-use Modules\Lpj\Models\Slik;
-use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-
-/**
- * Controller untuk mengelola data Slik
- *
- * Menangani operasi CRUD dan import data Slik dari file Excel
- * dengan fitur server-side processing untuk datatables
- *
- * @package Modules\Lpj\Http\Controllers
- */
-class SlikController extends Controller
-{
-    public $user;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->user = Auth::user();
-    }
-
-    /**
-     * Menampilkan halaman index slik
-     *
-     * @return \Illuminate\View\View
-     */
-    public function index()
-    {
-        return view('lpj::slik.index');
-    }
-
-    /**
-     * Menampilkan detail slik
-     *
-     * @param int $id
-     * @return \Illuminate\View\View
-     */
-    public function show($id)
-    {
-        $slik = Slik::findOrFail($id);
-        return view('lpj::slik.show', compact('slik'));
-    }
-
-    /**
-     * Data untuk datatables dengan server-side processing
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function dataForDatatables(Request $request)
-    {
-        // Authorization check dapat ditambahkan sesuai kebutuhan
-        // if (is_null($this->user)) {
-        //     abort(403, 'Unauthorized access.');
-        // }
-
-        // Retrieve data from the database
-        $query = Slik::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('sandi_bank', 'LIKE', "%$search%")
-                  ->orWhere('no_rekening', 'LIKE', "%$search%")
-                  ->orWhere('cif', 'LIKE', "%$search%")
-                  ->orWhere('nama_debitur', 'LIKE', "%$search%")
-                  ->orWhere('nama_cabang', 'LIKE', "%$search%")
-                  ->orWhere('jenis_agunan', 'LIKE', "%$search%")
-                  ->orWhere('nama_pemilik_agunan', 'LIKE', "%$search%")
-                  ->orWhere('alamat_agunan', 'LIKE', "%$search%")
-                  ->orWhere('lokasi_agunan', 'LIKE', "%$search%");
-            });
-        }
-
-        // Apply year filter
-        if ($request->has('year') && !empty($request->get('year'))) {
-            $query->byYear($request->get('year'));
-        }
-
-        // Apply month filter
-        if ($request->has('month') && !empty($request->get('month'))) {
-            $query->byMonth($request->get('month'));
-        }
-
-        // Apply sandi bank filter
-        if ($request->has('sandi_bank') && !empty($request->get('sandi_bank'))) {
-            $query->where('sandi_bank', $request->get('sandi_bank'));
-        }
-
-        // Apply kolektibilitas filter
-        if ($request->has('kolektibilitas') && !empty($request->get('kolektibilitas'))) {
-            $query->where('kolektibilitas', $request->get('kolektibilitas'));
-        }
-
-        // Apply jenis agunan filter
-        if ($request->has('jenis_agunan') && !empty($request->get('jenis_agunan'))) {
-            $query->where('jenis_agunan', $request->get('jenis_agunan'));
-        }
-
-        // Apply sorting if provided
-        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
-            $order  = $request->get('sortOrder');
-            $column = $request->get('sortField', 'created_at');
-            $query->orderBy($column, $order);
-        } else {
-            $query->orderBy('created_at', 'desc');
-        }
-
-        // 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 with relationships
-        $data = $query->get();
-
-        // Transform data untuk datatables
-        $transformedData = $data->map(function ($item) {
-            return [
-                'id'                     => $item->id,
-                'sandi_bank'             => $item->sandi_bank,
-                'tahun'                  => $item->tahun,
-                'bulan'                  => $item->bulan,
-                'no_rekening'            => $item->no_rekening,
-                'cif'                    => $item->cif,
-                'nama_debitur'           => $item->nama_debitur,
-                'kolektibilitas'         => $item->kolektibilitas,
-                'kolektibilitas_badge'   => $item->kolektibilitas_badge,
-                'fasilitas'              => $item->fasilitas,
-                'jenis_agunan'           => $item->jenis_agunan,
-                'nama_pemilik_agunan'    => $item->nama_pemilik_agunan,
-                'nilai_agunan'           => $item->nilai_agunan_formatted,
-                'nilai_agunan_ljk'       => $item->nilai_agunan_ljk_formatted,
-                'alamat_agunan'          => $item->alamat_agunan,
-                'lokasi_agunan'          => $item->lokasi_agunan,
-                'nama_cabang'            => $item->nama_cabang,
-                'kode_cabang'            => $item->kode_cabang,
-                'created_by'             => $item->creator?->name ?? '-',
-                'created_at'             => dateFormat($item->created_at, true)
-            ];
-        });
-
-        // Calculate the page count
-        $pageCount = ceil($totalRecords / ($request->get('size', 10)));
-
-        // 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'            => $transformedData,
-        ]);
-    }
-
-    /**
-     * Import data slik dari Excel dengan optimasi memory dan progress tracking
-     *
-     * @param Request $request
-     * @return \Illuminate\Http\RedirectResponse
-     */
-    public function import(Request $request)
-    {
-        Log::info('SlikController: Starting import process with optimizations', [
-            'user_id' => Auth::id(),
-            'request_size' => $request->header('Content-Length'),
-            'has_file' => $request->hasFile('file'),
-            'memory_limit' => ini_get('memory_limit'),
-            'max_execution_time' => ini_get('max_execution_time')
-        ]);
-
-        // Validasi file upload dengan logging detail dan error handling komprehensif
-        try {
-            // Cek apakah ada file yang diupload
-            if (!$request->hasFile('file')) {
-                Log::error('SlikController: Tidak ada file yang diupload', [
-                    'user_id' => Auth::id(),
-                    'files_count' => count($request->allFiles()),
-                    'request_data' => $request->all()
-                ]);
-                throw ValidationException::withMessages(['file' => 'Tidak ada file yang diupload.']);
-            }
-
-            $file = $request->file('file');
-
-            // Cek apakah file valid
-            if (!$file->isValid()) {
-                $error = $file->getError();
-                $errorMessage = match($error) {
-                    UPLOAD_ERR_INI_SIZE => 'File terlalu besar (melebihi upload_max_filesize).',
-                    UPLOAD_ERR_FORM_SIZE => 'File terlalu besar (melebihi MAX_FILE_SIZE).',
-                    UPLOAD_ERR_PARTIAL => 'File hanya terupload sebagian.',
-                    UPLOAD_ERR_NO_FILE => 'Tidak ada file yang diupload.',
-                    UPLOAD_ERR_NO_TMP_DIR => 'Direktori temp tidak tersedia.',
-                    UPLOAD_ERR_CANT_WRITE => 'Gagal menulis file ke disk.',
-                    UPLOAD_ERR_EXTENSION => 'Upload dibatalkan oleh ekstensi PHP.',
-                    default => 'Error upload tidak diketahui: ' . $error
-                };
-
-                Log::error('SlikController: File upload tidak valid', [
-                    'error' => $error,
-                    'error_message' => $errorMessage,
-                    'user_id' => Auth::id(),
-                    'file_info' => [
-                        'name' => $file->getClientOriginalName(),
-                        'size' => $file->getSize(),
-                        'mime' => $file->getMimeType()
-                    ]
-                ]);
-                throw ValidationException::withMessages(['file' => $errorMessage]);
-            }
-
-            $maxFileSize = config('import.slik.max_file_size', 50) * 1024; // dalam KB
-            $request->validate([
-                'file' => 'required|file|mimes:xlsx,xls|max:' . $maxFileSize
-            ]);
-            Log::info('SlikController: Validasi file berhasil');
-        } catch (\Illuminate\Validation\ValidationException $e) {
-            Log::error('SlikController: Validasi file gagal', [
-                'errors' => $e->errors(),
-                'user_id' => Auth::id(),
-                'request_size' => $request->header('Content-Length')
-            ]);
-            throw $e;
-        }
-
-        try {
-            $uploadedFile = $request->file('file');
-            $originalName = $uploadedFile->getClientOriginalName();
-            $fileSize = $uploadedFile->getSize();
-
-            Log::info('SlikController: Memulai import data Slik', [
-                'user_id' => Auth::id(),
-                'filename' => $originalName,
-                'filesize' => $fileSize,
-                'filesize_mb' => round($fileSize / 1024 / 1024, 2),
-                'mime_type' => $uploadedFile->getMimeType(),
-                'extension' => $uploadedFile->getClientOriginalExtension()
-            ]);
-
-            // Generate unique import ID
-            $importId = uniqid('slik_import_');
-            $userId = Auth::id() ?? 1;
-
-            // Cek apakah menggunakan queue processing untuk file besar
-            $useQueue = config('import.slik.queue.enabled', false) && $fileSize > (5 * 1024 * 1024); // > 5MB
-
-            // Pastikan direktori temp ada
-            $tempDir = storage_path('app/temp');
-            if (!file_exists($tempDir)) {
-                mkdir($tempDir, 0755, true);
-                Log::info('SlikController: Direktori temp dibuat', ['path' => $tempDir]);
-            }
-
-            // Simpan file sementara dengan nama unik
-            $tempFileName = 'slik_import_' . time() . '_' . uniqid() . '.' . $uploadedFile->getClientOriginalExtension();
-            $tempFilePath = $tempDir . '/' . $tempFileName;
-
-            Log::info('SlikController: Memindahkan file ke temp', [
-                'temp_path' => $tempFilePath,
-                'use_queue' => $useQueue
-            ]);
-
-            // Pindahkan file ke direktori temp
-            $uploadedFile->move($tempDir, $tempFilePath);
-
-            // Verifikasi file berhasil dipindahkan
-            if (!file_exists($tempFilePath)) {
-                throw new Exception('File gagal dipindahkan ke direktori temp');
-            }
-
-            Log::info('SlikController: File berhasil dipindahkan', [
-                'file_size' => filesize($tempFilePath)
-            ]);
-
-            if ($useQueue) {
-                Log::info('SlikController: Menggunakan queue processing untuk file besar', [
-                    'import_id' => $importId,
-                    'file_size_mb' => round($fileSize / 1024 / 1024, 2)
-                ]);
-
-                // Dispatch job ke queue
-                \Modules\Lpj\Jobs\ProcessSlikImport::dispatch($tempFilePath, $userId, $importId);
-
-                return redirect()->back()->with('success', 'Import sedang diproses di background. ID: ' . $importId);
-            }
-
-            // Import langsung untuk file kecil
-            Log::info('SlikController: Processing file directly', [
-                'import_id' => $importId,
-                'file_size_mb' => round($fileSize / 1024 / 1024, 2)
-            ]);
-
-            // Set optimasi memory untuk import langsung
-            $memoryLimit = config('import.slik.memory_limit', 256);
-            ini_set('memory_limit', $memoryLimit . 'M');
-            ini_set('max_execution_time', config('import.slik.timeout', 30000));
-
-            // Enable garbage collection jika diizinkan
-            if (config('import.slik.enable_gc', true)) {
-                gc_enable();
-            }
-
-            // Proses import menggunakan SlikImport class
-            Log::info('SlikController: Memulai proses Excel import');
-            $import = new SlikImport();
-            Excel::import($import, $tempFilePath);
-            Log::info('SlikController: Excel import selesai');
-
-            // Force garbage collection setelah selesai
-            if (config('import.slik.enable_gc', true)) {
-                gc_collect_cycles();
-            }
-
-            // Hapus file temporary setelah import
-            if (file_exists($tempFilePath)) {
-                unlink($tempFilePath);
-                Log::info('SlikController: File temp berhasil dihapus');
-            }
-
-            Log::info('SlikController: Data Slik berhasil diimport', [
-                'user_id' => Auth::id(),
-                'import_id' => $importId
-            ]);
-
-            return redirect()->back()->with('success', 'Data Slik berhasil diimport dari file Excel.');
-
-        } catch (Exception $e) {
-            // Hapus file temporary jika ada error
-            if (isset($tempFilePath) && file_exists($tempFilePath)) {
-                unlink($tempFilePath);
-                Log::info('SlikController: File temp dihapus karena error');
-            }
-
-            Log::error('SlikController: Gagal import data Slik', [
-                'error' => $e->getMessage(),
-                'trace' => $e->getTraceAsString(),
-                'user_id' => Auth::id(),
-                'file' => $e->getFile(),
-                'line' => $e->getLine(),
-                'memory_usage' => memory_get_usage(true)
-            ]);
-
-            return redirect()->back()->with('error', 'Gagal import data Slik: ' . $e->getMessage());
-        }
-    }
-
-    /**
-     * Menampilkan halaman form import
-     *
-     * @return \Illuminate\View\View
-     */
-    public function importForm()
-    {
-        return view('lpj::slik.import');
-    }
-
-    /**
-     * Download template Excel untuk import
-     *
-     * @return \Symfony\Component\HttpFoundation\BinaryFileResponse
-     */
-    public function downloadTemplate()
-    {
-        $templatePath = resource_path('metronic/slik.xlsx');
-
-        if (!file_exists($templatePath)) {
-            return redirect()->back()->with('error', 'Template file tidak ditemukan.');
-        }
-
-        return response()->download($templatePath, 'template_slik.xlsx');
-    }
-
-    /**
-     * Get import progress
-     *
-     * @param string $importId
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function progress(string $importId)
-    {
-        try {
-            $progressService = new \Modules\Lpj\Services\ImportProgressService();
-            $progress = $progressService->getProgress($importId);
-
-            if (!$progress) {
-                return response()->json([
-                    'success' => false,
-                    'message' => 'Progress import tidak ditemukan'
-                ], 404);
-            }
-
-            return response()->json([
-                'success' => true,
-                'progress' => $progress
-            ]);
-
-        } catch (\Exception $e) {
-            Log::error('SlikController: Error getting progress', [
-                'import_id' => $importId,
-                'error' => $e->getMessage()
-            ]);
-
-            return response()->json([
-                'success' => false,
-                'message' => 'Gagal mendapatkan progress: ' . $e->getMessage()
-            ], 500);
-        }
-    }
-
-    /**
-     * Export data SLIK ke Excel
-     * 
-     * Method ini menangani export data SLIK ke format Excel dengan:
-     * - Logging aktivitas export
-     * - Error handling yang proper
-     * - Format Excel yang sesuai dengan struktur SLIK
-     * 
-     * @return \Symfony\Component\HttpFoundation\BinaryFileResponse
-     */
-    public function export()
-    {
-        try {
-            Log::info('SLIK Export: Memulai proses export data SLIK', [
-                'user_id' => Auth::id(),
-                'timestamp' => now(),
-                'memory_usage' => memory_get_usage(true) / 1024 / 1024 . ' MB'
-            ]);
-            
-            // Hitung total data yang akan di-export
-            $totalData = Slik::count();
-            
-            Log::info('SLIK Export: Informasi data export', [
-                'total_records' => $totalData,
-                'user_id' => Auth::id(),
-                'timestamp' => now()
-            ]);
-            
-            // Generate nama file dengan timestamp
-            $filename = 'slik_export_' . date('Y-m-d_H-i-s') . '.xlsx';
-            
-            // Proses export menggunakan SlikExport class
-            $export = Excel::download(new SlikExport(), $filename);
-            
-            Log::info('SLIK Export: Berhasil generate file export', [
-                'filename' => $filename,
-                'total_records' => $totalData,
-                'user_id' => Auth::id(),
-                'timestamp' => now(),
-                'memory_peak' => memory_get_peak_usage(true) / 1024 / 1024 . ' MB'
-            ]);
-            
-            return $export;
-            
-        } catch (\Exception $e) {
-            Log::error('SLIK Export: Gagal melakukan export data SLIK', [
-                'error' => $e->getMessage(),
-                'trace' => $e->getTraceAsString(),
-                'user_id' => Auth::id(),
-                'timestamp' => now(),
-                'memory_usage' => memory_get_usage(true) / 1024 / 1024 . ' MB'
-            ]);
-            
-            return response()->json([
-                'success' => false,
-                'message' => 'Gagal melakukan export data SLIK: ' . $e->getMessage()
-            ], 500);
-        }
-    }
-
-    /**
-     * Truncate all SLIK data
-     * 
-     * @return \Illuminate\Http\JsonResponse
-     */
-    public function truncate()
-    {
-        try {
-            DB::beginTransaction();
-            
-            Log::info('SLIK Truncate: Memulai proses truncate data SLIK', [
-                'user_id' => Auth::id(),
-                'timestamp' => now()
-            ]);
-            
-            // Truncate tabel SLIK
-            Slik::truncate();
-            
-            DB::commit();
-            
-            Log::info('SLIK Truncate: Berhasil menghapus semua data SLIK', [
-                'user_id' => Auth::id(),
-                'timestamp' => now()
-            ]);
-            
-            return response()->json([
-                'success' => true,
-                'message' => 'Semua data SLIK berhasil dihapus'
-            ]);
-            
-        } catch (\Exception $e) {
-            DB::rollback();
-            
-            Log::error('SLIK Truncate: Gagal menghapus data SLIK', [
-                'error' => $e->getMessage(),
-                'trace' => $e->getTraceAsString(),
-                'user_id' => Auth::id(),
-                'timestamp' => now()
-            ]);
-            
-            return response()->json([
-                'success' => false,
-                'message' => 'Gagal menghapus data SLIK: ' . $e->getMessage()
-            ], 500);
-        }
-    }
-}

app/Http/Controllers/SpkController.php

@@ -345,19 +345,6 @@ use Illuminate\Support\Facades\Auth;
             $content = $pdf->download()->getOriginalContent();
             Storage::put('public/'.$newFileNameWithPath,$content);
 
-            $permohonanModel = Permohonan::where('nomor_registrasi', $penawaran->nomor_registrasi)->first();
-            if ($permohonanModel) {
-                $permohonanModel->status = 'registrasi-final';
-                $permohonanModel->save();
-            }
-
-            $persetujuanPenawaran = PenawaranTender::where('id', $penawaran->id)->first();
-            if ($persetujuanPenawaran) {
-                $persetujuanPenawaran->status = 'registrasi-final';
-                $persetujuanPenawaran->save();
-            }
-
-
             $data1['status'] = 'success';
             $data1['spkpenawaran_path'] = $spkpenawaran_path;
             $data1['message']['message_success'] = array('Generate SPK PDF successfully');

app/Http/Controllers/SurveyorController.php

@@ -3,21 +3,25 @@
 namespace Modules\Lpj\Http\Controllers;
 
 use App\Http\Controllers\Controller;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Validator;
 use Maatwebsite\Excel\Facades\Excel;
 use Modules\Lpj\Exports\BasicDataSurveyorExport;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Str;
 use Barryvdh\DomPDF\Facade\Pdf;
 use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Carbon;
-use Exception;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Http\Response;
 use Modules\Lpj\Models\Debiture;
 use Modules\Lpj\Models\LaporanExternal;
 use Modules\Lpj\Models\Permohonan;
 use Modules\Lpj\Models\Branch;
+use Modules\Lpj\Models\Surveyor;
 use Modules\Lpj\Models\BentukTanah;
 use Modules\Lpj\Models\KonturTanah;
 use Modules\Location\Models\Province;
@@ -37,8 +41,17 @@ use Modules\Lpj\Models\SpekBangunan;
 use Modules\Lpj\Models\SpekKategoritBangunan;
 use Modules\Lpj\Models\SaranaPelengkap;
 use Modules\Lpj\Models\ArahMataAngin;
+use Modules\Lpj\Models\Analisa;
 use Modules\Lpj\Models\Penilaian;
 use Modules\Lpj\Models\PerkerasanJalan;
+use Modules\Lpj\Models\AnalisaFakta;
+use Modules\Lpj\Models\AnalisaLingkungan;
+use Modules\Lpj\Models\AnalisaTanahBagunan;
+use Modules\Lpj\Models\SpekBangunanAnalisa;
+use Modules\Lpj\Models\Denah;
+use Modules\Lpj\Models\FotoJaminan;
+use Modules\Lpj\Models\Lingkungan;
+use Modules\Lpj\Models\LantaiUnit;
 use Modules\Lpj\Models\Teams;
 use Modules\Lpj\Models\Lantai;
 use Modules\Lpj\Models\Inspeksi;
@@ -49,24 +62,29 @@ use Modules\Lpj\Models\PosisiUnit;
 use Modules\Lpj\Models\TerletakArea;
 use Modules\Lpj\Models\FasilitasObjek;
 use Modules\Lpj\Models\MerupakanDaerah;
+use Modules\Lpj\Models\ObjekJaminan;
 use Modules\Lpj\Models\ModelAlatBerat;
 use Modules\Lpj\Models\JenisPesawat;
 use Modules\Lpj\Models\DokumenJaminan;
 use Modules\Lpj\Models\DetailDokumenJaminan;
 use Modules\Lpj\Models\JenisKapal;
 use Modules\Lpj\Models\JenisKendaraan;
+use Modules\Lpj\Models\RuteJaminan;
 use Modules\Lpj\Models\HubunganPemilikJaminan;
 use Modules\Lpj\Models\HubunganPenghuniJaminan;
+use Modules\Lpj\Models\AnalisaUnit;
 use Modules\Lpj\Models\GolonganMasySekitar;
 use Modules\Lpj\Models\TingkatKeramaian;
 use Modules\Lpj\Models\TujuanPenilaian;
 use Modules\Lpj\Models\LaluLintasLokasi;
+use Modules\Lpj\Models\SpekBagunanAnalisaDetail;
 use Modules\Lpj\Http\Requests\SurveyorRequest;
+use Modules\Lpj\Http\Requests\FormSurveyorRequest;
 use Modules\Lpj\Jobs\SendJadwalKunjunganEmailJob;
+use App\Helpers\Lpj;
 use Modules\Lpj\Models\Authorization;
 use Modules\Lpj\Services\SurveyorValidateService;
 use Modules\Lpj\Services\SaveFormInspesksiService;
-use Modules\Lpj\Models\PermohonanHistory;
 
 class SurveyorController extends Controller
 {
@@ -108,9 +126,6 @@ class SurveyorController extends Controller
         $provinces = Province::all();
         $bentukTanah = BentukTanah::all();
 
-        // Jalankan cleanup inspeksi otomatis untuk permohonan ini
-        $this->cleanupInspeksiData($id);
-
         // Get all inspeksi data for this permohonan
         if (strtolower($permohonan->tujuanPenilaian->name) == 'rap') {
             $inspeksiData = Inspeksi::where('permohonan_id', $id)
@@ -136,17 +151,13 @@ class SurveyorController extends Controller
             });
         }
 
-        $catatan_revisi_survey = PermohonanHistory::where('permohonan_id', $id)
-           ->where('status', 'revisi-survey')->latest()->first();
-
         return view('lpj::surveyor.detail', compact(
             'permohonan',
             'surveyor',
             'branches',
             'provinces',
             'bentukTanah',
-            'inspeksiData',
-            'catatan_revisi_survey',
+            'inspeksiData'
         ));
     }
 
@@ -242,7 +253,7 @@ class SurveyorController extends Controller
                 ], 200);
 
             } catch (\Exception $e) {
-                Log::error('Denah Store Error: ' . $e->getMessage());
+                \Log::error('Denah Store Error: ' . $e->getMessage());
                 return response()->json([
                     'success' => false,
                     'message' => 'Gagal menyimpan data: ' . $e->getMessage()
@@ -783,12 +794,12 @@ class SurveyorController extends Controller
             ]);
 
 
-            if (in_array(strtolower($permohonan->jenisPenilaian->name), ['external', 'eksternal'])) {
+            if ($permohonan->jenisPenilaian->name == "External") {
                 LaporanExternal::updateOrCreate(
                     ['permohonan_id' => $permohonan->id],
                     [
                         'nomor_laporan'   => $permohonan->nomor_registrasi,
-                        'tgl_final_laporan' => now(),
+                        'tanggal_laporan' => now(),
                         'created_by'      => Auth::id(),
                     ]
                 );
@@ -1068,7 +1079,7 @@ class SurveyorController extends Controller
             return null;
 
         } catch (\Exception $e) {
-            Log::error('File upload error: ' . $e->getMessage());
+            \Log::error('File upload error: ' . $e->getMessage());
             throw new \Exception("Gagal mengupload file: " . $e->getMessage());
         }
     }
@@ -1385,11 +1396,6 @@ class SurveyorController extends Controller
     }
     public function storeDataPembanding(Request $request)
     {
-        $request->merge([
-            'kordinat_lat' => $request->get('kordinat_lat') ? str_replace(',', '', $request->get('kordinat_lat')) : null,
-            'kordinat_lng' => $request->get('kordinat_lng') ? str_replace(',', '', $request->get('kordinat_lng')) : null,
-        ]);
-
         try {
             DB::beginTransaction();
 
@@ -1550,11 +1556,11 @@ class SurveyorController extends Controller
     {
 
         $validated = $request->validate([
-            'documentId' => 'required',
+            'dokument' => 'required',
             'jenis_jaminan' => 'required'
         ]);
 
-        $dokumentId = $validated['documentId'];
+        $dokumentId = $validated['dokument'];
         $jaminanId = $validated['jenis_jaminan'];
 
         $permohonan = $this->getPermohonanJaminanId($id, $dokumentId, $jaminanId);
@@ -1638,11 +1644,11 @@ class SurveyorController extends Controller
     public function denah(Request $request, $id)
     {
         $validated = $request->validate([
-          'documentId' => 'required',
+          'dokument' => 'required',
           'jenis_jaminan' => 'required'
         ]);
 
-        $dokumentId = $validated['documentId'];
+        $dokumentId = $validated['dokument'];
         $jaminanId = $validated['jenis_jaminan'];
 
         $permohonan = $this->getPermohonanJaminanId($id, $dokumentId, $jaminanId);
@@ -1666,11 +1672,11 @@ class SurveyorController extends Controller
     public function foto(Request $request, $id)
     {
         $validated = $request->validate([
-            'documentId' => 'required',
+            'dokument' => 'required',
             'jenis_jaminan' => 'required'
         ]);
 
-        $dokumentId = $validated['documentId'];
+        $dokumentId = $validated['dokument'];
         $jaminanId = $validated['jenis_jaminan'];
         $fotoObjekJaminan = FotoObjekJaminan::all();
 
@@ -1701,11 +1707,11 @@ class SurveyorController extends Controller
             // Ambil data permohonan dengan eager loading
 
             $validated = $request->validate([
-                'documentId' => 'required',
+                'dokument' => 'required',
                 'jenis_jaminan' => 'required'
             ]);
 
-            $dokumentId = $validated['documentId'];
+            $dokumentId = $validated['dokument'];
             $jaminanId = $validated['jenis_jaminan'];
 
             $permohonan = $this->getPermohonanJaminanId($id, $dokumentId, $jaminanId);
@@ -1841,10 +1847,10 @@ class SurveyorController extends Controller
                 return redirect()
                     ->route('basicdata.' . $type . '.index')
                     ->with('success', 'created successfully');
-            } catch (\Exception $e) {
+            } catch (Exeception $e) {
                 return redirect()
                     ->route('basicdata.' . $type . '.index')
-                    ->with('error', $e->getMessage());
+                    ->with('error', $th->getMessage());
             }
         }
     }
@@ -2110,7 +2116,7 @@ class SurveyorController extends Controller
 
     public function dataForDatatablesData(Request $request, $type)
     {
-        if (is_null(Auth::user()) || !$this->user->can('jenis_aset.view')) {
+        if (is_null(auth()->user()) || !$this->user->can('jenis_aset.view')) {
             //abort(403, 'Sorry! You are not allowed to view users.');
         }
 
@@ -2150,7 +2156,7 @@ class SurveyorController extends Controller
         if (array_key_exists($type, $models)) {
             $query = $models[$type]::query();
         } else {
-            throw new \InvalidArgumentException("Invalid type: $type");
+            throw new InvalidArgumentException("Invalid type: $type");
         }
 
         if ($request->has('search') && !empty($request->get('search'))) {
@@ -2223,9 +2229,9 @@ class SurveyorController extends Controller
             $model = $modelClass::findOrFail($id);
             $model->delete();
             return response()->json(['success' => true, 'message' => 'deleted successfully']);
-        } catch (\Illuminate\Database\Eloquent\ModelNotFoundException $e) {
+        } catch (ModelNotFoundException $e) {
             return response()->json(['success' => false, 'message' => 'not found.'], 404);
-        } catch (\Exception $e) {
+        } catch (Exception $e) {
             return response()->json(['success' => false, 'message' => 'Failed to delete.'], 500);
         }
     }
@@ -2381,14 +2387,14 @@ class SurveyorController extends Controller
                 $path = $file->storeAs("public/surveyor/{$request->type}", $fileName);
 
                 if ($path === false) {
-                    throw new \Exception("Failed to store file for {$fileKey}");
+                    throw new Exception("Failed to store file for {$fileKey}");
                 }
                 if (isset($data[$fileKey]) && $data[$fileKey]) {
                     $this->deleteFile($data[$fileKey]);
                 }
                 return str_replace('public/', '', $path);
             } else {
-                throw new \Exception("Invalid file upload for {$fileKey}");
+                throw new Exception("Invalid file upload for {$fileKey}");
             }
         } elseif (isset($data[$fileKey]) && $data[$fileKey]) {
             return $data[$fileKey];
@@ -2417,14 +2423,14 @@ class SurveyorController extends Controller
     public function uploadFile($file, $type)
     {
         if (!$file->isValid()) {
-            throw new \Exception("Invalid file upload for {$type}");
+            throw new Exception("Invalid file upload for {$type}");
         }
 
         $fileName = time() . '_' . $file->getClientOriginalName();
         $path = $file->storeAs("public/surveyor/{$type}", $fileName);
 
         if ($path === false) {
-            throw new \Exception("Failed to store file for {$type}");
+            throw new Exception("Failed to store file for {$type}");
         }
 
         return str_replace('public/', '', $path);
@@ -2874,10 +2880,9 @@ class SurveyorController extends Controller
                 $inspeksi->data_form = json_encode($existingData);
                 $inspeksi->save();
             } else {
-                Inspeksi::updateOrCreate([
+                Inspeksi::create([
                     'permohonan_id' => $request->input('permohonan_id'),
-                    'dokument_id' => $request->input('document_id')
-                ],[
+                    'dokument_id' => $request->input('document_id'),
                     'data_form' => json_encode($existingData),
                 ]);
             }
@@ -2898,99 +2903,5 @@ class SurveyorController extends Controller
         ]);
     }
 
-    /**
-     * Fungsi untuk cleanup data inspeksi otomatis
-     * Menghapus data inspeksi tanpa dokument_id jika ada data lain dengan dokument_id yang sama
-     */
-    private function cleanupInspeksiData($permohonanId)
-    {
-        try {
-            Log::info('SurveyorController: Memulai cleanup inspeksi otomatis', [
-                'permohonan_id' => $permohonanId,
-                'user_id' => Auth::id()
-            ]);
-
-            // Ambil data inspeksi yang memiliki dokument_id (data lengkap)
-            $dataWithDokument = Inspeksi::where('permohonan_id', $permohonanId)
-                ->whereNotNull('dokument_id')
-                ->whereNull('deleted_at')
-                ->get();
-
-            // Ambil data inspeksi yang tidak memiliki dokument_id (data yang akan di-cleanup)
-            $dataWithoutDokument = Inspeksi::where('permohonan_id', $permohonanId)
-                ->whereNull('dokument_id')
-                ->whereNull('deleted_at')
-                ->get();
-
-            // Jika ada data tanpa dokument_id, cek apakah ada data dengan dokument_id yang sama
-            if ($dataWithoutDokument->isNotEmpty() && $dataWithDokument->isNotEmpty()) {
-                
-                // Group data dengan dokument_id by created_by
-                $groupedDataWithDokument = $dataWithDokument->groupBy('created_by');
-                
-                // Group data tanpa dokument_id by created_by
-                $groupedDataWithoutDokument = $dataWithoutDokument->groupBy('created_by');
-
-                // Proses cleanup untuk setiap user
-                foreach ($groupedDataWithDokument as $userId => $userDataWithDokument) {
-                    
-                    // Cek apakah user ini juga memiliki data tanpa dokument_id
-                    if (isset($groupedDataWithoutDokument[$userId])) {
-                        
-                        // Ambil salah satu data dengan dokument_id sebagai referensi untuk logging
-                        $referenceData = $userDataWithDokument->first();
-                        
-                        Log::info('SurveyorController: Menemukan data lengkap untuk user, akan menghapus data tidak lengkap', [
-                            'user_id' => $userId,
-                            'permohonan_id' => $permohonanId,
-                            'reference_dokument_id' => $referenceData->dokument_id,
-                            'data_count_to_delete' => $groupedDataWithoutDokument[$userId]->count()
-                        ]);
-                        
-                        // Ambil semua data tanpa dokument_id untuk user ini
-                        $userDataWithoutDokument = $groupedDataWithoutDokument[$userId];
-
-                        // Soft delete data tanpa dokument_id
-                        foreach ($userDataWithoutDokument as $dataToDelete) {
-                            DB::beginTransaction();
-                            try {
-                                // Soft delete data
-                                $dataToDelete->delete();
-                                
-                                Log::info('SurveyorController: Data inspeksi berhasil di-soft delete', [
-                                    'id' => $dataToDelete->id,
-                                    'permohonan_id' => $dataToDelete->permohonan_id,
-                                    'dokument_id' => $dataToDelete->dokument_id,
-                                    'created_by' => $dataToDelete->created_by,
-                                    'deleted_at' => now()
-                                ]);
-
-                                DB::commit();
-                            } catch (\Exception $e) {
-                                DB::rollback();
-                                Log::error('SurveyorController: Gagal menghapus data inspeksi', [
-                                    'id' => $dataToDelete->id,
-                                    'error' => $e->getMessage()
-                                ]);
-                            }
-                        }
-                    }
-                }
-            }
-
-            Log::info('SurveyorController: Cleanup inspeksi otomatis selesai', [
-                'permohonan_id' => $permohonanId,
-                'data_with_dokument' => $dataWithDokument->count(),
-                'data_without_dokument' => $dataWithoutDokument->count()
-            ]);
-
-        } catch (\Exception $e) {
-            Log::error('SurveyorController: Error saat cleanup inspeksi otomatis', [
-                'permohonan_id' => $permohonanId,
-                'error' => $e->getMessage(),
-                'trace' => $e->getTraceAsString()
-            ]);
-        }
-    }
 
 }

app/Http/Requests/CategoryDaftarPustakaRequest.php

@@ -1,33 +0,0 @@
-<?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/DaftarPustakaRequest.php

@@ -1,38 +0,0 @@
-<?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/NilaiPlafondRequest.php

@@ -14,7 +14,6 @@
         {
             $rules = [
                 'name' => 'required|max:255',
-                'biaya' => 'nullable|numeric|min:0',
             ];
 
             if ($this->method() == 'PUT') {

app/Http/Requests/NocRequest.php

@@ -52,7 +52,7 @@
         private function getBasicInfoRules()
         {
             return [
-                'permohonan_id'            => 'nullable|exists:permohonan,id',
+                'permohonan_id'            => 'required|exists:permohonan,id',
                 'persetujuan_penawaran_id' => 'required|exists:persetujuan_penawaran,id',
                 'status'                   => 'nullable|boolean',
                 'created_by'               => 'nullable|exists:users,id',
@@ -72,16 +72,10 @@
             return [
                 'total_harus_bayar'  => 'nullable|numeric|min:0',
                 'nominal_bayar'      => 'nullable|numeric|min:0',
-                'total_pembukuan'    => 'nullable|numeric|min:0',
                 'bukti_ksl'          => $fileRule,
                 'bukti_bayar'        => $fileRule,
                 'status_bayar'       => 'nullable|boolean',
                 'tanggal_pembayaran' => 'nullable|date',
-                'status_kurang_bayar' => 'nullable|boolean',
-                'status_lebih_bayar' => 'nullable|boolean',
-                'nominal_kurang_bayar' => 'nullable|numeric|min:0',
-                'nominal_lebih_bayar' => 'nullable|numeric|min:0',
-                'bukti_pengembalian' => 'nullable|file|mimes:pdf,jpg,jpeg,png|max:2048',
             ];
         }
 
@@ -95,16 +89,12 @@
             $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',
-                'nomor_tiket'                => 'nullable|string',
-                'nomor_rekening_lebih_bayar' => 'nullable|string',
-                'bukti_ksl_lebih_bayar'      => 'nullable|string',
-                'bukti_ksl_kurang_bayar'     => 'nullable|string'
+                'nominal_penyelesaian' => 'nullable|numeric|min:0',
+                'status_penyelesaian'  => 'nullable|boolean',
+                'tanggal_penyelesaian' => 'nullable|date',
+                'bukti_penyelesaian'   => $fileRule,
+                'memo_penyelesaian'    => $fileRule,
+                'catatan_noc'          => 'nullable|string',
             ];
         }
 
@@ -130,6 +120,7 @@
         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',
@@ -157,11 +148,6 @@
                 'authorized_status.boolean'         => 'Status Otorisasi harus berupa boolean',
                 'authorized_at.date'                => 'Format Tanggal Otorisasi tidak valid',
                 'authorized_by.exists'              => 'User Otorisasi tidak valid',
-                'status_kurang_bayar.boolean'       => 'Status Kurang Bayar harus berupa boolean',
-                'status_lebih_bayar.boolean'        => 'Status Lebih Bayar harus berupa boolean',
-                'nominal_kurang_bayar.numeric'      => 'Nominal Kurang Bayar harus berupa angka',
-                'nominal_kurang_bayar.min'          => 'Nominal Kurang Bayar minimal 0',
-                'nominal_lebih_bayar.numeric'       => 'Nominal Lebih Bayar harus berupa angka',
             ];
         }
     }

app/Http/Requests/PermohonanRequest.php

@@ -48,6 +48,7 @@
                     ),
                     'tanggal_permohonan' => date('Y-m-d'),
                     'user_id'            => auth()->user()->id,
+                    'branch_id'          => auth()->user()->branch_id,
                     'status'             => 'order'
                 ]);
             }

app/Http/Requests/PersetujuanPenawaranRequest.php

@@ -14,54 +14,49 @@
         public function rules()
         {
             return [
-            'permohonan_id'              => 'nullable|exists:permohonan,id',
-            'penawaran_id'               => 'nullable|exists:penawaran,id',
-            'nomor_proposal_penawaran'   => 'nullable|string|max:255',
-            'nomor_tiket'                => 'nullable|string|max:100',
-            'nominal_kurang_bayar'       => 'nullable|string|max:100',
-            'bukti_ksl_kurang_bayar'     => 'nullable|file|mimes:pdf,doc,docx|max:10240',
-            'tanggal_proposal_penawaran' => 'nullable|date',
-            'biaya_final'                => 'nullable|numeric|min:0',
-            'sla_resume'                 => 'nullable|numeric|min:0',
-            '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',
-            'status'                     => 'nullable|boolean',
-            'authorized_status'          => 'boolean',
-            'authorized_at'              => 'nullable|date',
-            'authorized_by'              => 'nullable|exists:users,id',
-            'catatan'                    => 'nullable|string',
-        ];
+                'permohonan_id'              => 'nullable|exists:permohonan,id',
+                'penawaran_id'               => 'nullable|exists:penawaran,id',
+                'nomor_proposal_penawaran'   => 'nullable|string|max:255',
+                'tanggal_proposal_penawaran' => 'nullable|date',
+                'biaya_final'                => 'nullable|numeric|min:0',
+                'sla_resume'                 => 'nullable|numeric|min:0',
+                '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',
+                'status'                     => 'nullable|boolean',
+                'authorized_status'          => 'boolean',
+                'authorized_at'              => 'nullable|date',
+                'authorized_by'              => 'nullable|exists:users,id',
+                'catatan'                    => 'nullable|string',
+            ];
         }
 
         public function messages()
         {
             return [
-            'penawaran_id.required'               => 'Penawaran ID wajib diisi.',
-            'penawaran_id.exists'                 => 'Penawaran ID tidak valid.',
-            'nomor_proposal_penawaran.required'   => 'Nomor proposal penawaran wajib diisi.',
-            'nomor_tiket.string'                  => 'Nomor tiket harus berupa teks.',
-            'nomor_tiket.max'                     => 'Nomor tiket tidak boleh lebih dari 100 karakter.',
-            'tanggal_proposal_penawaran.required' => 'Tanggal proposal penawaran wajib diisi.',
-            'tanggal_proposal_penawaran.date'     => 'Tanggal proposal penawaran harus berupa tanggal yang valid.',
-            'biaya_final.required'                => 'Biaya final wajib diisi.',
-            'biaya_final.numeric'                 => 'Biaya final harus berupa angka.',
-            'biaya_final.min'                     => 'Biaya final tidak boleh kurang dari 0.',
-            'sla_resume.required'                 => 'SLA Resume wajib diisi.',
-            'sla_final.required'                  => 'SLA Final wajib diisi.',
-            'file_persetujuan_penawaran.file'     => 'File Persetujuan Penawaran harus berupa file.',
-            'file_persetujuan_penawaran.mimes'    => 'File Persetujuan Penawaran harus berupa file PDF, DOC, atau DOCX.',
-            'file_persetujuan_penawaran.max'      => 'Ukuran File Persetujuan Penawaran tidak boleh lebih dari 10MB.',
-            '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.',
-            'region_id.required'                  => 'Region ID wajib diisi.',
-            'region_id.exists'                    => 'Region ID tidak valid.',
-            'status.required'                     => 'Status wajib diisi.',
-            'status.boolean'                      => 'Status harus berupa nilai boolean.',
-            '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.',
-        ];
+                'penawaran_id.required'               => 'Penawaran ID wajib diisi.',
+                'penawaran_id.exists'                 => 'Penawaran ID tidak valid.',
+                'nomor_proposal_penawaran.required'   => 'Nomor proposal penawaran wajib diisi.',
+                'tanggal_proposal_penawaran.required' => 'Tanggal proposal penawaran wajib diisi.',
+                'tanggal_proposal_penawaran.date'     => 'Tanggal proposal penawaran harus berupa tanggal yang valid.',
+                'biaya_final.required'                => 'Biaya final wajib diisi.',
+                'biaya_final.numeric'                 => 'Biaya final harus berupa angka.',
+                'biaya_final.min'                     => 'Biaya final tidak boleh kurang dari 0.',
+                'sla_resume.required'                 => 'SLA Resume wajib diisi.',
+                'sla_final.required'                  => 'SLA Final wajib diisi.',
+                'file_persetujuan_penawaran.file'     => 'File Persetujuan Penawaran harus berupa file.',
+                'file_persetujuan_penawaran.mimes'    => 'File Persetujuan Penawaran harus berupa file PDF, DOC, atau DOCX.',
+                'file_persetujuan_penawaran.max'      => 'Ukuran File Persetujuan Penawaran tidak boleh lebih dari 10MB.',
+                '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.',
+                'region_id.required'                  => 'Region ID wajib diisi.',
+                'region_id.exists'                    => 'Region ID tidak valid.',
+                'status.required'                     => 'Status wajib diisi.',
+                'status.boolean'                      => 'Status harus berupa nilai boolean.',
+                '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.',
+            ];
         }
     }

app/Imports/BucokImport.php

@@ -1,341 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Imports;
-
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Validator;
-use Maatwebsite\Excel\Concerns\ToCollection;
-use Maatwebsite\Excel\Concerns\WithStartRow;
-use Maatwebsite\Excel\Concerns\WithValidation;
-use Maatwebsite\Excel\Concerns\WithBatchInserts;
-use Maatwebsite\Excel\Concerns\WithChunkReading;
-use Modules\Lpj\Models\Bucok;
-use Carbon\Carbon;
-use Exception;
-
-  /**
- * Kelas untuk mengimpor data Excel ke tabel bucoks
- * Menggunakan Laravel Excel dengan validasi dan batch processing
- * Data dimulai dari baris ke-5 tanpa header
- */
-class BucokImport implements ToCollection, WithStartRow, WithValidation, WithBatchInserts, WithChunkReading
-{
-    private $importedCount = 0;
-    private $skippedCount  = 0;
-    private $createdCount  = 0;
-    private $updatedCount  = 0;
-    private $errors        = [];
-
-      /**
-     * Menentukan baris mulai membaca data (baris ke-5)
-     *
-     * @return int
-     */
-    public function startRow(): int
-    {
-        return 5;
-    }
-
-      /**
-     * Memproses koleksi data dari Excel
-     *
-     * @param Collection $collection
-     * @return void
-     */
-    public function collection(Collection $collection)
-    {
-        DB::beginTransaction();
-
-        try {
-            foreach ($collection as $rowIndex => $row) {
-                  // Log setiap baris yang diproses
-                Log::info('Processing Bucok import row', [
-                    'row_number' => $rowIndex + 5,   // +5 karena mulai dari baris 5
-                    'row_data'   => $row->toArray()
-                ]);
-
-                  // Konversi row ke array dengan indeks numerik
-                $rowArray = $row->toArray();
-
-                  // Skip baris kosong
-                if (empty(array_filter($rowArray))) {
-                    continue;
-                }
-
-                  // Validasi data baris
-                $mappedData = $this->mapRowToBucok($rowArray, $rowIndex + 5);
-
-                  // Update atau create berdasarkan nomor_tiket
-                if (!empty($mappedData['nomor_tiket'])) {
-                      // Update atau create berdasarkan nomor_tiket
-                    $bucok = Bucok::updateOrCreate(
-                        ['nomor_tiket' => $mappedData['nomor_tiket']],            // Kondisi pencarian
-                        array_merge($mappedData, ['updated_by' => auth()->id()])  // Data yang akan diupdate/create
-                    );
-
-                      // Log dan tracking apakah data di-update atau di-create
-                    if ($bucok->wasRecentlyCreated) {
-                        $this->createdCount++;
-                        Log::info('Bucok created successfully', [
-                            'row_number'  => $rowIndex + 5,
-                            'nomor_tiket' => $mappedData['nomor_tiket'],
-                            'action'      => 'created'
-                        ]);
-                    } else {
-                        $this->updatedCount++;
-                        Log::info('Bucok updated successfully', [
-                            'row_number'  => $rowIndex + 5,
-                            'nomor_tiket' => $mappedData['nomor_tiket'],
-                            'action'      => 'updated'
-                        ]);
-                    }
-                }
-
-                $this->importedCount++;
-            }
-
-            DB::commit();
-
-              // Log summary
-            Log::info('Bucok import completed', [
-                'imported'     => $this->importedCount,
-                'skipped'      => $this->skippedCount,
-                'total_errors' => count($this->errors)
-            ]);
-
-        } catch (Exception $e) {
-            DB::rollback();
-            Log::error('Bucok import failed', ['error' => $e->getMessage()]);
-            throw $e;
-        }
-    }
-
-      /**
-     * Mapping data Excel berdasarkan indeks kolom ke struktur model Bucok
-     * Kolom dimulai dari indeks 0 (A=0, B=1, C=2, dst.)
-     *
-     * @param array $row
-     * @param int $rowNumber
-     * @return array
-     */
-    private function mapRowToBucok(array $row, int $rowNumber): array
-    {
-        return [
-            'no'                     => $row[0] ?? null,                                        // Kolom A
-            'tanggal'                => !empty($row[1]) ? $this->parseDate($row[1]) : null,     // Kolom B
-            'bulan'                  => $row[2] ?? null,                                        // Kolom C
-            'tahun'                  => $row[3] ?? null,                                        // Kolom D
-            'tanggal_penuh'          => !empty($row[4]) ? $this->parseDate($row[4]) : null,     // Kolom E
-            'nomor_categ'            => $row[5] ?? null,                                        // Kolom F
-            'coa_summary'            => $row[6] ?? null,                                        // Kolom G
-            'nomor_coa'              => $row[7] ?? null,                                        // Kolom H
-            'nama_coa'               => $row[8] ?? null,                                        // Kolom I
-            'nomor_tiket'            => $row[9] ?? null,                                        // Kolom J - Auto-generate jika kosong
-            'deskripsi'              => $row[10] ?? null,                                       // Kolom K
-            'nominal'                => $this->parseNumeric($row[11] ?? 0),                     // Kolom L
-            'penyelesaian'           => $row[12] ?? 'Belum Selesai',                            // Kolom M
-            'umur_aging'             => $this->parseNumeric($row[13] ?? 0),                     // Kolom N
-            'cost_center'            => $row[14] ?? null,                                       // Kolom O
-            'nama_sub_direktorat'    => $row[15] ?? null,                                       // Kolom P
-            'nama_direktorat_cabang' => $row[16] ?? null,                                       // Kolom Q
-            'tanggal_penyelesaian'   => !empty($row[17]) ? $this->parseDate($row[17]) : null,   // Kolom R
-            'nominal_penyelesaian'   => $this->parseNumeric($row[18] ?? 0),                     // Kolom S
-            'nominal_berjalan'       => $this->parseNumeric($row[19] ?? 0),                     // Kolom T
-            'amortisasi_berjalan'    => $this->parseNumeric($row[20] ?? 0),                     // Kolom U
-            'sistem_berjalan'        => $this->parseNumeric($row[21] ?? 0),                     // Kolom V
-            'lainnya_berjalan'       => $this->parseNumeric($row[22] ?? 0),                     // Kolom W
-            'nominal_gantung'        => $this->parseNumeric($row[23] ?? 0),                     // Kolom X
-            'aset_gantung'           => $this->parseNumeric($row[24] ?? 0),                     // Kolom Y
-            'keterangan_gantung'     => $row[25] ?? null,                                       // Kolom Z
-            'lainnya_satu'           => $row[26] ?? null,                                       // Kolom AA
-            'lainnya_dua'            => $row[27] ?? null,                                       // Kolom AB
-            'created_by'             => auth()->id(),
-            'updated_by'             => auth()->id()
-        ];
-    }
-
-      /**
-     * Parse tanggal dari berbagai format
-     *
-     * @param mixed $dateValue
-     * @return Carbon|null
-     */
-    private function parseDate($dateValue)
-    {
-        if (empty($dateValue)) {
-            return null;
-        }
-
-        try {
-              // Jika berupa angka Excel date serial
-            if (is_numeric($dateValue)) {
-                return Carbon::createFromFormat('Y-m-d', \PhpOffice\PhpSpreadsheet\Shared\Date::excelToDateTimeObject($dateValue)->format('Y-m-d'));
-            }
-
-              // Jika berupa string tanggal
-            return Carbon::parse($dateValue);
-        } catch (Exception $e) {
-            Log::warning('Failed to parse date', ['value' => $dateValue, 'error' => $e->getMessage()]);
-            return null;
-        }
-    }
-
-      /**
-     * Parse nilai numerik dari berbagai format
-     *
-     * @param mixed $numericValue
-     * @return float
-     */
-    private function parseNumeric($numericValue): float
-    {
-        if (empty($numericValue)) {
-            return 0;
-        }
-
-          // Hapus karakter non-numerik kecuali titik dan koma
-        $cleaned = preg_replace('/[^0-9.,\-]/', '', $numericValue);
-
-          // Ganti koma dengan titik untuk decimal
-        $cleaned = str_replace(',', '.', $cleaned);
-
-        return (float) $cleaned;
-    }
-
-      /**
-     * Validasi data yang sudah dimapping
-     *
-     * @param array $data
-     * @return \Illuminate\Validation\Validator
-     */
-    private function validateMappedData(array $data)
-    {
-        return Validator::make($data, [
-            'no'                     => 'nullable|integer',
-            'tanggal'                => 'nullable|date',
-            'bulan'                  => 'nullable|integer|between:1,12',
-            'tahun'                  => 'nullable|integer|min:2000|max:2099',
-            'tanggal_penuh'          => 'nullable|date',
-            'nomor_categ'            => 'nullable|string|max:50',
-            'coa_summary'            => 'nullable|string|max:255',
-            'nomor_coa'              => 'nullable|string|max:50',
-            'nama_coa'               => 'nullable|string|max:255',
-            'nomor_tiket'            => 'nullable|string|max:50',
-            'deskripsi'              => 'nullable|string',
-            'nominal'                => 'nullable|numeric|min:0',
-            'penyelesaian'           => 'nullable|in:Selesai,Belum Selesai,Dalam Proses',
-            'umur_aging'             => 'nullable|integer|min:0',
-            'cost_center'            => 'nullable|string|max:100',
-            'nama_sub_direktorat'    => 'nullable|string|max:255',
-            'nama_direktorat_cabang' => 'nullable|string|max:255',
-            'tanggal_penyelesaian'   => 'nullable|date',
-            'nominal_penyelesaian'   => 'nullable|numeric|min:0',
-            'nominal_berjalan'       => 'nullable|numeric|min:0',
-            'amortisasi_berjalan'    => 'nullable|numeric|min:0',
-            'sistem_berjalan'        => 'nullable|numeric|min:0',
-            'lainnya_berjalan'       => 'nullable|numeric|min:0',
-            'nominal_gantung'        => 'nullable|numeric|min:0',
-            'aset_gantung'           => 'nullable|numeric|min:0',
-            'keterangan_gantung'     => 'nullable|string',
-            'lainnya_satu'           => 'nullable|string',
-            'lainnya_dua'            => 'nullable|string'
-        ]);
-    }
-
-      /**
-     * Aturan validasi untuk seluruh file Excel (tidak digunakan karena tanpa header)
-     *
-     * @return array
-     */
-    public function rules(): array
-    {
-        return [];
-    }
-
-      /**
-     * Ukuran batch untuk insert
-     *
-     * @return int
-     */
-    public function batchSize(): int
-    {
-        return 100;
-    }
-
-      /**
-     * Ukuran chunk untuk membaca file
-     *
-     * @return int
-     */
-    public function chunkSize(): int
-    {
-        return 100;
-    }
-
-      /**
-     * Mendapatkan jumlah data yang berhasil diimpor
-     *
-     * @return int
-     */
-    public function getImportedCount(): int
-    {
-        return $this->importedCount;
-    }
-
-      /**
-     * Mendapatkan jumlah data yang berhasil dibuat
-     *
-     * @return int
-     */
-    public function getCreatedCount(): int
-    {
-        return $this->createdCount;
-    }
-
-      /**
-     * Mendapatkan jumlah data yang berhasil diupdate
-     *
-     * @return int
-     */
-    public function getUpdatedCount(): int
-    {
-        return $this->updatedCount;
-    }
-
-      /**
-     * Mendapatkan statistik lengkap import
-     *
-     * @return array
-     */
-    public function getImportStatistics(): array
-    {
-        return [
-            'total_processed' => $this->importedCount,
-            'created'         => $this->createdCount,
-            'updated'         => $this->updatedCount,
-            'skipped'         => $this->skippedCount,
-            'errors'          => count($this->errors)
-        ];
-    }
-
-      /**
-     * Mendapatkan jumlah data yang dilewati
-     *
-     * @return int
-     */
-    public function getSkippedCount(): int
-    {
-        return $this->skippedCount;
-    }
-
-      /**
-     * Mendapatkan daftar error yang terjadi
-     *
-     * @return array
-     */
-    public function getErrors(): array
-    {
-        return $this->errors;
-    }
-}

app/Imports/SlikImport.php

@@ -1,415 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Imports;
-
-use Modules\Lpj\Models\Slik;
-use Illuminate\Support\Collection;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-use Maatwebsite\Excel\Concerns\ToCollection;
-use Maatwebsite\Excel\Concerns\WithStartRow;
-use Maatwebsite\Excel\Concerns\WithChunkReading;
-use Maatwebsite\Excel\Concerns\WithBatchInserts;
-use Maatwebsite\Excel\Concerns\WithCustomCsvSettings;
-
-
-/**
- * Class SlikImport
- *
- * Handle import data Excel untuk modul Slik
- * Menggunakan Laravel Excel package untuk membaca file Excel
- * dengan optimasi memory dan chunk processing
- *
- * @package Modules\Lpj\app\Imports
- */
-class SlikImport implements ToCollection, WithStartRow, WithBatchInserts, WithChunkReading, WithCustomCsvSettings
-{
-    /**
-     * Mulai membaca dari baris ke-5 (skip header)
-     *
-     * @return int
-     */
-    public function startRow(): int
-    {
-        return 5;
-    }
-
-    /**
-     * Batch size untuk insert data dari konfigurasi
-     *
-     * @return int
-     */
-    public function batchSize(): int
-    {
-        return config('import.slik.batch_size', 50);
-    }
-
-    /**
-     * Chunk size untuk membaca file dari konfigurasi
-     *
-     * @return int
-     */
-    public function chunkSize(): int
-    {
-        return config('import.slik.chunk_size', 50);
-    }
-
-    /**
-     * Custom CSV settings untuk optimasi pembacaan file
-     *
-     * @return array
-     */
-    public function getCsvSettings(): array
-    {
-        return [
-            'input_encoding' => 'UTF-8',
-            'delimiter' => ',',
-            'enclosure' => '"',
-            'escape_character' => '\\',
-        ];
-    }
-
-    /**
-     * Process collection data dari Excel dengan optimasi memory
-     *
-     * @param Collection $collection
-     * @return void
-     */
-    public function collection(Collection $collection)
-    {
-        // Set memory limit dari konfigurasi
-        $memoryLimit = config('import.slik.memory_limit', 1024);
-        $currentMemoryLimit = ini_get('memory_limit');
-
-        if ($currentMemoryLimit !== '-1' && $this->convertToBytes($currentMemoryLimit) < $memoryLimit * 1024 * 1024) {
-            ini_set('memory_limit', $memoryLimit . 'M');
-        }
-
-        // Set timeout handler
-        $timeout = config('import.slik.timeout', 1800);
-        set_time_limit($timeout);
-
-        // Force garbage collection sebelum memulai
-        if (config('import.slik.enable_gc', true)) {
-            gc_collect_cycles();
-        }
-
-        Log::info('SlikImport: Memulai import data', [
-            'total_rows' => $collection->count(),
-            'memory_usage' => memory_get_usage(true),
-            'memory_peak' => memory_get_peak_usage(true),
-            'memory_limit' => ini_get('memory_limit'),
-            'php_version' => PHP_VERSION,
-            'memory_limit_before' => $currentMemoryLimit,
-            'config' => [
-                'memory_limit' => $memoryLimit,
-                'chunk_size' => $this->chunkSize(),
-                'batch_size' => $this->batchSize()
-            ]
-        ]);
-
-        DB::beginTransaction();
-
-        try {
-            $processedRows = 0;
-            $skippedRows = 0;
-            $errorRows = 0;
-            $totalRows = $collection->count();
-
-            foreach ($collection as $index => $row) {
-                // Log progress setiap 25 baris untuk chunk lebih kecil
-                if ($index % 25 === 0) {
-                    Log::info('SlikImport: Processing chunk', [
-                        'current_row' => $index + 5,
-                        'progress' => round(($index / max($totalRows, 1)) * 100, 2) . '%',
-                        'processed' => $processedRows,
-                        'skipped' => $skippedRows,
-                        'errors' => $errorRows,
-                        'memory_usage' => memory_get_usage(true),
-                        'memory_peak' => memory_get_peak_usage(true),
-                        'memory_diff' => memory_get_peak_usage(true) - memory_get_usage(true)
-                    ]);
-                }
-
-                // Skip baris kosong
-                if ($this->isEmptyRow($row)) {
-                    $skippedRows++;
-                    Log::debug('SlikImport: Skipping empty row', ['row_number' => $index + 5]);
-                    continue;
-                }
-
-                // Validasi data
-                if (!$this->validateRow($row)) {
-                    $errorRows++;
-                    Log::warning('SlikImport: Invalid row data', [
-                        'row_number' => $index + 5,
-                        'data' => $row->toArray()
-                    ]);
-                    continue;
-                }
-
-                try {
-                    // Map data dari Excel ke model
-                    $slikData = $this->mapRowToSlik($row);
-
-                    // Update atau create berdasarkan no_rekening dan cif
-                    $slik = Slik::updateOrCreate(
-                        [
-                            'no_rekening' => $slikData['no_rekening'],
-                            'cif' => $slikData['cif']
-                        ],
-                        $slikData
-                    );
-
-                    $processedRows++;
-
-                    // Log detail untuk baris pertama sebagai sample
-                    if ($index === 0) {
-                        Log::info('SlikImport: Sample data processed', [
-                            'slik_id' => $slik->id,
-                            'no_rekening' => $slik->no_rekening,
-                            'cif' => $slik->cif,
-                            'was_recently_created' => $slik->wasRecentlyCreated
-                        ]);
-                    }
-
-                    // Force garbage collection setiap 25 baris untuk mengurangi memory
-                    if (config('import.slik.enable_gc', true) && $index > 0 && $index % 25 === 0) {
-                        gc_collect_cycles();
-                    }
-
-                    // Unset data yang sudah tidak digunakan untuk mengurangi memory
-                    if ($index > 0 && $index % 25 === 0) {
-                        unset($slikData, $slik);
-                    }
-
-                    // Reset collection internal untuk mengurangi memory
-                    if ($index > 0 && $index % 100 === 0) {
-                        $collection = collect($collection->slice($index + 1)->values());
-                    }
-
-                } catch (\Exception $e) {
-                    $errorRows++;
-                    Log::error('SlikImport: Error processing row', [
-                        'row_number' => $index + 5,
-                        'error' => $e->getMessage(),
-                        'data' => $row->toArray(),
-                        'memory_usage' => memory_get_usage(true)
-                    ]);
-                }
-            }
-
-            DB::commit();
-
-            // Force garbage collection setelah selesai
-            if (config('import.slik.enable_gc', true)) {
-                gc_collect_cycles();
-            }
-
-            // Cleanup variables
-            unset($collection);
-
-            Log::info('SlikImport: Import berhasil diselesaikan', [
-                'total_rows' => $totalRows,
-                'processed_rows' => $processedRows,
-                'skipped_rows' => $skippedRows,
-                'error_rows' => $errorRows,
-                'final_memory_usage' => memory_get_usage(true),
-                'peak_memory_usage' => memory_get_peak_usage(true),
-                'memory_saved' => memory_get_peak_usage(true) - memory_get_usage(true),
-                'memory_efficiency' => ($processedRows > 0) ? round(memory_get_peak_usage(true) / $processedRows, 2) : 0
-            ]);
-
-        } catch (\Exception $e) {
-            DB::rollBack();
-
-            // Force garbage collection jika error
-            if (config('import.slik.enable_gc', true)) {
-                gc_collect_cycles();
-            }
-
-            $errorType = 'general';
-            if (str_contains(strtolower($e->getMessage()), 'memory')) {
-                $errorType = 'memory';
-            } elseif (str_contains(strtolower($e->getMessage()), 'timeout') || str_contains(strtolower($e->getMessage()), 'maximum execution time')) {
-                $errorType = 'timeout';
-            }
-
-            Log::error('SlikImport: Error during import', [
-                'error' => $e->getMessage(),
-                'error_type' => $errorType,
-                'exception_type' => get_class($e),
-                'trace' => $e->getTraceAsString(),
-                'file' => $e->getFile(),
-                'line' => $e->getLine(),
-                'memory_usage' => memory_get_usage(true),
-                'memory_peak' => memory_get_peak_usage(true),
-                'memory_limit' => ini_get('memory_limit'),
-                'timeout_limit' => ini_get('max_execution_time'),
-                'is_memory_error' => str_contains(strtolower($e->getMessage()), 'memory'),
-                'is_timeout_error' => str_contains(strtolower($e->getMessage()), 'timeout') || str_contains(strtolower($e->getMessage()), 'maximum execution time')
-            ]);
-            throw $e;
-        }
-    }
-
-    /**
-     * Convert memory limit string ke bytes
-     *
-     * @param string $memoryLimit
-     * @return int
-     */
-    private function convertToBytes(string $memoryLimit): int
-    {
-        $memoryLimit = trim($memoryLimit);
-        $lastChar = strtolower(substr($memoryLimit, -1));
-        $number = (int) substr($memoryLimit, 0, -1);
-
-        switch ($lastChar) {
-            case 'g':
-                return $number * 1024 * 1024 * 1024;
-            case 'm':
-                return $number * 1024 * 1024;
-            case 'k':
-                return $number * 1024;
-            default:
-                return (int) $memoryLimit;
-        }
-    }
-
-    /**
-     * Cek apakah baris kosong
-     *
-     * @param Collection $row
-     * @return bool
-     */
-    private function isEmptyRow(Collection $row): bool
-    {
-        return $row->filter(function ($value) {
-            return !empty(trim($value));
-        })->isEmpty();
-    }
-
-    /**
-     * Validasi data baris
-     *
-     * @param Collection $row
-     * @return bool
-     */
-    private function validateRow(Collection $row): bool
-    {
-        // Validasi minimal: sandi_bank, no_rekening, dan cif harus ada
-        return !empty(trim($row[0])) && // sandi_bank
-               !empty(trim($row[5])) && // no_rekening
-               !empty(trim($row[6]));   // cif
-    }
-
-    /**
-     * Map data dari baris Excel ke array untuk model Slik
-     *
-     * @param Collection $row
-     * @return array
-     */
-    private function mapRowToSlik(Collection $row): array
-    {
-        return [
-            'sandi_bank' => trim($row[0]) ?: null,
-            'tahun' => $this->parseInteger($row[1]),
-            'bulan' => $this->parseInteger($row[2]),
-            'flag_detail' => trim($row[3]) ?: null,
-            'kode_register_agunan' => trim($row[4]) ?: null,
-            'no_rekening' => trim($row[5]) ?: null,
-            'cif' => trim($row[6]) ?: null,
-            'kolektibilitas' => trim($row[7]) ?: null,
-            'fasilitas' => trim($row[8]) ?: null,
-            'jenis_segmen_fasilitas' => trim($row[9]) ?: null,
-            'status_agunan' => trim($row[10]) ?: null,
-            'jenis_agunan' => trim($row[11]) ?: null,
-            'peringkat_agunan' => trim($row[12]) ?: null,
-            'lembaga_pemeringkat' => trim($row[13]) ?: null,
-            'jenis_pengikatan' => trim($row[14]) ?: null,
-            'tanggal_pengikatan' => $this->parseDate($row[15]),
-            'nama_pemilik_agunan' => trim($row[16]) ?: null,
-            'bukti_kepemilikan' => trim($row[17]) ?: null,
-            'alamat_agunan' => trim($row[18]) ?: null,
-            'lokasi_agunan' => trim($row[19]) ?: null,
-            'nilai_agunan' => $this->parseDecimal($row[20]),
-            'nilai_agunan_menurut_ljk' => $this->parseDecimal($row[21]),
-            'tanggal_penilaian_ljk' => $this->parseDate($row[22]),
-            'nilai_agunan_penilai_independen' => $this->parseDecimal($row[23]),
-            'nama_penilai_independen' => trim($row[24]) ?: null,
-            'tanggal_penilaian_penilai_independen' => $this->parseDate($row[25]),
-            'jumlah_hari_tunggakan' => $this->parseInteger($row[26]),
-            'status_paripasu' => trim($row[27]) ?: null,
-            'prosentase_paripasu' => $this->parseDecimal($row[28]),
-            'status_kredit_join' => trim($row[29]) ?: null,
-            'diasuransikan' => trim($row[30]) ?: null,
-            'keterangan' => trim($row[31]) ?: null,
-            'kantor_cabang' => trim($row[32]) ?: null,
-            'operasi_data' => trim($row[33]) ?: null,
-            'kode_cabang' => trim($row[34]) ?: null,
-            'nama_debitur' => trim($row[35]) ?: null,
-            'nama_cabang' => trim($row[36]) ?: null,
-            'flag' => trim($row[37]) ?: null,
-        ];
-    }
-
-    /**
-     * Parse integer value
-     *
-     * @param mixed $value
-     * @return int|null
-     */
-    private function parseInteger($value): ?int
-    {
-        if (empty(trim($value))) {
-            return null;
-        }
-
-        return (int) $value;
-    }
-
-    /**
-     * Parse decimal value
-     *
-     * @param mixed $value
-     * @return float|null
-     */
-    private function parseDecimal($value): ?float
-    {
-        if (empty(trim($value))) {
-            return null;
-        }
-
-        // Remove currency formatting
-        $cleaned = str_replace([',', '.'], ['', '.'], $value);
-        $cleaned = preg_replace('/[^0-9.]/', '', $cleaned);
-
-        return (float) $cleaned;
-    }
-
-    /**
-     * Parse date value
-     *
-     * @param mixed $value
-     * @return string|null
-     */
-    private function parseDate($value): ?string
-    {
-        if (empty(trim($value))) {
-            return null;
-        }
-
-        try {
-            // Try to parse various date formats
-            $date = \Carbon\Carbon::parse($value);
-            return $date->format('Y-m-d');
-        } catch (\Exception $e) {
-            Log::warning('SlikImport: Invalid date format', [
-                'value' => $value,
-                'error' => $e->getMessage()
-            ]);
-            return null;
-        }
-    }
-}

app/Jobs/CleanupInspeksiDataJob.php

@@ -1,156 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Jobs;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Log;
-use Modules\Lpj\Models\Inspeksi;
-
-/**
- * Job untuk membersihkan data inspeksi yang tidak memiliki dokument_id
- * 
- * Case: Jika ada data inspeksi yang masuk dengan permohonan_id yang sama
- * tetapi memiliki dokument_id dan user created_by yang sama, maka
- * data lama (tanpa dokument_id) akan di-soft delete
- */
-class CleanupInspeksiDataJob implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public $timeout = 300; // 5 menit
-    public $tries = 3;
-    public $maxExceptions = 3;
-    public $backoff = [60, 120, 300]; // Exponential backoff dalam detik
-
-    protected int $permohonanId;
-    protected int $createdBy;
-    protected ?int $dokumentId;
-
-    /**
-     * Create a new job instance.
-     *
-     * @param int $permohonanId
-     * @param int $createdBy
-     * @param int|null $dokumentId
-     */
-    public function __construct(int $permohonanId, int $createdBy, ?int $dokumentId = null)
-    {
-        $this->permohonanId = $permohonanId;
-        $this->createdBy = $createdBy;
-        $this->dokumentId = $dokumentId;
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     * @throws \Exception
-     */
-    public function handle(): void
-    {
-        Log::info('CleanupInspeksiDataJob: Memulai proses cleanup data inspeksi', [
-            'permohonan_id' => $this->permohonanId,
-            'created_by' => $this->createdBy,
-            'dokument_id' => $this->dokumentId
-        ]);
-
-        DB::beginTransaction();
-
-        try {
-            // Cari data inspeksi yang memiliki dokument_id (data baru)
-            $newInspeksi = Inspeksi::where('permohonan_id', $this->permohonanId)
-                ->where('created_by', $this->createdBy)
-                ->whereNotNull('dokument_id')
-                ->whereNull('deleted_at')
-                ->first();
-
-            if (!$newInspeksi) {
-                Log::warning('CleanupInspeksiDataJob: Tidak ditemukan data inspeksi baru dengan dokument_id', [
-                    'permohonan_id' => $this->permohonanId,
-                    'created_by' => $this->createdBy
-                ]);
-                DB::rollBack();
-                return;
-            }
-
-            Log::info('CleanupInspeksiDataJob: Data inspeksi baru ditemukan', [
-                'inspeksi_id' => $newInspeksi->id,
-                'dokument_id' => $newInspeksi->dokument_id
-            ]);
-
-            // Cari data inspeksi lama yang tidak memiliki dokument_id
-            $oldInspeksiList = Inspeksi::where('permohonan_id', $this->permohonanId)
-                ->where('created_by', $this->createdBy)
-                ->whereNull('dokument_id')
-                ->whereNull('deleted_at')
-                ->where('id', '!=', $newInspeksi->id) // Jangan hapus data yang baru saja ditemukan
-                ->get();
-
-            if ($oldInspeksiList->isEmpty()) {
-                Log::info('CleanupInspeksiDataJob: Tidak ditemukan data inspeksi lama tanpa dokument_id', [
-                    'permohonan_id' => $this->permohonanId,
-                    'created_by' => $this->createdBy
-                ]);
-                DB::commit();
-                return;
-            }
-
-            $deletedCount = 0;
-            foreach ($oldInspeksiList as $oldInspeksi) {
-                // Soft delete data lama
-                $oldInspeksi->delete(); // Menggunakan soft delete karena model menggunakan SoftDeletes trait
-                
-                Log::info('CleanupInspeksiDataJob: Data inspeksi lama berhasil di-soft delete', [
-                    'old_inspeksi_id' => $oldInspeksi->id,
-                    'permohonan_id' => $oldInspeksi->permohonan_id,
-                    'created_by' => $oldInspeksi->created_by,
-                    'deleted_at' => now()->toDateTimeString()
-                ]);
-                
-                $deletedCount++;
-            }
-
-            DB::commit();
-
-            Log::info('CleanupInspeksiDataJob: Proses cleanup selesai', [
-                'permohonan_id' => $this->permohonanId,
-                'created_by' => $this->createdBy,
-                'deleted_count' => $deletedCount,
-                'new_inspeksi_id' => $newInspeksi->id
-            ]);
-
-        } catch (\Exception $e) {
-            DB::rollBack();
-            
-            Log::error('CleanupInspeksiDataJob: Terjadi error saat proses cleanup', [
-                'permohonan_id' => $this->permohonanId,
-                'created_by' => $this->createdBy,
-                'error' => $e->getMessage(),
-                'trace' => $e->getTraceAsString()
-            ]);
-
-            throw $e;
-        }
-    }
-
-    /**
-     * Handle a job failure.
-     *
-     * @param \Throwable $exception
-     * @return void
-     */
-    public function failed(\Throwable $exception): void
-    {
-        Log::error('CleanupInspeksiDataJob: Job gagal dieksekusi', [
-            'permohonan_id' => $this->permohonanId,
-            'created_by' => $this->createdBy,
-            'error' => $exception->getMessage(),
-            'trace' => $exception->getTraceAsString()
-        ]);
-    }
-}

app/Jobs/ProcessSlikImport.php

@@ -1,179 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Jobs;
-
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Facades\Log;
-use Illuminate\Support\Facades\Storage;
-use Modules\Lpj\Imports\SlikImport;
-use Maatwebsite\Excel\Facades\Excel;
-
-class ProcessSlikImport implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public $timeout = 1800; // 30 menit untuk file besar
-    public $tries = 5; // Tambah retry untuk file sangat besar
-    public $maxExceptions = 5;
-    public $backoff = [60, 300, 900, 1800, 3600]; // Exponential backoff dalam detik
-
-    protected string $filePath;
-    protected int $userId;
-    protected string $importId;
-
-    /**
-     * Create a new job instance.
-     *
-     * @param string $filePath
-     * @param int $userId
-     * @param string $importId
-     */
-    public function __construct(string $filePath, int $userId, string $importId)
-    {
-        $this->filePath = $filePath;
-        $this->userId = $userId;
-        $this->importId = $importId;
-    }
-
-    /**
-     * Execute the job.
-     *
-     * @return void
-     */
-    public function handle(): void
-    {
-        Log::info('ProcessSlikImport: Memulai proses import via queue', [
-            'file_path' => $this->filePath,
-            'user_id' => $this->userId,
-            'import_id' => $this->importId,
-            'memory_limit' => ini_get('memory_limit'),
-            'max_execution_time' => ini_get('max_execution_time')
-        ]);
-
-        try {
-            // Cek file size terlebih dahulu
-            $fileSize = filesize($this->filePath);
-            $maxFileSize = config('import.slik.max_file_size', 50) * 1024 * 1024; // Convert MB to bytes
-            
-            if ($fileSize > $maxFileSize) {
-                throw new \Exception('File terlalu besar: ' . number_format($fileSize / 1024 / 1024, 2) . ' MB. Maksimum: ' . config('import.slik.max_file_size', 50) . ' MB');
-            }
-
-            // Set optimasi memory untuk queue processing
-            $memoryLimit = config('import.slik.memory_limit', 1024);
-            ini_set('memory_limit', $memoryLimit . 'M');
-            ini_set('max_execution_time', config('import.slik.timeout', 1800));
-            
-            // Set timeout untuk XML Scanner
-            $xmlScannerTimeout = config('import.slik.xml_scanner.timeout', 1800);
-            $xmlScannerMemory = config('import.slik.xml_scanner.memory_limit', 1024);
-
-            // Enable garbage collection jika diizinkan
-            if (config('import.slik.enable_gc', true)) {
-                gc_enable();
-            }
-
-            // Update progress status
-            $this->updateProgress('processing', 0, 'Memproses file Excel...');
-
-            Log::info('SlikImport: Processing file', [
-                'file' => basename($this->filePath),
-                'file_size' => number_format(filesize($this->filePath) / 1024 / 1024, 2) . ' MB',
-                'memory_limit' => $memoryLimit . 'M',
-                'timeout' => config('import.slik.timeout', 1800),
-                'enable_gc' => config('import.slik.enable_gc', true),
-                'xml_scanner_timeout' => config('import.slik.xml_scanner.timeout', 1800),
-                'chunk_size' => config('import.slik.chunk_size', 50),
-                'batch_size' => config('import.slik.batch_size', 50),
-            ]);
-
-            // Import file menggunakan SlikImport
-            $import = new SlikImport();
-            Excel::import($import, $this->filePath);
-
-            // Update progress selesai
-            $this->updateProgress('completed', 100, 'Import berhasil diselesaikan');
-
-            Log::info('ProcessSlikImport: Import berhasil diselesaikan', [
-                'import_id' => $this->importId,
-                'file_path' => $this->filePath,
-                'memory_usage' => memory_get_usage(true),
-                'memory_peak' => memory_get_peak_usage(true)
-            ]);
-
-            // Hapus file temporary setelah selesai
-            if (config('import.general.cleanup_temp_files', true)) {
-                Storage::delete($this->filePath);
-                Log::info('ProcessSlikImport: File temporary dihapus', ['file_path' => $this->filePath]);
-            }
-
-        } catch (\Exception $e) {
-            // Update progress error
-            $this->updateProgress('failed', 0, 'Error: ' . $e->getMessage());
-
-            Log::error('ProcessSlikImport: Error saat proses import', [
-                'import_id' => $this->importId,
-                'error' => $e->getMessage(),
-                'trace' => $e->getTraceAsString(),
-                'file' => $e->getFile(),
-                'line' => $e->getLine(),
-                'memory_usage' => memory_get_usage(true)
-            ]);
-
-            throw $e;
-        }
-    }
-
-    /**
-     * Update progress import
-     *
-     * @param string $status
-     * @param int $percentage
-     * @param string $message
-     * @return void
-     */
-    private function updateProgress(string $status, int $percentage, string $message): void
-    {
-        if (config('import.slik.progress.enabled', true)) {
-            $cacheKey = config('import.slik.progress.cache_key', 'slik_import_progress') . '_' . $this->importId;
-            $cacheTtl = config('import.slik.progress.cache_ttl', 3600);
-
-            $progressData = [
-                'status' => $status,
-                'percentage' => $percentage,
-                'message' => $message,
-                'timestamp' => now(),
-                'user_id' => $this->userId
-            ];
-
-            cache()->put($cacheKey, $progressData, $cacheTtl);
-        }
-    }
-
-    /**
-     * Handle job failure
-     *
-     * @param \Throwable $exception
-     * @return void
-     */
-    public function failed(\Throwable $exception): void
-    {
-        Log::error('ProcessSlikImport: Job failed', [
-            'import_id' => $this->importId,
-            'error' => $exception->getMessage(),
-            'trace' => $exception->getTraceAsString()
-        ]);
-
-        // Update progress ke failed
-        $this->updateProgress('failed', 0, 'Import gagal: ' . $exception->getMessage());
-
-        // Cleanup file temporary
-        if (Storage::exists($this->filePath)) {
-            Storage::delete($this->filePath);
-        }
-    }
-}

app/Models/Base.php

@@ -6,7 +6,7 @@
     use Illuminate\Database\Eloquent\SoftDeletes;
     use Spatie\Activitylog\LogOptions;
     use Spatie\Activitylog\Traits\LogsActivity;
-    use Mattiverse\Userstamps\Traits\Userstamps;
+    use Wildside\Userstamps\Userstamps;
     use Illuminate\Notifications\Notifiable;
 
 

app/Models/Bucok.php

@@ -1,115 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Models;
-
-use Illuminate\Foundation\Auth\User;
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Support\Str;
-
-/**
- * Model Bucok untuk mengelola data bucok
- *
- * @property int $id
- * @property int|null $no
- * @property string|null $tanggal
- * @property string|null $bulan
- * @property int|null $tahun
- * @property string|null $tanggal_penuh
- * @property string|null $nomor_categ
- * @property string|null $coa_summary
- * @property string|null $nomor_coa
- * @property string|null $nama_coa
- * @property string $nomor_tiket
- * @property string|null $deskripsi
- * @property float|null $nominal
- * @property string|null $penyelesaian
- * @property int|null $umur_aging
- * @property string|null $cost_center
- * @property string|null $nama_sub_direktorat
- * @property string|null $nama_direktorat_cabang
- * @property string|null $tanggal_penyelesaian
- * @property float|null $nominal_penyelesaian
- * @property float|null $nominal_berjalan
- * @property float|null $amortisasi_berjalan
- * @property float|null $sistem_berjalan
- * @property float|null $lainnya_berjalan
- * @property float|null $nominal_gantung
- * @property float|null $aset_gantung
- * @property string|null $keterangan_gantung
- * @property string|null $lainnya_satu
- * @property string|null $lainnya_dua
- */
-class Bucok extends Base
-{
-    use HasFactory;
-
-    /**
-     * Nama tabel yang digunakan oleh model
-     */
-    protected $table = 'bucoks';
-
-    /**
-     * Field yang dapat diisi secara mass assignment
-     */
-    protected $fillable = [
-        'no',
-        'tanggal',
-        'bulan',
-        'tahun',
-        'tanggal_penuh',
-        'nomor_categ',
-        'coa_summary',
-        'nomor_coa',
-        'nama_coa',
-        'nomor_tiket',
-        'deskripsi',
-        'nominal',
-        'penyelesaian',
-        'umur_aging',
-        'cost_center',
-        'nama_sub_direktorat',
-        'nama_direktorat_cabang',
-        'tanggal_penyelesaian',
-        'nominal_penyelesaian',
-        'nominal_berjalan',
-        'amortisasi_berjalan',
-        'sistem_berjalan',
-        'lainnya_berjalan',
-        'nominal_gantung',
-        'aset_gantung',
-        'keterangan_gantung',
-        'lainnya_satu',
-        'lainnya_dua',
-        'nomor_registrasi',
-        'permohonan_id',
-    ];
-
-    /**
-     * Casting tipe data untuk field tertentu
-     */
-    protected $casts = [
-        'no' => 'integer',
-        'tanggal' => 'date',
-        'tahun' => 'integer',
-        'tanggal_penuh' => 'date',
-        'nominal' => 'decimal:2',
-        'umur_aging' => 'integer',
-        'tanggal_penyelesaian' => 'date',
-        'nominal_penyelesaian' => 'decimal:2',
-        'nominal_berjalan' => 'decimal:2',
-        'amortisasi_berjalan' => 'decimal:2',
-        'sistem_berjalan' => 'decimal:2',
-        'lainnya_berjalan' => 'decimal:2',
-        'nominal_gantung' => 'decimal:2',
-        'aset_gantung' => 'decimal:2',
-    ];
-
-    /**
-     * Field yang akan di-hidden saat serialization
-     */
-    protected $hidden = [
-        'created_by',
-        'updated_by',
-        'deleted_by',
-    ];
-}

app/Models/CategoryDaftarPustaka.php

@@ -1,27 +0,0 @@
-<?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

@@ -1,29 +0,0 @@
-<?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/Inspeksi.php

@@ -14,7 +14,7 @@ class Inspeksi extends Base
     /**
      * 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','mig_detail_data_jaminan'];
+    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'];
 
     public function permohonan()
     {

app/Models/LampiranDokumen.php

@@ -27,7 +27,7 @@ class LampiranDokumen extends Base
     {
         $user = Auth::user();
 
-        if ($user && $user->hasAnyRole(['penilai', 'administrator', 'Penilai', 'admin','surveyor','pemohon-ao','pemohon-eo'])) {
+        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');

app/Models/LaporanAdminKredit.php

@@ -18,9 +18,7 @@ class LaporanAdminKredit extends Base
         'tanggal_kunjungan',
         'nilai_pasar_wajar',
         'nilai_likuidasi',
-        'nama_penilai',
-        'keterangan',
-        'kolektibilitas'
+        'nama_penilai'
     ];
 
     protected $casts = [

app/Models/LaporanSlik.php

@@ -1,114 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Models;
-
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Model;
-use Modules\Usermanagement\Models\User;
-
-class LaporanSlik extends Model
-{
-    use HasFactory;
-
-    protected $table = 'laporan_slik';
-
-    protected $fillable = [
-        'slik_id',
-        'sandi_bank',
-        'kode_kantor',
-        'kode_cabang',
-        'tahun',
-        'bulan',
-        'no_rekening',
-        'cif',
-        'kode_jenis',
-        'kode_jenis_ket',
-        'kode_sifat',
-        'kode_sifat_ket',
-        'kode_valuta',
-        'kode_valuta_ket',
-        'baki_debet',
-        'kolektibilitas',
-        'kolektibilitas_ket',
-        'tanggal_mulai',
-        'tanggal_jatuh_tempo',
-        'tanggal_selesai',
-        'tanggal_restrukturisasi',
-        'kode_sebab_macet',
-        'kode_sebab_macet_ket',
-        'tanggal_macet',
-        'kode_kondisi',
-        'kode_kondisi_ket',
-        'tanggal_kondisi',
-        'nilai_agunan',
-        'nilai_agunan_ket',
-        'jenis_agunan',
-        'kode_agunan',
-        'kode_agunan_ket',
-        'peringkat_agunan',
-        'peringkat_agunan_ket',
-        'nama_debitur',
-        'npwp',
-        'no_ktp',
-        'no_telp',
-        'kode_kab_kota',
-        'kode_kab_kota_ket',
-        'kode_negara_domisili',
-        'kode_negara_domisili_ket',
-        'kode_pos',
-        'alamat',
-        'fasilitas',
-        'status_agunan',
-        'tanggal_lapor',
-        'status',
-        'created_by',
-        'updated_by',
-    ];
-
-    protected $casts = [
-        'created_at' => 'datetime',
-        'updated_at' => 'datetime',
-    ];
-
-    public function slik()
-    {
-        return $this->belongsTo(Slik::class, 'slik_id');
-    }
-
-    public function creator()
-    {
-        return $this->belongsTo(User::class, 'created_by');
-    }
-
-    public function updater()
-    {
-        return $this->belongsTo(User::class, 'updated_by');
-    }
-
-    /**
-     * Scope untuk filter berdasarkan status
-     */
-    public function scopeActive($query)
-    {
-        return $query->where('status', 'aktif');
-    }
-
-    /**
-     * Accessor untuk nilai agunan yang diformat
-     */
-    public function getNilaiAgunanFormattedAttribute()
-    {
-        return number_format($this->nilai_agunan ?? 0, 0, ',', '.');
-    }
-
-    /**
-     * Accessor untuk status badge
-     */
-    public function getStatusBadgeAttribute()
-    {
-        $status = $this->status ?? 'aktif';
-        $class = $status == 'aktif' ? 'success' : 'danger';
-
-        return '<span class="badge badge-light-' . $class . '">' . ucfirst($status) . '</span>';
-    }
-}

app/Models/NilaiPlafond.php

@@ -6,5 +6,5 @@
     class NilaiPlafond extends Base
     {
         protected $table    = 'nilai_plafond';
-        protected $fillable = ['code', 'name', 'biaya'];
+        protected $fillable = ['code', 'name'];
     }

app/Models/Noc.php

@@ -2,28 +2,41 @@
 
 namespace Modules\Lpj\Models;
 
-use Illuminate\Foundation\Auth\User;
+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 $guarded = ['id'];
+    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',
-        'status_kurang_bayar' => 'boolean',
-        'nominal_kurang_bayar' => 'decimal:2',
-        'status_lebih_bayar' => 'boolean',
-        'nominal_lebih_bayar' => 'decimal:2',
         'tanggal_pembayaran' => 'date',
         'nominal_penyelesaian' => 'decimal:2',
         'status_penyelesaiaan' => 'boolean',
         'tanggal_penyelesaian' => 'date',
-        'memo_penyelesaian_date' => 'date',
-        'memo_penyelesaian_payment_date' => 'date',
-        'memo_penyelesaian_created_at' => 'datetime',
         'status' => 'boolean',
         'authorized_status' => 'boolean',
         'authorized_at' => 'datetime',
@@ -46,12 +59,4 @@ class Noc extends Base
     {
         return $this->belongsTo(User::class, 'authorized_by');
     }
-
-    public function debiture(){
-        return $this->belongsTo(Debiture::class,'debiture_id');
-    }
-
-    public function branch(){
-        return $this->belongsTo(Branch::class,'branch_id');
-    }
 }

app/Models/Slik.php

@@ -1,190 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Models;
-
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Support\Str;
-
-/**
- * Model Slik untuk mengelola data SLIK (Sistem Layanan Informasi Keuangan)
- *
- * @property int $id
- * @property string|null $sandi_bank
- * @property string|null $tahun
- * @property string|null $bulan
- * @property string|null $flag_detail
- * @property string|null $kode_register_agunan
- * @property string|null $no_rekening
- * @property string|null $cif
- * @property string|null $kolektibilitas
- * @property string|null $fasilitas
- * @property string|null $jenis_segmen_fasilitas
- * @property string|null $status_agunan
- * @property string|null $jenis_agunan
- * @property string|null $peringkat_agunan
- * @property string|null $lembaga_pemeringkat
- * @property string|null $jenis_pengikatan
- * @property string|null $tanggal_pengikatan
- * @property string|null $nama_pemilik_agunan
- * @property string|null $bukti_kepemilikan
- * @property string|null $alamat_agunan
- * @property string|null $lokasi_agunan
- * @property string|null $nilai_agunan
- * @property string|null $nilai_agunan_menurut_ljk
- * @property string|null $tanggal_penilaian_ljk
- * @property string|null $nilai_agunan_penilai_independen
- * @property string|null $nama_penilai_independen
- * @property string|null $tanggal_penilaian_penilai_independen
- * @property string|null $jumlah_hari_tunggakan
- * @property string|null $status_paripasu
- * @property string|null $prosentase_paripasu
- * @property string|null $status_kredit_join
- * @property string|null $diasuransikan
- * @property string|null $keterangan
- * @property string|null $kantor_cabang
- * @property string|null $operasi_data
- * @property string|null $kode_cabang
- * @property string|null $nama_debitur
- * @property string|null $nama_cabang
- * @property string|null $flag
- */
-class Slik extends Base
-{
-    use HasFactory;
-
-    /**
-     * Nama tabel yang digunakan oleh model
-     */
-    protected $table = 'sliks';
-
-    /**
-     * Field yang dapat diisi secara mass assignment
-     */
-    protected $fillable = [
-        'sandi_bank',
-        'tahun',
-        'bulan',
-        'flag_detail',
-        'kode_register_agunan',
-        'no_rekening',
-        'cif',
-        'kolektibilitas',
-        'fasilitas',
-        'jenis_segmen_fasilitas',
-        'status_agunan',
-        'jenis_agunan',
-        'peringkat_agunan',
-        'lembaga_pemeringkat',
-        'jenis_pengikatan',
-        'tanggal_pengikatan',
-        'nama_pemilik_agunan',
-        'bukti_kepemilikan',
-        'alamat_agunan',
-        'lokasi_agunan',
-        'nilai_agunan',
-        'nilai_agunan_menurut_ljk',
-        'tanggal_penilaian_ljk',
-        'nilai_agunan_penilai_independen',
-        'nama_penilai_independen',
-        'tanggal_penilaian_penilai_independen',
-        'jumlah_hari_tunggakan',
-        'status_paripasu',
-        'prosentase_paripasu',
-        'status_kredit_join',
-        'diasuransikan',
-        'keterangan',
-        'kantor_cabang',
-        'operasi_data',
-        'kode_cabang',
-        'nama_debitur',
-        'nama_cabang',
-        'flag',
-    ];
-
-    /**
-     * Casting tipe data untuk field tertentu
-     */
-    protected $casts = [
-        'tanggal_pengikatan' => 'date',
-        'tanggal_penilaian_ljk' => 'date',
-        'tanggal_penilaian_penilai_independen' => 'date',
-        'nilai_agunan' => 'decimal:2',
-        'nilai_agunan_menurut_ljk' => 'decimal:2',
-        'nilai_agunan_penilai_independen' => 'decimal:2',
-        'prosentase_paripasu' => 'decimal:2',
-        'jumlah_hari_tunggakan' => 'integer',
-    ];
-
-    /**
-     * Accessor untuk format nilai agunan dengan currency Indonesia
-     */
-    public function getNilaiAgunanFormattedAttribute(): string
-    {
-        return $this->nilai_agunan ? 'Rp ' . number_format($this->nilai_agunan, 0, ',', '.') : 'Rp 0';
-    }
-
-    /**
-     * Accessor untuk format nilai agunan menurut LJK dengan currency Indonesia
-     */
-    public function getNilaiAgunanMenurutLjkFormattedAttribute(): string
-    {
-        return $this->nilai_agunan_menurut_ljk ? 'Rp ' . number_format($this->nilai_agunan_menurut_ljk, 0, ',', '.') : 'Rp 0';
-    }
-
-    /**
-     * Accessor untuk format nilai agunan penilai independen dengan currency Indonesia
-     */
-    public function getNilaiAgunanPenilaiIndependenFormattedAttribute(): string
-    {
-        return $this->nilai_agunan_penilai_independen ? 'Rp ' . number_format($this->nilai_agunan_penilai_independen, 0, ',', '.') : 'Rp 0';
-    }
-
-    /**
-     * Accessor untuk status badge berdasarkan status agunan
-     */
-    public function getStatusBadgeAttribute(): string
-    {
-        $statusClass = match($this->status_agunan) {
-            'Aktif' => 'badge-success',
-            'Tidak Aktif' => 'badge-danger',
-            'Pending' => 'badge-warning',
-            default => 'badge-secondary'
-        };
-        
-        return '<span class="badge ' . $statusClass . '">' . ($this->status_agunan ?? 'Unknown') . '</span>';
-    }
-
-    /**
-     * Scope untuk filter berdasarkan tahun
-     */
-    public function scopeByYear($query, $year)
-    {
-        return $query->where('tahun', $year);
-    }
-
-    /**
-     * Scope untuk filter berdasarkan bulan
-     */
-    public function scopeByMonth($query, $month)
-    {
-        return $query->where('bulan', $month);
-    }
-
-    /**
-     * Scope untuk filter berdasarkan sandi bank
-     */
-    public function scopeBySandiBank($query, $sandiBank)
-    {
-        return $query->where('sandi_bank', $sandiBank);
-    }
-
-    /**
-     * Scope untuk filter berdasarkan kode cabang
-     */
-    public function scopeByKodeCabang($query, $kodeCabang)
-    {
-        return $query->where('kode_cabang', $kodeCabang);
-    }
-
-    // Method creator() dan editor() sudah disediakan oleh trait Userstamps
-}

app/Providers/LpjServiceProvider.php

@@ -32,46 +32,25 @@
         }
 
         /**
-     * Register commands in the format of Command::class
-     */
-    protected function registerCommands()
-    : void
-    {
-        $this->commands([
-            \Modules\Lpj\Console\Commands\CleanupInspeksiDataCommand::class,
-            \Modules\Lpj\Console\Commands\CleanupSingleInspeksiCommand::class,
-            \Modules\Lpj\Console\Commands\CleanupInspeksiStatusCommand::class,
-        ]);
-    }
+         * Register commands in the format of Command::class
+         */
+        protected function registerCommands()
+        : void
+        {
+            // $this->commands([]);
+        }
 
         /**
-     * Register command Schedules.
-     */
-    protected function registerCommandSchedules()
-    : void
-    {
-        $this->app->booted(function () {
-            $schedule = $this->app->make(\Illuminate\Console\Scheduling\Schedule::class);
-            
-            // Jalankan cleanup inspeksi setiap hari jam 2 pagi
-            $schedule->command('lpj:cleanup-inspeksi --force')
-                ->dailyAt('02:00')
-                ->withoutOverlapping()
-                ->onOneServer()
-                ->runInBackground()
-                ->appendOutputTo(storage_path('logs/cleanup-inspeksi.log'));
-                
-            // Backup cleanup setiap minggu
-            $schedule->command('lpj:cleanup-inspeksi --force')
-                ->weekly()
-                ->sundays()
-                ->at('03:00')
-                ->withoutOverlapping()
-                ->onOneServer()
-                ->runInBackground()
-                ->appendOutputTo(storage_path('logs/cleanup-inspeksi-weekly.log'));
-        });
-    }
+         * Register command Schedules.
+         */
+        protected function registerCommandSchedules()
+        : void
+        {
+            // $this->app->booted(function () {
+            //     $schedule = $this->app->make(Schedule::class);
+            //     $schedule->command('inspire')->hourly();
+            // });
+        }
 
         /**
          * Register translations.

app/Services/DaftarPustakaService.php

@@ -1,90 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Services;
-
-use Modules\Lpj\Models\DaftarPustaka;
-
-class DaftarPustakaService
-{
-    public function storeDaftarPustaka(array $data, $file)
-    {
-        if ($file) {
-            $data['attachment'] = $this->handleUpload($file);
-        }
-        return DaftarPustaka::create($data);
-    }
-
-    public function updateDaftarPustaka($data, $file, $id)
-    {
-        // Ambil data inputan yang diperlukan saja
-
-        $daftarPustaka = DaftarPustaka::findOrFail($id);
-
-        // Jika ada file baru yang diupload
-        if ($file) {
-            // (Opsional) Hapus file lama
-            if ($daftarPustaka->attachment && file_exists(public_path($daftarPustaka->attachment))) {
-                unlink(public_path($daftarPustaka->attachment));
-            }
-
-            // Upload file baru
-            $data['attachment'] = $this->handleUpload($file);
-        }
-
-        // Update data
-        $daftarPustaka->update($data);
-
-        return $daftarPustaka;
-    }
-
-
-    public function deleteDaftarPustaka($id)
-    {
-        return DaftarPustaka::where('id', $id)->delete();
-    }
-
-    public function getDaftarPustakaById($id)
-    {
-        return DaftarPustaka::where('id', $id)->first();
-    }
-
-    // get all with pagination
-    public function getAllDaftarPustaka($request)
-    {
-        $query = DaftarPustaka::query();
-
-        // Filter pencarian
-        if (!empty($request->get('search'))) {
-            $search = $request->get('search');
-            $query->where(function ($q) use ($search) {
-                $q->orWhere('judul', 'LIKE', "%$search%");
-            });
-        }
-
-        // Filter kategori
-        if (!empty($request->get('category'))) {
-            $category = explode(',', $request->input('category'));
-            $query->whereIn('category_id', $category);
-        }
-
-        // Default pagination
-        $page = (int) $request->get('page', 1);
-        $size = (int) $request->get('size', 10);
-
-        return $query->paginate($size, ['*'], 'page', $page);
-    }
-
-
-    private function handleUpload($file)
-    {
-        $today = now();
-        $folderPath = 'daftar_pustaka/' . $today->format('Y/m/d');
-
-        $fileName = $file->getClientOriginalName();
-        $filePath = $file->storeAs($folderPath, $fileName, 'public');
-
-        return $filePath;
-    }
-
-
-}

app/Services/DashboardService.php

@@ -1,179 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Services;
-
-use Modules\Lpj\Models\Laporan;
-use Modules\Lpj\Models\Noc;
-use Modules\Lpj\Models\Permohonan;
-    use Illuminate\Support\Facades\DB;
-class DashboardService
-{
-    public function getDashboardData($start_date, $end_date)
-    {
-        $countLpjInternal = $this->getTotalLpjInternal($start_date, $end_date);
-        $countLpjExternal = $this->getTotalLpjEksternal($start_date, $end_date);
-        $countResume = $this->getResumeCabang($start_date, $end_date);
-        $countPendapatan = $this->getPendapatanAppraisal($start_date, $end_date);
-
-        return [
-            'count_lpj_internal' => $countLpjInternal,
-            'count_lpj_eksternal' => $countLpjExternal,
-            'count_resume' => $countResume,
-            'count_pendapatan' => $countPendapatan
-        ];
-
-    }
-
-
-
-    public function getTotalLpjInternal($start_date, $end_date)
-    {
-        $months = $this->getMonthly();
-        $regions = $this->getRegion();
-        $data = [];
-
-        foreach ($months as $index => $month) {
-            $monthNumber = $index + 1;
-            $data[$month] = [];
-
-            foreach ($regions as $region) {
-                if ($monthNumber > now()->month) {
-
-                    $data[$month][$region] = [
-                        'total_laporan' => 0,
-                        'total_debiture' => 0,
-                    ];
-                } else {
-
-                    $totalLaporan = Laporan::whereBetween('created_at', [$start_date, $end_date])
-                        ->count();
-                    $totalDebitur = Permohonan::whereBetween('created_at', [$start_date, $end_date])
-                    ->where('status', 'done')
-                    ->distinct()
-                    ->count('debiture_id');
-
-
-
-                    $data[$month][$region] = [
-                        'total_laporan' => $totalLaporan,
-                        'total_debiture' => $totalDebitur,
-                    ];
-                }
-            }
-        }
-        return $data;
-    }
-
-
-
-    public function getPendapatanAppraisal($start_date, $end_date)
-{
-    $months = $this->getMonthly();
-    $data = [];
-
-    foreach ($months as $index => $month) {
-        $monthNumber = $index + 1;
-
-        if ($monthNumber > now()->month) {
-            // Bulan belum terjadi
-            $data[$month] = [
-                'total_jumlah' => 0,
-                'total_akumulasi' => 0,
-            ];
-        } else {
-            // Hitung jumlah nominal_bayar pada bulan ini
-            $totalJumlah = Noc::whereYear('tanggal_pembayaran', now()->year)
-                ->whereMonth('tanggal_pembayaran', $monthNumber)
-                ->sum('nominal_bayar');
-
-
-            $data[$month] = [
-                'total_jumlah' => $totalJumlah,
-                'total_akumulasi' => $totalJumlah,
-            ];
-        }
-    }
-
-    return $data;
-}
-
-    public function getResumeCabang($start_date, $end_date)
-    {
-        $regions = $this->getRegion();
-        $status = ['batal', 'done'];
-        $data = [];
-
-        foreach ($status as $item) {
-            $data[$item] = [];
-            foreach ($regions as $region) {
-                $totalLaporan =  DB::table('laporan')
-                    ->join('permohonan', 'laporan.permohonan_id', '=', 'permohonan.id')
-                    ->where('permohonan.status', $item)
-                    ->whereBetween('laporan.created_at', [$start_date, $end_date])
-                    ->count();
-
-                $data[$item][$region] = [
-                    'count_report' => $totalLaporan,
-                ];
-            }
-        }
-
-        return $data;
-
-    }
-    public function getTotalLpjEksternal($start_date, $end_date)
-    {
-        $months = $this->getMonthly();
-        $data = [];
-        foreach ($months as $index => $month) {
-            $monthNumber = $index + 1;
-            if ($monthNumber > now()->month) {
-                $data[$month] = [
-                    'total_laporan' => 0,
-                    'total_debiture' => 0,
-                ];
-            } else {
-                $totalLaporan = Laporan::where('created_at', '>=', $start_date)->where('created_at', '<=', $end_date)->count();
-
-                $totalDebitur = Permohonan::whereBetween('created_at', [$start_date, $end_date])
-                    ->where('status', 'done')
-                    ->distinct()
-                    ->count('debiture_id');
-
-                $data[$month] = [
-                    'total_laporan' => $totalLaporan,
-                    'total_debiture' => $totalDebitur,
-                ];
-            }
-        }
-        return $data;
-
-
-    }
-
-    private function getMonthly()
-    {
-        return [
-            'januari',
-            'februari',
-            'maret',
-            'april',
-            'mei',
-            'juni',
-            'juli',
-            'agustus',
-            'september',
-            'oktober',
-            'november',
-            'desember',
-        ];
-    }
-
-    private function getRegion()
-    {
-        return [
-            'jabodetabek',
-            'non-jabodetabek',
-        ];
-    }
-}

app/Services/ImportProgressService.php

@@ -1,236 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Services;
-
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Log;
-
-class ImportProgressService
-{
-    protected string $cacheKeyPrefix;
-    protected int $cacheTtl;
-
-    /**
-     * Constructor
-     */
-    public function __construct()
-    {
-        $this->cacheKeyPrefix = config('import.slik.progress.cache_key', 'slik_import_progress');
-        $this->cacheTtl = config('import.slik.progress.cache_ttl', 3600);
-    }
-
-    /**
-     * Start new import progress
-     *
-     * @param string $importId
-     * @param int $userId
-     * @param string $filename
-     * @param int $totalRows
-     * @return array
-     */
-    public function start(string $importId, int $userId, string $filename, int $totalRows): array
-    {
-        $progressData = [
-            'import_id' => $importId,
-            'user_id' => $userId,
-            'filename' => $filename,
-            'total_rows' => $totalRows,
-            'processed_rows' => 0,
-            'skipped_rows' => 0,
-            'error_rows' => 0,
-            'status' => 'started',
-            'percentage' => 0,
-            'message' => 'Memulai import...',
-            'started_at' => now(),
-            'updated_at' => now()
-        ];
-
-        $cacheKey = $this->getCacheKey($importId);
-        Cache::put($cacheKey, $progressData, $this->cacheTtl);
-
-        Log::info('ImportProgressService: Import started', $progressData);
-
-        return $progressData;
-    }
-
-    /**
-     * Update progress import
-     *
-     * @param string $importId
-     * @param int $processedRows
-     * @param int $skippedRows
-     * @param int $errorRows
-     * @param string|null $message
-     * @return array
-     */
-    public function update(string $importId, int $processedRows, int $skippedRows, int $errorRows, ?string $message = null): array
-    {
-        $cacheKey = $this->getCacheKey($importId);
-        $progressData = Cache::get($cacheKey);
-
-        if (!$progressData) {
-            Log::warning('ImportProgressService: Progress data not found', ['import_id' => $importId]);
-            return [];
-        }
-
-        $totalRows = $progressData['total_rows'];
-        $percentage = $totalRows > 0 ? round(($processedRows / $totalRows) * 100, 2) : 0;
-
-        $progressData = array_merge($progressData, [
-            'processed_rows' => $processedRows,
-            'skipped_rows' => $skippedRows,
-            'error_rows' => $errorRows,
-            'percentage' => $percentage,
-            'message' => $message ?? "Memproses baris {$processedRows} dari {$totalRows}...",
-            'updated_at' => now()
-        ]);
-
-        Cache::put($cacheKey, $progressData, $this->cacheTtl);
-
-        // Log progress setiap 10%
-        if ($percentage % 10 === 0) {
-            Log::info('ImportProgressService: Progress update', [
-                'import_id' => $importId,
-                'percentage' => $percentage,
-                'processed' => $processedRows,
-                'total' => $totalRows
-            ]);
-        }
-
-        return $progressData;
-    }
-
-    /**
-     * Mark import as completed
-     *
-     * @param string $importId
-     * @param string|null $message
-     * @return array
-     */
-    public function complete(string $importId, ?string $message = null): array
-    {
-        $cacheKey = $this->getCacheKey($importId);
-        $progressData = Cache::get($cacheKey);
-
-        if (!$progressData) {
-            Log::warning('ImportProgressService: Progress data not found for completion', ['import_id' => $importId]);
-            return [];
-        }
-
-        $progressData = array_merge($progressData, [
-            'status' => 'completed',
-            'percentage' => 100,
-            'message' => $message ?? 'Import berhasil diselesaikan',
-            'completed_at' => now(),
-            'updated_at' => now()
-        ]);
-
-        Cache::put($cacheKey, $progressData, $this->cacheTtl);
-
-        Log::info('ImportProgressService: Import completed', [
-            'import_id' => $importId,
-            'total_rows' => $progressData['total_rows'],
-            'processed_rows' => $progressData['processed_rows'],
-            'skipped_rows' => $progressData['skipped_rows'],
-            'error_rows' => $progressData['error_rows']
-        ]);
-
-        return $progressData;
-    }
-
-    /**
-     * Mark import as failed
-     *
-     * @param string $importId
-     * @param string $errorMessage
-     * @return array
-     */
-    public function fail(string $importId, string $errorMessage): array
-    {
-        $cacheKey = $this->getCacheKey($importId);
-        $progressData = Cache::get($cacheKey);
-
-        if (!$progressData) {
-            Log::warning('ImportProgressService: Progress data not found for failure', ['import_id' => $importId]);
-            return [];
-        }
-
-        $progressData = array_merge($progressData, [
-            'status' => 'failed',
-            'message' => 'Import gagal: ' . $errorMessage,
-            'failed_at' => now(),
-            'updated_at' => now()
-        ]);
-
-        Cache::put($cacheKey, $progressData, $this->cacheTtl);
-
-        Log::error('ImportProgressService: Import failed', [
-            'import_id' => $importId,
-            'error' => $errorMessage,
-            'progress_data' => $progressData
-        ]);
-
-        return $progressData;
-    }
-
-    /**
-     * Get progress data
-     *
-     * @param string $importId
-     * @return array|null
-     */
-    public function getProgress(string $importId): ?array
-    {
-        $cacheKey = $this->getCacheKey($importId);
-        return Cache::get($cacheKey);
-    }
-
-    /**
-     * Get all active imports for user
-     *
-     * @param int $userId
-     * @return array
-     */
-    public function getUserImports(int $userId): array
-    {
-        $pattern = $this->cacheKeyPrefix . '_*';
-        $keys = Cache::get($pattern);
-        
-        $imports = [];
-        foreach ($keys as $key) {
-            $data = Cache::get($key);
-            if ($data && $data['user_id'] === $userId) {
-                $imports[] = $data;
-            }
-        }
-
-        return $imports;
-    }
-
-    /**
-     * Clear progress data
-     *
-     * @param string $importId
-     * @return bool
-     */
-    public function clear(string $importId): bool
-    {
-        $cacheKey = $this->getCacheKey($importId);
-        $result = Cache::forget($cacheKey);
-
-        Log::info('ImportProgressService: Progress data cleared', ['import_id' => $importId]);
-
-        return $result;
-    }
-
-    /**
-     * Generate cache key
-     *
-     * @param string $importId
-     * @return string
-     */
-    private function getCacheKey(string $importId): string
-    {
-        return $this->cacheKeyPrefix . '_' . $importId;
-    }
-}

app/Services/InspeksiCleanupService.php

@@ -1,83 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Services;
-
-use Illuminate\Support\Facades\Log;
-use Modules\Lpj\Jobs\CleanupInspeksiDataJob;
-
-/**
- * Service untuk membersihkan data inspeksi yang tidak memiliki dokument_id
- * 
- * Class ini menyediakan method untuk menjalankan cleanup data inspeksi
- * ketika ada data baru dengan dokument_id yang sama
- */
-class InspeksiCleanupService
-{
-    /**
-     * Dispatch job untuk cleanup data inspeksi
-     *
-     * @param int $permohonanId
-     * @param int $createdBy
-     * @param int|null $dokumentId
-     * @param bool $sync
-     * @return void
-     */
-    public function cleanupInspeksiData(int $permohonanId, int $createdBy, ?int $dokumentId = null, bool $sync = false): void
-    {
-        Log::info('InspeksiCleanupService: Memulai cleanup data inspeksi', [
-            'permohonan_id' => $permohonanId,
-            'created_by' => $createdBy,
-            'dokument_id' => $dokumentId,
-            'sync' => $sync
-        ]);
-
-        try {
-            $job = new CleanupInspeksiDataJob($permohonanId, $createdBy, $dokumentId);
-
-            if ($sync) {
-                // Jalankan secara synchronous (langsung)
-                $job->handle();
-                Log::info('InspeksiCleanupService: Cleanup selesai dijalankan secara sync');
-            } else {
-                // Dispatch ke queue
-                dispatch($job);
-                Log::info('InspeksiCleanupService: Cleanup job berhasil di-dispatch ke queue');
-            }
-        } catch (\Exception $e) {
-            Log::error('InspeksiCleanupService: Gagal menjalankan cleanup', [
-                'permohonan_id' => $permohonanId,
-                'created_by' => $createdBy,
-                'error' => $e->getMessage(),
-                'trace' => $e->getTraceAsString()
-            ]);
-
-            throw $e;
-        }
-    }
-
-    /**
-     * Dispatch job untuk cleanup data inspeksi secara async (default)
-     *
-     * @param int $permohonanId
-     * @param int $createdBy
-     * @param int|null $dokumentId
-     * @return void
-     */
-    public function cleanupAsync(int $permohonanId, int $createdBy, ?int $dokumentId = null): void
-    {
-        $this->cleanupInspeksiData($permohonanId, $createdBy, $dokumentId, false);
-    }
-
-    /**
-     * Jalankan cleanup data inspeksi secara sync
-     *
-     * @param int $permohonanId
-     * @param int $createdBy
-     * @param int|null $dokumentId
-     * @return void
-     */
-    public function cleanupSync(int $permohonanId, int $createdBy, ?int $dokumentId = null): void
-    {
-        $this->cleanupInspeksiData($permohonanId, $createdBy, $dokumentId, true);
-    }
-}

app/Services/LaporanBiayaService.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Services;
-use Illuminate\Http\Request;
-use Modules\Lpj\Models\Permohonan;
-
-class LaporanBiayaService
-{
-    public function buildDataTableQuery(array $data){
-        $query = Permohonan::with([
-            'noc'
-        ]);
-
-        if($data['search']){
-
-        }
-
-
-        return $query;
-    }
-}

app/Services/LaporanDebitureService.php

@@ -1,182 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Services;
-use Modules\Lpj\Models\Permohonan;
-use Illuminate\Http\Request;
-class LaporanDebitureService
-{
-    public function dataForDatatables(Request $request)
-    {
-
-        // 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->debiture_id) && !empty($search->debiture_id)) {
-                $query->where('debiture_id', $search->debiture_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();
-
-        // 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,
-        ]);
-    }
-}

app/Services/LaporanMonitoringSoService.php

@@ -1,228 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Services;
-use Modules\Lpj\Models\TeamsUsers;
-use Modules\Lpj\Models\Teams;
-use Modules\Lpj\Models\Debiture;
-use Modules\Lpj\Models\Permohonan;
-use Modules\Lpj\Models\Penilaian;
-use Modules\Lpj\Models\StatusPermohonan;
-use Carbon\Carbon;
-class LaporanMonitoringSoService
-{
-
-    public function progresPengerjaanLaporan($user){
-
-        // Inisialisasi regionId dan teamId
-        $regionId = $teamId = null;
-
-        if ($user->roles->pluck('name')->contains('senior-officer')) {
-            $userTeam = TeamsUsers::with('team')->firstWhere('user_id', $user->id);
-            $regionId = $userTeam?->team->regions_id;
-            $teamId = $userTeam?->teams_id;
-        }
-
-
-        $teamsActivity = TeamsUsers::with(['user', 'team', 'team.regions', 'user.roles'])
-            ->whereHas('team', function ($q) use ($regionId, $teamId) {
-                $q->when($regionId, fn ($q) => $q->where('regions_id', $regionId))
-                  ->when($teamId, fn ($q) => $q->where('id', $teamId));
-            })
-            ->where('user_id', '!=', $user->id)
-            ->whereHas('user.roles', fn ($q) => $q->whereIn('name', ['surveyor', 'surveyor-penilai']))
-            ->get();
-
-        $teamId = is_array($teamId) ? $teamId : [$teamId];
-
-        $teamPenilai = Teams::with(['regions', 'teamsUsers', 'teamsUsers.user'])->whereNotIn(
-            'id',
-            $teamId
-        )->get();
-
-        return [
-            'teamsActivity' => $teamsActivity,
-            'teamPenilai' => $teamPenilai,
-        ];
-    }
-
-
-    public function showDetailsPermohonan($request,$id)
-    {
-         $query = Penilaian::with([
-            'permohonan',
-            'permohonan.debiture',
-            'permohonan.tujuanPenilaian',
-            'permohonan.debiture.documents.jenisJaminan',
-            'userPenilai' => function ($query) use ($id) {
-                $query->where('user_id', $id);
-            },
-            'permohonan.penilai',
-            'permohonan.approveEo',
-            'permohonan.approveDd',
-            'permohonan.approveSo',
-
-        ])
-        ->whereHas('userPenilai', function ($q) use ($id) {
-            $q->where('user_id', $id);
-        })
-        ->whereHas('permohonan', function ($q) {
-            $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'
-            ]);
-        });
-
-
-
-        // Filter pencarian
-        if ($request->has('search') && !empty($request->get('search'))) {
-            $search = $request->get('search');
-            $query->where(function ($q) use ($search) {
-                $q->where('nomor_registrasi', 'LIKE', "%$search%")
-                  ->orWhere('status', 'LIKE', "%$search%");
-            });
-        }
-
-        // Sorting
-        if ($request->has('sortOrder') && !empty($request->get('sortOrder'))) {
-            $order  = $request->get('sortOrder');
-            $column = $request->get('sortField');
-            $query->orderBy($column, $order);
-        }
-
-        // Hitung total records
-        $totalRecords = $query->count();
-
-        // Pagination
-        $size = $request->get('size', 10);
-        $page = $request->get('page', 1);
-        $offset = ($page - 1) * $size;
-
-        // Ambil data dengan pagination
-        $data = $query->skip($offset)->take($size)->get();
-
-        $data = $data->map(function ($item) {
-            $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 ?? "";
-
-            $hari = $hariPaparan = 0;
-
-            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;
-
-            if ($tujuanPenilaian == 'RAP') {
-                $hariTambahan = 2;
-            } else {
-                if ($statusPembayaran == 'sudah_bayar') {
-                    $hariTambahan = 1; // H+1 untuk yang sudah bayar
-                } 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($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)) {
-                    $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;
-
-            }
-
-            return $item;
-        });
-
-        $filteredRecords = $data->count();
-        $pageCount = ceil($totalRecords / $size);
-
-        // Return data dalam bentuk JSON
-        return response()->json([
-            'draw'            => $request->get('draw'),
-            'recordsTotal'    => $totalRecords,
-            'recordsFiltered' => $filteredRecords,
-            'pageCount'       => $pageCount,
-            'page'            => $page,
-            'totalCount'      => $totalRecords,
-            'data'            => $data
-        ]);
-    }
-}

app/Services/LaporanSLAPenilaiService.php

@@ -1,123 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Services;
-
-use Modules\Lpj\Models\Permohonan;
-use Modules\Lpj\Models\Penilaian;
-use Illuminate\Http\Request;
-use Carbon\Carbon;
-
-class LaporanSLAPenilaiService
-{
-    public function dataForDatatables(Request $request)
-    {
-        // 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()
-                ]);
-            }
-
-
-            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('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(['documents','debiture.branch'])->get();
-
-        $data = $data->map(function ($permohonan) {
-
-            $tgl_kunjungan = $permohonan->penilaian?->tanggal_kunjungan;
-            $tgl_otorisator = $permohonan->approval_dd_at ?? $permohonan->approval_eo_at ?? $permohonan->approval_so_at;
-            $jangkaWaktu = $this->hitungTotalJangkaWaktuSla($tgl_kunjungan, $tgl_otorisator);
-
-
-
-            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,
-                'tanggal_laporan'   => $permohonan->approval_dd_at ?? $permohonan->approval_eo_at ?? '',
-                'tanggal_approval'    => $permohonan->approval_dd_at ?? $permohonan->approval_eo_at ?? '',
-                'tanggal_kunjungan'    => $permohonan->penilaian?->tanggal_kunjungan ?? '',
-                'nama_penilai'      => $permohonan->penilaian?->_user_penilai?->userPenilaiTeam?->name,
-                'jangka_waktu' => $jangkaWaktu,
-                'keterangan' => $permohonan->keterangan
-            ];
-        });
-
-        // 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,
-        ]);
-    }
-
-    private function hitungTotalJangkaWaktuSla($tgl_kunjungan,$tgl_otorisator){
-            $countHariKerja = hitungHariKerja($tgl_kunjungan, $tgl_otorisator);
-            return $countHariKerja;
-    }
-}

app/Services/LaporanUserService.php

@@ -1,127 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Services;
-use Modules\Lpj\Models\Permohonan;
-use Illuminate\Http\Request;
-
-class LaporanUserService
-{
-    public function getUserPemohon($search = null)
-    {
-        return Permohonan::join('users', 'users.id', '=', 'permohonan.user_id')
-            ->whereNotNull('permohonan.nomor_registrasi')
-            ->when($search, function ($query) use ($search) {
-                $query->where('users.name', 'like', "%$search%");
-            })
-            ->select('users.id', 'users.name')
-            ->distinct()
-            ->orderBy('users.name')
-            ->limit(20)
-            ->get();
-    }
-
-
-    public function dataForDatatables(Request $request)
-    {
-
-        // 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->user_id) && !empty($search->user_id)) {
-                $query->where('user_id', $search->user_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();
-
-        // 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) {
-
-            $npw             = 0;
-
-
-            if (isset($permohonan->penilai->lpj)) {
-                $lpj = json_decode($permohonan->penilai->lpj, true);
-                $npw = str_replace('.', '', $lpj['total_nilai_pasar_wajar'] ?? 0);
-            }
-
-            return [
-                'id'                        => $permohonan->id,
-                'nomor_registrasi'          => $permohonan->nomor_registrasi,
-                'branch'                    => $permohonan->debiture->branch?->name,
-                'name'                      => $permohonan->debiture?->name,
-                'pemohon'                   => $permohonan->creator?->name,
-                'tanggal_permohonan' => $permohonan->tanggal_permohonan,
-                'nama_penilai'              => $permohonan->penilaian?->_user_penilai?->userPenilaiTeam?->name,
-                'tanggal_laporan'    => $permohonan->approval_dd_at ?? $permohonan->approval_eo_at ?? '',
-                 'nilai_pasar_wajar'         => formatRupiah($npw, 2)
-            ];
-        });
-
-        // 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,
-        ]);
-    }
-}

app/Services/PreviewLaporanService.php

@@ -1,735 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Services;
-
-
-use Carbon\Carbon;
-use App\Helpers\Lpj;
-use Modules\Lpj\Models\Denah;
-use Modules\Lpj\Models\Teams;
-use Modules\Lpj\Models\Branch;
-use Modules\Lpj\Models\Lantai;
-use Barryvdh\DomPDF\Facade\Pdf;
-use Modules\Lpj\Models\Analisa;
-use Modules\Lpj\Models\Penilai;
-use Modules\Lpj\Models\Debiture;
-use Modules\Lpj\Models\Inspeksi;
-use Modules\Lpj\Models\Surveyor;
-use Modules\Lpj\Models\ViewUnit;
-use Modules\Location\Models\City;
-use Modules\Lpj\Models\JenisUnit;
-use Modules\Lpj\Models\Penilaian;
-use Modules\Lpj\Models\Perizinan;
-use Modules\Lpj\Models\BentukUnit;
-use Modules\Lpj\Models\JenisKapal;
-use Modules\Lpj\Models\LantaiUnit;
-use Modules\Lpj\Models\Lingkungan;
-use Modules\Lpj\Models\Permohonan;
-use Modules\Lpj\Models\PosisiUnit;
-use Illuminate\Support\Facades\Log;
-use Modules\Lpj\Models\AnalisaUnit;
-use Modules\Lpj\Models\BentukTanah;
-use Modules\Lpj\Models\FotoJaminan;
-use Modules\Lpj\Models\KonturTanah;
-use Modules\Lpj\Models\RuteJaminan;
-use Modules\Location\Models\Village;
-use Modules\Lpj\Models\AnalisaFakta;
-use Modules\Lpj\Models\JenisJaminan;
-use Modules\Lpj\Models\JenisPesawat;
-use Modules\Lpj\Models\ObjekJaminan;
-use Modules\Lpj\Models\SpekBangunan;
-use Modules\Lpj\Models\TerletakArea;
-use Modules\Location\Models\District;
-use Modules\Location\Models\Province;
-use Modules\Lpj\Models\ArahMataAngin;
-use Modules\Lpj\Models\JenisBangunan;
-use Modules\Lpj\Models\PosisiKavling;
-use Modules\Lpj\Models\SifatBangunan;
-use Modules\Lpj\Models\DokumenJaminan;
-use Modules\Lpj\Models\FasilitasObjek;
-use Modules\Lpj\Models\JenisKendaraan;
-use Modules\Lpj\Models\ModelAlatBerat;
-use Modules\Lpj\Models\KetinggianTanah;
-use Modules\Lpj\Models\KondisiBangunan;
-use Modules\Lpj\Models\LaporanExternal;
-use Modules\Lpj\Models\MerupakanDaerah;
-use Modules\Lpj\Models\PerkerasanJalan;
-use Modules\Lpj\Models\SaranaPelengkap;
-use Modules\Lpj\Models\TujuanPenilaian;
-use Modules\Lpj\Models\FotoObjekJaminan;
-use Modules\Lpj\Models\LaluLintasLokasi;
-use Modules\Lpj\Models\TingkatKeramaian;
-use Modules\Lpj\Models\AnalisaLingkungan;
-use Modules\Lpj\Models\KondisiFisikTanah;
-use Modules\Lpj\Models\AnalisaTanahBagunan;
-use Modules\Lpj\Models\GolonganMasySekitar;
-use Modules\Lpj\Models\SpekBangunanAnalisa;
-use Modules\Lpj\Models\DetailDokumenJaminan;
-use Modules\Lpj\Models\SpekKategoritBangunan;
-use Modules\Lpj\Http\Requests\SurveyorRequest;
-use Modules\Lpj\Models\HubunganPemilikJaminan;
-use Modules\Lpj\Models\HubunganPenghuniJaminan;
-use Modules\Lpj\Models\SpekBagunanAnalisaDetail;
-use Modules\Lpj\Jobs\SendJadwalKunjunganEmailJob;
-use Modules\Lpj\Http\Requests\FormSurveyorRequest;
-
-class PreviewLaporanService
-{
-    /**
-     * Preview Laporan dan unduh foto terkait dengan logika fallback path.
-     *
-     * Menghasilkan PDF atau paket unduhan foto berdasarkan status laporan.
-     * Jika file foto asli tidak ditemukan dan status LPJ adalah 1, maka
-     * sistem akan mencoba menggunakan fallback path dengan pola
-     * `surveyor/001/{lastTwoParts}` untuk meminimalisir gambar hilang.
-     *
-     * @param  int     $permohonan_id  ID Permohonan
-     * @param  int     $dokumen_id     ID Dokumen
-     * @param  int     $jaminan_id     ID Jaminan
-     * @param  string  $back           URL atau rute kembali
-     * @return \Symfony\Component\HttpFoundation\Response
-     */
-    public function previewLaporan($permohonan_id, $dokumen_id, $jaminan_id, $back)
-    {
-        $permohonan = $this->getPermohonanJaminanId(
-            $permohonan_id,
-            $dokumen_id,
-            $jaminan_id
-        );
-        // $tipeLaporanResponse = $this->checkPrintOutLaporan($permohonan_id, $document_id);
-        // $tipeLaporan = $tipeLaporanResponse->getData();
-
-        // if (!$tipeLaporan->status) {
-        //     return redirect()->back()->with('error', 'Laporan tidak valid');
-        // }
-        $basicData =  $this->getCommonData();
-
-        $inspeksi = Inspeksi::where('permohonan_id', $permohonan_id)->where('dokument_id', $dokumen_id)->first();
-        $lpj = Penilai::where('permohonan_id', $permohonan_id)->where('dokument_id', $dokumen_id)->first();
-
-        $mig_permohonan = json_decode($permohonan->mig_permohonan);
-
-        $nomorLaporan = getNomorLaporan($permohonan_id, $dokumen_id);
-        $tanggalLaporan =  $permohonan->is_mig
-            ? ($mig_permohonan->mig_mst_jaminan_tgl_laporan ?? $mig_permohonan->mig_mst_jaminan_tgl_create ?? null)
-            : ($lpj->created_at ?? null);
-        $forminspeksi = null;
-        $lpjData = null;
-        $formFoto  = null;
-
-        // if ($inspeksi) {
-        $forminspeksi = json_decode($inspeksi?->data_form, true) ?? null;
-
-        $formFoto = json_decode($inspeksi?->foto_form, true) ?? null;
-        // $denahForm = json_decode($data->denah_form, true);
-        $dataPembanding = json_decode($inspeksi?->data_pembanding, true) ?? null;
-        // }
-
-        // if ($lpj) {
-        $lpjData = json_decode($lpj?->lpj, true) ?? null;
-        $memo = json_decode($lpj?->memo, true) ?? null;
-        $resumeData = json_decode($lpj?->resume, true) ?? null;
-        $rap = json_decode($lpj?->rap, true);
-        $report = json_decode($lpj?->call_report, true) ?? null;
-        // }
-
-        $inputAddress = $forminspeksi['asset']['alamat']['sesuai'] ?? $forminspeksi['asset']['alamat']['tidak sesuai'] ?? [];
-
-        $alamat = [
-            'address' => $inputAddress['address'] ?? null,
-            'village_code' => getWilayahName($inputAddress['village_code'] ?? null, 'village'),
-            'district_code' => getWilayahName($inputAddress['district_code'] ?? null, 'district'),
-            'city_code' => getWilayahName($inputAddress['city_code'] ?? null, 'city'),
-            'province_code' => getWilayahName($inputAddress['province_code'] ?? null, 'province')
-        ];
-
-        $statusLpj = 0;
-
-        // $viewLaporan = $this->getViewLaporan($tipeLaporan);
-        return view('lpj::component.show-laporan-inspeksi', compact('permohonan', 'basicData', 'forminspeksi', 'alamat', 'lpjData', 'memo', 'resumeData', 'rap', 'report', 'lpj', 'formFoto', 'nomorLaporan', 'tanggalLaporan', 'dataPembanding', 'inspeksi', 'statusLpj', 'permohonan_id', 'back', ));
-    }
-
-    public function printOutLaporan($permohonan_id, $document_id, $jaminan_id)
-    {
-        $tipeLaporanResponse = $this->checkPrintOutLaporan($permohonan_id, $document_id);
-        $tipeLaporan = $tipeLaporanResponse->getData();
-
-        //dd($permohonan_id, $document_id, $tipeLaporan);
-
-        if (!$tipeLaporan->status) {
-            //return redirect()->back()->with('error', 'Laporan tidak valid');
-        }
-        $permohonan = $this->getPermohonanJaminanId(
-            $permohonan_id,
-            $document_id,
-            $jaminan_id
-        );
-
-        $basicData = $this->getCommonData();
-
-        $inspeksi = Inspeksi::where('permohonan_id', $permohonan_id)->where('dokument_id', $document_id)->first();
-        $lpj = Penilai::where('permohonan_id', $permohonan_id)->first(); //->where('dokument_id', $document_id)->first();
-
-        $mig_permohonan = json_decode($permohonan->mig_permohonan);
-        $nomorLaporan = getNomorLaporan($permohonan_id, $document_id);
-
-        //Carbon::createFromFormat('d/m/Y H:i:s', $mig_permohonan->mig_mst_jaminan_tgl_laporan)->format('Y-m-d H:i:s');
-
-         $tanggalLaporan =  $permohonan->is_mig
-            ? ($mig_permohonan->mig_mst_jaminan_tgl_laporan
-                ? Carbon::createFromFormat('d/m/Y H:i:s', $mig_permohonan->mig_mst_jaminan_tgl_laporan)->format('Y-m-d H:i:s')
-                : ($mig_permohonan->mig_mst_jaminan_tgl_oto
-                    ? Carbon::createFromFormat('d/m/Y H:i:s', $mig_permohonan->mig_mst_jaminan_tgl_oto)->format('Y-m-d H:i:s')
-                    : null))
-            : ($lpj->created_at ?? null);
-
-
-        $forminspeksi = null;
-        $lpjData = null;
-        $formFoto  = null;
-
-        $dataPembanding ='';
-        if ($inspeksi) {
-            $forminspeksi = json_decode($inspeksi->data_form, true);
-            $formFoto = json_decode($inspeksi->foto_form, true);
-            // $denahForm = json_decode($data->denah_form, true);
-            $dataPembanding = json_decode($inspeksi->data_pembanding, true);
-        }
-
-
-        if ($lpj) {
-            $lpjData = json_decode($lpj->lpj, true);
-            $memo = json_decode($lpj->memo, true);
-            $resumeData = json_decode($lpj->resume, true);
-            $rap = json_decode($lpj->rap, true);
-            $report = json_decode($lpj->call_report, true);
-        }
-
-        $inputAddress = $forminspeksi['asset']['alamat']['sesuai'] ?? $forminspeksi['asset']['alamat']['tidak sesuai'] ?? [];
-
-        $inputAddress = $forminspeksi['asset']['alamat']['sesuai'] ?? $forminspeksi['asset']['alamat']['tidak sesuai'] ?? [];
-        $alamat = [
-                'address' => $inputAddress['address'] ?? null,
-                'village_code' => getWilayahName($inputAddress['village_code'] ?? null, 'village'),
-                'district_code' => getWilayahName($inputAddress['district_code'] ?? null, 'district'),
-                'city_code' => getWilayahName($inputAddress['city_code'] ?? null, 'city'),
-                'province_code' => getWilayahName($inputAddress['province_code'] ?? null, 'province')
-            ];
-
-        $viewLaporan = $this->getViewLaporan($tipeLaporan->status);
-
-        $statusLpj = 1;
-
-            $mig_permohonan = json_decode($permohonan->mig_permohonan);
-	        $nilaiPasar = $mig_permohonan->mig_mst_lpj_tot_nilai_pasar ?? null;
-
-            if(($tipeLaporan->status === 'memo' && $permohonan->mig_permohonan && $permohonan->is_mig) || ($nilaiPasar !== null && $nilaiPasar < 1 && $permohonan->is_mig)){
-                $paths = $formFoto['upload_foto'] ?? null;
-
-                if (!is_array($paths) || empty($paths)) {
-                    return response()->json(['error' => 'No files to download'], 404);
-                }
-
-                $files = [];
-                foreach ($paths as $path) {
-                    if (!$path['path']) {
-                        Log::warning('PreviewLaporanService: Path kosong terdeteksi dalam daftar paths.');
-                        continue;
-                    }
-
-                    // Logika fallback untuk path file
-                    $originalPath = $path['path'];
-                    $fallbackPath = null;
-
-                    // Jika file asli tidak ditemukan, buat fallback path
-                    if ($statusLpj == 1) {
-                        $fullOriginalPath = storage_path('app/public/' . $originalPath);
-
-                        if (!file_exists($fullOriginalPath)) {
-                            // Ekstrak bagian akhir path (contoh: 251051/251051_2_2.png)
-                            $pathParts = explode('/', $originalPath);
-                            if (count($pathParts) >= 2) {
-                                $lastTwoParts = array_slice($pathParts, -2);
-                                $fallbackPath = 'surveyor/001/' . implode('/', $lastTwoParts);
-                                Log::info('PreviewLaporanService: Menggunakan fallback path kandidat.', [
-                                    'original' => $originalPath,
-                                    'fallback' => $fallbackPath,
-                                ]);
-                            }
-                        }
-                    }
-
-                    // Tentukan path yang akan digunakan
-                    $pathToUse = ($fallbackPath && $statusLpj == 1 && file_exists(storage_path('app/public/' . $fallbackPath)))
-                        ? $fallbackPath
-                        : $originalPath;
-
-                    $fullPath = storage_path('app/public/' . $pathToUse);
-                    if (!file_exists($fullPath)) {
-                        Log::warning('PreviewLaporanService: File tidak ditemukan untuk original maupun fallback.', [
-                            'original' => $originalPath,
-                            'fallback' => $fallbackPath,
-                            'resolved' => $pathToUse,
-                        ]);
-                        continue;
-                    }
-
-                    Log::info('PreviewLaporanService: Menambahkan file untuk diunduh.', [
-                        'resolved' => $pathToUse,
-                        'fullPath' => $fullPath,
-                    ]);
-                    $files[] = $fullPath;
-                }
-
-                if (empty($files)) {
-                    Log::warning('PreviewLaporanService: Tidak ada file valid ditemukan setelah resolusi path.');
-                    return response()->json(['error' => 'No valid files found'], 404);
-                }
-
-                // For single file, download directly
-                if (count($files) === 1) {
-                    Log::info('PreviewLaporanService: Mengunduh single file.', ['file' => $files[0]]);
-                    return response()->download($files[0]);
-                }
-
-                // For multiple files, create zip and download
-                $zipName = 'photos_' . time() . '.zip';
-                $zipPath = storage_path('app/public/' . $zipName);
-
-                $zip = new \ZipArchive();
-                if ($zip->open($zipPath, \ZipArchive::CREATE) === true) {
-                    foreach ($files as $file) {
-                        $zip->addFile($file, basename($file));
-                    }
-                    $zip->close();
-                    Log::info('PreviewLaporanService: Zip file berhasil dibuat.', ['zip' => $zipPath, 'count' => count($files)]);
-                    return response()->download($zipPath)->deleteFileAfterSend(true);
-                }
-
-                Log::error('PreviewLaporanService: Gagal membuat zip file.');
-                return response()->json(['error' => 'Failed to create zip file'], 500);
-            }
-        try {
-            $pdf = $this->generatePDF($viewLaporan, compact(
-                'permohonan',
-                'forminspeksi',
-                'lpjData',
-                'formFoto',
-                'basicData',
-                'inspeksi',
-                'lpj',
-                'statusLpj',
-                'alamat',
-                'dataPembanding',
-                'nomorLaporan',
-                'memo',
-                'resumeData',
-                'tanggalLaporan',
-                'rap',
-                'report'
-            ));
-
-            $cleanNomorLaporan = str_replace(['/', '\\'], '-', $nomorLaporan);
-            $filename = 'Laporan_' . $tipeLaporan->status . '_' . $permohonan->debiture->name . '_' . $cleanNomorLaporan;
-
-            return  $pdf->download($filename . '_data.pdf');
-        } catch (\Exception $e) {
-            Log::error('PDF generation failed: ' . $e->getMessage());
-            return response()->json(['error' => 'Failed to generate PDF. Please check the log for details.'], 500);
-        }
-    }
-
-    private function generatePDF(string $viewLaporan, array $data)
-    {
-        //return view('lpj::' . $viewLaporan, $data);
-
-        $pdf = PDF::loadView('lpj::' . $viewLaporan, $data);
-        $pdf->setPaper('A4', 'portrait');
-        $pdf->set_option('isHtml5ParserEnabled', true);
-        $pdf->set_option('isPhpEnabled', true);
-
-        return $pdf;
-    }
-
-
-    private function getViewLaporan($tipe)
-    {
-        $viewMap = [
-            'sederhana' => 'penilai.components.print-out-sederhana',
-            'standar' => 'penilai.components.print-out-standar',
-            'resume' => 'penilai.components.print-resume',
-            'memo' => 'penilai.components.print-memo',
-            'rap' => 'penilai.components.print-out-rap',
-            'call-report' => 'penilai.components.print-out-call-report'
-        ];
-        return $viewMap[$tipe] ?? 'penilai.components.print-resume';
-    }
-
-    public function checkPrintOutLaporan($permohonan_id, $dokumen_id)
-    {
-
-        // Ambil data berdasarkan ID
-        $statusLpj = Penilai::where('permohonan_id', $permohonan_id)
-            //->where('dokument_id', $dokumen_id)
-            ->first();
-
-
-        $permohonan = Permohonan::where('id', $permohonan_id)->first();
-
-        // Jika data tidak ditemukan, kembalikan status null
-        if (!$statusLpj) {
-            return response()->json(['status' => null]);
-        }
-
-        // Tentukan tipe berdasarkan kondisi
-        $type = $statusLpj->type_penilai ?? null;
-
-        if ($type === 'memo' && $permohonan->is_mig!=1) {
-            return $this->checkDataMemo($type, $statusLpj);
-        }
-
-        if ($type === 'resume') {
-            return $this->checkDataResume($type, $statusLpj);
-        }
-
-
-        if ($type === 'standar' || $type === 'sederhana') {
-            return $this->checkDataLpj($type, $statusLpj);
-        }
-
-        if ($type === 'rap') {
-            return $this->checkDataRap($type, $statusLpj);
-        }
-
-
-
-        // Kembalikan respons dengan tipe yang sesuai
-        return response()->json(['status' => $type]);
-    }
-
-    public function checkDataMemo($type, $statusLpj)
-    {
-        // Ambil data JSON dari statusLpj
-        $data = json_decode($statusLpj->memo, true) ?? [];
-
-
-        $validationRules = [
-            'memo' => [
-                'kepada',
-                'dari',
-                'nomor_memo',
-                'tanggal',
-                'perihal',
-                'jenis_asset_tidak_sesuai',
-                'lokasi.lokasi',
-                'lokasi.province_code',
-                'lokasi.city_code',
-                'lokasi.district_code',
-                'lokasi.village_code',
-                'lokasi.penilai',
-                'terlampir',
-                'hasil_survey',
-                'kesimpulan_saran',
-            ],
-        ];
-
-        // Validasi data JSON
-        if (isset($validationRules[$type])) {
-            $missingFields = [];
-
-            foreach ($validationRules[$type] as $field) {
-                $keys = explode('.', $field);
-                $value = $data;
-
-                foreach ($keys as $key) {
-                    if (!isset($value[$key])) {
-                        $missingFields[] = $field;
-                        break;
-                    }
-                    $value = $value[$key];
-                }
-            }
-
-            // Jika ada field yang kosong, kembalikan error
-            if (!empty($missingFields)) {
-                return response()->json([
-                    'status' => null,
-                    'message' => "Silahkan lengkapi data memo terlebih dahulu.",
-                    'missing_fields' => $missingFields,
-                ], 400);
-            }
-        }
-
-        // Jika data valid
-        return response()->json([
-            'status' => $type,
-            'message' => "Data memo valid.",
-        ]);
-    }
-
-
-
-
-    public function checkDataResume($type, $statusLpj)
-    {
-        // Ambil data JSON dari statusLpj
-        $data = json_decode($statusLpj->resume, true) ?? [];
-
-        $validationRules = [
-            'resume' => [
-                'fisik'
-            ],
-        ];
-
-        // Validasi data JSON
-        if (isset($validationRules[$type])) {
-            $missingFields = [];
-
-            foreach ($validationRules[$type] as $field) {
-                $keys = explode('.', $field);
-                $value = $data;
-
-                foreach ($keys as $key) {
-                    if (!isset($value[$key])) {
-                        $missingFields[] = $field;
-                        break;
-                    }
-                    $value = $value[$key];
-                }
-
-                // Validasi khusus untuk array fisik dan sesuai_imb
-                if ($field === 'fisik' || $field === 'sesuai_imb') {
-                    if (empty($value) || !is_array($value)) {
-                        $missingFields[] = $field;
-                        continue;
-                    }
-
-                    // Validasi struktur data di dalam array
-                    foreach ($value as $item) {
-                        $requiredKeys = ['sertifikat', 'luas_tanah', 'nilai'];
-                        foreach ($requiredKeys as $requiredKey) {
-                            if (!isset($item[$requiredKey])) {
-                                $missingFields[] = $field . '.' . $requiredKey;
-                            }
-                        }
-                    }
-                }
-            }
-
-            // Jika ada field yang kosong, kembalikan error
-            if (!empty($missingFields)) {
-                return response()->json([
-                    'status' => null,
-                    'message' => "Silahkan lengkapi data resume terlebih dahulu.",
-                    'missing_fields' => $missingFields,
-                ], 400);
-            }
-        }
-
-        // Jika data valid
-        return response()->json([
-            'status' => $type,
-            'message' => "Data resume valid.",
-        ]);
-    }
-
-    public function checkDataLpj($type, $statusLpj)
-    {
-        // Ambil data JSON dari statusLpj
-        $data = json_decode($statusLpj->lpj, true) ?? [];
-
-        $validationRules = [
-            'lpj' => [
-                'luas_tanah',
-                'nilai_tanah_1',
-                'nilai_tanah_2',
-                'luas_bangunan',
-                'nilai_bangunan_1',
-                'nilai_bangunan_2',
-                'total_nilai_pasar_wajar',
-                'likuidasi',
-                'likuidasi_nilai_1',
-                'likuidasi_nilai_2',
-                'asuransi_luas_bangunan',
-                'asuransi_nilai_1',
-                'asuransi_nilai_2',
-                'npw_tambahan'
-            ],
-        ];
-
-        // Validasi data JSON
-        if (isset($validationRules[$type])) {
-            $missingFields = [];
-
-            foreach ($validationRules[$type] as $field) {
-                // Penanganan khusus untuk field yang boleh null
-                if (in_array($field, ['sarana_pelengkap_penilai', 'nilai_sarana_pelengkap_1', 'nilai_sarana_pelengkap_2'])) {
-                    continue;
-                }
-
-                if (!isset($data[$field])) {
-                    $missingFields[] = $field;
-                    continue;
-                }
-
-                // Validasi khusus untuk npw_tambahan
-                if ($field === 'npw_tambahan' && is_array($data[$field])) {
-                    foreach ($data[$field] as $index => $item) {
-                        $requiredKeys = ['name', 'luas', 'nilai_1', 'nilai_2'];
-                        foreach ($requiredKeys as $key) {
-                            if (!isset($item[$key])) {
-                                $missingFields[] = "npw_tambahan[$index].$key";
-                            }
-                        }
-                    }
-                }
-            }
-
-
-            // Jika ada field yang kosong, kembalikan error
-            if (!empty($missingFields)) {
-                return response()->json([
-                    'status' => null,
-                    'message' => "Silahkan lengkapi data LPJ terlebih dahulu.",
-                    'missing_fields' => $missingFields,
-                ], 400);
-            }
-        }
-
-        // Jika data valid
-        return response()->json([
-            'status' => $type,
-            'message' => "Data LPJ valid.",
-        ]);
-    }
-
-    public function checkDataRap($type, $statusLpj)
-    {
-        // Ambil data JSON dari statusLpj
-        $data = json_decode($statusLpj->rap, true) ?? [];
-
-        $requiredFields = [
-            'dari',
-            'kepada',
-            'perihal',
-            'tanggal',
-            'nomor_rap'
-        ];
-
-        // Cek apakah ada field yang kosong
-        $missingFields = [];
-        foreach ($requiredFields as $field) {
-            if (!isset($data[$field]) || empty($data[$field])) {
-                $missingFields[] = $field;
-            }
-        }
-
-        // Jika ada field yang kosong, kembalikan error
-        if (!empty($missingFields)) {
-            return response()->json([
-                'status' => null,
-                'message' => "Silahkan lengkapi data RAP terlebih dahulu.",
-                'missing_fields' => $missingFields
-            ], 400);
-        }
-
-        // Jika semua data terisi
-        return response()->json([
-            'status' => $type,
-            'message' => "Data RAP valid."
-        ]);
-    }
-    private function getPermohonanJaminanId($id, $dokumentId, $jaminanId)
-    {
-        return Permohonan::with([
-            'user',
-            'debiture.province',
-            'debiture.city',
-            'debiture.district',
-            'debiture.village',
-            'branch',
-            'tujuanPenilaian',
-            'penilaian',
-            'penawaran',
-            'debiture.documents' => function ($query) use ($dokumentId, $jaminanId) {
-                $query->where('id', $dokumentId)
-                      ->where('jenis_jaminan_id', $jaminanId);
-            }
-            ])->findOrFail($id);
-    }
-
-    public function getCommonData()
-    {
-        return [
-            'branches' => Branch::all(),
-            'bentukTanah' => BentukTanah::all(),
-            'konturTanah' => KonturTanah::all(),
-            'posisiKavling' => PosisiKavling::all(),
-            'ketinggianTanah' => KetinggianTanah::all(),
-            'kondisiFisikTanah' => KondisiFisikTanah::all(),
-            'jenisBangunan' => JenisBangunan::all(),
-            'kondisiBangunan' => KondisiBangunan::all(),
-            'sifatBangunan' => SifatBangunan::all(),
-            'spekKategoriBangunan' => SpekKategoritBangunan::all(),
-            'spekBangunan' => SpekBangunan::all(),
-            'saranaPelengkap' => SaranaPelengkap::all(),
-            'arahMataAngin' => ArahMataAngin::all(),
-            'lantai' => Lantai::all(),
-            'viewUnit' => ViewUnit::all(),
-            'golMasySekitar' => GolonganMasySekitar::all(),
-            'tingkatKeramaian' => TingkatKeramaian::all(),
-            'laluLintasLokasi' => LaluLintasLokasi::all(),
-            'jenisPesawat' => JenisPesawat::all(),
-            'modelAlatBerat' => ModelAlatBerat::all(),
-            'jenisKapal' => JenisKapal::all(),
-            'jenisKendaraan' => JenisKendaraan::all(),
-            'terletakArea' => TerletakArea::all(),
-            'posisiUnit' => PosisiUnit::all(),
-            'bentukUnit' => BentukUnit::all(),
-            'fasilitasObjek' => FasilitasObjek::all(),
-            'merupakanDaerah' => MerupakanDaerah::all(),
-            'jenisUnit' => JenisUnit::all(),
-            'jenisJaminan' => JenisJaminan::all(),
-            'hubCadeb' => HubunganPemilikJaminan::all(),
-            'hubPenghuni' => HubunganPenghuniJaminan::all(),
-            'perkerasanJalan' => PerkerasanJalan::all(),
-            'terletakDiArea' => TerletakArea::all(),
-            'tujuanPenilaian' => TujuanPenilaian::all(),
-            'perizinan' => Perizinan::all(),
-            'foto' =>  FotoObjekJaminan::all()
-        ];
-    }
-
-    private const HEADERS = [
-        'bentuk-tanah' => ['Bentuk Tanah', 'bentuk-tanah'],
-        'kontur-tanah' => ['Kontur Tanah', 'kontur-tanah'],
-        'posisi-kavling' => ['Posisi Kavling', 'posisi-kavling'],
-        'ketinggian-tanah' => ['Ketinggian Tanah', 'ketinggian-tanah'],
-        'kondisi-fisik-tanah' => ['Kondisi Fisik Tanah', 'kondisi-fisik-tanah'],
-        'jenis-bangunan' => ['Jenis Bangunan', 'jenis-bangunan'],
-        'kondisi-bangunan' => ['Kondisi Bangunan', 'kondisi-bangunan'],
-        'sifat-bangunan' => ['Sifat Bangunan', 'sifat-bangunan'],
-        'sarana-pelengkap' => ['Sarana Pelengkap', 'sarana-pelengkap'],
-        'lalu-lintas-lokasi' => ['Lalu Lintas Depan Lokasi', 'lalu-lintas-lokasi'],
-        'tingkat-keramaian' => ['Tingkat Keramaian', 'tingkat-keramaian'],
-        'gol-mas-sekitar' => ['Golongan Masyarakat Sekitar', 'gol-mas-sekitar'],
-        'spek-kategori-bangunan' => ['Spek Kategori Bangunan', 'spek-kategori-bangunan'],
-        'spek-bangunan' => ['Spek Bangunan', 'spek-bangunan'],
-        'lantai-unit' => ['Lantai Unit', 'lantai-unit'],
-        'view-unit' => ['View Unit', 'view-unit'],
-        'perkerasan-jalan' => ['Perkerasan jalan', 'perkerasan-jalan'],
-        'jenis-pesawat' => ['Jenis pesawat', 'jenis-pesawat'],
-        'model-alat-berat' => ['Model alat berat', 'model-alat-berat'],
-        'jenis-kapal' => ['Jenis kapal', 'jenis-kapal'],
-        'jenis-kendaraan' => ['Jenis kendaraan', 'jenis-kendaraan'],
-        'jenis-unit' => ['Jenis unit', 'jenis-unit'],
-        'terletak-area' => ['Terletak di Area', 'terletak-area'],
-        'merupakan-daerah' => ['Merupakan Daerah', 'merupakan-daerah'],
-        'posisi-unit' => ['Posisi unit', 'posisi-unit'],
-        'bentuk-unit' => ['Bentuk unit', 'bentuk-unit'],
-        'fasilitas-objek' => ['Fasilitas Umum Dekat Objek', 'fasilitas-objek'],
-        'foto-objek-jaminan' => ['Foto Objek Jaminan', 'foto-objek-jaminan'],
-        'perizinan' => ['Perizinan', 'perizinan'],
-    ];
-
-}

app/Services/RekapHarianService.php

@@ -1,63 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Services;
-
-class RekapHarianService
-{
-    public function getRekapHarian()
-    {
-        // return $id;
-    }
-
-    public function totalLaporan()
-    {
-        $jenis_penilaian = JenisPenilaian::all();
-        $laporan = [];
-        $grandTotal = [];
-
-        foreach ($jenis_penilaian as $index => $jenis) {
-
-            $totalLaporanDebiture = $this->totalLaporanDebiture();
-            $totalKunjunganDebiture = $this->totalKunjunganDebiture();
-            $totalKunjunganLokasi = $this->totalKunjunganLokasi();
-
-
-            $grandTotal = [
-                'laporan_debiture' => 0,
-                'debiture' => 0,
-                'lokasi' => 0,
-                'pipeline' => 0
-            ];
-        }
-        return $grandTotal;
-
-    }
-
-
-    private function totalLaporanDebiture()
-    {
-        $query = [
-            'jenis_penilaian_id' => 1,
-            'total' => 2
-        ];
-        return $query;
-    }
-
-    public function totalKunjunganDebiture()
-    {
-        $query = [
-          'jenis_penilaian_id' => 1,
-          'total' => 2
-        ];
-        return $query;
-    }
-
-    public function totalKunjunganLokasi()
-    {
-        $query = [
-          'jenis_penilaian_id' => 1,
-          'total' => 2
-        ];
-        return $query;
-    }
-}

app/Services/SaveFormInspesksiService.php

@@ -122,7 +122,7 @@ class SaveFormInspesksiService
         }
 
         if ($hasFactaData) {
-            $rules = array_merge($rules, $this->getFactData($data, $request,  $inspeksi));
+            $rules = array_merge($rules, $this->getFactData($data, $request));
         }
 
         return $rules;
@@ -450,6 +450,8 @@ class SaveFormInspesksiService
 
         $data['perizinan'] = $perizinanData;
 
+
+
         $partisiResult = [];
         if (isset($data['partisi'])) {
             foreach ($data['partisi'] as $name => $values) {

app/Services/TypeLaporanService.php

@@ -1,107 +0,0 @@
-<?php
-
-namespace Modules\Lpj\Services;
-
-class TypeLaporanService
-{
-    public function handleRequest($type, $permohonanId, $documentId, $jaminanId, $surveyorController)
-    {
-        $permohonan = $this->getPermohonanData($surveyorController, $permohonanId, $documentId, $jaminanId);
-
-        if ($permohonan->status == 'proses-laporan') {
-            throw new \Exception('Masih dalam proses laporan');
-        }
-
-        $nomorLaporan = $this->generateNomorLaporan($surveyorController, $permohonan, $documentId, $type);
-        $inspeksi = $this->getInspeksi($permohonanId, $documentId);
-        $this->updatePenilai($permohonanId, $documentId, $type);
-
-        $debitur = Debiture::find($permohonan->debiture_id);
-        $forminspeksi = $inspeksi ? json_decode($inspeksi->data_form, true) : null;
-
-        $locationCodes = $this->getAlamatData($debitur, $forminspeksi);
-        $locationData = $this->getLocationData(
-            $locationCodes['provinceCode'],
-            $locationCodes['cityCode'],
-            $locationCodes['districtCode'],
-            $forminspeksi
-        );
-
-        return [
-            'permohonan' => $permohonan,
-            'nomorLaporan' => $nomorLaporan,
-            'basicData' => $surveyorController->getCommonData(),
-            'cities' => $locationData['cities'],
-            'districts' => $locationData['districts'],
-            'villages' => $locationData['villages'],
-            'forminspeksi' => $forminspeksi,
-        ];
-    }
-
-    private function getPermohonanData($surveyorController, $permohonanId, $documentId, $jaminanId)
-    {
-        return $surveyorController->getPermohonanData($permohonanId, $documentId, $jaminanId);
-    }
-
-    private function generateNomorLaporan($surveyorController, $permohonan, $documentId, $type)
-    {
-        return $surveyorController->generateNomorLaporan($permohonan, $documentId, $type);
-    }
-
-    private function getInspeksi($permohonanId, $documentId)
-    {
-        return Inspeksi::where('permohonan_id', $permohonanId)
-            ->where('document_id', $documentId)
-            ->first();
-    }
-
-    private function updatePenilai($permohonanId, $documentId, $type)
-    {
-        // Logika untuk memperbarui data berdasarkan tipe laporan
-    }
-
-    private function getAlamatData($debitur, $forminspeksi)
-    {
-        return [
-            'provinceCode' => $debitur->province_id ?? $forminspeksi['province'],
-            'cityCode' => $debitur->city_id ?? $forminspeksi['city'],
-            'districtCode' => $debitur->district_id ?? $forminspeksi['district'],
-        ];
-    }
-
-    private function getLocationData($provinceCode, $cityCode, $districtCode, $forminspeksi)
-    {
-        return [
-            'cities' => $this->fetchCityData($provinceCode),
-            'districts' => $this->fetchDistrictData($cityCode),
-            'villages' => $this->fetchVillageData($districtCode),
-        ];
-    }
-
-    private function fetchCityData($provinceCode)
-    {
-        return City::where('province_code', $provinceCode)->get();
-    }
-    private function fetchDistrictData($cityCode)
-    {
-        return District::where('city_code', $cityCode)->get();
-    }
-    private function fetchVillageData($districtCode)
-    {
-        return  Village::where('district_code', $districtCode)->get();
-    }
-
-    private function updateOrCreatePenilai($permohonan_id, $document_id, $type, $data)
-    {
-        return Penilai::updateOrCreate(
-            [
-                     'permohonan_id' => $permohonan_id,
-                     'dokument_id' => $document_id,
-
-                 ],
-            [
-                     $type => json_encode($data),
-                 ]
-        );
-    }
-}

config/config.php

@@ -2,62 +2,4 @@
 
     return [
         'name' => 'Lpj',
-        'import' => [
-            'slik' => [
-                // Memory limit untuk import (dalam MB)
-                'memory_limit' => env('SLIK_IMPORT_MEMORY_LIMIT', 1024),
-
-                // Ukuran chunk untuk processing (jumlah baris per chunk)
-                'chunk_size' => env('SLIK_IMPORT_CHUNK_SIZE', 50),
-
-                // Ukuran batch untuk database insert
-                'batch_size' => env('SLIK_IMPORT_BATCH_SIZE', 50),
-
-                // Timeout untuk import (dalam detik)
-                'timeout' => env('SLIK_IMPORT_TIMEOUT', 1800), // 30 menit untuk file besar
-
-                // Maksimum file size yang diizinkan (dalam MB)
-                'max_file_size' => env('SLIK_IMPORT_MAX_FILE_SIZE', 50),
-
-                // Enable garbage collection untuk optimasi memory
-                'enable_gc' => env('SLIK_IMPORT_ENABLE_GC', true),
-
-                // Enable progress logging
-                'enable_progress_logging' => env('SLIK_IMPORT_ENABLE_PROGRESS_LOGGING', true),
-
-                // Enable detailed error logging
-                'enable_error_logging' => env('SLIK_IMPORT_ENABLE_ERROR_LOGGING', true),
-
-                // XML Scanner settings untuk optimasi memory
-                'xml_scanner' => [
-                    'timeout' => env('SLIK_XML_SCANNER_TIMEOUT', 1800), // 30 menit
-                    'memory_limit' => env('SLIK_XML_SCANNER_MEMORY_LIMIT', 1024), // 1GB
-                    'chunk_size' => env('SLIK_XML_SCANNER_CHUNK_SIZE', 50), // Lebih kecil untuk XML
-                ],
-
-                // Queue processing untuk file besar
-                'queue' => [
-                    'enabled' => env('SLIK_IMPORT_QUEUE_ENABLED', false),
-                    'connection' => env('SLIK_IMPORT_QUEUE_CONNECTION', 'database'),
-                    'queue_name' => env('SLIK_IMPORT_QUEUE_NAME', 'imports'),
-                    'chunk_size' => env('SLIK_IMPORT_QUEUE_CHUNK_SIZE', 500),
-                ],
-
-                // Progress tracking
-                'progress' => [
-                    'enabled' => env('SLIK_IMPORT_PROGRESS_ENABLED', true),
-                    'update_interval' => env('SLIK_IMPORT_PROGRESS_INTERVAL', 50), // update setiap 50 baris
-                    'cache_key' => 'slik_import_progress',
-                    'cache_ttl' => 3600, // 1 jam
-                ],
-            ],
-
-            // General import settings
-            'general' => [
-                'default_memory_limit' => env('IMPORT_DEFAULT_MEMORY_LIMIT', 128),
-                'max_execution_time' => env('IMPORT_MAX_EXECUTION_TIME', 300000),
-                'temp_directory' => env('IMPORT_TEMP_DIRECTORY', storage_path('app/temp')),
-                'cleanup_temp_files' => env('IMPORT_CLEANUP_TEMP_FILES', true),
-            ],
-        ],
     ];

database/migrations/2025_03_14_013537_add_jenis_lampiran_id_to_lampiran_dokumen_table.php

@@ -1,30 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-    use Modules\Lpj\Models\JenisLampiran;
-
-    return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('lampiran_dokumen', function (Blueprint $table) {
-           $table->foreignIdFor(JenisLampiran::class)->constrained('jenis_lampiran')->onDelete('cascade')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('lampiran_dokumen', function (Blueprint $table) {
-            $table->dropForeign(['jenis_lampiran_id']);
-            $table->dropColumn('jenis_lampiran_id');
-        });
-    }
-};

database/migrations/2025_04_02_090044_mig_update_debiturs_table.php

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class () extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */
@@ -12,16 +13,27 @@ return new class () extends Migration {
     {
         Schema::table('debitures', function (Blueprint $table) {
             // nullable
-            $table->string('cif', 16)
-            ->nullable()
-            ->default('0000000000')
-            ->comment('asal data LPJ.PRM_DEBITUR.KODE_CIF. Pada KODE_CIF ada yang digitnya 16 => 3372040405810002')
-            ->change();
             $table->unsignedBigInteger('branch_id')->nullable()->change();
+            $table->string('cif', 16)->nullable()->comment('asal data LPJ.PRM_DEBITUR.KODE_CIF. Pada KODE_CIF ada yang digitnya 16 => 3372040405810002')->change();
             $table->string('nomor_id', 50)->nullable()->change();
-
+            
+            // Menambahkan kolom baru dengan nullable dan comment
+            $table->char('mig_addr_display', 1)->nullable()->comment('asal data LPJ.PRM_DEBITUR_ADDR.ADDR_DISPLAY');
+            $table->char('mig_comm_display', 1)->nullable()->comment('asal data LPJ.PRM_DEBITUR_COMM.COMM_DISPLAY');
+            $table->char('mig_flag_oto', 1)->nullable()->comment('asal data LPJ.PRM_DEBITUR.FLAG_OTO');
+            $table->string('mig_kd_cabang', 11)->nullable()->comment('asal data LPJ.PRM_DEBITUR.KD_CABANG. Berguna untuk update branch_id');
+            $table->string('mig_kd_cabang_addr', 11)->nullable()->comment('asal data LPJ.PRM_DEBITUR_ADDR.KD_CABANG');
+            $table->string('mig_kd_cabang_comm', 11)->nullable()->comment('asal data LPJ.PRM_DEBITUR_COMM.KD_CABANG');
             $table->unsignedBigInteger('mig_kd_debitur_seq')->nullable()->comment('asal data LPJ.PRM_DEBITUR.KD_DEBITUR_SEQ. Berguna untuk update debitur_id menggunakan KD_DEBITUR_SEQ nya');
-            $table->timestamp('processed_at')->nullable();
+            $table->string('mig_nama_daerah', 200)->nullable()->comment('asal data LPJ.PRM_DEBITUR_ADDR.NAMA_DAERAH');
+            $table->string('mig_no_cif', 20)->nullable()->comment('asal data LPJ.PRM_DEBITUR.NO_CIF');            
+            $table->string('mig_nomor_id2', 50)->nullable()->comment('asal data LPJ.PRM_DEBITUR.NO_ID. dipisahkan karena isinya tidak murni number');
+            $table->string('mig_phone', 300)->nullable()->comment('asal data LPJ.PRM_DEBITUR_COMM.COMM_VALUE. dipisahkan karena isinya tidak murni number phone');
+            $table->dateTime('mig_tgl_oto')->nullable()->comment('asal data LPJ.PRM_DEBITUR.TGL_OTO');
+            $table->unsignedBigInteger('mig_urut_seq_addr')->nullable()->comment('asal data LPJ.PRM_DEBITUR_ADDR.URUT_SEQ');
+            $table->unsignedBigInteger('mig_urut_seq_comm')->nullable()->comment('asal data LPJ.PRM_DEBITUR_COMM.URUT_SEQ');
+            $table->string('mig_user_oto', 10)->nullable()->comment('asal data LPJ.PRM_DEBITUR.USER_OTO');
+            $table->string('mig_user_update')->nullable()->comment('asal data LPJ.PRM_DEBITUR.USER_UPDATE');
             $table->char('is_mig', 1)->nullable()->comment('untuk menandakan row ini dari LPJ OLD');
         });
     }
@@ -31,7 +43,7 @@ return new class () extends Migration {
      */
     public function down(): void
     {
-        Schema::table('debitures', function (Blueprint $table) {
+         Schema::table('debitures', function (Blueprint $table) {
             // Kembalikan kolom branch_id agar tidak nullable (asumsi awal NOT NULL)
             $table->unsignedBigInteger('branch_id')->nullable(false)->change();
 
@@ -41,10 +53,22 @@ return new class () extends Migration {
 
             // Hapus kolom tambahan yang dibuat di up()
             $table->dropColumn([
+                'mig_addr_display',
+                'mig_comm_display',
+                'mig_flag_oto',
+                'mig_kd_cabang',
+                'mig_kd_cabang_addr',
+                'mig_kd_cabang_comm',
                 'mig_kd_debitur_seq',
+                'mig_nama_daerah',
+                'mig_no_cif',
+                'mig_nomor_id2',
+                'mig_phone',
+                'mig_tgl_oto',
                 'mig_urut_seq_addr',
                 'mig_urut_seq_comm',
-                'processed_at',
+                'mig_user_oto',
+                'mig_user_update',                
                 'is_mig'
             ]);
         });

database/migrations/2025_04_05_080904_mig_create_debitures_addrs_table.php

@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('mig_debitures_addrs', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('mig_kd_debitur_seq')->nullable()->comment('asal data LPJ.PRM_DEBITUR_ADDR.KD_DEBITUR_SEQ');
+            $table->unsignedBigInteger('mig_urut_seq')->nullable()->comment('asal data LPJ.PRM_DEBITUR_ADDR.URUT_SEQ');
+            $table->unsignedBigInteger('mig_addr_type_seq')->nullable()->comment('asal data LPJ.PRM_DEBITUR_ADDR.ADDR_TYPE_SEQ');
+            $table->string('mig_addr_value', 500)->nullable()->comment('asal data LPJ.PRM_DEBITUR_ADDR.ADDR_VALUE');
+            $table->string('mig_user_update', 10)->nullable()->comment('asal data LPJ.PRM_DEBITUR_ADDR.USER_UPDATE');
+            $table->dateTime('mig_tgl_update')->nullable()->comment('asal data LPJ.PRM_DEBITUR_ADDR.TGL_UPDATE');    
+            $table->char('mig_flag_oto', 1)->nullable()->comment('asal data LPJ.PRM_DEBITUR_ADDR.FLAG_OTO');
+            $table->string('mig_user_oto', 10)->nullable()->comment('asal data LPJ.PRM_DEBITUR_ADDR.USER_OTO');
+            $table->dateTime('mig_tgl_oto')->nullable()->comment('asal data LPJ.PRM_DEBITUR_ADDR.TGL_OTO');    
+            $table->unsignedBigInteger('mig_kd_kel_seq')->nullable()->comment('asal data LPJ.PRM_DEBITUR_ADDR.KD_KEL_SEQ');
+            $table->char('mig_addr_display', 1)->nullable()->comment('asal data LPJ.PRM_DEBITUR_ADDR.ADDR_DISPLAY');   
+            $table->string('mig_kd_cabang', 11)->nullable()->comment('asal data LPJ.PRM_DEBITUR_ADDR.KD_CABANG'); 
+            $table->string('mig_nama_daerah', 200)->nullable()->comment('asal data LPJ.PRM_DEBITUR_ADDR.NAMA_DAERAH');
+            $table->char('is_mig', 1)->nullable()->comment('untuk menandakan row ini dari LPJ OLD');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('mig_debitures_addrs');
+    }
+};

database/migrations/2025_04_05_092224_mig_create_debitures_comms_table.php

@@ -0,0 +1,39 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::create('mig_debitures_comms', function (Blueprint $table) {
+            $table->id();
+            $table->unsignedBigInteger('mig_kd_debitur_seq')->nullable()->comment('asal data LPJ.PRM_DEBITUR_COMM.KD_DEBITUR_SEQ');
+            $table->unsignedBigInteger('mig_urut_seq')->nullable()->comment('asal data LPJ.PRM_DEBITUR_COMM.URUT_SEQ');
+            $table->unsignedBigInteger('mig_comm_type_seq')->nullable()->comment('asal data LPJ.PRM_DEBITUR_COMM.COMM_TYPE_SEQ');
+            $table->string('mig_comm_value', 300)->nullable()->comment('asal data LPJ.PRM_DEBITUR_COMM.COMM_VALUE');
+            $table->unsignedBigInteger('mig_addr_type_seq')->nullable()->comment('asal data LPJ.PRM_DEBITUR_COMM.ADDR_TYPE_SEQ');
+            $table->string('mig_user_update', 10)->nullable()->comment('asal data LPJ.PRM_DEBITUR_COMM.USER_UPDATE');
+            $table->dateTime('mig_tgl_update')->nullable()->comment('asal data LPJ.PRM_DEBITUR_COMM.TGL_UPDATE');    
+            $table->char('mig_flag_oto', 1)->nullable()->comment('asal data LPJ.PRM_DEBITUR_COMM.FLAG_OTO');
+            $table->string('mig_user_oto', 10)->nullable()->comment('asal data LPJ.PRM_DEBITUR_COMM.USER_OTO');
+            $table->dateTime('mig_tgl_oto')->nullable()->comment('asal data LPJ.PRM_DEBITUR_COMM.TGL_OTO');    
+            $table->char('mig_comm_display', 1)->nullable()->comment('asal data LPJ.PRM_DEBITUR_COMM.ADDR_DISPLAY');   
+            $table->string('mig_kd_cabang', 11)->nullable()->comment('asal data LPJ.PRM_DEBITUR_COMM.KD_CABANG'); 
+            $table->char('is_mig', 1)->nullable()->comment('untuk menandakan row ini dari LPJ OLD');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('mig_debitures_comms');
+    }
+};

database/migrations/2025_04_24_090044_mig_update_permohonan_table.php

@@ -1,47 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class () extends Migration {
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('permohonan', function (Blueprint $table) {
-            // nullable
-            $table->unsignedBigInteger('branch_id')->nullable()->change();
-            $table->unsignedBigInteger('user_id')->nullable()->change();
-
-
-            $table->unsignedBigInteger('mig_kd_debitur_seq')->nullable()->comment('asal data LPJ.PRM_DEBITUR.KD_DEBITUR_SEQ. Berguna untuk update debitur_id menggunakan KD_DEBITUR_SEQ nya');
-            $table->unsignedBigInteger('nomor_lpj')->nullable();
-            $table->string('mig_nama_ao')->nullable();
-            $table->char('is_mig', 1)->nullable()->comment('untuk menandakan row ini dari LPJ OLD');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('permohonan', function (Blueprint $table) {
-            // Kembalikan kolom branch_id agar tidak nullable (asumsi awal NOT NULL)
-            $table->unsignedBigInteger('branch_id')->nullable(false)->change();
-            $table->unsignedBigInteger('user_id')->nullable(false)->change();
-
-
-
-            // Hapus kolom tambahan yang dibuat di up()
-            $table->dropColumn([
-                'mig_kd_debitur_seq',
-                'nomor_lpj',
-                'mig_nama_ao',
-                'is_mig'
-            ]);
-        });
-    }
-};

database/migrations/2025_04_24_090045_mig_update_dokumen_jaminan.php

@@ -1,40 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class () extends Migration {
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('dokumen_jaminan', function (Blueprint $table) {
-            // nullable
-
-            $table->unsignedBigInteger('mig_kd_debitur_seq')->nullable()->comment('asal data LPJ.PRM_DEBITUR.KD_DEBITUR_SEQ. Berguna untuk update debitur_id menggunakan KD_DEBITUR_SEQ nya');
-            $table->unsignedBigInteger('nomor_lpj')->nullable();
-            $table->timestamp('processed_at')->nullable();
-            $table->char('is_mig', 1)->nullable()->comment('untuk menandakan row ini dari LPJ OLD');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('dokumen_jaminan', function (Blueprint $table) {
-
-
-            // Hapus kolom tambahan yang dibuat di up()
-            $table->dropColumn([
-                'nomor_lpj',
-                'mig_kd_debitur_seq',
-                'processed_at',
-                'is_mig'
-            ]);
-        });
-    }
-};

database/migrations/2025_04_24_090045_mig_update_pemilik_jaminan_table.php

@@ -1,38 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class () extends Migration {
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('pemilik_jaminan', function (Blueprint $table) {
-            // nullable
-
-            $table->unsignedBigInteger('mig_kd_debitur_seq')->nullable()->comment('asal data LPJ.PRM_DEBITUR.KD_DEBITUR_SEQ. Berguna untuk update debitur_id menggunakan KD_DEBITUR_SEQ nya');
-            $table->timestamp('processed_at')->nullable();
-            $table->char('is_mig', 1)->nullable()->comment('untuk menandakan row ini dari LPJ OLD');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('pemilik_jaminan', function (Blueprint $table) {
-
-
-            // Hapus kolom tambahan yang dibuat di up()
-            $table->dropColumn([
-                'mig_kd_debitur_seq',
-                'processed_at',
-                'is_mig'
-            ]);
-        });
-    }
-};

database/migrations/2025_05_04_111456_add_field_migration_to_inspeksi_table.php

@@ -1,32 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('inspeksi', function (Blueprint $table) {
-            $table->unsignedBigInteger('nomor_lpj')->nullable();
-            $table->timestamp('processed_at')->nullable();
-            $table->char('is_mig', 1)->nullable()->comment('untuk menandakan row ini dari LPJ OLD');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('inspeksi', function (Blueprint $table) {
-            $table->dropColumn('nomor_lpj');
-            $table->dropColumn('processed_at');
-            $table->dropColumn('is_mig');
-        });
-    }
-};

database/migrations/2025_05_04_111641_add_field_migration_to_penilai_table.php

@@ -1,33 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('penilai', function (Blueprint $table) {
-             $table->unsignedBigInteger('nomor_lpj')->nullable();
-            $table->timestamp('processed_at')->nullable();
-            $table->char('is_mig', 1)->nullable()->comment('untuk menandakan row ini dari LPJ OLD');
-        });
-
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('penilai', function (Blueprint $table) {
-            $table->dropColumn('nomor_lpj');
-            $table->dropColumn('processed_at');
-            $table->dropColumn('is_mig');
-        });
-    }
-};

database/migrations/2025_05_07_040513_update_detail_dokumen_jaminan_details.php

@@ -0,0 +1,39 @@
+<?php
+
+use Modules\Lpj\Models\DetailDokumenJaminan;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        DetailDokumenJaminan::query()
+            ->whereNotNull('details')
+            ->where('details', '!=', '')
+            ->where('details', 'not like', '[%]')
+            ->update([
+                'details' => DB::raw("CONCAT('[', details, ']')")
+            ]);
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        DetailDokumenJaminan::query()
+            ->whereNotNull('details')
+            ->where('details', '!=', '')
+            ->where('details', 'like', '[%]')
+            ->where('details', 'like', '%]')
+            ->update([
+                'details' => DB::raw("SUBSTRING(details, 2, LENGTH(details) - 2)")
+            ]);
+    }
+};

database/migrations/2025_05_07_114328_add_mig_mst_lpj_nomor_jaminan_to_permohonan_table.php

@@ -11,8 +11,8 @@ return new class extends Migration
      */
     public function up(): void
     {
-        Schema::table('noc', function (Blueprint $table) {
-            $table->bigInteger('branch_id')->nullable()->after('debiture_id');
+        Schema::table('permohonan', function (Blueprint $table) {
+            $table->string('mig_mst_lpj_nomor_jaminan')->nullable();
         });
     }
 
@@ -21,8 +21,8 @@ return new class extends Migration
      */
     public function down(): void
     {
-        Schema::table('noc', function (Blueprint $table) {
-            $table->dropColumn('branch_id');
+        Schema::table('permohonan', function (Blueprint $table) {
+            $table->dropColumn('mig_mst_lpj_nomor_jaminan');
         });
     }
 };

database/migrations/2025_05_07_183700_add_nomor_registrasi_to_persetujuan_penawaran_table.php

@@ -11,8 +11,8 @@ return new class extends Migration
      */
     public function up(): void
     {
-        Schema::table('noc', function (Blueprint $table) {
-            $table->decimal('total_pembukuan', 10, 2)->after('nominal_bayar');
+        Schema::table('persetujuan_penawaran', function (Blueprint $table) {
+            $table->string('nomor_registrasi')->nullable()->after('penawaran_id');
         });
     }
 
@@ -21,8 +21,8 @@ return new class extends Migration
      */
     public function down(): void
     {
-        Schema::table('noc', function (Blueprint $table) {
-            $table->dropColumn('total_pembukuan');
+        Schema::table('persetujuan_penawaran', function (Blueprint $table) {
+            $table->dropColumn('nomor_registrasi');
         });
     }
 };

database/migrations/2025_07_07_025336_create_category_daftar_pustaka_table.php

@@ -1,35 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class () extends Migration {
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::create('category_daftar_pustaka', function (Blueprint $table) {
-            $table->id();
-            $table->string('code')->unique()->index();
-            $table->string('name');
-            $table->timestamps();
-            $table->timestamp('authorized_at')->nullable();
-            $table->char('authorized_status', 1)->nullable();
-            $table->softDeletes();
-            $table->unsignedBigInteger('created_by')->nullable();
-            $table->unsignedBigInteger('updated_by')->nullable();
-            $table->unsignedBigInteger('deleted_by')->nullable();
-            $table->unsignedBigInteger('authorized_by')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('category_daftar_pustaka');
-    }
-};

database/migrations/2025_07_07_025337_create_daftar_pustaka_table.php

@@ -1,38 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class () extends Migration {
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::create('daftar_pustaka', function (Blueprint $table) {
-            $table->id();
-            $table->string('judul');
-            $table->string('attachment')->nullable();
-            $table->text('deskripsi');
-            $table->unsignedBigInteger('category_id');
-            $table->foreign('category_id')->references('id')->on('category_daftar_pustaka');
-            $table->timestamps();
-            $table->timestamp('authorized_at')->nullable();
-            $table->char('authorized_status', 1)->nullable();
-            $table->softDeletes();
-            $table->unsignedBigInteger('created_by')->nullable();
-            $table->unsignedBigInteger('updated_by')->nullable();
-            $table->unsignedBigInteger('deleted_by')->nullable();
-            $table->unsignedBigInteger('authorized_by')->nullable();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('daftar_pustaka');
-    }
-};

database/migrations/2025_07_17_055636_add_memo_penyelesaian_fields_to_noc_table.php

@@ -1,36 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration {
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('noc', function (Blueprint $table) {
-            // Field untuk informasi memo penyelesaian
-            $table->string('memo_penyelesaian_number')->nullable()->after('memo_penyelesaian');
-            $table->date('memo_penyelesaian_date')->nullable()->after('memo_penyelesaian_number');
-            $table->date('memo_penyelesaian_payment_date')->nullable()->after('memo_penyelesaian_date');
-            $table->timestamp('memo_penyelesaian_created_at')->nullable()->after('memo_penyelesaian_date');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('noc', function (Blueprint $table) {
-            $table->dropColumn([
-                'memo_penyelesaian_number',
-                'memo_penyelesaian_date',
-                'memo_penyelesaian_payment_date',
-                'memo_penyelesaian_created_at'
-            ]);
-        });
-    }
-};

database/migrations/2025_07_31_060244_add_payment_status_fields_to_noc_table.php

@@ -1,44 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration {
-    /**
-     * Menjalankan migration untuk menambahkan field status pembayaran
-     * Field yang ditambahkan: status_kurang_bayar, nominal_kurang_bayar,
-     * status_lebih_bayar, nominal_lebih_bayar, bukti_pengembalian
-     */
-    public function up(): void
-    {
-        Schema::table('noc', function (Blueprint $table) {
-            // Field untuk status kurang bayar
-            $table->boolean('status_kurang_bayar')->default(false)->after('status_bayar');
-            $table->decimal('nominal_kurang_bayar', 15, 2)->nullable()->after('status_kurang_bayar');
-
-            // Field untuk status lebih bayar
-            $table->boolean('status_lebih_bayar')->default(false)->after('nominal_kurang_bayar');
-            $table->decimal('nominal_lebih_bayar', 15, 2)->nullable()->after('status_lebih_bayar');
-
-            // Field untuk bukti pengembalian jika lebih bayar
-            $table->string('bukti_pengembalian')->nullable()->after('nominal_lebih_bayar');
-        });
-    }
-
-    /**
-     * Rollback migration
-     */
-    public function down(): void
-    {
-        Schema::table('noc', function (Blueprint $table) {
-            $table->dropColumn([
-                'status_kurang_bayar',
-                'nominal_kurang_bayar',
-                'status_lebih_bayar',
-                'nominal_lebih_bayar',
-                'bukti_pengembalian'
-            ]);
-        });
-    }
-};

database/migrations/2025_08_12_1003145_create_tickets_table.php

@@ -1,67 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration {
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::create('bucoks', function (Blueprint $table) {
-            $table->id();
-            $table->string('no')->nullable(); // Nomor urut
-            $table->string('tanggal')->nullable(); // Tanggal
-            $table->string('bulan')->nullable(); // Bulan
-            $table->string('tahun')->nullable(); // Tahun
-            $table->string('tanggal_penuh')->nullable(); // Tanggal lengkap
-            $table->string('nomor_categ')->nullable(); // Nomor kategori
-            $table->string('coa_summary')->nullable(); // COA Summary
-            $table->string('nomor_coa')->nullable(); // Nomor COA
-            $table->string('nama_coa')->nullable(); // Nama COA
-            $table->string('nomor_tiket')->unique(); // Nomor tiket (unique)
-            $table->string('deskripsi')->nullable(); // Deskripsi
-            $table->string('nominal')->nullable(); // Nominal
-            $table->string('penyelesaian')->nullable(); // Penyelesaian
-            $table->string('umur_aging')->nullable(); // Umur aging
-            $table->string('cost_center')->nullable(); // Cost center
-            $table->string('nama_sub_direktorat')->nullable(); // Nama sub direktorat
-            $table->string('nama_direktorat_cabang')->nullable(); // Nama direktorat cabang
-            $table->string('tanggal_penyelesaian')->nullable(); // Tanggal penyelesaian
-            $table->string('nominal_penyelesaian')->nullable(); // Nominal penyelesaian
-            $table->string('nominal_berjalan')->nullable(); // Nominal berjalan
-            $table->string('amortisasi_berjalan')->nullable(); // Amortisasi berjalan
-            $table->string('sistem_berjalan')->nullable(); // Sistem berjalan
-            $table->string('lainnya_berjalan')->nullable(); // Lainnya berjalan
-            $table->string('nominal_gantung')->nullable(); // Nominal gantung
-            $table->string('aset_gantung')->nullable(); // Aset gantung
-            $table->string('keterangan_gantung')->nullable(); // Keterangan gantung
-            $table->string('lainnya_satu')->nullable(); // Lainnya satu
-            $table->string('lainnya_dua')->nullable(); // Lainnya dua
-
-            // Standard Laravel fields
-            $table->timestamps();
-            $table->string('created_by')->nullable();
-            $table->string('updated_by')->nullable();
-            $table->string('deleted_by')->nullable();
-            $table->softDeletes();
-
-            // Indexes untuk performa
-            $table->index(['nomor_tiket']);
-            $table->index(['tanggal']);
-            $table->index(['tahun']);
-            $table->index(['nomor_coa']);
-            $table->index(['cost_center']);
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::dropIfExists('bucoks');
-    }
-};

database/migrations/2025_09_11_145857_add_nomor_tiket_to_persetujuan_penawaran_table.php

@@ -1,59 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration
-{
-    /**
-     * Run the migrations.
-     * Menambahkan kolom nomor_tiket ke tabel persetujuan_penawaran
-     */
-    public function up(): void
-    {
-        Schema::table('persetujuan_penawaran', function (Blueprint $table) {
-            // Menambahkan kolom nomor_tiket setelah nomor_proposal_penawaran
-            $table->string('nomor_tiket', 100)->nullable()->after('nomor_proposal_penawaran')
-                  ->comment('Nomor tiket untuk tracking persetujuan penawaran');
-            $table->string('nominal_kurang_bayar')->nullable()->after('nomor_proposal_penawaran');
-            $table->string('bukti_ksl_kurang_bayar')->nullable()->after('nominal_kurang_bayar');
-
-        });
-
-        Schema::table('noc', function (Blueprint $table) {
-            // Menambahkan kolom nomor_tiket setelah nomor_proposal_penawaran
-            $table->string('nomor_tiket', 100)->nullable()->after('persetujuan_penawaran_id')
-                  ->comment('Nomor tiket untuk tracking persetujuan penawaran');
-            $table->string('nomor_rekening_lebih_bayar',20)->nullable()->after('nominal_lebih_bayar');
-            $table->string('bukti_ksl_lebih_bayar')->nullable()->after('nomor_rekening_lebih_bayar');
-            $table->string('bukti_ksl_kurang_bayar')->nullable()->after('bukti_ksl_lebih_bayar');
-            $table->string('nominal_pelunasan')->nullable()->after('bukti_ksl_kurang_bayar');
-            $table->string('debiture_id')->nullable()->after('persetujuan_penawaran_id');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     * Menghapus kolom nomor_tiket dari tabel persetujuan_penawaran
-     */
-    public function down(): void
-    {
-        Schema::table('persetujuan_penawaran', function (Blueprint $table) {
-            // Menghapus kolom nomor_tiket
-            $table->dropColumn('nomor_tiket');
-            $table->dropColumn('nominal_kurang_bayar');
-            $table->dropColumn('bukti_ksl_kurang_bayar');
-        });
-
-        Schema::table('noc', function (Blueprint $table) {
-            // Menghapus kolom nomor_tiket
-            $table->dropColumn('nomor_tiket');
-            $table->dropColumn('nomor_rekening_lebih_bayar');
-            $table->dropColumn('bukti_ksl_lebih_bayar');
-            $table->dropColumn('bukti_ksl_kurang_bayar');
-            $table->dropColumn('nominal_pelunasan');
-            $table->dropColumn('debiture_id');
-        });
-    }
-};