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

update revisi 1

Browse Source
This commit is contained in:
Jagad R R
2024-12-26 18:37:34 +07:00
parent 19ef6b91bb
commit cc9e2d7214
16 changed files with 216 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Forms/FormEntertainmentPresentationController.php
+18 -7
View File
@@ -26,14 +26,25 @@ class FormEntertainmentPresentationController extends Controller
{
$this->checkAuthorization(auth()->user(), ['forms.entertainment.view']);
// get user role
// get user role
$role = auth()->user()->getRoleNames()[0];
$forms = null;
$forms = FormEntertaimentPresentation::get();
if($role == 'Marketing Information System' || $role == 'superadmin') {
$forms = FormEntertaimentPresentation::get();
} else {
$forms = FormEntertaimentPresentation::where('user_id', auth()->user()->id)->get();
if ($role == 'Admin Region') {
$region_id = auth()->user()->getMyCabangAndRegionId()['region'];
if ($region_id) {
$users = UserHasCabang::whereHas('cabang', function ($query) use ($region_id) {
$query->where('region_id', $region_id);
})->get();
$userIds = $users->pluck('user_id')->toArray();
$forms = $forms->whereIn('user_id', $userIds);
}
}
else {
$forms = $forms->where('user_id', auth()->user()->id);
}
session()->put('redirect_url', route('forms.entertainment'));
@@ -61,7 +72,7 @@ class FormEntertainmentPresentationController extends Controller
'name' => 'required',
'alamat' => 'required',
'nik_or_npwp' => 'required',
'bukti1' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg|max:2048',
'bukti1' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg,heic,heif|max:2048',
'bukti2' => 'nullable|file|mimes:xlsx,xls,csv',
'bukti3' => 'nullable|file|mimes:pdf',
]);
@@ -165,7 +176,7 @@ class FormEntertainmentPresentationController extends Controller
'name' => 'required',
'alamat' => 'required',
'nik_or_npwp' => 'required',
'bukti1' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg|max:2048',
'bukti1' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg,heic,heif|max:2048',
'bukti2' => 'nullable|file|mimes:xlsx,xls,csv',
'bukti3' => 'nullable|file|mimes:pdf',
]);
app/Http/Controllers/Forms/FormMeetingSeminarController.php
+18 -7
View File
@@ -26,14 +26,25 @@ class FormMeetingSeminarController extends Controller
{
$this->checkAuthorization(auth()->user(), ['forms.meeting.view']);
// get user role
// get user role
$role = auth()->user()->getRoleNames()[0];
$forms = null;
$forms = FormMeetingSeminar::get();
if($role == 'Marketing Information System' || $role == 'superadmin') {
$forms = FormMeetingSeminar::get();
} else {
$forms = FormMeetingSeminar::where('user_id', auth()->user()->id)->get();
if ($role == 'Admin Region') {
$region_id = auth()->user()->getMyCabangAndRegionId()['region'];
if ($region_id) {
$users = UserHasCabang::whereHas('cabang', function ($query) use ($region_id) {
$query->where('region_id', $region_id);
})->get();
$userIds = $users->pluck('user_id')->toArray();
$forms = $forms->whereIn('user_id', $userIds);
}
}
else {
$forms = $forms->where('user_id', auth()->user()->id);
}
session()->put('redirect_url', route('forms.meeting'));
@@ -57,7 +68,7 @@ class FormMeetingSeminarController extends Controller
'allowance' => 'required',
'transport_ankot' => 'required',
'hotel' => 'required',
'bukti1' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg|max:2048',
'bukti1' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg,heic,heif|max:2048',
'bukti2' => 'nullable|file|mimes:xlsx,xls,csv',
'bukti3' => 'nullable|file|mimes:pdf',
]);
@@ -154,7 +165,7 @@ class FormMeetingSeminarController extends Controller
'allowance' => 'required',
'transport_ankot' => 'required',
'hotel' => 'required',
'bukti1' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg|max:2048',
'bukti1' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg,heic,heif|max:2048',
'bukti2' => 'nullable|file|mimes:xlsx,xls,csv',
'bukti3' => 'nullable|file|mimes:pdf',
]);
app/Http/Controllers/Forms/FormOtherController.php
+20 -6
View File
@@ -30,10 +30,24 @@ class FormOtherController extends Controller
$role = auth()->user()->getRoleNames()[0];
$forms = null;
if($role == 'Marketing Information System' || $role == 'superadmin') {
$forms = FormOthers::get();
} else {
$forms = FormOthers::where('user_id', auth()->user()->id)->get();
// get user role
$role = auth()->user()->getRoleNames()[0];
$forms = FormOthers::get();
if ($role == 'Admin Region') {
$region_id = auth()->user()->getMyCabangAndRegionId()['region'];
if ($region_id) {
$users = UserHasCabang::whereHas('cabang', function ($query) use ($region_id) {
$query->where('region_id', $region_id);
})->get();
$userIds = $users->pluck('user_id')->toArray();
$forms = $forms->whereIn('user_id', $userIds);
}
}
else {
$forms = $forms->where('user_id', auth()->user()->id);
}
session()->put('redirect_url', route('forms.other'));
@@ -60,7 +74,7 @@ class FormOtherController extends Controller
'tanggal' => 'required|date',
'keterangan' => 'required',
'total' => 'required',
'bukti1' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg|max:2048',
'bukti1' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg,heic,heif|max:2048',
'bukti2' => 'nullable|file|mimes:xlsx,xls,csv',
'bukti3' => 'nullable|file|mimes:pdf',
]);
@@ -159,7 +173,7 @@ class FormOtherController extends Controller
'tanggal' => 'required|date',
'keterangan' => 'required',
'total' => 'required',
'bukti1' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg|max:2048',
'bukti1' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg,heic,heif|max:2048',
'bukti2' => 'nullable|file|mimes:xlsx,xls,csv',
'bukti3' => 'nullable|file|mimes:pdf',
]);
app/Http/Controllers/Forms/FormUpCountryController.php
+17 -7
View File
@@ -28,12 +28,22 @@ class FormUpCountryController extends Controller
// get user role
$role = auth()->user()->getRoleNames()[0];
$forms = null;
$forms = FormUpCountry::get();
if($role == 'Marketing Information System' || $role == 'superadmin') {
$forms = FormUpCountry::with('rayon')->get();
} else {
$forms = FormUpCountry::with('rayon')->where('user_id', auth()->user()->id)->get();
if ($role == 'Admin Region') {
$region_id = auth()->user()->getMyCabangAndRegionId()['region'];
if ($region_id) {
$users = UserHasCabang::whereHas('cabang', function ($query) use ($region_id) {
$query->where('region_id', $region_id);
})->get();
$userIds = $users->pluck('user_id')->toArray();
$forms = $forms->whereIn('user_id', $userIds);
}
}
else {
$forms = $forms->where('user_id', auth()->user()->id);
}
session()->put('redirect_url', route('forms.up-country'));
@@ -63,7 +73,7 @@ class FormUpCountryController extends Controller
'allowance' => 'required',
'transport_dalkot' => 'required',
'transport_ankot' => 'required',
'bukti1' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg|max:2048',
'bukti1' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg,heic,heif|max:2048',
'bukti2' => 'nullable|file|mimes:xlsx,xls,csv',
'bukti3' => 'nullable|file|mimes:pdf',
]);
@@ -171,7 +181,7 @@ class FormUpCountryController extends Controller
'transport_dalkot' => 'required',
'transport_ankot' => 'required',
'hotel' => 'required',
'bukti1' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg|max:2048',
'bukti1' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg,heic,heif|max:2048',
'bukti2' => 'nullable|file|mimes:xlsx,xls,csv',
'bukti3' => 'nullable|file|mimes:pdf',
]);
app/Http/Controllers/Forms/FormVehicleController.php
+17 -7
View File
@@ -28,12 +28,22 @@ class FormVehicleController extends Controller
// get user role
$role = auth()->user()->getRoleNames()[0];
$forms = null;
$forms = FormVehicleRunningCost::get();
if($role == 'Marketing Information System' || $role == 'superadmin') {
$forms = FormVehicleRunningCost::get();
} else {
$forms = FormVehicleRunningCost::where('user_id', auth()->user()->id)->get();
if ($role == 'Admin Region') {
$region_id = auth()->user()->getMyCabangAndRegionId()['region'];
if ($region_id) {
$users = UserHasCabang::whereHas('cabang', function ($query) use ($region_id) {
$query->where('region_id', $region_id);
})->get();
$userIds = $users->pluck('user_id')->toArray();
$forms = $forms->whereIn('user_id', $userIds);
}
}
else {
$forms = $forms->where('user_id', auth()->user()->id);
}
session()->put('redirect_url', route('forms.vehicle'));
@@ -61,7 +71,7 @@ class FormVehicleController extends Controller
'tipe_bensin' => 'required|in:pertalite,pertamax',
'nopol' => 'required',
'keterangan' => 'required',
'bukti1' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg|max:2048',
'bukti1' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg,heic,heif|max:2048',
'bukti2' => 'nullable|file|mimes:xlsx,xls,csv',
'bukti3' => 'nullable|file|mimes:pdf',
]);
@@ -165,7 +175,7 @@ class FormVehicleController extends Controller
'tipe_bensin' => 'required|in:pertalite,pertamax',
'nopol' => 'required',
'keterangan' => 'required',
'bukti1' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg|max:2048',
'bukti1' => 'nullable|image|mimes:jpeg,png,jpg,gif,svg,heic,heif|max:2048',
'bukti2' => 'nullable|file|mimes:xlsx,xls,csv',
'bukti3' => 'nullable|file|mimes:pdf',
]);