arifal/CKB
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix load data dealer base on user with pivot or not

Browse Source
This commit is contained in:
arifal
2025-07-10 12:24:11 +07:00
parent e59841fd23
commit b632996052
5 changed files with 223 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Http/Controllers/ReportController.php
View File

@@ -16,6 +16,7 @@ use Illuminate\Support\Facades\DB;
use Illuminate\Support\Facades\Gate;
use Yajra\DataTables\Facades\DataTables;
use Maatwebsite\Excel\Facades\Excel;
use App\Models\Role;
class ReportController extends Controller
{
@@ -383,10 +384,20 @@ class ReportController extends Controller
$request['year'] = date('Y');
}
$user = Auth::user();
$role = Role::with(['dealers' => function($query) {
$query->whereNull('dealers.deleted_at'); // Only active dealers
}])->find($user->role_id);
if(strtolower($role->name) === 'admin') {
$dealer_datas = Dealer::all();
}else{
$dealer_datas = $role->dealers()->whereNull('dealers.deleted_at')->orderBy('name')->get();
}
$year = $request->year;
$month = $request->month;
$dealer = $request->dealer;
$dealer_datas = Dealer::all();
$ajax_url = route('dashboard_data').'?month='.$month.'&year='.$year.'&dealer='.$dealer;
return view('dashboard', compact('month', 'ajax_url', 'dealer', 'dealer_datas', 'year'));
}