updated

app/Http/Controllers/PracticeManagementController.php

@@ -48,8 +48,11 @@ class PracticeManagementController extends Controller
 
     public function rpmMatrix(Request $request)
     {
-        $clients = Client::whereNull('shadow_pro_id')
-            ->orderByRaw('most_recent_cellular_measurement_at desc nulls last')
+        $proID = $this->performer()->pro->id;
+        $isAdmin = $this->performer()->pro->pro_type == 'ADMIN';
+        $query = Client::whereNull('shadow_pro_id');
+        if(!$isAdmin) $query->where('mcp_pro_id', '=', $proID);
+        $clients = $query->orderByRaw('most_recent_cellular_measurement_at desc nulls last')
             ->paginate(50);
         return view ('app.practice-management.rpm-matrix', compact('clients'));
     }

resources/views/layouts/template.blade.php

@@ -134,9 +134,11 @@
                     </a>
                     <div class="dropdown-menu mcp-theme-1 no-overflow-menu p-0" aria-labelledby="practice-management">
 
+                        <a class="dropdown-item" href="{{ route('practice-management.rpmMatrix') }}">RPM Matrix</a>
+
                         @if($pro->pro_type == 'ADMIN')
 
-                            <a class="dropdown-item" href="{{ route('practice-management.rpmMatrix') }}">RPM Matrix</a>
+
                             {{--<a class="dropdown-item" href="{{ route('practice-management.previousBills') }}">Previous Bills</a>--}}
                             <a class="dropdown-item" href="{{ route('practice-management.financialTransactions') }}">Financial Transactions</a>
                             <a class="dropdown-item" href="/practice-management/bills/not-yet-signed">Pending Bills to Sign</a>