itdept/expense
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' of https://gitlab.com/fiqhpratama1/xpendify

Browse Source
This commit is contained in:
Jagad R R
2025-03-05 13:45:02 +07:00
parent ee3de88659 bb88fa2bb5
commit d0ddc129ae
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Forms/FormEntertainmentPresentationController.php
+2 -2
View File
@@ -125,7 +125,7 @@ class FormEntertainmentPresentationController extends Controller
'name' => 'required', 'name' => 'required',
'alamat' => 'required', 'alamat' => 'required',
'nik_or_npwp' => 'required', 'nik_or_npwp' => 'required',
'bukti_total' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])], 'bukti_total' => ['nullable', 'file', 'max:51200'],
]); ]);
$startDate = date('Y-m-' . env('STARTING_DATE')); $startDate = date('Y-m-' . env('STARTING_DATE'));
@@ -293,7 +293,7 @@ class FormEntertainmentPresentationController extends Controller
'name' => 'required', 'name' => 'required',
'alamat' => 'required', 'alamat' => 'required',
'nik_or_npwp' => 'required', 'nik_or_npwp' => 'required',
'bukti_total' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])], 'bukti_total' => ['nullable', 'file', 'max:51200'],
]); ]);
if($form->status != 'On Progress' && $role == 'Medical Representatif') { if($form->status != 'On Progress' && $role == 'Medical Representatif') {
app/Http/Controllers/Forms/FormMeetingSeminarController.php
+6 -6
View File
@@ -126,9 +126,9 @@ class FormMeetingSeminarController extends Controller
'allowance' => 'nullable|numeric', 'allowance' => 'nullable|numeric',
'transport_ankot' => 'nullable|numeric', 'transport_ankot' => 'nullable|numeric',
'hotel' => 'nullable|numeric', 'hotel' => 'nullable|numeric',
'bukti_allowance' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])], 'bukti_allowance' => ['nullable', 'file', 'max:51200'],
'bukti_transport_ankot' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])], 'bukti_transport_ankot' => ['nullable', 'file', 'max:51200'],
'bukti_hotel' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])], 'bukti_hotel' => ['nullable', 'file', 'max:51200'],
]); ]);
$currentDate = $request->tanggal; $currentDate = $request->tanggal;
@@ -325,9 +325,9 @@ class FormMeetingSeminarController extends Controller
'allowance' => 'nullable|numeric', 'allowance' => 'nullable|numeric',
'transport_ankot' => 'nullable|numeric', 'transport_ankot' => 'nullable|numeric',
'hotel' => 'nullable|numeric', 'hotel' => 'nullable|numeric',
'bukti_allowance' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])], 'bukti_allowance' => ['nullable', 'file', 'max:51200'],
'bukti_transport_ankot' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])], 'bukti_transport_ankot' => ['nullable', 'file', 'max:51200'],
'bukti_hotel' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])], 'bukti_hotel' => ['nullable', 'file', 'max:51200'],
]); ]);
if($form->status != 'On Progress' && $role == 'Medical Representatif') { if($form->status != 'On Progress' && $role == 'Medical Representatif') {
app/Http/Controllers/Forms/FormOtherController.php
+2 -2
View File
@@ -123,7 +123,7 @@ class FormOtherController extends Controller
'tanggal' => 'required|date', 'tanggal' => 'required|date',
'keterangan' => 'required', 'keterangan' => 'required',
'total' => 'required|numeric|min:1', 'total' => 'required|numeric|min:1',
'bukti_total' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])], 'bukti_total' => ['nullable', 'file', 'max:51200'],
]); ]);
$startDate = date('Y-m-' . env('STARTING_DATE')); $startDate = date('Y-m-' . env('STARTING_DATE'));
@@ -286,7 +286,7 @@ class FormOtherController extends Controller
'tanggal' => 'required|date', 'tanggal' => 'required|date',
'keterangan' => 'required', 'keterangan' => 'required',
'total' => 'required|numeric|min:1|max:' . BudgetHelper::getAvailableBudget($cabang_id), 'total' => 'required|numeric|min:1|max:' . BudgetHelper::getAvailableBudget($cabang_id),
'bukti_total' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])], 'bukti_total' => ['nullable', 'file', 'max:51200'],
]); ]);
if($form->status != 'On Progress' && $role == 'Medical Representatif') { if($form->status != 'On Progress' && $role == 'Medical Representatif') {
app/Http/Controllers/Forms/FormUpCountryController.php
+8 -8
View File
@@ -137,10 +137,10 @@ class FormUpCountryController extends Controller
'transport_dalkot' => 'nullable|numeric', 'transport_dalkot' => 'nullable|numeric',
'transport_ankot' => 'nullable|numeric', 'transport_ankot' => 'nullable|numeric',
'hotel' => 'nullable|numeric', 'hotel' => 'nullable|numeric',
'bukti_allowance' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])], 'bukti_allowance' => ['nullable', 'file', 'max:51200'],
'bukti_transport_dalkot' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])], 'bukti_transport_dalkot' => ['nullable', 'file', 'max:51200'],
'bukti_transport_ankot' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])], 'bukti_transport_ankot' => ['nullable', 'file', 'max:51200'],
'bukti_hotel' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])], 'bukti_hotel' => ['nullable', 'file', 'max:51200'],
]); ]);
$startDate = date('Y-m-' . env('STARTING_DATE')); $startDate = date('Y-m-' . env('STARTING_DATE'));
@@ -360,10 +360,10 @@ class FormUpCountryController extends Controller
'transport_dalkot' => 'nullable|numeric', 'transport_dalkot' => 'nullable|numeric',
'transport_ankot' => 'nullable|numeric', 'transport_ankot' => 'nullable|numeric',
'hotel' => 'nullable|numeric', 'hotel' => 'nullable|numeric',
'bukti_allowance' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])], 'bukti_allowance' => ['nullable', 'file', 'max:51200'],
'bukti_transport_dalkot' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])], 'bukti_transport_dalkot' => ['nullable', 'file', 'max:51200'],
'bukti_transport_ankot' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])], 'bukti_transport_ankot' => ['nullable', 'file', 'max:51200'],
'bukti_hotel' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])], 'bukti_hotel' => ['nullable', 'file', 'max:51200'],
]); ]);
$form = FormUpCountry::findOrfail($id); $form = FormUpCountry::findOrfail($id);
app/Http/Controllers/Forms/FormVehicleController.php
+2 -2
View File
@@ -126,7 +126,7 @@ class FormVehicleController extends Controller
'tipe_bensin' => 'required|in:pertalite,pertamax', 'tipe_bensin' => 'required|in:pertalite,pertamax',
'nopol' => 'required', 'nopol' => 'required',
'keterangan' => 'required', 'keterangan' => 'required',
'bukti_total' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])], 'bukti_total' => ['nullable', 'file', 'max:51200'],
]); ]);
$startDate = date('Y-m-' . env('STARTING_DATE')); $startDate = date('Y-m-' . env('STARTING_DATE'));
@@ -294,7 +294,7 @@ class FormVehicleController extends Controller
'tipe_bensin' => 'required|in:pertalite,pertamax', 'tipe_bensin' => 'required|in:pertalite,pertamax',
'nopol' => 'required', 'nopol' => 'required',
'keterangan' => 'required', 'keterangan' => 'required',
'bukti_total' => ['nullable', 'file', 'max:51200', new FileType(['php', 'exe', 'js', 'sh', 'bat', 'exe', 'sh', 'php', 'vbs'])], 'bukti_total' => ['nullable', 'file', 'max:51200'],
]); ]);
if($form->status != 'On Progress' && $role == 'Medical Representatif') { if($form->status != 'On Progress' && $role == 'Medical Representatif') {