- **Penambahan Fitur Multi-Branch:**
- Tambahkan dropdown pilihan cabang (branch) saat fitur multi-branch diaktifkan.
- Secara otomatis mengisi informasi branch jika hanya tersedia satu branch yang terkait dengan user.
- **Perbaikan Validasi Form:**
- Memastikan field `account_number` dan `branch_id` memiliki validasi yang lebih ketat.
- Tambahkan validasi untuk `period_from` agar hanya menerima data periode yang tersedia (`is_available`).
- **Perubahan Tampilan:**
- Menyesuaikan desain form:
- Tambahkan kondisi dynamic display pada field branch berdasarkan status multi-branch.
- Reformat struktur HTML untuk meningkatkan keterbacaan dengan indentasi lebih konsisten.
- Perbaikan tampilan elemen tabel pada daftar request statement:
- Mengoptimalkan style menggunakan properti CSS baru pada grid dan typography.
- **Optimasi Query dan Akses Data:**
- Tambahkan filter berdasarkan `branch_code` agar data hanya terlihat untuk cabang yang relevan dengan user.
- Optimalkan pengambilan data branch dengan hanya memuat cabang yang aktif.
- **Peningkatan Logging:**
- Tambahkan log pada pengolahan query untuk mendeteksi masalah akses branch saat user tidak memiliki akses multi-branch.
- **Refaktor Backend:**
- Tambahkan variable `multiBranch` pada controller untuk mengatur logika UI secara dinamis.
- Refaktor pencarian branch di server-side untuk mengantisipasi session `MULTI_BRANCH`.
Perubahan ini mendukung fleksibilitas akses cabang untuk user dengan mode multi-branch serta meningkatkan validasi dan pengalaman UI form.
Signed-off-by: Daeng Deni Mardaeni <ddeni05@gmail.com>
124 lines
4.3 KiB
PHP
124 lines
4.3 KiB
PHP
<?php
|
|
|
|
namespace Modules\Webstatement\Http\Requests;
|
|
|
|
use Illuminate\Foundation\Http\FormRequest;
|
|
use Modules\Webstatement\Models\PrintStatementLog as Statement;
|
|
|
|
class PrintStatementRequest extends FormRequest
|
|
{
|
|
/**
|
|
* Determine if the user is authorized to make this request.
|
|
*/
|
|
public function authorize(): bool
|
|
{
|
|
return true;
|
|
}
|
|
|
|
/**
|
|
* Get the validation rules that apply to the request.
|
|
*/
|
|
public function rules(): array
|
|
{
|
|
$rules = [
|
|
'account_number' => ['required', 'string'],
|
|
'is_period_range' => ['sometimes', 'boolean'],
|
|
'email' => ['nullable', 'email'],
|
|
'email_sent_at' => ['nullable', 'timestamp'],
|
|
'request_type' => ['sometimes', 'string', 'in:single_account,branch,all_branches'],
|
|
'batch_id' => ['nullable', 'string'],
|
|
'period_from' => [
|
|
'required',
|
|
'string',
|
|
'regex:/^\d{6}$/', // YYYYMM format
|
|
// Prevent duplicate requests with same account number and period
|
|
function ($attribute, $value, $fail) {
|
|
$query = Statement::where('account_number', $this->input('account_number'))
|
|
->where('authorization_status', '!=', 'rejected')
|
|
->where('is_available', true)
|
|
->where('period_from', $value);
|
|
|
|
// If this is an update request, exclude the current record
|
|
if ($this->route('statement')) {
|
|
$query->where('id', '!=', $this->route('statement'));
|
|
}
|
|
|
|
// If period_to is provided, check for overlapping periods
|
|
if ($this->input('period_to')) {
|
|
$query->where(function ($q) use ($value) {
|
|
$q->where('period_from', '<=', $this->input('period_to'))
|
|
->where('period_to', '>=', $value);
|
|
});
|
|
}
|
|
|
|
if ($query->exists()) {
|
|
$fail('A statement request with this account number and period already exists.');
|
|
}
|
|
}
|
|
],
|
|
];
|
|
|
|
// If it's a period range, require period_to
|
|
if ($this->input('period_to')) {
|
|
$rules['period_to'] = [
|
|
'required',
|
|
'string',
|
|
'regex:/^\d{6}$/', // YYYYMM format
|
|
'gte:period_from' // period_to must be greater than or equal to period_from
|
|
];
|
|
}
|
|
|
|
return $rules;
|
|
}
|
|
|
|
/**
|
|
* Get custom messages for validator errors.
|
|
*/
|
|
public function messages(): array
|
|
{
|
|
return [
|
|
'account_number.required' => 'Account number is required',
|
|
'period_from.required' => 'Period is required',
|
|
'period_from.regex' => 'Period must be in YYYYMM format',
|
|
'period_to.required' => 'End period is required for period range',
|
|
'period_to.regex' => 'End period must be in YYYYMM format',
|
|
'period_to.gte' => 'End period must be after or equal to start period',
|
|
'request_type.in' => 'Request type must be single_account, branch, or all_branches',
|
|
];
|
|
}
|
|
|
|
/**
|
|
* Prepare the data for validation.
|
|
*/
|
|
protected function prepareForValidation(): void
|
|
{
|
|
if ($this->has('period_from')) {
|
|
// Convert to YYYYMM format
|
|
$this->merge([
|
|
'period_from' => substr($this->period_from, 0, 4) . substr($this->period_from, 5, 2),
|
|
]);
|
|
}
|
|
|
|
if ($this->has('period_to')) {
|
|
// Convert to YYYYMM format
|
|
$this->merge([
|
|
'period_to' => substr($this->period_to, 0, 4) . substr($this->period_to, 5, 2),
|
|
]);
|
|
}
|
|
|
|
// Convert is_period_range to boolean if it exists
|
|
if ($this->has('period_to')) {
|
|
$this->merge([
|
|
'is_period_range' => true,
|
|
]);
|
|
}
|
|
|
|
// Set default request_type if not provided
|
|
if (!$this->has('request_type')) {
|
|
$this->merge([
|
|
'request_type' => 'single_account',
|
|
]);
|
|
}
|
|
}
|
|
}
|