diff --git a/app/Http/Controllers/Backend/AdminsController.php b/app/Http/Controllers/Backend/AdminsController.php index 2597580..f178c3d 100644 --- a/app/Http/Controllers/Backend/AdminsController.php +++ b/app/Http/Controllers/Backend/AdminsController.php @@ -35,8 +35,9 @@ class AdminsController extends Controller 'path' => url()->current() ]; + $admins = Admin::with(['region', 'cabang', 'roles'])->get(); return view('backend.pages.admins.index', [ - 'admins' => Admin::all(), + 'admins' => $admins, 'pageInfo' => $pageInfo, ]); } diff --git a/app/Http/Controllers/Backend/AuditTrailController.php b/app/Http/Controllers/Backend/AuditTrailController.php index 250ac5d..ad0b56f 100644 --- a/app/Http/Controllers/Backend/AuditTrailController.php +++ b/app/Http/Controllers/Backend/AuditTrailController.php @@ -23,7 +23,7 @@ class AuditTrailController extends Controller 'backend.pages.audit_trail.index', [ // sort by newest - 'data' => AuditTrail::orderBy('created_at', 'desc')->get(), + 'data' => AuditTrail::with('user')->orderBy('created_at', 'desc')->get(), 'pageInfo' => $pageInfo, ] ); diff --git a/app/Http/Controllers/Master/CabangController.php b/app/Http/Controllers/Master/CabangController.php index 0d60cb8..09b4fe7 100644 --- a/app/Http/Controllers/Master/CabangController.php +++ b/app/Http/Controllers/Master/CabangController.php @@ -18,7 +18,7 @@ class CabangController extends Controller session()->put('redirect_url', route('admin.cabang.index')); return view('backend.pages.master.cabang.index', [ - 'cabang' => Cabang::all() + 'cabang' => Cabang::with(['head', 'region', 'cost'])->get() ]); } diff --git a/app/Http/Controllers/Master/RegionController.php b/app/Http/Controllers/Master/RegionController.php index b1575c9..3e5b00e 100644 --- a/app/Http/Controllers/Master/RegionController.php +++ b/app/Http/Controllers/Master/RegionController.php @@ -16,7 +16,7 @@ class RegionController extends Controller session()->put('redirect_url', route('admin.region.index')); return view('backend.pages.master.region.index', [ - 'region' => Region::all() + 'region' => Region::with('head')->get() ]); } diff --git a/resources/views/backend/pages/admins/index.blade.php b/resources/views/backend/pages/admins/index.blade.php index 8856907..ed65bf2 100644 --- a/resources/views/backend/pages/admins/index.blade.php +++ b/resources/views/backend/pages/admins/index.blade.php @@ -66,8 +66,8 @@ @endforeach - {{ $admin->getMyCabangAndRegion()['region'] }} - {{ $admin->getMyCabangAndRegion()['cabang'] }} + {{ $admin->region->cabang->region->name ?? '' }} + {{ $admin->cabang->cabang->name ?? '' }} View Expense @if (auth()->user()->can('admin.edit'))