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

fix data not showing in some role

Browse Source
This commit is contained in:
Jagad R R
2025-01-01 15:33:16 +07:00
parent fbcc841e80
commit 9b1ca9f58d
5 changed files with 70 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Forms/FormEntertainmentPresentationController.php
+14 -2
View File
@@ -31,7 +31,7 @@ class FormEntertainmentPresentationController extends Controller
$role = auth()->user()->getRoleNames()[0];
$forms = FormEntertaimentPresentation::get();
if ($role == 'Admin Region') {
if ($role == 'Admin Region' || $role == 'Marketing Operational Manager Region') {
$region_id = auth()->user()->getMyCabangAndRegionId()['region'];
if ($region_id) {
@@ -43,9 +43,21 @@ class FormEntertainmentPresentationController extends Controller
$forms = $forms->whereIn('user_id', $userIds);
}
}
else {
else if ($role == 'Area Manager Cabang') {
$cabang_id = auth()->user()->getMyCabangAndRegionId()['cabang'];
if ($cabang_id) {
$users = UserHasCabang::where('cabang_id', $cabang_id)->get();
$userIds = $users->pluck('user_id')->toArray();
$forms = $forms->whereIn('user_id', $userIds);
}
}
else if ($role == 'Medical Representatif') {
$forms = $forms->where('user_id', auth()->user()->id);
}
else {
$forms = $forms;
}
session()->put('redirect_url', route('forms.entertainment'));
return view('backend.pages.forms.entertainment.index', [
app/Http/Controllers/Forms/FormMeetingSeminarController.php
+14 -2
View File
@@ -31,7 +31,7 @@ class FormMeetingSeminarController extends Controller
$role = auth()->user()->getRoleNames()[0];
$forms = FormMeetingSeminar::get();
if ($role == 'Admin Region') {
if ($role == 'Admin Region' || $role == 'Marketing Operational Manager Region') {
$region_id = auth()->user()->getMyCabangAndRegionId()['region'];
if ($region_id) {
@@ -43,9 +43,21 @@ class FormMeetingSeminarController extends Controller
$forms = $forms->whereIn('user_id', $userIds);
}
}
else {
else if ($role == 'Area Manager Cabang') {
$cabang_id = auth()->user()->getMyCabangAndRegionId()['cabang'];
if ($cabang_id) {
$users = UserHasCabang::where('cabang_id', $cabang_id)->get();
$userIds = $users->pluck('user_id')->toArray();
$forms = $forms->whereIn('user_id', $userIds);
}
}
else if ($role == 'Medical Representatif') {
$forms = $forms->where('user_id', auth()->user()->id);
}
else {
$forms = $forms;
}
session()->put('redirect_url', route('forms.meeting'));
return view('backend.pages.forms.meeting.index', [
app/Http/Controllers/Forms/FormOtherController.php
+14 -2
View File
@@ -34,7 +34,7 @@ class FormOtherController extends Controller
$role = auth()->user()->getRoleNames()[0];
$forms = FormOthers::get();
if ($role == 'Admin Region') {
if ($role == 'Admin Region' || $role == 'Marketing Operational Manager Region') {
$region_id = auth()->user()->getMyCabangAndRegionId()['region'];
if ($region_id) {
@@ -46,9 +46,21 @@ class FormOtherController extends Controller
$forms = $forms->whereIn('user_id', $userIds);
}
}
else {
else if ($role == 'Area Manager Cabang') {
$cabang_id = auth()->user()->getMyCabangAndRegionId()['cabang'];
if ($cabang_id) {
$users = UserHasCabang::where('cabang_id', $cabang_id)->get();
$userIds = $users->pluck('user_id')->toArray();
$forms = $forms->whereIn('user_id', $userIds);
}
}
else if ($role == 'Medical Representatif') {
$forms = $forms->where('user_id', auth()->user()->id);
}
else {
$forms = $forms;
}
session()->put('redirect_url', route('forms.other'));
return view('backend.pages.forms.other.index', [
app/Http/Controllers/Forms/FormUpCountryController.php
+14 -2
View File
@@ -30,7 +30,7 @@ class FormUpCountryController extends Controller
$role = auth()->user()->getRoleNames()[0];
$forms = FormUpCountry::get();
if ($role == 'Admin Region') {
if ($role == 'Admin Region' || $role == 'Marketing Operational Manager Region') {
$region_id = auth()->user()->getMyCabangAndRegionId()['region'];
if ($region_id) {
@@ -42,9 +42,21 @@ class FormUpCountryController extends Controller
$forms = $forms->whereIn('user_id', $userIds);
}
}
else {
else if ($role == 'Area Manager Cabang') {
$cabang_id = auth()->user()->getMyCabangAndRegionId()['cabang'];
if ($cabang_id) {
$users = UserHasCabang::where('cabang_id', $cabang_id)->get();
$userIds = $users->pluck('user_id')->toArray();
$forms = $forms->whereIn('user_id', $userIds);
}
}
else if ($role == 'Medical Representatif') {
$forms = $forms->where('user_id', auth()->user()->id);
}
else {
$forms = $forms;
}
session()->put('redirect_url', route('forms.up-country'));
return view('backend.pages.forms.upcountry.index', [
app/Http/Controllers/Forms/FormVehicleController.php
+14 -2
View File
@@ -30,7 +30,7 @@ class FormVehicleController extends Controller
$role = auth()->user()->getRoleNames()[0];
$forms = FormVehicleRunningCost::get();
if ($role == 'Admin Region') {
if ($role == 'Admin Region' || $role == 'Marketing Operational Manager Region') {
$region_id = auth()->user()->getMyCabangAndRegionId()['region'];
if ($region_id) {
@@ -42,9 +42,21 @@ class FormVehicleController extends Controller
$forms = $forms->whereIn('user_id', $userIds);
}
}
else {
else if ($role == 'Area Manager Cabang') {
$cabang_id = auth()->user()->getMyCabangAndRegionId()['cabang'];
if ($cabang_id) {
$users = UserHasCabang::where('cabang_id', $cabang_id)->get();
$userIds = $users->pluck('user_id')->toArray();
$forms = $forms->whereIn('user_id', $userIds);
}
}
else if ($role == 'Medical Representatif') {
$forms = $forms->where('user_id', auth()->user()->id);
}
else {
$forms = $forms;
}
session()->put('redirect_url', route('forms.vehicle'));
return view('backend.pages.forms.vehicle.index', [