feat(webstatement): tambahkan fitur retry laporan transaksi ATM
- Menambahkan method baru `retry` pada `AtmTransactionReportController` untuk memproses ulang laporan transaksi ATM:
- Mengizinkan retry untuk laporan dengan status `failed` atau `pending`.
- Mereset status laporan menjadi `processing` dan membersihkan informasi error sebelumnya.
- Dispatch ulang job `GenerateAtmTransactionReportJob`.
- Menambahkan mekanisme error handling dengan memperbarui status laporan jika terjadi kegagalan.
- Memperbarui view `atm-reports/index.blade.php`:
- Menambahkan tombol `Retry Job` pada baris laporan dengan status `failed` atau `pending`.
- Menyediakan fungsi JavaScript untuk memproses retry dengan AJAX:
- Menampilkan konfirmasi sebelum retry.
- Reload halaman setelah retry selesai.
- Memperbarui view `atm-reports/show.blade.php`:
- Menambahkan tombol `Retry Job` untuk laporan dengan status `failed`, `pending`, atau `completed` yang kehilangan file.
- Menampilkan form retry dalam pesan error jika file laporan tidak tersedia.
- Memperbarui routing pada `web.php`:
- Menambahkan route baru `atm-reports.retry` untuk endpoint retry dengan HTTP POST.
- Mendaftarkan ulang command `GenerateAtmTransactionReport` pada provider:
- Memastikan job untuk retry sudah terdaftar pada sistem.
Signed-off-by: Daeng Deni Mardaeni <ddeni05@gmail.com>
This commit is contained in:
@@ -292,4 +292,41 @@ class AtmTransactionReportController extends Controller
|
||||
return redirect()->back()->with('error', 'Failed to send email: ' . $e->getMessage());
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Retry generating the ATM transaction report
|
||||
*/
|
||||
public function retry(AtmTransactionReportLog $atmReport)
|
||||
{
|
||||
// Check if retry is allowed (only for failed or pending status)
|
||||
if (!in_array($atmReport->status, ['failed', 'pending'])) {
|
||||
return back()->with('error', 'Report can only be retried if status is failed or pending.');
|
||||
}
|
||||
|
||||
try {
|
||||
// Reset the report status and clear error message
|
||||
$atmReport->update([
|
||||
'status' => 'processing',
|
||||
'error_message' => null,
|
||||
'file_path' => null,
|
||||
'file_size' => null,
|
||||
'record_count' => null,
|
||||
'updated_by' => Auth::id()
|
||||
]);
|
||||
|
||||
// Dispatch the job again
|
||||
GenerateAtmTransactionReportJob::dispatch($atmReport->period, $atmReport->id);
|
||||
|
||||
return back()->with('success', 'ATM Transaction report job has been retried successfully.');
|
||||
|
||||
} catch (Exception $e) {
|
||||
$atmReport->update([
|
||||
'status' => 'failed',
|
||||
'error_message' => $e->getMessage(),
|
||||
'updated_by' => Auth::id()
|
||||
]);
|
||||
|
||||
return back()->with('error', 'Failed to retry report generation: ' . $e->getMessage());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,15 +6,16 @@ use Illuminate\Support\Facades\Blade;
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
use Nwidart\Modules\Traits\PathNamespace;
|
||||
use Illuminate\Console\Scheduling\Schedule;
|
||||
use Modules\Webstatement\Console\UnlockPdf;
|
||||
use Modules\Webstatement\Console\CombinePdf;
|
||||
use Modules\Webstatement\Console\ConvertHtmlToPdf;
|
||||
use Modules\Webstatement\Console\ExportDailyStatements;
|
||||
use Modules\Webstatement\Console\ExportPeriodStatements;
|
||||
use Modules\Webstatement\Console\ProcessDailyMigration;
|
||||
use Modules\Webstatement\Console\ExportPeriodStatements;
|
||||
use Modules\Webstatement\Console\GenerateBiayakartuCommand;
|
||||
use Modules\Webstatement\Jobs\UpdateAtmCardBranchCurrencyJob;
|
||||
use Modules\Webstatement\Console\GenerateAtmTransactionReport;
|
||||
use Modules\Webstatement\Console\GenerateBiayaKartuCsvCommand;
|
||||
use Modules\Webstatement\Console\UnlockPdf;
|
||||
|
||||
class WebstatementServiceProvider extends ServiceProvider
|
||||
{
|
||||
@@ -65,6 +66,7 @@ class WebstatementServiceProvider extends ServiceProvider
|
||||
ConvertHtmlToPdf::class,
|
||||
UnlockPdf::class,
|
||||
ExportPeriodStatements::class,
|
||||
GenerateAtmTransactionReport::class,
|
||||
]);
|
||||
}
|
||||
|
||||
|
||||
@@ -241,6 +241,31 @@
|
||||
</a>`;
|
||||
}
|
||||
|
||||
// Di bagian JavaScript untuk action buttons
|
||||
if (data.status === 'failed' || data.status === 'pending' || (data.status === 'completed' && !data.file_path)) {
|
||||
buttons += `<button class="btn btn-sm btn-icon btn-clear btn-warning" onclick="retryReport(${data.id})" title="Retry Job">
|
||||
<i class="ki-duotone ki-arrows-circle fs-5"></i>
|
||||
</button>`;
|
||||
}
|
||||
|
||||
// Tambahkan function untuk retry
|
||||
function retryReport(id) {
|
||||
if (confirm('Are you sure you want to retry generating this report?')) {
|
||||
$.ajax({
|
||||
url: `atm-reports/${id}/retry`,
|
||||
type: 'POST',
|
||||
data: {
|
||||
_token: $('meta[name="csrf-token"]').attr('content')
|
||||
},
|
||||
success: function(response) {
|
||||
location.reload();
|
||||
},
|
||||
error: function(xhr) {
|
||||
alert('Error: ' + xhr.responseJSON.message);
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
buttons += `</div>`;
|
||||
return buttons;
|
||||
},
|
||||
|
||||
@@ -14,6 +14,15 @@
|
||||
<i class="ki-duotone ki-document fs-2"></i>Download Report
|
||||
</a>
|
||||
@endif
|
||||
|
||||
@if (in_array($atmReport->status, ['failed', 'pending']) || ($atmReport->status === 'completed' && !$atmReport->file_path))
|
||||
<form action="{{ route('atm-reports.retry', $atmReport->id) }}" method="POST" class="d-inline" onsubmit="return confirm('Are you sure you want to retry generating this report?')">
|
||||
@csrf
|
||||
<button type="submit" class="btn btn-sm btn-warning me-2">
|
||||
<i class="ki-duotone ki-arrows-circle fs-2"></i>Retry Job
|
||||
</button>
|
||||
</form>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -91,6 +100,15 @@
|
||||
<div class="fw-bold fs-6">
|
||||
@if ($atmReport->file_path)
|
||||
<div>Path: {{ $atmReport->file_path }}</div>
|
||||
@else
|
||||
<div class="text-warning">File not available -
|
||||
<form action="{{ route('atm-reports.retry', $atmReport->id) }}" method="POST" class="d-inline">
|
||||
@csrf
|
||||
<button type="submit" class="p-0 btn btn-link text-warning" onclick="return confirm('File is missing. Retry generating the report?')">
|
||||
Click here to retry
|
||||
</button>
|
||||
</form>
|
||||
</div>
|
||||
@endif
|
||||
@if ($atmReport->file_size)
|
||||
<div>Size: {{ number_format($atmReport->file_size / 1024, 2) }} KB</div>
|
||||
|
||||
@@ -8,9 +8,10 @@ use Illuminate\Support\Facades\Route;
|
||||
use Modules\Webstatement\Http\Controllers\KartuAtmController;
|
||||
use Modules\Webstatement\Http\Controllers\MigrasiController;
|
||||
use Modules\Webstatement\Http\Controllers\CustomerController;
|
||||
use Modules\Webstatement\Http\Controllers\DebugStatementController;
|
||||
use Modules\Webstatement\Http\Controllers\EmailBlastController;
|
||||
use Modules\Webstatement\Http\Controllers\WebstatementController;
|
||||
use Modules\Webstatement\Http\Controllers\DebugStatementController;
|
||||
use Modules\Webstatement\Http\Controllers\AtmTransactionReportController;
|
||||
|
||||
|
||||
|
||||
@@ -89,6 +90,18 @@ Route::middleware(['auth'])->group(function () {
|
||||
});
|
||||
|
||||
Route::resource('statements', PrintStatementController::class);
|
||||
|
||||
|
||||
// ATM Transaction Report Routes
|
||||
Route::group(['prefix' => 'atm-reports', 'as' => 'atm-reports.', 'middleware' => ['auth']], function () {
|
||||
Route::get('/datatables', [AtmTransactionReportController::class, 'dataForDatatables'])->name('datatables');
|
||||
Route::get('/{atmReport}/download', [AtmTransactionReportController::class, 'download'])->name('download');
|
||||
Route::post('/{atmReport}/authorize', [AtmTransactionReportController::class, 'authorize'])->name('authorize');
|
||||
Route::get('/{atmReport}/send-email', [AtmTransactionReportController::class, 'sendEmail'])->name('send-email');
|
||||
Route::post('/{atmReport}/retry', [AtmTransactionReportController::class, 'retry'])->name('retry');
|
||||
});
|
||||
|
||||
Route::resource('atm-reports', AtmTransactionReportController::class);
|
||||
});
|
||||
|
||||
Route::get('migrasi', [MigrasiController::class, 'index'])->name('migrasi.index');
|
||||
|
||||
Reference in New Issue
Block a user