diff --git a/app/Http/Controllers/PrintStatementController.php b/app/Http/Controllers/PrintStatementController.php index cbc86c8..70cf1f4 100644 --- a/app/Http/Controllers/PrintStatementController.php +++ b/app/Http/Controllers/PrintStatementController.php @@ -14,6 +14,7 @@ use Modules\Basicdata\Models\Branch; use Modules\Webstatement\Http\Requests\PrintStatementRequest; use Modules\Webstatement\Mail\StatementEmail; + use Modules\Webstatement\Models\Account; use Modules\Webstatement\Models\PrintStatementLog; use ZipArchive; @@ -24,7 +25,10 @@ */ public function index(Request $request) { - $branches = Branch::orderBy('name')->get(); + $branches = Branch::whereNotNull('customer_company') + ->where('code', '!=', 'ID0019999') + ->orderBy('name') + ->get(); return view('webstatement::statements.index', compact('branches')); } @@ -35,32 +39,66 @@ */ public function store(PrintStatementRequest $request) { + // Add account verification before storing + $accountNumber = $request->input('account_number'); // Assuming this is the field name for account number + // First, check if the account exists and get branch information + $account = Account::where('account_number', $accountNumber)->first(); + if ($account) { + $branch_code = $account->branch_code; + $userBranchId = session('branch_id'); // Assuming branch ID is stored in session + $multiBranch = session('MULTI_BRANCH'); + + if (!$multiBranch) { + // Check if account branch matches user's branch + if ($account->branch_id !== $userBranchId) { + return redirect()->route('statements.index') + ->with('error', 'Nomor rekening tidak sesuai dengan cabang Anda. Transaksi tidak dapat dilanjutkan.'); + } + } + + // Check if account belongs to restricted branch ID0019999 + if ($account->branch_id === 'ID0019999') { + return redirect()->route('statements.index') + ->with('error', 'Nomor rekening terdaftar pada cabang khusus. Silakan hubungi bagian HC untuk informasi lebih lanjut.'); + } + + // If all checks pass, proceed with storing data + // Your existing store logic here + + } else { + // Account not found + return redirect()->route('statements.index') + ->with('error', 'Nomor rekening tidak ditemukan dalam sistem.'); + } + DB::beginTransaction(); try { $validated = $request->validated(); // Add user tracking data dan field baru untuk single account request - $validated['user_id'] = Auth::id(); - $validated['created_by'] = Auth::id(); - $validated['ip_address'] = $request->ip(); - $validated['user_agent'] = $request->userAgent(); - $validated['request_type'] = 'single_account'; // Default untuk request manual - $validated['status'] = 'pending'; // Status awal - $validated['total_accounts'] = 1; // Untuk single account + $validated['user_id'] = Auth::id(); + $validated['created_by'] = Auth::id(); + $validated['ip_address'] = $request->ip(); + $validated['user_agent'] = $request->userAgent(); + $validated['request_type'] = 'single_account'; // Default untuk request manual + $validated['status'] = 'pending'; // Status awal + $validated['authorization_status'] = 'approved'; // Status otorisasi awal + $validated['total_accounts'] = 1; // Untuk single account $validated['processed_accounts'] = 0; - $validated['success_count'] = 0; - $validated['failed_count'] = 0; + $validated['success_count'] = 0; + $validated['failed_count'] = 0; + $validated['branch_code'] = $branch_code; // Awal tidak tersedia // Create the statement log $statement = PrintStatementLog::create($validated); // Log aktivitas Log::info('Statement request created', [ - 'statement_id' => $statement->id, - 'user_id' => Auth::id(), + 'statement_id' => $statement->id, + 'user_id' => Auth::id(), 'account_number' => $statement->account_number, - 'request_type' => $statement->request_type + 'request_type' => $statement->request_type ]); // Process statement availability check @@ -69,18 +107,18 @@ DB::commit(); return redirect()->route('statements.index') - ->with('success', 'Statement request has been created successfully.'); + ->with('success', 'Statement request has been created successfully.'); } catch (Exception $e) { DB::rollBack(); Log::error('Failed to create statement request', [ - 'error' => $e->getMessage(), + 'error' => $e->getMessage(), 'user_id' => Auth::id() ]); return redirect()->back() - ->withInput() - ->with('error', 'Failed to create statement request: ' . $e->getMessage()); + ->withInput() + ->with('error', 'Failed to create statement request: ' . $e->getMessage()); } } @@ -102,19 +140,19 @@ DB::beginTransaction(); try { - $disk = Storage::disk('sftpStatement'); + $disk = Storage::disk('sftpStatement'); $filePath = "{$statement->period_from}/Print/{$statement->branch_code}/{$statement->account_number}.pdf"; if ($statement->is_period_range && $statement->period_to) { $periodFrom = Carbon::createFromFormat('Ym', $statement->period_from); - $periodTo = Carbon::createFromFormat('Ym', $statement->period_to); + $periodTo = Carbon::createFromFormat('Ym', $statement->period_to); - $missingPeriods = []; + $missingPeriods = []; $availablePeriods = []; for ($period = clone $periodFrom; $period->lte($periodTo); $period->addMonth()) { $periodFormatted = $period->format('Ym'); - $periodPath = $periodFormatted . "/Print/{$statement->branch_code}/{$statement->account_number}.pdf"; + $periodPath = $periodFormatted . "/Print/{$statement->branch_code}/{$statement->account_number}.pdf"; if ($disk->exists($periodPath)) { $availablePeriods[] = $periodFormatted; @@ -127,55 +165,55 @@ $notes = "Missing periods: " . implode(', ', $missingPeriods); $statement->update([ 'is_available' => false, - 'remarks' => $notes, - 'updated_by' => Auth::id(), - 'status' => 'failed' + 'remarks' => $notes, + 'updated_by' => Auth::id(), + 'status' => 'failed' ]); Log::warning('Statement not available - missing periods', [ - 'statement_id' => $statement->id, + 'statement_id' => $statement->id, 'missing_periods' => $missingPeriods ]); } else { $statement->update([ - 'is_available' => true, - 'updated_by' => Auth::id(), - 'status' => 'completed', + 'is_available' => true, + 'updated_by' => Auth::id(), + 'status' => 'completed', 'processed_accounts' => 1, - 'success_count' => 1 + 'success_count' => 1 ]); Log::info('Statement available - all periods found', [ - 'statement_id' => $statement->id, + 'statement_id' => $statement->id, 'available_periods' => $availablePeriods ]); } } else if ($disk->exists($filePath)) { $statement->update([ - 'is_available' => true, - 'updated_by' => Auth::id(), - 'status' => 'completed', + 'is_available' => true, + 'updated_by' => Auth::id(), + 'status' => 'completed', 'processed_accounts' => 1, - 'success_count' => 1 + 'success_count' => 1 ]); Log::info('Statement available', [ 'statement_id' => $statement->id, - 'file_path' => $filePath + 'file_path' => $filePath ]); } else { $statement->update([ - 'is_available' => false, - 'updated_by' => Auth::id(), - 'status' => 'failed', + 'is_available' => false, + 'updated_by' => Auth::id(), + 'status' => 'failed', 'processed_accounts' => 1, - 'failed_count' => 1, - 'error_message' => 'Statement file not found' + 'failed_count' => 1, + 'error_message' => 'Statement file not found' ]); Log::warning('Statement not available', [ 'statement_id' => $statement->id, - 'file_path' => $filePath + 'file_path' => $filePath ]); } @@ -185,14 +223,14 @@ Log::error('Error checking statement availability', [ 'statement_id' => $statement->id, - 'error' => $e->getMessage() + 'error' => $e->getMessage() ]); $statement->update([ - 'is_available' => false, - 'status' => 'failed', + 'is_available' => false, + 'status' => 'failed', 'error_message' => $e->getMessage(), - 'updated_by' => Auth::id() + 'updated_by' => Auth::id() ]); } } @@ -223,19 +261,19 @@ $statement->update([ 'is_downloaded' => true, 'downloaded_at' => now(), - 'updated_by' => Auth::id() + 'updated_by' => Auth::id() ]); Log::info('Statement downloaded', [ - 'statement_id' => $statement->id, - 'user_id' => Auth::id(), + 'statement_id' => $statement->id, + 'user_id' => Auth::id(), 'account_number' => $statement->account_number ]); DB::commit(); // Generate or fetch the statement file - $disk = Storage::disk('sftpStatement'); + $disk = Storage::disk('sftpStatement'); $filePath = "{$statement->period_from}/Print/{$statement->branch_code}/{$statement->account_number}.pdf"; if ($statement->is_period_range && $statement->period_to) { @@ -249,7 +287,7 @@ Log::error('Failed to download statement', [ 'statement_id' => $statement->id, - 'error' => $e->getMessage() + 'error' => $e->getMessage() ]); return back()->with('error', 'Failed to download statement: ' . $e->getMessage()); @@ -337,13 +375,13 @@ // Map frontend column names to database column names if needed $columnMap = [ - 'branch' => 'branch_code', - 'account' => 'account_number', - 'period' => 'period_from', - 'auth_status' => 'authorization_status', + 'branch' => 'branch_code', + 'account' => 'account_number', + 'period' => 'period_from', + 'auth_status' => 'authorization_status', 'request_type' => 'request_type', - 'status' => 'status', - 'remarks' => 'remarks', + 'status' => 'status', + 'remarks' => 'remarks', ]; $dbColumn = $columnMap[$column] ?? $column; @@ -541,8 +579,8 @@ Log::info('Statement email sent successfully', [ 'statement_id' => $statement->id, - 'email' => $statement->email, - 'user_id' => Auth::id() + 'email' => $statement->email, + 'user_id' => Auth::id() ]); DB::commit(); diff --git a/app/Http/Requests/PrintStatementRequest.php b/app/Http/Requests/PrintStatementRequest.php index cd6835b..c6d4698 100644 --- a/app/Http/Requests/PrintStatementRequest.php +++ b/app/Http/Requests/PrintStatementRequest.php @@ -21,7 +21,6 @@ class PrintStatementRequest extends FormRequest public function rules(): array { $rules = [ - 'branch_code' => ['required', 'string', 'exists:branches,code'], 'account_number' => ['required', 'string'], 'is_period_range' => ['sometimes', 'boolean'], 'email' => ['nullable', 'email'], @@ -77,8 +76,6 @@ class PrintStatementRequest extends FormRequest public function messages(): array { return [ - 'branch_code.required' => 'Branch code is required', - 'branch_code.exists' => 'Selected branch does not exist', 'account_number.required' => 'Account number is required', 'period_from.required' => 'Period is required', 'period_from.regex' => 'Period must be in YYYYMM format', diff --git a/module.json b/module.json index b3e0eae..5f83d10 100644 --- a/module.json +++ b/module.json @@ -30,7 +30,8 @@ "attributes": [], "permission": "", "roles": [ - "administrator" + "administrator", + "customer_service" ] }, { diff --git a/resources/views/statements/index.blade.php b/resources/views/statements/index.blade.php index 687c0fc..0546ca2 100644 --- a/resources/views/statements/index.blade.php +++ b/resources/views/statements/index.blade.php @@ -18,21 +18,6 @@ @endif
-
- - - @error('branch_code') -
{{ $message }}
- @enderror -
-
@@ -122,10 +107,6 @@ Period - - Status - - Available @@ -243,22 +224,6 @@ return fromPeriod + toPeriod; }, }, - authorization_status: { - title: 'Status', - render: (item, data) => { - let statusClass = 'badge badge-light-primary'; - - if (data.authorization_status === 'approved') { - statusClass = 'badge badge-light-success'; - } else if (data.authorization_status === 'rejected') { - statusClass = 'badge badge-light-danger'; - } else if (data.authorization_status === 'pending') { - statusClass = 'badge badge-light-warning'; - } - - return `${data.authorization_status}`; - }, - }, is_available: { title: 'Available', render: (item, data) => { diff --git a/resources/views/statements/show.blade.php b/resources/views/statements/show.blade.php index 76c333b..393a1ad 100644 --- a/resources/views/statements/show.blade.php +++ b/resources/views/statements/show.blade.php @@ -73,19 +73,6 @@
-
-
Status
-
- @if($statement->authorization_status === 'pending') - Pending Authorization - @elseif($statement->authorization_status === 'approved') - Approved - @elseif($statement->authorization_status === 'rejected') - Rejected - @endif -
-
-
Availability