Compare commits

..

11 Commits

Author SHA1 Message Date
Daeng Deni Mardaeni
50e60eb587 feat(statements): tampilkan End Date hanya untuk cabang 0988
- Bungkus input "End Date" dengan kondisi cabang: `@if (auth()->user()->branch->code === '0988') ... @endif`
- Batasi visibilitas field "End Date" agar hanya user cabang `0988` yang dapat melihat dan mengisi periode akhir (`period_to`)
- Pertahankan struktur input dan validasi yang ada: `type="month"`, binding `period_to`, dan blok `@error('period_to')` tetap berfungsi
- Pastikan tampilan form tetap rapi untuk cabang selain `0988` dengan field "End Date" disembunyikan tanpa mengganggu input lain
- Sinkronkan ekspektasi backend: field `period_to` hanya dikirim dari cabang `0988` sehingga controller/job perlu menangani nilai kosong untuk cabang lain
- Uji manual: login sebagai user cabang `0988` → pastikan field muncul; login cabang lain → pastikan field tidak muncul; validasi tetap berjalan
- Dokumentasikan batasan cabang dan alasan pembatasan untuk mencegah penggunaan tidak sesuai kebijakan internal
2025-12-01 11:00:07 +07:00
Daeng Deni Mardaeni
9373325399 feat(webstatement): dukung endPeriod dan format folder baru untuk statement
- Ubah konstruksi path SFTP dan storage lokal agar konsisten dengan format folder baru `YYYYMMDD.YYYYMMDD`
- Tambahkan dukungan periode akhir (`endPeriod`) pada alur cetak dan ekspor statement, lengkap dengan propagasi ke view dan log
- Perkuat logging di controller dan job untuk audit proses, serta sesuaikan penamaan file pada jalur PRINT

Rincian Perubahan
- PrintStatementController.php
  - Ganti path SFTP awal dari `{$period_from}/{$branch_code}/{$account_number}_{$period_from}.pdf` menjadi:
    - `{$periodPath}/PRINT/{$branch_code}/{$account_number}.1.pdf` pada cek file awal
    - Gunakan `$periodPath = formatPeriodForFolder($statement->period_from)` untuk semua referensi path
  - Iterasi ketersediaan periode:
    - Gunakan `formatPeriodForFolder($periodFormatted)` saat membentuk `periodPath` dalam loop bulan
  - Generate atau fetch statement:
    - Ubah path menjadi `{$periodPath}/{$branch_code}/{$account_number}_{$period}.pdf` untuk konsistensi
  - ZIP multi-periode:
    - Cari file ZIP pada `statements/{$periodPath}/multi_account/{$statementId}` sesuai format folder baru
  - Variabel periode:
    - Tambahkan `$endPeriod = $statement->period_to ?? $period` dan propagasikan ke:
      - Pemanggilan `generateStatementPdf($norek, $period, $endPeriod, ...)`
      - View `statements.stmt` melalui `compact(..., 'endPeriod')`
    - Perbarui logging untuk menampilkan `endPeriod`
  - Generate PDF:
    - Tandai storage path menjadi `statements/{$periodPath}/{$norek}`
    - Ubah signature: `generateStatementPdf($norek, $period, $endPeriod, ...)`
  - Akses file lokal/SFTP:
    - Ubah path storage menjadi `statements/{$periodPath}/{$account->branch_code}/{$filename}`
    - Penyesuaian delete path: `statements/{$periodPath}/{$norek}/{$filename}`

- ExportStatementPeriodJob.php
  - Tambah properti dan parameter konstruktor: `$endPeriod`
  - Ubah inisialisasi periode:
    - Ganti `calculatePeriodDates()` menjadi `formatPeriodForFolder()` (metode internal yang menetapkan `startDate` dan `endDate`)
    - Jika `$endPeriod` diisi, jadikan akhir bulan dari `endPeriod` sebagai `endDate` pemrosesan
  - Render view:
    - Tambahkan `endPeriod` ke `compact(...)` agar view mengetahui batas periode akhir
  - Storage path:
    - Gunakan `formatPeriodForFolder($this->period)` untuk path `statements/{$periodPath}/{$account->branch_code}`
  - Controller dispatch:
    - Ubah pemanggilan job menjadi `ExportStatementPeriodJob::dispatch($statementId, $accountNumber, $period, $endPeriod, $balance, $clientName)`

- resources/views/statements/stmt.blade.php
  - Periode:
    - Hitung `periodDates` via `calculatePeriodDates($period)`
    - Jika `endPeriod` ada, gunakan `calculatePeriodDates($endPeriod)` sebagai referensi `endDate`
  - Data customer:
    - Gunakan `$customer` langsung, bukan `$account->customer`
    - Kondisional alamat berdasarkan `stmt_sent_type == 'BY.MAIL.TO.DOM.ADDR'`:
      - Utamakan `l_dom_street` jika tersedia, fallback ke `address`
      - Susun RT/RW/kelurahan/kota/provinsi/kode pos sesuai preferensi pengiriman
  - Format angka:
    - Penyesuaian spasi dan casting `(float)` untuk konsistensi number_format
  - Logging:
    - Tambahkan informasi hasil perhitungan period dates untuk audit
2025-11-27 18:15:33 +07:00
Daeng Deni Mardaeni
ea23401473 feat(statement): perbaikan fitur statement dan penambahan akses sentra operasi
- Memberikan akses penuh fitur multi-branch untuk role `administrator` dan `sentra_operasi`.
- Menambahkan akun untuk client **SILOT** dalam daftar monitoring.
- Menonaktifkan validasi duplikasi statement di `PrintStatementRequest`.
- Memindahkan struktur penyimpanan file dari `statements/{client}` menjadi `partners/{client}`.
- Menambahkan pengurutan hasil berdasarkan `branch_code` dan `account_number` untuk laporan.
- Memperbaiki tampilan dropdown branch dan menyembunyikan field `end_date` yang tidak relevan.
- Menghapus opsi `NO.PRINT` dari dropdown `stmt_sent_type` untuk penyederhanaan UI.
- Peningkatan UI dan struktur direktori untuk mempermudah pembacaan dan pengelolaan statement.
2025-09-09 11:16:48 +07:00
Daeng Deni Mardaeni
5d0dbfcf21 🔄 refactor(jobs): perbaikan logika pada beberapa controller dan job
- **WebstatementController.php**:
  - Menyederhanakan fungsi `index()` dengan mengubah parameter menjadi langsung `string $queueName='default'`.
  - Menghapus pengambilan parameter `$queueName` dari objek `Request`.
- **ExportStatementPeriodJob.php**:
  - Memperbaiki perhitungan saldo berjalan (`running balance`) dengan mempertimbangkan mata uang.
  - Menambahkan logika penggunaan `amount_fcy` jika mata uang bukan IDR.
  - Menyesuaikan tipe transaksi (D/C) menggunakan nilai `amount` yang telah disesuaikan.
- **GenerateBiayaKartuCsvJob.php**:
  - Mengubah daftar produk yang dikecualikan menjadi `['6031','6021','6042']`.
  - Memperbaiki filter khusus dengan mengecualikan `product_code` 6004 jika `ctdesc` = CLASSIC.
  - Menambahkan kolom hash unik 16 digit pada data CSV untuk identifikasi setiap record.
- **ProcessCustomerDataJob.php**:
  - Menambahkan mapping baru `name_1` → `name` pada `getHeaderMapping`.
  - Menambahkan logging untuk field `fillable` agar debugging lebih mudah.
2025-09-09 08:51:53 +07:00
Daeng Deni Mardaeni
291e791114 feat(api): implementasi autentikasi HMAC dan validasi komprehensif untuk API balance
- Security: validasi HMAC SHA512 untuk semua request, cek timestamp ISO 8601 dengan toleransi 5 menit, autentikasi API key, dan wajib header X-Api-Key, X-Signature, X-Timestamp.
- Input validation: account_number numeric 10 digit & exists, start/end date format YYYY-MM-DD dengan aturan range (start ≤ end ≤ today).
- Perubahan file: update `app/Http/Requests/BalanceSummaryRequest.php` (HMAC check, timestamp check, pesan error, logging) dan `config/webstatement.php` (api_key, secret_key).
- Error handling: konsisten dengan ResponseCode enum; HTTP status 400/401/404; pesan error jelas (Bahasa Indonesia) + logging.
- Testing: Postman collection diperbarui untuk kasus negatif & edge cases; backward compatibility dijaga.
- Breaking changes: endpoint kini mewajibkan 3 header (X-Api-Key, X-Signature, X-Timestamp); account number wajib 10 digit numeric; format tanggal strict.
- ENV: tambahkan `WEBSTATEMENT_API_KEY` dan `WEBSTATEMENT_SECRET_KEY` (dipetakan ke `config/webstatement.php`).
2025-08-28 15:39:21 +07:00
Daeng Deni Mardaeni
00681a8e30 feat(auth): implementasi autentikasi HMAC dan standardisasi format respons API
- Tambah validasi HMAC (X-Signature, X-Timestamp, X-Api-Key) pada setiap request.
- Standarkan format respons sesuai ResponseCode; hapus `response_description` (gabung ke `response_message`).
- `BalanceSummaryRequest`: validasi header + `validateHmac512`, pakai secret dari config, logging detail, bedakan invalid API key vs invalid signature.
- `AccountBalanceController`: sederhanakan pesan error “Rekening tidak ditemukan”.
- Konfigurasi baru: `webstatement.api_key`, `webstatement.secret_key`; pastikan helper `validateHmac512` tersedia.
- Breaking: Bearer token tidak didukung; gunakan HMAC headers.
- Validasi nomor rekening di database sebelum proses bisnis.
- Logging terstruktur untuk setiap percobaan validasi HMAC (header & hasil verifikasi).
- Konsistensi kode error via ResponseCode enum untuk semua kasus gagal.
2025-08-28 13:44:58 +07:00
Daeng Deni Mardaeni
adda3122f8 feat(response): Restrukturisasi format response untuk validasi error dan response sukses
- Menambahkan logika baru di `ResponseCode` untuk memisahkan struktur response sukses dan error.
- Field `errors` sekarang berada di root level untuk response validasi error.
- Meta response error lebih ringkas, hanya menyertakan `generated_at` dan `request_id`.
- Pesan error menampilkan seluruh daftar error, bukan hanya error pertama.
- Konsistensi format response memudahkan integrasi dengan frontend.
- Field `account_number` dan `period` dihapus dari meta pada response error.
- Memberikan request_id otomatis pada setiap response untuk keperluan tracking.
- Semua endpoint yang menggunakan ResponseCode enum otomatis mengikuti format baru.
2025-08-28 11:18:57 +07:00
Daeng Deni Mardaeni
e53b522f77 feat(API): standarisasi response API dengan ResponseCode enum dan penambahan struktur meta
- Menambahkan ResponseCode enum untuk standarisasi semua response API.
- Integrasi meta data: nomor rekening, periode, request_id, dan reference_code.
- Memperbarui validasi input dengan response code standar (INVALID_FIELD).
- Struktur response dibuat konsisten untuk success dan error.
- Logging diperkuat untuk debugging dan monitoring.
2025-08-27 17:07:57 +07:00
Daeng Deni Mardaeni
ffdb528360 feat(api): menambahkan controller API untuk ringkasan saldo rekening
- Menambahkan `AccountBalanceController` dengan endpoint `GET /api/balance`.
- Integrasi dengan `AccountBalanceService` untuk pengelolaan logika bisnis.
- Validasi request menggunakan `BalanceSummaryRequest`.
- Formatting response dengan `BalanceSummaryResource`.
- Menyediakan ringkasan saldo, transaksi, dan metadata dengan response JSON konsisten.
2025-08-27 16:26:13 +07:00
Daeng Deni Mardaeni
1ff4035b98 feat(balance): implementasi service layer untuk balance management
- Menambahkan `AccountBalanceService` dengan transaksi PostgreSQL dan proper error handling.
- Implementasi `BalanceServiceProvider` untuk mendukung dependency injection pattern.
- Registrasi `BalanceServiceProvider` dalam `WebstatementServiceProvider`.
- Penambahan `CAST` ke `DECIMAL(15,2)` untuk kompatibilitas PostgreSQL.
- Perhitungan balance summary mencakup opening balance dan closing balance.
- Agregasi transaksi dengan type casting yang aman.
- Implementasi database transaction handling dengan mekanisme rollback dan commit.
- Logging komprehensif untuk debugging dan audit trail.
- Mendukung balance inquiry berdasarkan tanggal maupun periode tertentu.
- Validasi akun dengan pengecekan `exists` untuk memastikan data valid.
2025-08-27 16:22:06 +07:00
Daeng Deni Mardaeni
f324f9e3f6 feat(Modules/Webstatement): Tambahkan BalanceSummaryRequest dan BalanceSummaryResource untuk API Balance Summary
- Menambahkan BalanceSummaryRequest dengan validasi lengkap untuk parameter API balance summary.
- Menambahkan BalanceSummaryResource untuk transformasi dan formatting response balance summary.
- Implementasi validasi nomor rekening menggunakan regex alphanumeric dan dash.
- Validasi tanggal dengan format Y-m-d dan batasan logika tanggal.
- Format balance menggunakan number_format dengan pemisah ribuan dan desimal Indonesia (2, ',', '.').
- Struktur response JSON yang konsisten dengan informasi lengkap balance summary.
- Menambahkan metadata pada response untuk tracking dan debugging.
- Logging request untuk monitoring dan audit trail.
- Mendukung pagination dan filtering tanggal untuk API balance summary.
2025-08-27 16:19:06 +07:00
19 changed files with 906 additions and 68 deletions

140
app/Enums/ResponseCode.php Normal file
View File

@@ -0,0 +1,140 @@
<?php
namespace Modules\Webstatement\Enums;
use Illuminate\Support\Str;
/**
* Response Code Enum untuk standarisasi response API
*
* @category Enums
* @package Modules\Webstatement\Enums
*/
enum ResponseCode: string
{
// Success Codes
case SUCCESS = '00';
// Data Error Codes
case INVALID_FIELD = '01';
case MISSING_FIELD = '02';
case INVALID_FORMAT = '03';
case DATA_NOT_FOUND = '04';
case DUPLICATE_REQUEST = '05';
case ACCOUNT_ALREADY_EXISTS = '06';
case ACCOUNT_NOT_FOUND = '07';
// Auth Error Codes
case INVALID_TOKEN = '10';
case UNAUTHORIZED = '11';
// System Error Codes
case SYSTEM_MALFUNCTION = '96';
case TIMEOUT = '97';
case SERVICE_UNAVAILABLE = '98';
case GENERAL_ERROR = '99';
/**
* Mendapatkan pesan response berdasarkan kode
*
* @return string
*/
public function getMessage(): string
{
return match($this) {
self::SUCCESS => 'Success',
self::INVALID_FIELD => 'Invalid Field',
self::MISSING_FIELD => 'Missing Field',
self::INVALID_FORMAT => 'Invalid Format',
self::DATA_NOT_FOUND => 'Data Not Found',
self::DUPLICATE_REQUEST => 'Duplicate Request',
self::ACCOUNT_ALREADY_EXISTS => 'Account Already Exists',
self::ACCOUNT_NOT_FOUND => 'Account Not Found',
self::INVALID_TOKEN => 'Invalid Token',
self::UNAUTHORIZED => 'Unauthorized',
self::SYSTEM_MALFUNCTION => 'System Malfunction',
self::TIMEOUT => 'Timeout',
self::SERVICE_UNAVAILABLE => 'Service Unavailable',
self::GENERAL_ERROR => 'General Error',
};
}
/**
* Mendapatkan deskripsi response berdasarkan kode
*
* @return string
*/
public function getDescription(): string
{
return match($this) {
self::SUCCESS => 'Permintaan berhasil',
self::INVALID_FIELD => 'Field tertentu tidak sesuai aturan',
self::MISSING_FIELD => 'Field wajib tidak dikirim',
self::INVALID_FORMAT => 'Format salah',
self::DATA_NOT_FOUND => 'Data yang diminta tidak ditemukan',
self::DUPLICATE_REQUEST => 'Request ID sama, sudah pernah diproses',
self::ACCOUNT_ALREADY_EXISTS => 'Nomor rekening / username / email sudah terdaftar',
self::ACCOUNT_NOT_FOUND => 'Nomor rekening / akun tidak ditemukan',
self::INVALID_TOKEN => 'Token tidak valid',
self::UNAUTHORIZED => 'Tidak punya akses',
self::SYSTEM_MALFUNCTION => 'Gangguan teknis di server',
self::TIMEOUT => 'Request timeout',
self::SERVICE_UNAVAILABLE => 'Layanan tidak tersedia',
self::GENERAL_ERROR => 'Kesalahan umum',
};
}
/**
* Mendapatkan HTTP status code berdasarkan response code
*
* @return int
*/
public function getHttpStatus(): int
{
return match($this) {
self::SUCCESS => 200,
self::INVALID_FIELD,
self::MISSING_FIELD,
self::INVALID_FORMAT => 400,
self::DATA_NOT_FOUND,
self::ACCOUNT_NOT_FOUND => 404,
self::DUPLICATE_REQUEST,
self::ACCOUNT_ALREADY_EXISTS => 409,
self::INVALID_TOKEN,
self::UNAUTHORIZED => 401,
self::SYSTEM_MALFUNCTION,
self::GENERAL_ERROR => 500,
self::TIMEOUT => 408,
self::SERVICE_UNAVAILABLE => 503,
};
}
/**
* Membuat response array standar
*
* @param mixed $data
* @param string|null $message
* @return array
*/
public function toResponse($data = null, ?string $message = null): array
{
$response = [
'status' => $this->value == '00' ? true : false,
'response_code' => $this->value,
'response_message' => $this->getMessage() . ($message ? ' | ' . $message : ''),
];
if (isset($data['errors'])) {
$response['errors'] = $data['errors'];
} else {
$response['data'] = $data;
}
$response['meta'] = [
'generated_at' => now()->toDateTimeString(),
'request_id' => request()->header('X-Request-ID', uniqid('req_'))
];
return $response;
}
}

View File

@@ -0,0 +1,97 @@
<?php
namespace Modules\Webstatement\Http\Controllers\Api;
use App\Http\Controllers\Controller;
use Illuminate\Http\JsonResponse;
use Illuminate\Support\Facades\Log;
use Modules\Webstatement\Http\Requests\BalanceSummaryRequest;
use Modules\Webstatement\Http\Requests\DetailedBalanceRequest;
use Modules\Webstatement\Services\AccountBalanceService;
use Modules\Webstatement\Http\Resources\BalanceSummaryResource;
use Modules\Webstatement\Http\Resources\DetailedBalanceResource;
use Modules\Webstatement\Enums\ResponseCode;
use Exception;
class AccountBalanceController extends Controller
{
protected AccountBalanceService $accountBalanceService;
public function __construct(AccountBalanceService $accountBalanceService)
{
$this->accountBalanceService = $accountBalanceService;
}
/**
* Get account balance summary (opening and closing balance)
*
* @param BalanceSummaryRequest $request
* @return JsonResponse
*/
public function getBalanceSummary(BalanceSummaryRequest $request): JsonResponse
{
try {
$accountNumber = $request->input('account_number');
$startDate = $request->input('start_date');
$endDate = $request->input('end_date');
Log::info('Account balance summary requested', [
'account_number' => $accountNumber,
'start_date' => $startDate,
'end_date' => $endDate,
'ip' => $request->ip(),
'user_agent' => $request->userAgent()
]);
$result = $this->accountBalanceService->getBalanceSummary(
$accountNumber,
$startDate,
$endDate
);
if (empty($result)) {
return response()->json(
ResponseCode::DATA_NOT_FOUND->toResponse(
null,
'Rekening tidak ditemukan'
),
ResponseCode::DATA_NOT_FOUND->getHttpStatus()
);
}
return response()->json(
ResponseCode::SUCCESS->toResponse(
(new BalanceSummaryResource($result))->toArray($request),
),
ResponseCode::SUCCESS->getHttpStatus()
);
} catch (Exception $e) {
Log::error('Error getting account balance summary', [
'error' => $e->getMessage(),
'file' => $e->getFile(),
'line' => $e->getLine(),
'trace' => $e->getTraceAsString()
]);
$responseCode = match ($e->getCode()) {
404 => ResponseCode::DATA_NOT_FOUND,
401 => ResponseCode::UNAUTHORIZED,
403 => ResponseCode::UNAUTHORIZED,
408 => ResponseCode::TIMEOUT,
503 => ResponseCode::SERVICE_UNAVAILABLE,
400 => ResponseCode::INVALID_FIELD,
default => ResponseCode::SYSTEM_MALFUNCTION
};
return response()->json(
$responseCode->toResponse(
null,
config('app.debug') ? $e->getMessage() : 'Terjadi kesalahan sistem'
),
$responseCode->getHttpStatus()
);
}
}
}

View File

@@ -31,7 +31,11 @@ ini_set('max_execution_time', 300000);
->get();
$branch = Branch::find(Auth::user()->branch_id);
$multiBranch = session('MULTI_BRANCH') ?? false;
$multiBranch = false;
if(Auth::user()->hasRole(['administrator','sentra_operasi'])){
$multiBranch = session('MULTI_BRANCH') ?? false;
}
return view('webstatement::statements.index', compact('branches', 'branch', 'multiBranch'));
}
@@ -168,7 +172,11 @@ ini_set('max_execution_time', 300000);
try {
$disk = Storage::disk('sftpStatement');
$filePath = "{$statement->period_from}/{$statement->branch_code}/{$statement->account_number}_{$statement->period_from}.pdf";
// Convert period format from YYYYMM to YYYYMMDD.YYYYMMDD for folder path
$periodPath = formatPeriodForFolder($statement->period_from);
$filePath = "{$periodPath}/PRINT/{$statement->branch_code}/{$statement->account_number}.1.pdf";
// Log untuk debugging
Log::info('Checking SFTP file path', [
@@ -186,7 +194,8 @@ ini_set('max_execution_time', 300000);
for ($period = clone $periodFrom; $period->lte($periodTo); $period->addMonth()) {
$periodFormatted = $period->format('Ym');
$periodPath = $periodFormatted . "/{$statement->branch_code}/{$statement->account_number}_{$periodFormatted}.pdf";
$periodFolderPath = formatPeriodForFolder($periodFormatted);
$periodPath = $periodFolderPath . "/{$statement->branch_code}/{$statement->account_number}_{$periodFormatted}.pdf";
if ($disk->exists($periodPath)) {
$availablePeriods[] = $periodFormatted;
@@ -316,7 +325,8 @@ ini_set('max_execution_time', 300000);
// Generate or fetch the statement file
$disk = Storage::disk('sftpStatement');
$filePath = "{$statement->period_from}/{$statement->branch_code}/{$statement->account_number}_{$statement->period_from}.pdf";
$periodPath = formatPeriodForFolder($statement->period_from);
$filePath = "{$periodPath}/{$statement->branch_code}/{$statement->account_number}_{$statement->period_from}.pdf";
if ($statement->is_period_range && $statement->period_to) {
// Log: Memulai proses download period range
@@ -339,7 +349,8 @@ ini_set('max_execution_time', 300000);
for ($period = clone $periodFrom; $period->lte($periodTo); $period->addMonth()) {
$periodFormatted = $period->format('Ym');
$periodPath = $periodFormatted . "/{$statement->branch_code}/{$statement->account_number}_{$periodFormatted}.pdf";
$periodFolderPath = formatPeriodForFolder($periodFormatted);
$periodPath = $periodFolderPath . "/{$statement->branch_code}/{$statement->account_number}_{$periodFormatted}.pdf";
if ($disk->exists($periodPath)) {
$availablePeriods[] = $periodFormatted;
@@ -383,7 +394,8 @@ ini_set('max_execution_time', 300000);
// Add each available statement to the zip
foreach ($availablePeriods as $period) {
$periodFilePath = "{$period}/{$statement->branch_code}/{$statement->account_number}_{$period}.pdf";
$periodFolderPath = formatPeriodForFolder($period);
$periodFilePath = "{$periodFolderPath}/{$statement->branch_code}/{$statement->account_number}_{$period}.pdf";
$localFilePath = storage_path("app/temp/{$statement->account_number}_{$period}.pdf");
try {
@@ -512,7 +524,7 @@ ini_set('max_execution_time', 300000);
$query = PrintStatementLog::query();
$query->whereNotNull('user_id');
if (!Auth::user()->role === 'administrator') {
if (!Auth::user()->hasRole(['administrator','sentra_operasi'])) {
$query->where(function($q) {
$q->where('user_id', Auth::id())
->orWhere('branch_code', Auth::user()->branch->code);
@@ -668,7 +680,8 @@ ini_set('max_execution_time', 300000);
$localDisk = Storage::disk('local');
$sftpDisk = Storage::disk('sftpStatement');
$filePath = "{$statement->period_from}/{$statement->branch_code}/{$statement->account_number}_{$statement->period_from}.pdf";
$periodPath = formatPeriodForFolder($statement->period_from);
$filePath = "{$periodPath}/{$statement->branch_code}/{$statement->account_number}_{$statement->period_from}.pdf";
/**
* Fungsi helper untuk mendapatkan file dari disk dengan prioritas local
@@ -718,7 +731,8 @@ ini_set('max_execution_time', 300000);
for ($period = clone $periodFrom; $period->lte($periodTo); $period->addMonth()) {
$periodFormatted = $period->format('Ym');
$periodPath = "{$periodFormatted}/{$statement->branch_code}/{$statement->account_number}_{$periodFormatted}.pdf";
$periodFolderPath = formatPeriodForFolder($periodFormatted);
$periodPath = "{$periodFolderPath}/{$statement->branch_code}/{$statement->account_number}_{$periodFormatted}.pdf";
$fileInfo = $getFileFromDisk($periodPath);
@@ -906,6 +920,7 @@ ini_set('max_execution_time', 300000);
$norek = $statement->account_number;
$period = $statement->period_from;
$endPeriod = $statement->period_to ?? $period;
$format='pdf';
// Generate nama file PDF
@@ -977,20 +992,21 @@ ini_set('max_execution_time', 300000);
Log::info('Statement data prepared successfully', [
'account_number' => $norek,
'period' => $period,
'endPeriod' => $endPeriod ?? $period,
'saldo_period' => $saldoPeriod,
'saldo_awal' => $saldoAwalBulan->actual_balance ?? 0,
'entries_count' => $stmtEntries->count()
]);
$periodDates = calculatePeriodDates($period);
$periodDates = formatPeriodForFolder($period);
// Jika format adalah PDF, generate PDF
if ($format === 'pdf') {
return $this->generateStatementPdf($norek, $period, $stmtEntries, $account, $customer, $headerTableBg, $branch, $saldoAwalBulan, $statement->id, $tempPath, $filename);
return $this->generateStatementPdf($norek, $period, $endPeriod, $stmtEntries, $account, $customer, $headerTableBg, $branch, $saldoAwalBulan, $statement->id, $tempPath, $filename);
}
// Default return HTML view
return view('webstatement::statements.stmt', compact('stmtEntries', 'account', 'customer', 'headerTableBg', 'branch', 'period', 'saldoAwalBulan'));
return view('webstatement::statements.stmt', compact('stmtEntries', 'account', 'customer', 'headerTableBg', 'branch', 'period', 'saldoAwalBulan', 'endPeriod'));
} catch (Exception $e) {
DB::rollBack();
@@ -1028,7 +1044,7 @@ ini_set('max_execution_time', 300000);
* @param object $saldoAwalBulan Data saldo awal
* @return \Illuminate\Http\Response
*/
protected function generateStatementPdf($norek, $period, $stmtEntries, $account, $customer, $headerTableBg, $branch, $saldoAwalBulan, $statementId, $tempPath, $filename)
protected function generateStatementPdf($norek, $period, $endPeriod, $stmtEntries, $account, $customer, $headerTableBg, $branch, $saldoAwalBulan, $statementId, $tempPath, $filename)
{
try {
DB::beginTransaction();
@@ -1036,6 +1052,7 @@ ini_set('max_execution_time', 300000);
Log::info('Starting PDF generation with storage', [
'account_number' => $norek,
'period' => $period,
'endPeriod' => $endPeriod ?? $period,
'user_id' => Auth::id()
]);
@@ -1047,10 +1064,12 @@ ini_set('max_execution_time', 300000);
'headerTableBg',
'branch',
'period',
'endPeriod',
'saldoAwalBulan'
))->render();
// Tentukan path storage
$storagePath = "statements/{$period}/{$norek}";
// Tentukan path storage dengan format folder baru
$periodPath = formatPeriodForFolder($period);
$storagePath = "statements/{$periodPath}/{$norek}";
$fullStoragePath = "{$storagePath}/{$filename}";
// Generate PDF menggunakan Browsershot dan simpan langsung ke storage
@@ -1226,7 +1245,8 @@ ini_set('max_execution_time', 300000);
$account = Account::where('account_number',$norek)->first();
$storagePath = "statements/{$period}/{$account->branch_code}/{$filename}";
$periodPath = formatPeriodForFolder($period);
$storagePath = "statements/{$periodPath}/{$account->branch_code}/{$filename}";
// Cek apakah file ada di storage
if (!Storage::disk('local')->exists($storagePath)) {
@@ -1285,7 +1305,8 @@ ini_set('max_execution_time', 300000);
$filename = $this->generatePdfFileName($norek, $period);
}
$storagePath = "statements/{$period}/{$norek}/{$filename}";
$periodPath = formatPeriodForFolder($period);
$storagePath = "statements/{$periodPath}/{$norek}/{$filename}";
if (Storage::disk('local')->exists($storagePath)) {
$deleted = Storage::disk('local')->delete($storagePath);
@@ -1519,6 +1540,8 @@ ini_set('max_execution_time', 300000);
$accountNumber = $statement->account_number;
$period = $statement->period_from ?? date('Ym');
$endPeriod = $statement->period_to ?? $period;
$balance = AccountBalance::where('account_number', $accountNumber)
->when($period === '202505', function($query) {
return $query->where('period', '>=', '20250512')
@@ -1542,7 +1565,7 @@ ini_set('max_execution_time', 300000);
}
// Dispatch the job
$job = ExportStatementPeriodJob::dispatch($statement->id, $accountNumber, $period, $balance, $clientName);
$job = ExportStatementPeriodJob::dispatch($statement->id, $accountNumber, $period, $endPeriod, $balance, $clientName);
Log::info("Statement export job dispatched successfully", [
'job_id' => $job->job_id ?? null,
@@ -1602,8 +1625,9 @@ ini_set('max_execution_time', 300000);
], 404);
}
// Find ZIP file
$zipFiles = Storage::disk('local')->files("statements/{$statement->period_from}/multi_account/{$statementId}");
// Find ZIP file dengan format folder baru
$periodPath = formatPeriodForFolder($statement->period_from);
$zipFiles = Storage::disk('local')->files("statements/{$periodPath}/multi_account/{$statementId}");
$zipFile = null;
foreach ($zipFiles as $file) {

View File

@@ -20,10 +20,8 @@ class WebstatementController extends Controller
* @param Request $request
* @return \Illuminate\Http\JsonResponse
*/
public function index(Request $request)
public function index(string $queueName='default')
{
$queueName = $request->get('queue_name', 'default');
Log::info('Starting statement export process', [
'queue_name' => $queueName
]);
@@ -142,7 +140,10 @@ class WebstatementController extends Controller
],
"MONETA"=> [
"1085667890"
]
],
"SILOT" => [
"1083972676"
]
];
}

View File

@@ -0,0 +1,317 @@
<?php
namespace Modules\Webstatement\Http\Requests;
use Illuminate\Foundation\Http\FormRequest;
use Illuminate\Support\Facades\Log;
use Illuminate\Http\Exceptions\HttpResponseException;
use Modules\Webstatement\Enums\ResponseCode;
use Modules\Webstatement\Models\AccountBalance;
class BalanceSummaryRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*
* @return bool
*/
public function authorize(): bool
{
try {
// Ambil parameter dari header
$signature = $this->header('X-Signature');
$timestamp = $this->header('X-Timestamp');
$apiKey = $this->header('X-Api-Key');
// Validasi keberadaan header yang diperlukan
if (!$signature || !$timestamp || !$apiKey) {
Log::warning('HMAC validation failed - missing required headers', [
'signature' => $signature,
'timestamp' => $timestamp,
'apiKey' => $apiKey,
'ip' => $this->ip(),
'user_agent' => $this->userAgent()
]);
return false;
}
// Validasi API key dari config
$expectedApiKey = config('webstatement.api_key');
if ($apiKey !== $expectedApiKey) {
Log::warning('HMAC validation failed - invalid API key', [
'provided_api_key' => $apiKey,
'expected_api_key' => $expectedApiKey,
'ip' => $this->ip(),
'user_agent' => $this->userAgent()
]);
return false;
}
// Ambil secret key dari config
$secretKey = config('webstatement.secret_key');
// Ambil parameter untuk validasi HMAC
$httpMethod = $this->method();
$relativeUrl = $this->path();
$requestBody = $this->getContent();
// Validasi HMAC signature
$isValid = validateHmac512(
$httpMethod,
$relativeUrl,
$apiKey,
$requestBody,
$timestamp,
$secretKey,
$signature
);
if (!$isValid) {
Log::warning('HMAC validation failed - invalid signature', [
'http_method' => $httpMethod,
'relative_url' => $relativeUrl,
'api_key' => $apiKey,
'timestamp' => $timestamp,
'ip' => $this->ip(),
'user_agent' => $this->userAgent()
]);
}
return $isValid;
} catch (\Exception $e) {
Log::error('HMAC validation error', [
'error' => $e->getMessage(),
'file' => $e->getFile(),
'line' => $e->getLine(),
'ip' => $this->ip(),
'user_agent' => $this->userAgent()
]);
return false;
}
}
/**
* Get the validation rules that apply to the request.
*
* @return array<string, mixed>
*/
public function rules(): array
{
return [
'account_number' => [
'required',
'string',
'max:10',
'min:10',
'exists:account_balances,account_number',
'regex:/^[0-9]+$/' // Numeric only
],
'start_date' => [
'required',
'date_format:Y-m-d',
'before_or_equal:end_date',
'after_or_equal:1900-01-01',
'before_or_equal:today'
],
'end_date' => [
'required',
'date_format:Y-m-d',
'after_or_equal:start_date',
'after_or_equal:1900-01-01',
'before_or_equal:today'
],
];
}
/**
* Get custom messages for validator errors.
*
* @return array<string, string>
*/
public function messages(): array
{
return [
'account_number.exists' => 'Nomor rekening tidak ditemukan.',
'account_number.required' => 'Nomor rekening wajib diisi.',
'account_number.string' => 'Nomor rekening harus berupa teks.',
'account_number.max' => 'Nomor rekening maksimal :max karakter.',
'account_number.min' => 'Nomor rekening minimal :min karakter.',
'account_number.regex' => 'Nomor rekening hanya boleh mengandung angka.',
'start_date.required' => 'Tanggal awal wajib diisi.',
'start_date.date_format' => 'Format tanggal awal harus YYYY-MM-DD.',
'start_date.before_or_equal' => 'Tanggal awal harus sebelum atau sama dengan tanggal akhir.',
'end_date.required' => 'Tanggal akhir wajib diisi.',
'end_date.date_format' => 'Format tanggal akhir harus YYYY-MM-DD.',
'end_date.after_or_equal' => 'Tanggal akhir harus sesudah atau sama dengan tanggal awal.',
'end_date.before_or_equal' => 'Tanggal akhir harus sebelum atau sama dengan hari ini.',
];
}
/**
* Handle a failed validation attempt.
*
* @param \Illuminate\Contracts\Validation\Validator $validator
* @return void
*
* @throws \Illuminate\Validation\ValidationException
*/
protected function failedValidation($validator)
{
$errors = $validator->errors();
if($errors->has('account_number') && $errors->first('account_number') === 'Nomor rekening tidak ditemukan.') {
throw new HttpResponseException(
response()->json(
ResponseCode::ACCOUNT_NOT_FOUND->toResponse(
null,
'Nomor rekening tidak ditemukan'
),
ResponseCode::ACCOUNT_NOT_FOUND->getHttpStatus()
)
);
}
throw new HttpResponseException(
response()->json(
ResponseCode::INVALID_FIELD->toResponse(
['errors' => $errors->all()],
'Validasi gagal'
),
ResponseCode::INVALID_FIELD->getHttpStatus()
)
);
}
/**
* Handle failed authorization.
*
* @return void
*
* @throws \Illuminate\Auth\Access\AuthorizationException
*/
protected function failedAuthorization()
{
$xApiKey = $this->header('X-Api-Key');
$xSignature = $this->header('X-Signature');
$xTimestamp = $this->header('X-Timestamp');
$expectedApiKey = config('webstatement.api_key');
if(!$xApiKey){
throw new HttpResponseException(
response()->json(
ResponseCode::INVALID_FIELD->toResponse(
['errors' => ['X-Api-Key' => 'API Key wajib diisi']],
'Validasi gagal'
),
ResponseCode::INVALID_FIELD->getHttpStatus()
)
);
}
if(!$xSignature){
throw new HttpResponseException(
response()->json(
ResponseCode::INVALID_FIELD->toResponse(
['errors' => ['X-Signature' => 'Signature wajib diisi']],
'Validasi gagal'
),
ResponseCode::INVALID_FIELD->getHttpStatus()
)
);
}
if(!$xTimestamp){
throw new HttpResponseException(
response()->json(
ResponseCode::INVALID_FIELD->toResponse(
['errors' => ['X-Timestamp' => 'Timestamp wajib diisi']],
'Validasi gagal'
),
ResponseCode::INVALID_FIELD->getHttpStatus()
)
);
}
// Validasi format timestamp ISO 8601
if (!preg_match('/^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(\.\d{3})?Z?$/', $xTimestamp)) {
throw new HttpResponseException(
response()->json(
ResponseCode::INVALID_FIELD->toResponse(
['errors' => ['X-Timestamp' => 'Format timestamp tidak valid. Gunakan format ISO 8601 (YYYY-MM-DDTHH:MM:SS.sssZ)']],
'Validasi gagal'
),
ResponseCode::INVALID_FIELD->getHttpStatus()
)
);
}
// Validasi timestamp tidak lebih dari 5 menit dari waktu sekarang
try {
$timestamp = new \DateTime($xTimestamp);
$now = new \DateTime();
$diff = $now->getTimestamp() - $timestamp->getTimestamp();
if (abs($diff) > 300) { // 5 menit = 300 detik
throw new HttpResponseException(
response()->json(
ResponseCode::INVALID_FIELD->toResponse(
['errors' => ['X-Timestamp' => 'Timestamp expired. Maksimal selisih 5 menit dari waktu sekarang']],
'Validasi gagal'
),
ResponseCode::INVALID_FIELD->getHttpStatus()
)
);
}
} catch (\Exception $e) {
throw new HttpResponseException(
response()->json(
ResponseCode::INVALID_FIELD->toResponse(
['errors' => ['X-Timestamp' => 'Timestamp tidak dapat diproses']],
'Validasi gagal'
),
ResponseCode::INVALID_FIELD->getHttpStatus()
)
);
}
// Cek apakah ini karena invalid API key
if ($xApiKey !== $expectedApiKey) {
throw new HttpResponseException(
response()->json(
ResponseCode::INVALID_TOKEN->toResponse(
null,
'API Key tidak valid'
),
ResponseCode::INVALID_TOKEN->getHttpStatus()
)
);
}
// Untuk kasus HMAC signature tidak valid
throw new HttpResponseException(
response()->json(
ResponseCode::UNAUTHORIZED->toResponse(
null,
'Signature tidak valid'
),
ResponseCode::UNAUTHORIZED->getHttpStatus()
)
);
}
/**
* Prepare the data for validation.
*
* @return void
*/
protected function prepareForValidation(): void
{
Log::info('Balance summary request received', [
'input' => $this->all(),
'ip' => $this->ip(),
'user_agent' => $this->userAgent()
]);
}
}

View File

@@ -62,7 +62,7 @@ class PrintStatementRequest extends FormRequest
// Hanya cek duplikasi jika account_number ada
if (!empty($this->input('account_number'))) {
$query = Statement::where('account_number', $this->input('account_number'))
->where('authorization_status', '!=', 'rejected')
//->where('authorization_status', '!=', 'rejected')
->where(function($query) {
$query->where('is_available', true)
->orWhere('is_generated', true);
@@ -84,7 +84,7 @@ class PrintStatementRequest extends FormRequest
}
if ($query->exists()) {
$fail('A statement request with this account number and period already exists.');
//$fail('A statement request with this account number and period already exists.');
}
}
}

View File

@@ -0,0 +1,44 @@
<?php
namespace Modules\Webstatement\Http\Resources;
use Illuminate\Http\Request;
use Illuminate\Http\Resources\Json\JsonResource;
use Illuminate\Support\Str;
class BalanceSummaryResource extends JsonResource
{
/**
* Transform the resource into an array.
*
* @param Request $request
* @return array
*/
public function toArray($request): array
{
return [
'account_number' => $this['account_number'],
'period' => [
'start_date' => $this['period']['start_date'],
'end_date' => $this['period']['end_date'],
],
'opening_balance' => [
'date' => $this['opening_balance']['date'],
'balance' => $this['opening_balance']['balance'],
'formatted_balance' => number_format($this['opening_balance']['balance'], 2, ',', '.'),
],
'closing_balance' => [
'date' => $this['closing_balance']['date'],
'balance' => $this['closing_balance']['balance'],
'formatted_balance' => number_format($this['closing_balance']['balance'], 2, ',', '.'),
'base_balance' => [
'date' => $this['closing_balance']['base_balance']['date'],
'balance' => $this['closing_balance']['base_balance']['balance'],
'formatted_balance' => number_format($this['closing_balance']['base_balance']['balance'], 2, ',', '.'),
],
'transactions_on_end_date' => $this['closing_balance']['transactions_on_end_date'],
'formatted_transactions_on_end_date' => number_format($this['closing_balance']['transactions_on_end_date'], 2, ',', '.'),
]
];
}
}

View File

@@ -361,8 +361,8 @@
{
// Determine the base path based on client
$basePath = !empty($this->client)
? "statements/{$this->client}"
: "statements";
? "partners/{$this->client}"
: "partners";
$accountPath = "{$basePath}/{$this->account_number}";

View File

@@ -38,6 +38,7 @@ class ExportStatementPeriodJob implements ShouldQueue
protected $account_number;
protected $period; // Format: YYYYMM (e.g., 202505)
protected $endPeriod; // Format: YYYYMM (e.g., 202505)
protected $saldo;
protected $disk;
protected $client;
@@ -57,11 +58,12 @@ class ExportStatementPeriodJob implements ShouldQueue
* @param string $client
* @param string $disk
*/
public function __construct(int $statementId, string $account_number, string $period, string $saldo, string $client = '', string $disk = 'local', bool $toCsv = true)
public function __construct(int $statementId, string $account_number, string $period, string $endPeriod, string $saldo, string $client = '', string $disk = 'local', bool $toCsv = true)
{
$this->statementId = $statementId;
$this->account_number = $account_number;
$this->period = $period;
$this->endPeriod = $endPeriod;
$this->saldo = $saldo;
$this->disk = $disk;
$this->client = $client;
@@ -69,13 +71,13 @@ class ExportStatementPeriodJob implements ShouldQueue
$this->toCsv = $toCsv;
// Calculate start and end dates based on period
$this->calculatePeriodDates();
$this->formatPeriodForFolder();
}
/**
* Calculate start and end dates for the given period
*/
private function calculatePeriodDates(): void
private function formatPeriodForFolder(): void
{
$year = substr($this->period, 0, 4);
$month = substr($this->period, 4, 2);
@@ -90,6 +92,13 @@ class ExportStatementPeriodJob implements ShouldQueue
// End date is always the last day of the month
$this->endDate = Carbon::createFromDate($year, $month, 1)->endOfMonth()->endOfDay();
// If endPeriod is provided, use it instead of endDate
if($this->endPeriod){
$year = substr($this->endPeriod, 0, 4);
$month = substr($this->endPeriod, 4, 2);
$this->endDate = Carbon::createFromDate($year, $month, 1)->endOfMonth()->endOfDay();
}
}
/**
@@ -202,19 +211,23 @@ class ExportStatementPeriodJob implements ShouldQueue
foreach ($entries as $item) {
$globalSequence++;
$runningBalance += (float) $item->amount_lcy;
$transactionDate = $this->formatTransactionDate($item);
$actualDate = $this->formatActualDate($item);
$amount = $item->amount_fcy;
if($item->currency=='IDR'){
$amount = $item->amount_lcy;
}
$runningBalance += (float) $amount;
$processedData[] = [
'account_number' => $this->account_number,
'period' => $this->period,
'sequence_no' => $globalSequence,
'transaction_date' => $item->booking_date,
'reference_number' => $item->trans_reference,
'transaction_amount' => $item->amount_lcy,
'transaction_type' => $item->amount_lcy < 0 ? 'D' : 'C',
'transaction_amount' => $amount,
'transaction_type' => $amount < 0 ? 'D' : 'C',
'description' => $this->generateNarrative($item),
'end_balance' => $runningBalance,
'actual_date' => $actualDate,
@@ -474,8 +487,9 @@ class ExportStatementPeriodJob implements ShouldQueue
// Generate filename
$filename = "{$this->account_number}_{$this->period}.pdf";
// Tentukan path storage
$storagePath = "statements/{$this->period}/{$account->branch_code}";
// Tentukan path storage dengan format folder baru
$periodPath = formatPeriodForFolder($this->period);
$storagePath = "statements/{$periodPath}/{$account->branch_code}";
$tempPath = storage_path("app/temp/{$filename}");
$fullStoragePath = "{$storagePath}/{$filename}";
@@ -488,6 +502,7 @@ class ExportStatementPeriodJob implements ShouldQueue
Storage::makeDirectory($storagePath);
$period = $this->period;
$endPeriod = $this->endPeriod;
// Render HTML view
$html = view('webstatement::statements.stmt', compact(
@@ -497,6 +512,7 @@ class ExportStatementPeriodJob implements ShouldQueue
'headerTableBg',
'branch',
'period',
'endPeriod',
'saldoAwalBulan'
))->render();
@@ -612,7 +628,8 @@ class ExportStatementPeriodJob implements ShouldQueue
// Determine the base path based on client
$account = Account::where('account_number', $this->account_number)->first();
$storagePath = "statements/{$this->period}/{$account->branch_code}";
$periodPath = formatPeriodForFolder($this->period);
$storagePath = "statements/{$periodPath}/{$account->branch_code}";
Storage::disk($this->disk)->makeDirectory($storagePath);
$filePath = "{$storagePath}/{$this->fileName}";

View File

@@ -184,15 +184,13 @@
->whereNotNull('currency')
->where('currency', '!=', '')
->whereIn('ctdesc', $cardTypes)
->whereNotIn('product_code',['6002','6004','6042','6031']) // Hapus 6021 dari sini
->whereNotIn('product_code',['6031','6021','6042']) // Hapus 6021 dari sini
->where('branch','!=','ID0019999')
// Filter khusus: Kecualikan product_code 6021 yang ctdesc nya gold
->where(function($subQuery) {
$subQuery->where('product_code', '!=', '6021')
->orWhere(function($nestedQuery) {
$nestedQuery->where('product_code', '6021')
->where('ctdesc', '!=', 'GOLD');
});
->where(function($query) {
$query->whereNot(function($q) {
$q->where('product_code', '6004')
->where('ctdesc', 'CLASSIC');
});
});
@@ -203,8 +201,8 @@
Log::info('Eligible ATM cards fetched successfully', [
'total_cards' => $cards->count(),
'periode' => $this->periode,
'excluded_product_codes' => ['6002','6004','6042','6031'],
'special_filter' => 'product_code 6021 dengan ctdesc gold dikecualikan'
'excluded_product_codes' => ['6021','6042','6031'],
'special_filter' => 'product_code 6004 dengan ctdesc classic dikecualikan'
]);
return $cards;
@@ -251,6 +249,8 @@
: array
{
$today = date('Ymd');
// Generate hash string unik 16 digit
$uniqueHash = substr(hash('sha256', $card->crdno . $today . microtime(true) . uniqid()), 0, 16);
return [
'',
@@ -272,7 +272,8 @@
'',
'',
'',
'ACAT'
'ACAT',
$uniqueHash
];
}

View File

@@ -170,12 +170,13 @@
$mapping[$index] = $csvHeader;
continue;
}
// Custom mapping untuk field yang berbeda nama
$customMapping = [
'co_code' => 'branch_code', // co_code di CSV menjadi branch_code di database
'name_1' => 'name'
];
if (isset($customMapping[$csvHeader])) {
$mapping[$index] = $customMapping[$csvHeader];
} else {

View File

@@ -231,6 +231,7 @@
break;
case 'all_branches':
$query->orderBy('branch_code', 'asc');
// Tidak ada filter tambahan, ambil semua
break;
@@ -238,6 +239,7 @@
throw new InvalidArgumentException("Invalid request type: {$this->requestType}");
}
$query->orderBy('account_number');
$accounts = $query->get();
// Filter accounts yang memiliki email

View File

@@ -0,0 +1,31 @@
<?php
namespace Modules\Webstatement\Providers;
use Illuminate\Support\ServiceProvider;
use Modules\Webstatement\Services\AccountBalanceService;
class BalanceServiceProvider extends ServiceProvider
{
/**
* Register the service provider.
*
* @return void
*/
public function register(): void
{
$this->app->singleton(AccountBalanceService::class, function ($app) {
return new AccountBalanceService();
});
}
/**
* Get the services provided by the provider.
*
* @return array<string>
*/
public function provides(): array
{
return [AccountBalanceService::class];
}
}

View File

@@ -57,6 +57,7 @@ class WebstatementServiceProvider extends ServiceProvider
{
$this->app->register(EventServiceProvider::class);
$this->app->register(RouteServiceProvider::class);
$this->app->register(BalanceServiceProvider::class);
$this->app->bind(UpdateAtmCardBranchCurrencyJob::class);
}

View File

@@ -0,0 +1,130 @@
<?php
namespace Modules\Webstatement\Services;
use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Log;
use Carbon\Carbon;
use Modules\Webstatement\Models\AccountBalance;
use Modules\Webstatement\Models\StmtEntry;
class AccountBalanceService
{
/**
* Get balance summary (opening and closing balance)
*
* @param string $accountNumber
* @param string $startDate
* @param string $endDate
* @return array
*/
public function getBalanceSummary(string $accountNumber, string $startDate, string $endDate): array
{
return DB::transaction(function () use ($accountNumber, $startDate, $endDate) {
Log::info('Calculating balance summary', [
'account_number' => $accountNumber,
'start_date' => $startDate,
'end_date' => $endDate
]);
// Convert dates to Carbon instances
$startDateCarbon = Carbon::parse($startDate);
$endDateCarbon = Carbon::parse($endDate);
// Get opening balance (balance from previous day)
$openingBalanceDate = $startDateCarbon->copy()->subDay();
$openingBalance = $this->getAccountBalance($accountNumber, $openingBalanceDate);
// Get closing balance date (previous day from end date)
$closingBalanceDate = $endDateCarbon->copy()->subDay();
$closingBalanceBase = $this->getAccountBalance($accountNumber, $closingBalanceDate);
// Get transactions on end date
$transactionsOnEndDate = $this->getTransactionsOnDate($accountNumber, $endDate);
// Calculate closing balance
$closingBalance = $closingBalanceBase + $transactionsOnEndDate;
$result = [
'account_number' => $accountNumber,
'period' => [
'start_date' => $startDate,
'end_date' => $endDate
],
'opening_balance' => [
'date' => $openingBalanceDate->format('Y-m-d'),
'balance' => $openingBalance,
'formatted_balance' => number_format($openingBalance, 2)
],
'closing_balance' => [
'date' => $endDate,
'balance' => $closingBalance,
'formatted_balance' => number_format($closingBalance, 2),
'base_balance' => [
'date' => $closingBalanceDate->format('Y-m-d'),
'balance' => $closingBalanceBase,
'formatted_balance' => number_format($closingBalanceBase, 2)
],
'transactions_on_end_date' => $transactionsOnEndDate,
'formatted_transactions_on_end_date' => number_format($transactionsOnEndDate, 2)
]
];
Log::info('Balance summary calculated successfully', $result);
return $result;
});
}
/**
* Get account balance for specific date
*
* @param string $accountNumber
* @param Carbon $date
* @return float
*/
private function getAccountBalance(string $accountNumber, Carbon $date): float
{
$balance = AccountBalance::where('account_number', $accountNumber)
->where('period', $date->format('Ymd'))
->value('actual_balance');
if ($balance === null) {
Log::warning('Account balance not found', [
'account_number' => $accountNumber,
'date' => $date->format('Y-m-d'),
'period' => $date->format('Ymd')
]);
return 0.00;
}
return (float) $balance;
}
/**
* Get transactions on specific date
*
* @param string $accountNumber
* @param string $date
* @return float
*/
private function getTransactionsOnDate(string $accountNumber, string $date): float
{
$total = StmtEntry::where('account_number', $accountNumber)
->whereDate('value_date', $date)
->sum(DB::raw('CAST(amount_lcy AS DECIMAL(15,2))'));
return (float) $total;
}
/**
* Validate if account exists
*
* @param string $accountNumber
* @return bool
*/
public function validateAccount(string $accountNumber): bool
{
return AccountBalance::where('account_number', $accountNumber)->exists();
}
}

View File

@@ -5,4 +5,17 @@ return [
// ZIP file password configuration
'zip_password' => env('WEBSTATEMENT_ZIP_PASSWORD', 'statement123'),
/*
|--------------------------------------------------------------------------
| API Configuration
|--------------------------------------------------------------------------
|
| These configuration values are used for API authentication using HMAC
| signature validation. These keys are used to validate incoming API
| requests and ensure secure communication.
|
*/
'api_key' => env('API_KEY'),
'secret_key' => env('SECRET_KEY'),
];

View File

@@ -6,7 +6,7 @@
@section('content')
<div class="grid grid-cols-8 gap-5">
<div class="col-span-2 card">
<div class="col-span-2 bg-gray-100 card">
<div class="card-header">
<h3 class="card-title">Request Print Stetement</h3>
</div>
@@ -71,10 +71,6 @@
{{ in_array('BY.MAIL.TO.KTP.ADDR', old('stmt_sent_type', $statement->stmt_sent_type ?? [])) ? 'selected' : '' }}>
BY MAIL TO KTP ADDR
</option>
<option value="NO.PRINT"
{{ in_array('NO.PRINT', old('stmt_sent_type', $statement->stmt_sent_type ?? [])) ? 'selected' : '' }}>
NO PRINT
</option>
<option value="PRINT"
{{ in_array('PRINT', old('stmt_sent_type', $statement->stmt_sent_type ?? [])) ? 'selected' : '' }}>
PRINT
@@ -135,6 +131,7 @@
@enderror
</div>
@if (auth()->user()->branch->code === '0988')
<div class="form-group">
<label class="form-label required" for="end_date">End Date</label>
<input class="input @error('period_to') border-danger bg-danger-light @enderror" type="month"
@@ -144,6 +141,7 @@
<em class="text-sm alert text-danger">{{ $message }}</em>
@enderror
</div>
@endif
</div>
<div class="mt-5 text-end">

View File

@@ -288,8 +288,12 @@
@php
// Hitung tanggal periode berdasarkan $period
$periodDates = calculatePeriodDates($period);
// Jika endPeriod ada, gunakan endPeriod sebagai batas akhir, jika tidak, gunakan period
$endPeriodDate = $endPeriod ? calculatePeriodDates($endPeriod) : $periodDates;
$startDate = $periodDates['start'];
$endDate = $periodDates['end'];
$endDate = $endPeriodDate['end'] ?? $periodDates['end'];
// Log hasil perhitungan
\Log::info('Period dates calculated', [
@@ -366,13 +370,22 @@
<div class="column">
<p>{{ $branch->name }}</p>
<p style="text-transform: capitalize">Kepada</p>
<p>{{ $account->customer->name }}</p>
<p>{{ $account->customer->address }}</p>
<p>{{ $account->customer->district }}
{{ ($account->customer->ktp_rt ?: $account->customer->home_rt) ? 'RT ' . ($account->customer->ktp_rt ?: $account->customer->home_rt) : '' }}
{{ ($account->customer->ktp_rw ?: $account->customer->home_rw) ? 'RW ' . ($account->customer->ktp_rw ?: $account->customer->home_rw) : '' }}
</p>
<p>{{ trim($account->customer->city . ' ' . ($account->customer->province ? getProvinceCoreName($account->customer->province) . ' ' : '') . ($account->customer->postal_code ?? '')) }}
<p>{{ $customer->name }}</p>
@if ($account->stmt_sent_type == 'BY.MAIL.TO.DOM.ADDR')
<p>{{ $customer->l_dom_street ?? $customer->address }}</p>
<p>{{ $customer->district }}
{{ ($customer->ktp_rt ?: $customer->home_rt) ? 'RT ' . ($customer->ktp_rt ?: $customer->home_rt) : '' }}
{{ ($customer->ktp_rw ?: $customer->home_rw) ? 'RW ' . ($customer->ktp_rw ?: $customer->home_rw) : '' }}
</p>
<p>{{ trim($customer->city . ' ' . ($customer->province ? getProvinceCoreName($customer->province) . ' ' : '') . ($customer->postal_code ?? '')) }}
@else
<p>{{ $customer->address }}</p>
<p>{{ $customer->district }}
{{ ($customer->ktp_rt ?: $customer->home_rt) ? 'RT ' . ($customer->ktp_rt ?: $customer->home_rt) : '' }}
{{ ($customer->ktp_rw ?: $customer->home_rw) ? 'RW ' . ($customer->ktp_rw ?: $customer->home_rw) : '' }}
</p>
<p>{{ trim($customer->city . ' ' . ($customer->province ? getProvinceCoreName($customer->province) . ' ' : '') . ($customer->postal_code ?? '')) }}
@endif
</p>
</div>
<div style="text-transform: capitalize;" class="column">
@@ -408,7 +421,7 @@
<td class="text-right">&nbsp;</td>
<td class="text-right">&nbsp;</td>
<td class="text-right">
<strong>{{ number_format((float)$saldoAwalBulan->actual_balance, 2, ',', '.') }}</strong>
<strong>{{ number_format((float) $saldoAwalBulan->actual_balance, 2, ',', '.') }}</strong>
</td>
</tr>
@@ -443,10 +456,12 @@
<td class="text-center">{{ substr($row->actual_date, 0, 10) }}</td>
<td>{{ str_replace(['[', ']'], ' ', $narrativeLines[0] ?? '') }}</td>
<td>{{ $row->reference_number }}</td>
<td class="text-right">{{ $debit > 0 ? number_format((float)$debit, 2, ',', '.') : '' }}</td>
<td class="text-right">{{ $kredit > 0 ? number_format((float)$kredit, 2, ',', '.') : '' }}
<td class="text-right">
{{ $debit > 0 ? number_format((float) $debit, 2, ',', '.') : '' }}</td>
<td class="text-right">
{{ $kredit > 0 ? number_format((float) $kredit, 2, ',', '.') : '' }}
</td>
<td class="text-right">{{ number_format((float)$saldo, 2, ',', '.') }}</td>
<td class="text-right">{{ number_format((float) $saldo, 2, ',', '.') }}</td>
</tr>
@for ($i = 1; $i < count($narrativeLines); $i++)
<tr class="narrative-line">

View File

@@ -3,7 +3,13 @@
use Illuminate\Support\Facades\Route;
use Modules\Webstatement\Http\Controllers\CustomerController;
use Modules\Webstatement\Http\Controllers\EmailBlastController;
use Modules\Webstatement\Http\Controllers\Api\AccountBalanceController;
Route::post('/email-blast', [EmailBlastController::class, 'sendEmailBlast']);
Route::get('/email-blast-history', [EmailBlastController::class, 'getEmailBlastHistory']);
Route::get('/customers/search', [CustomerController::class, 'search']);
// Account Balance API Routes
Route::prefix('balance')->group(function () {
Route::post('/', [AccountBalanceController::class, 'getBalanceSummary']);
});