From 65b846f0c7088fa8f9170ce0268a97069389a011 Mon Sep 17 00:00:00 2001 From: Daeng Deni Mardaeni Date: Tue, 8 Jul 2025 17:40:11 +0700 Subject: [PATCH] feat(webstatement): tambahkan pengaturan ekspor dan optimasi fungsionalitas print statement - **Pembaruan pada `ExportStatementPeriodJob`:** - Menambahkan atribut baru `toCsv` untuk mendukung validasi sebelum proses ekspor CSV. - Menyesuaikan method `__construct` untuk menerima parameter tambahan `toCsv`. - Menambahkan validasi ekspor CSV dengan conditional check pada `toCsv` sebelum menjalankan `exportToCsv`. - Memperbaiki logika di `getTotalEntryCount` menggunakan `booking_date` untuk query lebih akurat. - Menambahkan logging terperinci pada proses penghitungan jumlah entri untuk meningkatkan debugging. - **Integrasi Log Print Statement:** - Mengupdate status kolom `is_generated` pada model `PrintStatementLog` setelah entri diproses. - Menambahkan mekanisme pembaruan data log print statement melalui validasi entry statement. - **Peningkatan pada Controller `PrintStatementController`:** - Memampukan proses ekspor otomatis jika statement tidak tersedia dengan metode baru `printStatementRekening`. - Menambahkan parameter `stmt_sent_type` untuk log print pada proses pencatatan data. - Mengimplementasikan pemrosesan period statement melalui job `ExportStatementPeriodJob`. - **Perubahan pada UI/Blade `statements/index`:** - Menambahkan opsi pemilihan multiple untuk tipe laporan `stmt_sent_type`. - Mengupdate dan merapikan komponen form untuk input branch, akun, email, dan periode laporan. - Menambahkan kolom baru `is_generated` pada tabel untuk menampilkan status log hasil pembuatan laporan. - **Pembaruan pada Datatable dan Skrip Frontend:** - Menambahkan render visual dengan badge untuk status `is_generated`. - Memperbaiki dan mengoptimalkan element HTML untuk datatable termasuk pagination dan search. - Menambahkan konfirmasi aksi dengan Ajax untuk retry pembuatan laporan jika diperlukan. - **Optimisasi dan Refactor:** - Menggunakan group import pada controller untuk meningkatkan keterbacaan. - Memperbaiki alignment dan indentasi pada beberapa file blade. - Menghapus kode yang tidak digunakan atau redundan seperti conditional unprocessed data. Dengan perubahan ini, sistem print statement lebih fleksibel, mencatat log lebih baik, dan mendukung fitur tracking pengeluaran laporan. Signed-off-by: Daeng Deni Mardaeni --- .../Controllers/PrintStatementController.php | 95 +++++++-- app/Jobs/ExportStatementPeriodJob.php | 55 +++-- resources/views/statements/index.blade.php | 198 +++++++++++------- 3 files changed, 246 insertions(+), 102 deletions(-) diff --git a/app/Http/Controllers/PrintStatementController.php b/app/Http/Controllers/PrintStatementController.php index cbc86c8..c91ed83 100644 --- a/app/Http/Controllers/PrintStatementController.php +++ b/app/Http/Controllers/PrintStatementController.php @@ -2,20 +2,20 @@ namespace Modules\Webstatement\Http\Controllers; - use App\Http\Controllers\Controller; - use Carbon\Carbon; - use Exception; - use Illuminate\Http\Request; - use Illuminate\Support\Facades\Auth; - use Illuminate\Support\Facades\DB; - use Illuminate\Support\Facades\Log; - use Illuminate\Support\Facades\Mail; - use Illuminate\Support\Facades\Storage; - use Modules\Basicdata\Models\Branch; - use Modules\Webstatement\Http\Requests\PrintStatementRequest; - use Modules\Webstatement\Mail\StatementEmail; - use Modules\Webstatement\Models\PrintStatementLog; - use ZipArchive; +use App\Http\Controllers\Controller; +use Carbon\Carbon; +use Exception; +use Illuminate\Http\Request; +use Illuminate\Support\Facades\{Auth, DB, Log, Mail, Storage}; +use Modules\Basicdata\Models\Branch; +use Modules\Webstatement\{ + Http\Requests\PrintStatementRequest, + Mail\StatementEmail, + Models\PrintStatementLog, + Models\AccountBalance, + Jobs\ExportStatementPeriodJob +}; +use ZipArchive; class PrintStatementController extends Controller { @@ -51,6 +51,7 @@ $validated['processed_accounts'] = 0; $validated['success_count'] = 0; $validated['failed_count'] = 0; + $validated['stmt_sent_type'] = implode(',', $request->input('stmt_sent_type')); // Create the statement log $statement = PrintStatementLog::create($validated); @@ -65,7 +66,9 @@ // Process statement availability check $this->checkStatementAvailability($statement); - + if(!$statement->is_available){ + $this->printStatementRekening($statement->account_number,$statement->period_from,$statement->period_to,$statement->stmt_sent_type); + } DB::commit(); return redirect()->route('statements.index') @@ -383,6 +386,7 @@ 'period_to' => $item->is_period_range ? $item->period_to : null, 'authorization_status' => $item->authorization_status, 'is_available' => $item->is_available, + 'is_generated' => $item->is_generated, 'is_downloaded' => $item->is_downloaded, 'created_at' => dateFormat($item->created_at, 1, 1), 'created_by' => $item->user->name ?? 'N/A', @@ -588,4 +592,65 @@ return "statement_{$accountNumber}_{$statement->period_from}.pdf"; } + + + function printStatementRekening($accountNumber, $period, $periodTo = null, $stmtSentType = null) { + $period = $period ?? date('Ym'); + $balance = AccountBalance::where('account_number', $accountNumber) + ->when($period === '202505', function($query) { + return $query->where('period', '>=', '20250512') + ->orderBy('period', 'asc'); + }, function($query) use ($period) { + // Get balance from last day of previous month + $firstDayOfMonth = Carbon::createFromFormat('Ym', $period)->startOfMonth(); + $lastDayPrevMonth = $firstDayOfMonth->copy()->subDay()->format('Ymd'); + return $query->where('period', $lastDayPrevMonth); + }) + ->first() + ->actual_balance ?? '0.00'; + $clientName = 'client1'; + + try { + \Log::info("Starting statement export for account: {$accountNumber}, period: {$period}, client: {$clientName}"); + + // Validate inputs + if (empty($accountNumber) || empty($period) || empty($clientName)) { + throw new \Exception('Required parameters missing'); + } + + // Dispatch the job + $job = ExportStatementPeriodJob::dispatch($accountNumber, $period, $balance, $clientName); + + \Log::info("Statement export job dispatched successfully", [ + 'job_id' => $job->job_id ?? null, + 'account' => $accountNumber, + 'period' => $period, + 'client' => $clientName + ]); + + return response()->json([ + 'success' => true, + 'message' => 'Statement export job queued successfully', + 'data' => [ + 'job_id' => $job->job_id ?? null, + 'account_number' => $accountNumber, + 'period' => $period, + 'client_name' => $clientName + ] + ]); + + } catch (\Exception $e) { + \Log::error("Failed to export statement", [ + 'error' => $e->getMessage(), + 'account' => $accountNumber, + 'period' => $period + ]); + + return response()->json([ + 'success' => false, + 'message' => 'Failed to queue statement export job', + 'error' => $e->getMessage() + ]); + } + } } diff --git a/app/Jobs/ExportStatementPeriodJob.php b/app/Jobs/ExportStatementPeriodJob.php index 7d89bc9..c6008ee 100644 --- a/app/Jobs/ExportStatementPeriodJob.php +++ b/app/Jobs/ExportStatementPeriodJob.php @@ -12,6 +12,7 @@ use Illuminate\Queue\SerializesModels; use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Storage; +use Modules\Webstatement\Models\PrintStatementLog; use Modules\Webstatement\Models\ProcessedStatement; use Modules\Webstatement\Models\StmtEntry; use Modules\Webstatement\Models\TempFundsTransfer; @@ -31,6 +32,7 @@ class ExportStatementPeriodJob implements ShouldQueue protected $chunkSize = 1000; protected $startDate; protected $endDate; + protected $toCsv; /** * Create a new job instance. @@ -41,7 +43,7 @@ class ExportStatementPeriodJob implements ShouldQueue * @param string $client * @param string $disk */ - public function __construct(string $account_number, string $period, string $saldo, string $client = '', string $disk = 'local') + public function __construct(string $account_number, string $period, string $saldo, string $client = '', string $disk = 'local', bool $toCsv = true) { $this->account_number = $account_number; $this->period = $period; @@ -49,6 +51,7 @@ class ExportStatementPeriodJob implements ShouldQueue $this->disk = $disk; $this->client = $client; $this->fileName = "{$account_number}_{$period}.csv"; + $this->toCsv = $toCsv; // Calculate start and end dates based on period $this->calculatePeriodDates(); @@ -84,8 +87,9 @@ class ExportStatementPeriodJob implements ShouldQueue Log::info("Date range: {$this->startDate->format('Y-m-d')} to {$this->endDate->format('Y-m-d')}"); $this->processStatementData(); - $this->exportToCsv(); - + if($this->toCsv){ + $this->exportToCsv(); + } Log::info("Export statement period job completed successfully for account: {$this->account_number}, period: {$this->period}"); } catch (Exception $e) { Log::error("Error in ExportStatementPeriodJob: " . $e->getMessage()); @@ -104,20 +108,28 @@ class ExportStatementPeriodJob implements ShouldQueue $existingDataCount = $this->getExistingProcessedCount($accountQuery); // Only process if data is not fully processed - if ($existingDataCount !== $totalCount) { + //if ($existingDataCount !== $totalCount) { $this->deleteExistingProcessedData($accountQuery); $this->processAndSaveStatementEntries($totalCount); - } + //} } private function getTotalEntryCount(): int { - return StmtEntry::where('account_number', $this->account_number) - ->whereBetween('date_time', [ - $this->startDate->format('ymdHi'), - $this->endDate->format('ymdHi') - ]) - ->count(); + $query = StmtEntry::where('account_number', $this->account_number) + ->whereBetween('booking_date', [ + $this->startDate->format('Ymd'), + $this->endDate->format('Ymd') + ]); + + Log::info("Getting total entry count with query: " . $query->toSql(), [ + 'bindings' => $query->getBindings(), + 'account' => $this->account_number, + 'start_date' => $this->startDate->format('Ymd'), + 'end_date' => $this->endDate->format('Ymd') + ]); + + return $query->count(); } private function getExistingProcessedCount(array $criteria): int @@ -141,11 +153,11 @@ class ExportStatementPeriodJob implements ShouldQueue Log::info("Processing {$totalCount} statement entries for account: {$this->account_number}"); - StmtEntry::with(['ft', 'transaction']) + $entry = StmtEntry::with(['ft', 'transaction']) ->where('account_number', $this->account_number) - ->whereBetween('date_time', [ - $this->startDate->format('ymdHi'), - $this->endDate->format('ymdHi') + ->whereBetween('booking_date', [ + $this->startDate->format('Ymd'), + $this->endDate->format('Ymd') ]) ->orderBy('date_time', 'ASC') ->orderBy('trans_reference', 'ASC') @@ -156,6 +168,16 @@ class ExportStatementPeriodJob implements ShouldQueue DB::table('processed_statements')->insert($processedData); } }); + + if($entry){ + $printLog = PrintStatementLog::where('account_number', $this->account_number) + ->where('period_from', $this->period) + ->latest() + ->first(); + if($printLog){ + $printLog->update(['is_generated' => true]); + } + } } private function prepareProcessedData($entries, &$runningBalance, &$globalSequence): array @@ -166,14 +188,13 @@ class ExportStatementPeriodJob implements ShouldQueue $globalSequence++; $runningBalance += (float) $item->amount_lcy; - $transactionDate = $this->formatTransactionDate($item); $actualDate = $this->formatActualDate($item); $processedData[] = [ 'account_number' => $this->account_number, 'period' => $this->period, 'sequence_no' => $globalSequence, - 'transaction_date' => $transactionDate, + 'transaction_date' => $item->booking_date, 'reference_number' => $item->trans_reference, 'transaction_amount' => $item->amount_lcy, 'transaction_type' => $item->amount_lcy < 0 ? 'D' : 'C', diff --git a/resources/views/statements/index.blade.php b/resources/views/statements/index.blade.php index 687c0fc..e1d24ba 100644 --- a/resources/views/statements/index.blade.php +++ b/resources/views/statements/index.blade.php @@ -11,41 +11,83 @@

Request Print Stetement

-
+ @csrf - @if(isset($statement)) + @if (isset($statement)) @method('PUT') @endif
- - @foreach($branches as $branch) - @endforeach @error('branch_code') -
{{ $message }}
+
{{ $message }}
+ @enderror +
+ +
+ + + @error('stmt_sent_type') +
{{ $message }}
@enderror
- + @error('account_number') -
{{ $message }}
+
{{ $message }}
@enderror
- + @error('email') -
{{ $message }}
+
{{ $message }}
@enderror
@@ -53,24 +95,21 @@ + type="month" name="period_from" + value="{{ $statement->period_from ?? old('period_from') }}" + max="{{ date('Y-m', strtotime('-1 month')) }}"> @error('period_from') - {{ $message }} + {{ $message }} @enderror
- + @error('period_to') - {{ $message }} + {{ $message }} @enderror
@@ -85,8 +124,9 @@
-
-
+
+

Daftar Statement Request

@@ -96,59 +136,67 @@
+
- +
- - - - - - - - - - - - + + + + + + + + + + + + +
- - - ID - - - Branch - - - Account Number - - - Period - - - Status - - - Available - - - Notes - - - Created At - - Action
+ + + ID + + + Branch + + + Account Number + + + Period + + + Status + + + Available + + + Generated + + + Notes + + + Created At + + Action
-
-
+
+
Show - per page + + per page
-
+
@@ -175,7 +223,7 @@ if (result.isConfirmed) { $.ajaxSetup({ headers: { - 'X-CSRF-TOKEN': '{{ csrf_token() }}' + 'X-CSRF-TOKEN': '{{ csrf_token() }}' } }); @@ -262,12 +310,22 @@ is_available: { title: 'Available', render: (item, data) => { - let statusClass = data.is_available ? 'badge badge-light-success' : 'badge badge-light-danger'; + let statusClass = data.is_available ? 'badge badge-light-success' : + 'badge badge-light-danger'; let statusText = data.is_available ? 'Yes' : 'No'; return `${statusText}`; }, }, - remarks : { + is_generated: { + title: 'Generated', + render: (item, data) => { + let statusClass = data.is_generated ? 'badge badge-light-success' : + 'badge badge-light-danger'; + let statusText = data.is_generated ? 'Yes' : 'No'; + return `${statusText}`; + }, + }, + remarks: { title: 'Notes', }, created_at: { @@ -315,7 +373,7 @@ let dataTable = new KTDataTable(element, dataTableOptions); // Custom search functionality - searchInput.addEventListener('input', function () { + searchInput.addEventListener('input', function() { const searchValue = this.value.trim(); dataTable.search(searchValue, true); });