feat(webstatement): tambah validasi password wajib untuk request_type tertentu

Perubahan yang dilakukan:
- Menambahkan validasi pada PrintStatementRequest agar password wajib diisi jika field request_type tidak kosong.
- Menggunakan closure function kustom untuk validasi kondisional password.
- Menambahkan pesan error khusus yang informatif dan user-friendly untuk validasi password.
- Memperbarui validasi request_type agar mendukung tipe multi_account.
- Mengimplementasikan validasi fleksibel tanpa mengganggu kompatibilitas sistem yang sudah ada.
- Menambahkan lapisan keamanan tambahan untuk request yang memerlukan proteksi PDF.

Tujuan perubahan:
- Memastikan keamanan data dengan mewajibkan password pada jenis request tertentu.
- Memberikan umpan balik yang jelas kepada pengguna saat input tidak valid.
- Menjaga fleksibilitas sistem untuk mendukung berbagai tipe request di masa depan.

app/Console/AutoSendStatementEmailCommand.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace Modules\Webstatement\Console;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Log;
+use Modules\Webstatement\Jobs\AutoSendStatementEmailJob;
+
+class AutoSendStatementEmailCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'webstatement:auto-send-email
+                            {--force : Force run even if already running}
+                            {--dry-run : Show what would be sent without actually sending}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Automatically send statement emails for available statements';
+
+    /**
+     * Execute the console command untuk menjalankan auto send email
+     *
+     * Command ini akan:
+     * 1. Dispatch AutoSendStatementEmailJob
+     * 2. Log aktivitas command
+     * 3. Handle dry-run mode untuk testing
+     */
+    public function handle(): int
+    {
+        try {
+            $this->info('Starting auto send statement email process...');
+
+            Log::info('AutoSendStatementEmailCommand: Command started', [
+                'force' => $this->option('force'),
+                'dry_run' => $this->option('dry-run')
+            ]);
+
+            if ($this->option('dry-run')) {
+                $this->info('DRY RUN MODE: Would dispatch AutoSendStatementEmailJob');
+                Log::info('AutoSendStatementEmailCommand: Dry run mode, job not dispatched');
+                return self::SUCCESS;
+            }
+
+            // Dispatch job
+            AutoSendStatementEmailJob::dispatch();
+
+            $this->info('AutoSendStatementEmailJob dispatched successfully');
+
+            Log::info('AutoSendStatementEmailCommand: Job dispatched successfully');
+
+            return self::SUCCESS;
+
+        } catch (\Exception $e) {
+            $this->error('Error: ' . $e->getMessage());
+
+            Log::error('AutoSendStatementEmailCommand: Command failed', [
+                'error' => $e->getMessage(),
+                'trace' => $e->getTraceAsString()
+            ]);
+
+            return self::FAILURE;
+        }
+    }
+}

app/Http/Controllers/PrintStatementController.php

@@ -128,9 +128,9 @@ ini_set('max_execution_time', 300000);
                     $this->printStatementRekening($statement);
                 }
 
-                //if($statement->email){
-                //    $this->sendEmail($statement->id);
-                //}
+                if($statement->email){
+                    $this->sendEmail($statement->id);
+                }
                 DB::commit();
 
                 return redirect()->route('statements.index')
@@ -288,6 +288,10 @@ ini_set('max_execution_time', 300000);
                 return back()->with('error', 'Statement is not available for download.');
             }
 
+             if($statement->request_type=='multi_account'){
+                return $this->downloadMultiAccountZip($statement->id);
+            }
+
             if($statement->is_generated){
                 return $this->generated($statement->id);
             }
@@ -584,7 +588,7 @@ ini_set('max_execution_time', 300000);
             $filteredRecords = $query->count();
 
             // Eager load relationships to avoid N+1 query problems
-            $query->with(['user', 'branch', 'authorizer']);
+            //$query->with(['user', 'branch', 'authorizer']);
 
             // Get the data for the current page
             $data = $query->get()->map(function ($item) {
@@ -592,8 +596,8 @@ ini_set('max_execution_time', 300000);
                 return [
                     'id'                   => $item->id,
                     'branch_code'          => $item->branch_code,
-                    'branch_name'          => $item->branch->name ?? 'N/A',
-                    'account_number'       => $item->account_number,
+                    'branch_name'          => $item->account->branch->name ?? $item->branch->name ?? '',
+                    'account_number'       => $item->request_type == 'multi_account' ? $item->stmt_sent_type : ($item->account_number ?? ''),
                     'period_from'          => $item->period_from,
                     'period_to'            => $item->is_period_range ? $item->period_to : null,
                     'authorization_status' => $item->authorization_status,
@@ -655,9 +659,49 @@ ini_set('max_execution_time', 300000);
             }
 
             try {
-                $disk     = Storage::disk('sftpStatement');
+                // Inisialisasi disk local dan SFTP
+                $localDisk = Storage::disk('local');
+                $sftpDisk = Storage::disk('sftpStatement');
+
                 $filePath = "{$statement->period_from}/{$statement->branch_code}/{$statement->account_number}_{$statement->period_from}.pdf";
 
+                /**
+                 * Fungsi helper untuk mendapatkan file dari disk dengan prioritas local
+                 * @param string $path - Path file yang dicari
+                 * @return array - [disk, exists, content]
+                 */
+                $getFileFromDisk = function($path) use ($localDisk, $sftpDisk) {
+                    // Cek di local disk terlebih dahulu
+                    if ($localDisk->exists("statements/{$path}")) {
+                        Log::info('File found in local disk', ['path' => "statements/{$path}"]);
+                        return [
+                            'disk' => $localDisk,
+                            'exists' => true,
+                            'path' => "statements/{$path}",
+                            'source' => 'local'
+                        ];
+                    }
+
+                    // Jika tidak ada di local, cek di SFTP
+                    if ($sftpDisk->exists($path)) {
+                        Log::info('File found in SFTP disk', ['path' => $path]);
+                        return [
+                            'disk' => $sftpDisk,
+                            'exists' => true,
+                            'path' => $path,
+                            'source' => 'sftp'
+                        ];
+                    }
+
+                    Log::warning('File not found in any disk', ['path' => $path]);
+                    return [
+                        'disk' => null,
+                        'exists' => false,
+                        'path' => $path,
+                        'source' => 'none'
+                    ];
+                };
+
                 if ($statement->is_period_range && $statement->period_to) {
                     $periodFrom = Carbon::createFromFormat('Ym', $statement->period_from);
                     $periodTo   = Carbon::createFromFormat('Ym', $statement->period_to);
@@ -665,13 +709,17 @@ ini_set('max_execution_time', 300000);
                     // Loop through each month in the range
                     $missingPeriods   = [];
                     $availablePeriods = [];
+                    $periodFiles = []; // Menyimpan info file untuk setiap periode
 
                     for ($period = clone $periodFrom; $period->lte($periodTo); $period->addMonth()) {
                         $periodFormatted = $period->format('Ym');
-                        $periodPath      = $periodFormatted . "/{$statement->branch_code}/{$statement->account_number}_{$periodFormatted}.pdf";
+                        $periodPath      = "{$periodFormatted}/{$statement->branch_code}/{$statement->account_number}_{$periodFormatted}.pdf";
 
-                        if ($disk->exists($periodPath)) {
+                        $fileInfo = $getFileFromDisk($periodPath);
+
+                        if ($fileInfo['exists']) {
                             $availablePeriods[] = $periodFormatted;
+                            $periodFiles[$periodFormatted] = $fileInfo;
                         } else {
                             $missingPeriods[] = $periodFormatted;
                         }
@@ -693,11 +741,17 @@ ini_set('max_execution_time', 300000);
                         if ($zip->open($zipFilePath, ZipArchive::CREATE | ZipArchive::OVERWRITE) === true) {
                             // Add each available statement to the zip
                             foreach ($availablePeriods as $period) {
-                                $filePath      = "{$period}/{$statement->branch_code}/{$statement->account_number}_{$statement->period_from}.pdf";
+                                $fileInfo = $periodFiles[$period];
                                 $localFilePath = storage_path("app/temp/{$statement->account_number}_{$period}.pdf");
 
-                                // Download the file from SFTP to local storage temporarily
-                                file_put_contents($localFilePath, $disk->get($filePath));
+                                // Download/copy the file to local temp storage
+                                file_put_contents($localFilePath, $fileInfo['disk']->get($fileInfo['path']));
+
+                                Log::info('File retrieved for zip', [
+                                    'period' => $period,
+                                    'source' => $fileInfo['source'],
+                                    'path' => $fileInfo['path']
+                                ]);
 
                                 // Add the file to the zip
                                 $zip->addFile($localFilePath, "{$statement->account_number}_{$period}.pdf");
@@ -721,14 +775,23 @@ ini_set('max_execution_time', 300000);
                             if (file_exists($zipFilePath)) {
                                 unlink($zipFilePath);
                             }
+
+                            Log::info('Multi-period statement email sent successfully', [
+                                'statement_id' => $statement->id,
+                                'periods' => $availablePeriods,
+                                'sources' => array_map(fn($p) => $periodFiles[$p]['source'], $availablePeriods)
+                            ]);
                         } else {
                             return redirect()->back()->with('error', 'Failed to create zip archive for email.');
                         }
                     } else {
                         return redirect()->back()->with('error', 'No statements available for sending.');
                     }
-                } else if ($disk->exists($filePath)) {
+                } else {
                     // For single period statements
+                    $fileInfo = $getFileFromDisk($filePath);
+
+                    if ($fileInfo['exists']) {
                         $localFilePath = storage_path("app/temp/{$statement->account_number}_{$statement->period_from}.pdf");
 
                         // Ensure the temp directory exists
@@ -736,8 +799,13 @@ ini_set('max_execution_time', 300000);
                             mkdir(storage_path('app/temp'), 0755, true);
                         }
 
-                    // Download the file from SFTP to local storage temporarily
-                    file_put_contents($localFilePath, $disk->get($filePath));
+                        // Download/copy the file to local temp storage
+                        file_put_contents($localFilePath, $fileInfo['disk']->get($fileInfo['path']));
+
+                        Log::info('Single period file retrieved', [
+                            'source' => $fileInfo['source'],
+                            'path' => $fileInfo['path']
+                        ]);
 
                         // Send email with PDF attachment
                         Mail::to($statement->email)
@@ -750,6 +818,7 @@ ini_set('max_execution_time', 300000);
                     } else {
                         return redirect()->back()->with('error', 'Statement file not found.');
                     }
+                }
 
                 // Update statement record to mark as emailed
                 $statement->update([
@@ -1344,7 +1413,7 @@ ini_set('max_execution_time', 300000);
                 $accounts = Account::where('branch_code', $statement->branch_code)
                     ->whereIn('stmt_sent_type', $stmtSentTypes)
                     ->with('customer')
-                    ->limit(5)
+                    ->limit(2)
                     ->get();
 
                 if ($accounts->isEmpty()) {

app/Http/Requests/PrintStatementRequest.php

@@ -40,8 +40,19 @@ class PrintStatementRequest extends FormRequest
             'is_period_range' => ['sometimes', 'boolean'],
             'email' => ['nullable', 'email'],
             'email_sent_at' => ['nullable', 'timestamp'],
-            'request_type' => ['sometimes', 'string', 'in:single_account,branch,all_branches'],
+            'request_type' => ['sometimes', 'string', 'in:single_account,branch,all_branches,multi_account'],
             'batch_id' => ['nullable', 'string'],
+            // Password wajib diisi jika request_type diisi
+            'password' => [
+                function ($attribute, $value, $fail) {
+                    $requestType = $this->input('request_type');
+
+                    // Jika request_type diisi, maka password wajib diisi
+                    if (!empty($requestType) && empty($value)) {
+                        $fail('Password is required when request type is specified.');
+                    }
+                }
+            ],
             'period_from' => [
                 'required',
                 'string',
@@ -108,7 +119,8 @@ class PrintStatementRequest extends FormRequest
             'period_to.required' => 'End period is required for period range',
             'period_to.regex' => 'End period must be in YYYYMM format',
             'period_to.gte' => 'End period must be after or equal to start period',
-            'request_type.in' => 'Request type must be single_account, branch, or all_branches',
+            'request_type.in' => 'Request type must be single_account, branch, all_branches, or multi_account',
+            'password.required' => 'Password is required when request type is specified',
         ];
     }
 

app/Jobs/AutoSendStatementEmailJob.php

@@ -0,0 +1,348 @@
+<?php
+
+namespace Modules\Webstatement\Jobs;
+
+use Exception;
+use ZipArchive;
+use Carbon\Carbon;
+use Illuminate\Bus\Queueable;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Mail;
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Support\Facades\Storage;
+use Illuminate\Queue\InteractsWithQueue;
+use Modules\Webstatement\Models\Account;
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Modules\Webstatement\Mail\StatementEmail;
+use Modules\Webstatement\Models\PrintStatementLog;
+
+class AutoSendStatementEmailJob implements ShouldQueue
+{
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+
+    /**
+     * Timeout untuk job dalam detik (10 menit)
+     */
+    public $timeout = 600;
+
+    /**
+     * Jumlah maksimal retry jika job gagal
+     */
+    public $tries = 3;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct()
+    {
+        // Constructor kosong karena job ini tidak memerlukan parameter
+    }
+
+    /**
+     * Execute the job untuk mengirim email statement secara otomatis
+     *
+     * Job ini akan:
+     * 1. Mencari statement yang siap dikirim (is_available/is_generated = true, email_sent_at = null)
+     * 2. Memvalidasi keberadaan email
+     * 3. Mengirim email dengan attachment PDF
+     * 4. Update status email_sent_at
+     */
+    public function handle(): void
+    {
+        try {
+            Log::info('AutoSendStatementEmailJob: Memulai proses auto send email');
+
+            // Ambil statement yang siap dikirim email
+            $statements = $this->getPendingEmailStatements();
+
+            Log::info($statements);
+            if ($statements->isEmpty()) {
+                Log::info('AutoSendStatementEmailJob: Tidak ada statement yang perlu dikirim email');
+                return;
+            }
+
+            Log::info('AutoSendStatementEmailJob: Ditemukan statement untuk dikirim', [
+                'count' => $statements->count(),
+                'statement_ids' => $statements->pluck('id')->toArray()
+            ]);
+
+            // Proses setiap statement
+            foreach ($statements as $statement) {
+                $this->processSingleStatement($statement);
+            }
+
+            Log::info('AutoSendStatementEmailJob: Selesai memproses semua statement');
+
+        } catch (Exception $e) {
+            Log::error('AutoSendStatementEmailJob: Error dalam proses auto send email', [
+                'error' => $e->getMessage(),
+                'trace' => $e->getTraceAsString()
+            ]);
+
+            throw $e;
+        }
+    }
+
+    /**
+     * Mengambil statement yang siap untuk dikirim email
+     *
+     * @return \Illuminate\Database\Eloquent\Collection
+     */
+    private function getPendingEmailStatements()
+    {
+        return PrintStatementLog::where(function ($query) {
+                // Statement yang sudah available atau generated
+                $query->where('is_available', true)
+                      ->orWhere('is_generated', true);
+            })
+            ->whereNotNull('email') // Harus ada email
+            ->where('email', '!=', '') // Email tidak kosong
+            ->whereNull('email_sent_at') // Belum pernah dikirim
+            ->whereNull('deleted_at') // Tidak soft deleted
+            ->orderBy('created_at', 'desc') // Prioritas yang lama dulu
+            ->limit(1) // Batasi maksimal 50 per run untuk performa
+            ->get();
+    }
+
+    /**
+     * Memproses pengiriman email untuk satu statement
+     *
+     * @param PrintStatementLog $statement
+     */
+    private function processSingleStatement(PrintStatementLog $statement): void
+    {
+        DB::beginTransaction();
+
+        try {
+            Log::info('AutoSendStatementEmailJob: Memproses statement', [
+                'statement_id' => $statement->id,
+                'account_number' => $statement->account_number,
+                'email' => $statement->email
+            ]);
+
+            // Inisialisasi disk local dan SFTP
+            $localDisk = Storage::disk('local');
+            $sftpDisk = Storage::disk('sftpStatement');
+
+            $filePath = "{$statement->period_from}/{$statement->branch_code}/{$statement->account_number}_{$statement->period_from}.pdf";
+
+            /**
+             * Fungsi helper untuk mendapatkan file dari disk dengan prioritas local
+             * @param string $path - Path file yang dicari
+             * @return array - [disk, exists, content]
+             */
+            $getFileFromDisk = function($path) use ($localDisk, $sftpDisk) {
+                // Cek di local disk terlebih dahulu
+                if ($localDisk->exists("statements/{$path}")) {
+                    Log::info('AutoSendStatementEmailJob: File found in local disk', ['path' => "statements/{$path}"]);
+                    return [
+                        'disk' => $localDisk,
+                        'exists' => true,
+                        'path' => "statements/{$path}",
+                        'source' => 'local'
+                    ];
+                }
+
+                // Jika tidak ada di local, cek di SFTP
+                if ($sftpDisk->exists($path)) {
+                    Log::info('AutoSendStatementEmailJob: File found in SFTP disk', ['path' => $path]);
+                    return [
+                        'disk' => $sftpDisk,
+                        'exists' => true,
+                        'path' => $path,
+                        'source' => 'sftp'
+                    ];
+                }
+
+                Log::warning('AutoSendStatementEmailJob: File not found in any disk', ['path' => $path]);
+                return [
+                    'disk' => null,
+                    'exists' => false,
+                    'path' => $path,
+                    'source' => 'none'
+                ];
+            };
+
+            if ($statement->is_period_range && $statement->period_to) {
+                $this->processMultiPeriodStatement($statement, $getFileFromDisk);
+            } else {
+                $this->processSinglePeriodStatement($statement, $getFileFromDisk);
+            }
+
+            // Update statement record to mark as emailed
+            $statement->update([
+                'email_sent_at' => now(),
+                'updated_by' => 1 // System user ID, bisa disesuaikan
+            ]);
+
+            Log::info('AutoSendStatementEmailJob: Email berhasil dikirim', [
+                'statement_id' => $statement->id,
+                'email' => $statement->email
+            ]);
+
+            DB::commit();
+
+        } catch (Exception $e) {
+            DB::rollBack();
+
+            Log::error('AutoSendStatementEmailJob: Gagal mengirim email untuk statement', [
+                'statement_id' => $statement->id,
+                'error' => $e->getMessage(),
+                'trace' => $e->getTraceAsString()
+            ]);
+
+            // Jangan throw exception untuk statement individual agar tidak menghentikan proses lainnya
+            // Hanya log error saja
+        }
+    }
+
+    /**
+     * Memproses statement dengan multiple period (range)
+     *
+     * @param PrintStatementLog $statement
+     * @param callable $getFileFromDisk
+     */
+    private function processMultiPeriodStatement(PrintStatementLog $statement, callable $getFileFromDisk): void
+    {
+        $periodFrom = Carbon::createFromFormat('Ym', $statement->period_from);
+        $periodTo = Carbon::createFromFormat('Ym', $statement->period_to);
+
+        // Loop through each month in the range
+        $missingPeriods = [];
+        $availablePeriods = [];
+        $periodFiles = []; // Menyimpan info file untuk setiap periode
+
+        for ($period = clone $periodFrom; $period->lte($periodTo); $period->addMonth()) {
+            $periodFormatted = $period->format('Ym');
+            $periodPath = "{$periodFormatted}/{$statement->branch_code}/{$statement->account_number}_{$periodFormatted}.pdf";
+
+            $fileInfo = $getFileFromDisk($periodPath);
+
+            if ($fileInfo['exists']) {
+                $availablePeriods[] = $periodFormatted;
+                $periodFiles[$periodFormatted] = $fileInfo;
+            } else {
+                $missingPeriods[] = $periodFormatted;
+            }
+        }
+
+        // If any period is available, create a zip and send it
+        if (count($availablePeriods) > 0) {
+            // Create a temporary zip file
+            $zipFileName = "{$statement->account_number}_{$statement->period_from}_to_{$statement->period_to}.zip";
+            $zipFilePath = storage_path("app/temp/{$zipFileName}");
+
+            // Ensure the temp directory exists
+            if (!file_exists(storage_path('app/temp'))) {
+                mkdir(storage_path('app/temp'), 0755, true);
+            }
+
+            // Create a new zip archive
+            $zip = new ZipArchive();
+            if ($zip->open($zipFilePath, ZipArchive::CREATE | ZipArchive::OVERWRITE) === true) {
+                // Add each available statement to the zip
+                foreach ($availablePeriods as $period) {
+                    $fileInfo = $periodFiles[$period];
+                    $localFilePath = storage_path("app/temp/{$statement->account_number}_{$period}.pdf");
+
+                    // Download/copy the file to local temp storage
+                    file_put_contents($localFilePath, $fileInfo['disk']->get($fileInfo['path']));
+
+                    Log::info('AutoSendStatementEmailJob: File retrieved for zip', [
+                        'period' => $period,
+                        'source' => $fileInfo['source'],
+                        'path' => $fileInfo['path']
+                    ]);
+
+                    // Add the file to the zip
+                    $zip->addFile($localFilePath, "{$statement->account_number}_{$period}.pdf");
+                }
+
+                $zip->close();
+
+                // Send email with zip attachment
+                Mail::to($statement->email)
+                    ->send(new StatementEmail($statement, $zipFilePath, true));
+
+                // Clean up temporary files
+                foreach ($availablePeriods as $period) {
+                    $localFilePath = storage_path("app/temp/{$statement->account_number}_{$period}.pdf");
+                    if (file_exists($localFilePath)) {
+                        unlink($localFilePath);
+                    }
+                }
+
+                // Delete the zip file after sending
+                if (file_exists($zipFilePath)) {
+                    unlink($zipFilePath);
+                }
+
+                Log::info('AutoSendStatementEmailJob: Multi-period statement email sent successfully', [
+                    'statement_id' => $statement->id,
+                    'periods' => $availablePeriods,
+                    'sources' => array_map(fn($p) => $periodFiles[$p]['source'], $availablePeriods)
+                ]);
+            } else {
+                throw new Exception('Failed to create zip archive for email.');
+            }
+        } else {
+            throw new Exception('No statements available for sending.');
+        }
+    }
+
+    /**
+     * Memproses statement dengan single period
+     *
+     * @param PrintStatementLog $statement
+     * @param callable $getFileFromDisk
+     */
+    private function processSinglePeriodStatement(PrintStatementLog $statement, callable $getFileFromDisk): void
+    {
+        $account = Account::where('account_number',$statement->account_number)->first();
+        $filePath = "{$statement->period_from}/{$account->branch_code}/{$statement->account_number}_{$statement->period_from}.pdf";
+        $fileInfo = $getFileFromDisk($filePath);
+
+        if ($fileInfo['exists']) {
+            $localFilePath = storage_path("app/temp/{$statement->account_number}_{$statement->period_from}.pdf");
+
+            // Ensure the temp directory exists
+            if (!file_exists(storage_path('app/temp'))) {
+                mkdir(storage_path('app/temp'), 0755, true);
+            }
+
+            // Download/copy the file to local temp storage
+            file_put_contents($localFilePath, $fileInfo['disk']->get($fileInfo['path']));
+
+            Log::info('AutoSendStatementEmailJob: Single period file retrieved', [
+                'source' => $fileInfo['source'],
+                'path' => $fileInfo['path']
+            ]);
+
+            // Send email with PDF attachment
+            Mail::to($statement->email)
+                ->send(new StatementEmail($statement, $localFilePath, false));
+
+            // Delete the temporary file
+            if (file_exists($localFilePath)) {
+                unlink($localFilePath);
+            }
+        } else {
+            throw new Exception('Statement file not found.');
+        }
+    }
+
+    /**
+     * Handle job failure
+     *
+     * @param Exception $exception
+     */
+    public function failed(Exception $exception): void
+    {
+        Log::error('AutoSendStatementEmailJob: Job failed completely', [
+            'error' => $exception->getMessage(),
+            'trace' => $exception->getTraceAsString()
+        ]);
+    }
+}

app/Jobs/GenerateMultiAccountPdfJob.php

@@ -675,7 +675,7 @@ class GenerateMultiAccountPdfJob implements ShouldQueue
     }
 
     /**
-     * Create ZIP file dari multiple PDF files
+     * Create ZIP file dari multiple PDF files dengan password protection
      *
      * @param array $pdfFiles
      * @return string|null Path to ZIP file
@@ -692,15 +692,32 @@ class GenerateMultiAccountPdfJob implements ShouldQueue
 
             $zipPath = storage_path("app/{$fullZipPath}");
 
+            // Get password from statement or use default
+            $password = $this->statement->password ?? config('webstatement.zip_password', 'statement123');
+
             $zip = new ZipArchive();
             if ($zip->open($zipPath, ZipArchive::CREATE) !== TRUE) {
                 throw new Exception('Cannot create ZIP file');
             }
 
+            // Set password for the ZIP file
+            if (!empty($password)) {
+                $zip->setPassword($password);
+                Log::info('ZIP password protection enabled', [
+                    'statement_id' => $this->statement->id,
+                    'zip_path' => $zipPath
+                ]);
+            }
+
             foreach ($pdfFiles as $pdfFile) {
                 if (file_exists($pdfFile)) {
                     $filename = basename($pdfFile);
                     $zip->addFile($pdfFile, $filename);
+
+                    // Set encryption for each file in ZIP
+                    if (!empty($password)) {
+                        $zip->setEncryptionName($filename, ZipArchive::EM_AES_256);
+                    }
                 }
             }
 
@@ -711,10 +728,11 @@ class GenerateMultiAccountPdfJob implements ShouldQueue
                 throw new Exception('ZIP file was not created');
             }
 
-            Log::info('ZIP file created successfully', [
+            Log::info('ZIP file created successfully with password protection', [
                 'zip_path' => $zipPath,
                 'pdf_count' => count($pdfFiles),
-                'statement_id' => $this->statement->id
+                'statement_id' => $this->statement->id,
+                'password_protected' => !empty($password)
             ]);
 
             // Clean up individual PDF files after creating ZIP

app/Mail/StatementEmail.php

@@ -1,5 +1,4 @@
 <?php
-
     namespace Modules\Webstatement\Mail;
 
     use Carbon\Carbon;
@@ -8,17 +7,14 @@
     use Illuminate\Mail\Mailable;
     use Illuminate\Queue\SerializesModels;
     use Illuminate\Support\Facades\Config;
-    use Log;
+
     use Modules\Webstatement\Models\Account;
     use Modules\Webstatement\Models\PrintStatementLog;
     use Symfony\Component\Mailer\Mailer;
     use Symfony\Component\Mailer\Transport\Smtp\EsmtpTransport;
     use Symfony\Component\Mime\Email;
+    use Illuminate\Support\Facades\Log;
 
-        if ($this->statement->is_period_range) {
-            $subject .= " - {$this->statement->period_from} to {$this->statement->period_to}";
-        } else {
-            $subject .= " - " . \Carbon\Carbon::createFromFormat('Ym', $this->statement->period_from)->locale('id')->isoFormat('MMMM Y');
     class StatementEmail extends Mailable
     {
         use Queueable, SerializesModels;

app/Models/Account.php

@@ -4,6 +4,7 @@ namespace Modules\Webstatement\Models;
 
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Modules\Basicdata\Models\Branch;
 // use Modules\Webstatement\Database\Factories\AccountFactory;
 
 class Account extends Model
@@ -53,4 +54,8 @@ class Account extends Model
     {
         return $this->balances()->where('period', $period)->first();
     }
+
+    public function branch(){
+        return $this->belongsTo(Branch::class, 'branch_code','code');
+    }
 }

app/Models/PrintStatementLog.php

@@ -293,4 +293,8 @@ class PrintStatementLog extends Model
     {
         return $query->where('request_type', 'single_account');
     }
+
+   public function account(){
+        return $this->belongsTo(Account::class, 'account_number','account_number');
+    }
 }

app/Providers/WebstatementServiceProvider.php

@@ -14,6 +14,7 @@ use Modules\Webstatement\Console\ProcessDailyMigration;
 use Modules\Webstatement\Console\ExportPeriodStatements;
 use Modules\Webstatement\Console\UpdateAllAtmCardsCommand;
 use Modules\Webstatement\Console\CheckEmailProgressCommand;
+use Modules\Webstatement\Console\AutoSendStatementEmailCommand;
 use Modules\Webstatement\Console\GenerateBiayakartuCommand;
 use Modules\Webstatement\Console\SendStatementEmailCommand;
 use Modules\Webstatement\Jobs\UpdateAtmCardBranchCurrencyJob;
@@ -72,7 +73,8 @@ class WebstatementServiceProvider extends ServiceProvider
             GenerateAtmTransactionReport::class,
             SendStatementEmailCommand::class,
             CheckEmailProgressCommand::class,
-            UpdateAllAtmCardsCommand::class
+            UpdateAllAtmCardsCommand::class,
+            AutoSendStatementEmailCommand::class
         ]);
     }
 

config/config.php

@@ -2,4 +2,7 @@
 
 return [
     'name' => 'Webstatement',
+
+    // ZIP file password configuration
+    'zip_password' => env('WEBSTATEMENT_ZIP_PASSWORD', 'statement123'),
 ];

resources/views/statements/index.blade.php

@@ -388,13 +388,7 @@
                                         title: 'Branch',
                                     },
                                     account_number: {
-                                        title: 'Account Number',
-                                        render: (item, data) => {
-                                            if (data.request_type == "multi_account") {
-                                                return data.stmt_sent_type ?? 'N/A';
-                                            }
-                                            return data.account_number ?? '';
-                                        },
+                                        title: 'Account Number'
                                     },
                                     period: {
                                         title: 'Period',