Compare commits
8 Commits
2d07783c46
...
b71fc1b3f9
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b71fc1b3f9 | ||
|
|
0d8a4c1ba4 | ||
|
|
e5f3a67374 | ||
|
|
701432a6e7 | ||
|
|
c1c7f03c87 | ||
|
|
d4efa58f1b | ||
|
|
f624a629f5 | ||
|
|
10fcdb5ea2 |
57
app/Console/ExportPeriodStatements.php
Normal file
57
app/Console/ExportPeriodStatements.php
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Modules\Webstatement\Console;
|
||||||
|
|
||||||
|
use Exception;
|
||||||
|
use Illuminate\Console\Command;
|
||||||
|
use Modules\Webstatement\Http\Controllers\WebstatementController;
|
||||||
|
|
||||||
|
class ExportPeriodStatements extends Command
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* The name and signature of the console command.
|
||||||
|
*
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $signature = 'webstatement:export-period-statements
|
||||||
|
{--account_number= : Account number to process migration}
|
||||||
|
{--period= : Period to process migration format Ym contoh. 202506}';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The console command description.
|
||||||
|
*
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $description = 'Export period statements for all configured client accounts';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Execute the console command.
|
||||||
|
*
|
||||||
|
* @return int
|
||||||
|
*/
|
||||||
|
public function handle()
|
||||||
|
{
|
||||||
|
$accountNumber = $this->option('account_number');
|
||||||
|
$period = $this->option('period');
|
||||||
|
|
||||||
|
$this->info('Starting period statement export process...');
|
||||||
|
|
||||||
|
|
||||||
|
try {
|
||||||
|
$controller = app(WebstatementController::class);
|
||||||
|
$response = $controller->printStatementRekening($accountNumber, $period);
|
||||||
|
|
||||||
|
$responseData = json_decode($response->getContent(), true);
|
||||||
|
$this->info($responseData['message']);
|
||||||
|
|
||||||
|
// Display summary of jobs queued
|
||||||
|
$jobCount = count($responseData['jobs'] ?? []);
|
||||||
|
$this->info("Successfully queued {$jobCount} statement export jobs");
|
||||||
|
|
||||||
|
return Command::SUCCESS;
|
||||||
|
} catch (Exception $e) {
|
||||||
|
$this->error('Error exporting statements: ' . $e->getMessage());
|
||||||
|
return Command::FAILURE;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -30,19 +30,14 @@
|
|||||||
*/
|
*/
|
||||||
public function handle()
|
public function handle()
|
||||||
{
|
{
|
||||||
$date = $this->option('date');
|
$processParameter = $this->option('process_parameter');
|
||||||
$type = $this->option('type');
|
|
||||||
|
|
||||||
$this->info('Starting daily data migration process...');
|
$this->info('Starting daily data migration process...');
|
||||||
$this->info('Date: ' . ($date ?? 'Not specified'));
|
$this->info('Process Parameter: ' . ($processParameter ?? 'False'));
|
||||||
$this->info('Type: ' . ($type ?? 'Not specified'));
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$controller = app(MigrasiController::class);
|
$controller = app(MigrasiController::class);
|
||||||
$response = $controller->index([
|
$response = $controller->index($processParameter);
|
||||||
'date' => $date,
|
|
||||||
'type' => $type
|
|
||||||
]);
|
|
||||||
|
|
||||||
$responseData = json_decode($response->getContent(), true);
|
$responseData = json_decode($response->getContent(), true);
|
||||||
$this->info($responseData['message'] ?? 'Process completed');
|
$this->info($responseData['message'] ?? 'Process completed');
|
||||||
|
|||||||
@@ -94,12 +94,11 @@
|
|||||||
return response()->json(['error' => $e->getMessage()], 500);
|
return response()->json(['error' => $e->getMessage()], 500);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
public function index($processParameter = false)
|
||||||
public function index()
|
|
||||||
{
|
{
|
||||||
$disk = Storage::disk('sftpStatement');
|
$disk = Storage::disk('sftpStatement');
|
||||||
|
|
||||||
if (request('process_parameter')) {
|
if ($processParameter) {
|
||||||
foreach (self::PARAMETER_PROCESSES as $process) {
|
foreach (self::PARAMETER_PROCESSES as $process) {
|
||||||
$this->processData($process, '_parameter');
|
$this->processData($process, '_parameter');
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,15 +5,9 @@
|
|||||||
use App\Http\Controllers\Controller;
|
use App\Http\Controllers\Controller;
|
||||||
use Carbon\Carbon;
|
use Carbon\Carbon;
|
||||||
use Illuminate\Contracts\Bus\Dispatcher;
|
use Illuminate\Contracts\Bus\Dispatcher;
|
||||||
use Illuminate\Http\Request;
|
|
||||||
use Illuminate\Support\Facades\DB;
|
|
||||||
use Illuminate\Support\Facades\Storage;
|
|
||||||
use Modules\Webstatement\Jobs\ExportStatementJob;
|
use Modules\Webstatement\Jobs\ExportStatementJob;
|
||||||
use Modules\Webstatement\Models\AccountBalance;
|
use Modules\Webstatement\Models\AccountBalance;
|
||||||
use Modules\Webstatement\Models\StmtEntry;
|
use Modules\Webstatement\Jobs\ExportStatementPeriodJob;
|
||||||
use Modules\Webstatement\Models\TempFundsTransfer;
|
|
||||||
use Modules\Webstatement\Models\TempStmtNarrFormat;
|
|
||||||
use Modules\Webstatement\Models\TempStmtNarrParam;
|
|
||||||
|
|
||||||
class WebstatementController extends Controller
|
class WebstatementController extends Controller
|
||||||
{
|
{
|
||||||
@@ -140,4 +134,65 @@
|
|||||||
|
|
||||||
return $accountBalance->actual_balance ?? 0;
|
return $accountBalance->actual_balance ?? 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function printStatementRekening($accountNumber, $period = 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()
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
443
app/Jobs/ExportStatementPeriodJob.php
Normal file
443
app/Jobs/ExportStatementPeriodJob.php
Normal file
@@ -0,0 +1,443 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Modules\Webstatement\Jobs;
|
||||||
|
|
||||||
|
use Carbon\Carbon;
|
||||||
|
use Exception;
|
||||||
|
use Illuminate\Bus\Queueable;
|
||||||
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
|
use Illuminate\Foundation\Bus\Dispatchable;
|
||||||
|
use Illuminate\Queue\InteractsWithQueue;
|
||||||
|
use Illuminate\Queue\SerializesModels;
|
||||||
|
use Illuminate\Support\Facades\DB;
|
||||||
|
use Illuminate\Support\Facades\Log;
|
||||||
|
use Illuminate\Support\Facades\Storage;
|
||||||
|
use Modules\Webstatement\Models\ProcessedStatement;
|
||||||
|
use Modules\Webstatement\Models\StmtEntry;
|
||||||
|
use Modules\Webstatement\Models\TempFundsTransfer;
|
||||||
|
use Modules\Webstatement\Models\TempStmtNarrFormat;
|
||||||
|
use Modules\Webstatement\Models\TempStmtNarrParam;
|
||||||
|
|
||||||
|
class ExportStatementPeriodJob implements ShouldQueue
|
||||||
|
{
|
||||||
|
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
|
||||||
|
|
||||||
|
protected $account_number;
|
||||||
|
protected $period; // Format: YYYYMM (e.g., 202505)
|
||||||
|
protected $saldo;
|
||||||
|
protected $disk;
|
||||||
|
protected $client;
|
||||||
|
protected $fileName;
|
||||||
|
protected $chunkSize = 1000;
|
||||||
|
protected $startDate;
|
||||||
|
protected $endDate;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new job instance.
|
||||||
|
*
|
||||||
|
* @param string $account_number
|
||||||
|
* @param string $period Format: YYYYMM (e.g., 202505)
|
||||||
|
* @param string $saldo
|
||||||
|
* @param string $client
|
||||||
|
* @param string $disk
|
||||||
|
*/
|
||||||
|
public function __construct(string $account_number, string $period, string $saldo, string $client = '', string $disk = 'local')
|
||||||
|
{
|
||||||
|
$this->account_number = $account_number;
|
||||||
|
$this->period = $period;
|
||||||
|
$this->saldo = $saldo;
|
||||||
|
$this->disk = $disk;
|
||||||
|
$this->client = $client;
|
||||||
|
$this->fileName = "{$account_number}_{$period}.csv";
|
||||||
|
|
||||||
|
// Calculate start and end dates based on period
|
||||||
|
$this->calculatePeriodDates();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Calculate start and end dates for the given period
|
||||||
|
*/
|
||||||
|
private function calculatePeriodDates(): void
|
||||||
|
{
|
||||||
|
$year = substr($this->period, 0, 4);
|
||||||
|
$month = substr($this->period, 4, 2);
|
||||||
|
|
||||||
|
// Special case for May 2025 - start from 12th
|
||||||
|
if ($this->period === '202505') {
|
||||||
|
$this->startDate = Carbon::createFromDate($year, $month, 12)->startOfDay();
|
||||||
|
} else {
|
||||||
|
// For all other periods, start from 1st of the month
|
||||||
|
$this->startDate = Carbon::createFromDate($year, $month, 1)->startOfDay();
|
||||||
|
}
|
||||||
|
|
||||||
|
// End date is always the last day of the month
|
||||||
|
$this->endDate = Carbon::createFromDate($year, $month, 1)->endOfMonth()->endOfDay();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Execute the job.
|
||||||
|
*/
|
||||||
|
public function handle(): void
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
Log::info("Starting export statement period job for account: {$this->account_number}, period: {$this->period}");
|
||||||
|
Log::info("Date range: {$this->startDate->format('Y-m-d')} to {$this->endDate->format('Y-m-d')}");
|
||||||
|
|
||||||
|
$this->processStatementData();
|
||||||
|
$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());
|
||||||
|
throw $e;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function processStatementData(): void
|
||||||
|
{
|
||||||
|
$accountQuery = [
|
||||||
|
'account_number' => $this->account_number,
|
||||||
|
'period' => $this->period
|
||||||
|
];
|
||||||
|
|
||||||
|
$totalCount = $this->getTotalEntryCount();
|
||||||
|
$existingDataCount = $this->getExistingProcessedCount($accountQuery);
|
||||||
|
|
||||||
|
// Only process if data is not fully processed
|
||||||
|
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();
|
||||||
|
}
|
||||||
|
|
||||||
|
private function getExistingProcessedCount(array $criteria): int
|
||||||
|
{
|
||||||
|
return ProcessedStatement::where('account_number', $criteria['account_number'])
|
||||||
|
->where('period', $criteria['period'])
|
||||||
|
->count();
|
||||||
|
}
|
||||||
|
|
||||||
|
private function deleteExistingProcessedData(array $criteria): void
|
||||||
|
{
|
||||||
|
ProcessedStatement::where('account_number', $criteria['account_number'])
|
||||||
|
->where('period', $criteria['period'])
|
||||||
|
->delete();
|
||||||
|
}
|
||||||
|
|
||||||
|
private function processAndSaveStatementEntries(int $totalCount): void
|
||||||
|
{
|
||||||
|
$runningBalance = (float) $this->saldo;
|
||||||
|
$globalSequence = 0;
|
||||||
|
|
||||||
|
Log::info("Processing {$totalCount} statement entries for account: {$this->account_number}");
|
||||||
|
|
||||||
|
StmtEntry::with(['ft', 'transaction'])
|
||||||
|
->where('account_number', $this->account_number)
|
||||||
|
->whereBetween('date_time', [
|
||||||
|
$this->startDate->format('ymdHi'),
|
||||||
|
$this->endDate->format('ymdHi')
|
||||||
|
])
|
||||||
|
->orderBy('date_time', 'ASC')
|
||||||
|
->orderBy('trans_reference', 'ASC')
|
||||||
|
->chunk($this->chunkSize, function ($entries) use (&$runningBalance, &$globalSequence) {
|
||||||
|
$processedData = $this->prepareProcessedData($entries, $runningBalance, $globalSequence);
|
||||||
|
|
||||||
|
if (!empty($processedData)) {
|
||||||
|
DB::table('processed_statements')->insert($processedData);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
private function prepareProcessedData($entries, &$runningBalance, &$globalSequence): array
|
||||||
|
{
|
||||||
|
$processedData = [];
|
||||||
|
|
||||||
|
foreach ($entries as $item) {
|
||||||
|
$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,
|
||||||
|
'reference_number' => $item->trans_reference,
|
||||||
|
'transaction_amount' => $item->amount_lcy,
|
||||||
|
'transaction_type' => $item->amount_lcy < 0 ? 'D' : 'C',
|
||||||
|
'description' => $this->generateNarrative($item),
|
||||||
|
'end_balance' => $runningBalance,
|
||||||
|
'actual_date' => $actualDate,
|
||||||
|
'created_at' => now(),
|
||||||
|
'updated_at' => now(),
|
||||||
|
];
|
||||||
|
}
|
||||||
|
|
||||||
|
return $processedData;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function formatTransactionDate($item): string
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
$prefix = substr($item->trans_reference ?? '', 0, 2);
|
||||||
|
$relationMap = [
|
||||||
|
'FT' => 'ft',
|
||||||
|
'TT' => 'tt',
|
||||||
|
'DC' => 'dc',
|
||||||
|
'AA' => 'aa'
|
||||||
|
];
|
||||||
|
|
||||||
|
$datetime = $item->date_time;
|
||||||
|
if (isset($relationMap[$prefix])) {
|
||||||
|
$relation = $relationMap[$prefix];
|
||||||
|
$datetime = $item->$relation?->date_time ?? $datetime;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Extract date from datetime (first 6 characters) and time (last 4 characters)
|
||||||
|
$dateStr = substr($datetime, 0, 6); // YYMMDD
|
||||||
|
$timeStr = substr($datetime, 6, 4); // HHMM
|
||||||
|
|
||||||
|
return Carbon::createFromFormat(
|
||||||
|
'ymdHi',
|
||||||
|
$dateStr . $timeStr
|
||||||
|
)->format('d/m/Y H:i');
|
||||||
|
} catch (Exception $e) {
|
||||||
|
Log::warning("Error formatting transaction date: " . $e->getMessage());
|
||||||
|
return Carbon::now()->format('d/m/Y H:i');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private function formatActualDate($item): string
|
||||||
|
{
|
||||||
|
try {
|
||||||
|
$prefix = substr($item->trans_reference ?? '', 0, 2);
|
||||||
|
$relationMap = [
|
||||||
|
'FT' => 'ft',
|
||||||
|
'TT' => 'tt',
|
||||||
|
'DC' => 'dc',
|
||||||
|
'AA' => 'aa'
|
||||||
|
];
|
||||||
|
|
||||||
|
$datetime = $item->date_time;
|
||||||
|
if (isset($relationMap[$prefix])) {
|
||||||
|
$relation = $relationMap[$prefix];
|
||||||
|
$datetime = $item->$relation?->date_time ?? $datetime;
|
||||||
|
}
|
||||||
|
|
||||||
|
return Carbon::createFromFormat(
|
||||||
|
'ymdHi',
|
||||||
|
$datetime
|
||||||
|
)->format('d/m/Y H:i');
|
||||||
|
} catch (Exception $e) {
|
||||||
|
Log::warning("Error formatting actual date: " . $e->getMessage());
|
||||||
|
return Carbon::now()->format('d/m/Y H:i');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Generate narrative for a statement entry
|
||||||
|
*/
|
||||||
|
private function generateNarrative($item)
|
||||||
|
{
|
||||||
|
$narr = [];
|
||||||
|
|
||||||
|
if ($item->transaction) {
|
||||||
|
if ($item->transaction->stmt_narr) {
|
||||||
|
$narr[] = $item->transaction->stmt_narr;
|
||||||
|
}
|
||||||
|
if ($item->narrative) {
|
||||||
|
$narr[] = $item->narrative;
|
||||||
|
}
|
||||||
|
if ($item->transaction->narr_type) {
|
||||||
|
$narr[] = $this->getFormatNarrative($item->transaction->narr_type, $item);
|
||||||
|
}
|
||||||
|
} else if ($item->narrative) {
|
||||||
|
$narr[] = $item->narrative;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($item->ft?->recipt_no) {
|
||||||
|
$narr[] = 'Receipt No: ' . $item->ft->recipt_no;
|
||||||
|
}
|
||||||
|
|
||||||
|
return implode(' ', array_filter($narr));
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get formatted narrative based on narrative type
|
||||||
|
*/
|
||||||
|
private function getFormatNarrative($narr, $item)
|
||||||
|
{
|
||||||
|
$narrParam = TempStmtNarrParam::where('_id', $narr)->first();
|
||||||
|
|
||||||
|
if (!$narrParam) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
$fmt = '';
|
||||||
|
if ($narrParam->_id == 'FTIN') {
|
||||||
|
$fmt = 'FT.IN';
|
||||||
|
} else if ($narrParam->_id == 'FTOUT') {
|
||||||
|
$fmt = 'FT.OUT';
|
||||||
|
} else if ($narrParam->_id == 'TTTRFOUT') {
|
||||||
|
$fmt = 'TT.O.TRF';
|
||||||
|
} else if ($narrParam->_id == 'TTTRFIN') {
|
||||||
|
$fmt = 'TT.I.TRF';
|
||||||
|
} else if ($narrParam->_id == 'APITRX'){
|
||||||
|
$fmt = 'API.TSEL';
|
||||||
|
} else if ($narrParam->_id == 'ONUSCR'){
|
||||||
|
$fmt = 'ONUS.CR';
|
||||||
|
} else if ($narrParam->_id == 'ONUSDR'){
|
||||||
|
$fmt = 'ONUS.DR';
|
||||||
|
}else {
|
||||||
|
$fmt = $narrParam->_id;
|
||||||
|
}
|
||||||
|
|
||||||
|
$narrFormat = TempStmtNarrFormat::where('_id', $fmt)->first();
|
||||||
|
|
||||||
|
if (!$narrFormat) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get the format string from the database
|
||||||
|
$formatString = $narrFormat->text_data ?? '';
|
||||||
|
|
||||||
|
// Parse the format string
|
||||||
|
// Split by the separator ']'
|
||||||
|
$parts = explode(']', $formatString);
|
||||||
|
|
||||||
|
$result = '';
|
||||||
|
|
||||||
|
foreach ($parts as $index => $part) {
|
||||||
|
if (empty($part)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($index === 0) {
|
||||||
|
// For the first part, take only what's before the '!'
|
||||||
|
$splitPart = explode('!', $part);
|
||||||
|
if (count($splitPart) > 0) {
|
||||||
|
// Remove quotes, backslashes, and other escape characters
|
||||||
|
$cleanPart = trim($splitPart[0]).' ';
|
||||||
|
// Remove quotes at the beginning and end
|
||||||
|
$cleanPart = preg_replace('/^["\'\\\\]+|["\'\\\\]+$/', '', $cleanPart);
|
||||||
|
// Remove any remaining backslashes
|
||||||
|
$cleanPart = str_replace('\\', '', $cleanPart);
|
||||||
|
// Remove any remaining quotes
|
||||||
|
$cleanPart = str_replace('"', '', $cleanPart);
|
||||||
|
$result .= $cleanPart;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// For other parts, these are field placeholders
|
||||||
|
$fieldName = strtolower(str_replace('.', '_', $part));
|
||||||
|
|
||||||
|
// Get the corresponding parameter value from narrParam
|
||||||
|
$paramValue = null;
|
||||||
|
|
||||||
|
// Check if the field exists as a property in narrParam
|
||||||
|
if (property_exists($narrParam, $fieldName)) {
|
||||||
|
$paramValue = $narrParam->$fieldName;
|
||||||
|
} else if (isset($narrParam->$fieldName)) {
|
||||||
|
$paramValue = $narrParam->$fieldName;
|
||||||
|
}
|
||||||
|
|
||||||
|
// If we found a value, add it to the result
|
||||||
|
if ($paramValue !== null) {
|
||||||
|
$result .= $paramValue;
|
||||||
|
} else {
|
||||||
|
// If no value found, try to use the original field name as a fallback
|
||||||
|
if ($fieldName !== 'recipt_no') {
|
||||||
|
$prefix = substr($item->trans_reference ?? '', 0, 2);
|
||||||
|
$relationMap = [
|
||||||
|
'FT' => 'ft',
|
||||||
|
'TT' => 'tt',
|
||||||
|
'DC' => 'dc',
|
||||||
|
'AA' => 'aa'
|
||||||
|
];
|
||||||
|
|
||||||
|
if (isset($relationMap[$prefix])) {
|
||||||
|
$relation = $relationMap[$prefix];
|
||||||
|
$result .= ($item->$relation?->$fieldName ?? '') . ' ';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return str_replace('<NL>', ' ', $result);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Export processed data to CSV file
|
||||||
|
*/
|
||||||
|
private function exportToCsv(): void
|
||||||
|
{
|
||||||
|
// Determine the base path based on client
|
||||||
|
$basePath = !empty($this->client)
|
||||||
|
? "statements/{$this->client}"
|
||||||
|
: "statements";
|
||||||
|
|
||||||
|
// Create client directory if it doesn't exist
|
||||||
|
if (!empty($this->client)) {
|
||||||
|
Storage::disk($this->disk)->makeDirectory($basePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create account directory
|
||||||
|
$accountPath = "{$basePath}/{$this->account_number}";
|
||||||
|
Storage::disk($this->disk)->makeDirectory($accountPath);
|
||||||
|
|
||||||
|
$filePath = "{$accountPath}/{$this->fileName}";
|
||||||
|
|
||||||
|
// Delete existing file if it exists
|
||||||
|
if (Storage::disk($this->disk)->exists($filePath)) {
|
||||||
|
Storage::disk($this->disk)->delete($filePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
$csvContent = "NO|TRANSACTION.DATE|REFERENCE.NUMBER|TRANSACTION.AMOUNT|TRANSACTION.TYPE|DESCRIPTION|END.BALANCE|ACTUAL.DATE\n";
|
||||||
|
|
||||||
|
// Retrieve processed data in chunks to reduce memory usage
|
||||||
|
ProcessedStatement::where('account_number', $this->account_number)
|
||||||
|
->where('period', $this->period)
|
||||||
|
->orderBy('sequence_no')
|
||||||
|
->chunk($this->chunkSize, function ($statements) use (&$csvContent, $filePath) {
|
||||||
|
foreach ($statements as $statement) {
|
||||||
|
$csvContent .= implode('|', [
|
||||||
|
$statement->sequence_no,
|
||||||
|
$statement->transaction_date,
|
||||||
|
$statement->reference_number,
|
||||||
|
$statement->transaction_amount,
|
||||||
|
$statement->transaction_type,
|
||||||
|
$statement->description,
|
||||||
|
$statement->end_balance,
|
||||||
|
$statement->actual_date
|
||||||
|
]) . "\n";
|
||||||
|
}
|
||||||
|
|
||||||
|
// Write to file incrementally to reduce memory usage
|
||||||
|
Storage::disk($this->disk)->append($filePath, $csvContent);
|
||||||
|
$csvContent = ''; // Reset content after writing
|
||||||
|
});
|
||||||
|
|
||||||
|
Log::info("Statement exported to {$this->disk} disk: {$filePath}");
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get transaction data by reference and field
|
||||||
|
*/
|
||||||
|
private function getTransaction($ref, $field)
|
||||||
|
{
|
||||||
|
$trans = TempFundsTransfer::where('ref_no', $ref)->first();
|
||||||
|
return $trans->$field ?? "";
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -9,6 +9,7 @@ use Illuminate\Console\Scheduling\Schedule;
|
|||||||
use Modules\Webstatement\Console\CombinePdf;
|
use Modules\Webstatement\Console\CombinePdf;
|
||||||
use Modules\Webstatement\Console\ConvertHtmlToPdf;
|
use Modules\Webstatement\Console\ConvertHtmlToPdf;
|
||||||
use Modules\Webstatement\Console\ExportDailyStatements;
|
use Modules\Webstatement\Console\ExportDailyStatements;
|
||||||
|
use Modules\Webstatement\Console\ExportPeriodStatements;
|
||||||
use Modules\Webstatement\Console\ProcessDailyMigration;
|
use Modules\Webstatement\Console\ProcessDailyMigration;
|
||||||
use Modules\Webstatement\Console\GenerateBiayakartuCommand;
|
use Modules\Webstatement\Console\GenerateBiayakartuCommand;
|
||||||
use Modules\Webstatement\Jobs\UpdateAtmCardBranchCurrencyJob;
|
use Modules\Webstatement\Jobs\UpdateAtmCardBranchCurrencyJob;
|
||||||
@@ -63,6 +64,7 @@ class WebstatementServiceProvider extends ServiceProvider
|
|||||||
CombinePdf::class,
|
CombinePdf::class,
|
||||||
ConvertHtmlToPdf::class,
|
ConvertHtmlToPdf::class,
|
||||||
UnlockPdf::class,
|
UnlockPdf::class,
|
||||||
|
ExportPeriodStatements::class,
|
||||||
]);
|
]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -97,7 +97,9 @@ Route::get('biaya-kartu', [SyncLogsController::class, 'index'])->name('biaya-kar
|
|||||||
Route::get('/stmt-entries/{accountNumber}', [MigrasiController::class, 'getStmtEntryByAccount']);
|
Route::get('/stmt-entries/{accountNumber}', [MigrasiController::class, 'getStmtEntryByAccount']);
|
||||||
Route::get('/stmt-export-csv', [WebstatementController::class, 'index'])->name('webstatement.index');
|
Route::get('/stmt-export-csv', [WebstatementController::class, 'index'])->name('webstatement.index');
|
||||||
|
|
||||||
|
|
||||||
Route::prefix('debug')->group(function () {
|
Route::prefix('debug')->group(function () {
|
||||||
|
Route::get('/test-statement',[WebstatementController::class,'printStatementRekening'])->name('webstatement.test');
|
||||||
Route::post('/statement', [DebugStatementController::class, 'debugStatement'])->name('debug.statement');
|
Route::post('/statement', [DebugStatementController::class, 'debugStatement'])->name('debug.statement');
|
||||||
Route::get('/statements', [DebugStatementController::class, 'listStatements'])->name('debug.statements.list');
|
Route::get('/statements', [DebugStatementController::class, 'listStatements'])->name('debug.statements.list');
|
||||||
});
|
});
|
||||||
|
|||||||
Reference in New Issue
Block a user