Dashboard final version, TODO: update main sidebar menu

app/Http/Controllers/ClientController.php

@@ -15,7 +15,7 @@ public function __construct(protected ReferenceDataCache $referenceCache) {}
     public function index(Client $client, Request $request)
     {
         $search = $request->input('search');
-        
+
         $query = $client::query()
             ->select('clients.*')
             ->when($search, function ($que) use ($search) {
@@ -128,10 +128,9 @@ public function contracts(Client $client, Request $request)
                             ->orWhere('person.full_name', 'ilike', '%'.$search.'%');
                     });
             })
-            ->when($segmentId, function ($q) use ($segmentId) {
-                $q->join('contract_segment', function ($join) use ($segmentId) {
-                    $join->on('contract_segment.contract_id', '=', 'contracts.id')
-                        ->where('contract_segment.segment_id', $segmentId)
+            ->when($segmentIds, function ($q) use ($segmentIds) {
+                $q->whereHas('segments', function ($s) use ($segmentIds) {
+                    $s->whereIn('segments.id', $segmentIds)
                         ->where('contract_segment.active', true);
                 });
             })
@@ -152,9 +151,15 @@ public function contracts(Client $client, Request $request)
             'phone_types' => $this->referenceCache->getPhoneTypes(),
         ];
 
+        // Support custom pagination parameter names used by DataTableNew2
+        $perPage = $request->integer('contracts_per_page', $request->integer('per_page', 15));
+        $pageNumber = $request->integer('contracts_page', $request->integer('page', 1));
+
         return Inertia::render('Client/Contracts', [
             'client' => $data,
-            'contracts' => $contractsQuery->paginate($request->integer('per_page', 20))->withQueryString(),
+            'contracts' => $contractsQuery
+                ->paginate($perPage, ['*'], 'contracts_page', $pageNumber)
+                ->withQueryString(),
             'filters' => $request->only(['from', 'to', 'search', 'segment']),
             'segments' => $segments,
             'types' => $types,