Updated ->pro to

app/Http/Controllers/Controller.php

@@ -31,7 +31,7 @@ class Controller extends BaseController
         $this->performer = get_current_session();
         if($this->performer && $this->performer->pro) {
             $this->pro = $this->performer->pro;
-            view()->share('pro', $this->performer->pro);
+            view()->share('pro', $this->pro);
         }
         view()->share('performer', $this->performer);
 

resources/views/app/patient/care-month/dashboard.blade.php

@@ -309,9 +309,9 @@
                                 </div>
 
                                 {{-- mcp billing --}}
-                                @if($performer->pro->pro_type == 'ADMIN' || $careMonth->mcp && $pro->id === $careMonth->mcp->id)
+                                @if($pro->pro_type == 'ADMIN' || $careMonth->mcp && $pro->id === $careMonth->mcp->id)
                                     <div class="mt-2 d-flex align-items-baseline">
-                                        @if($performer->pro->pro_type == 'ADMIN')
+                                        @if($pro->pro_type == 'ADMIN')
                                             <span class="font-weight-bold text-secondary mr-1">Billing (MCP):</span>
                                         @else
                                             <span class="font-weight-bold text-secondary mr-1">Billing:</span>
@@ -373,9 +373,9 @@
                                 @endif
 
                                 {{-- rmm billing --}}
-                                @if($performer->pro->pro_type == 'ADMIN' || $careMonth->rmmPro && $pro->id === $careMonth->rmmPro->id)
+                                @if($pro->pro_type == 'ADMIN' || $careMonth->rmmPro && $pro->id === $careMonth->rmmPro->id)
                                     <div class="mt-2 d-flex align-items-baseline">
-                                        @if($performer->pro->pro_type == 'ADMIN')
+                                        @if($pro->pro_type == 'ADMIN')
                                             <span class="font-weight-bold text-secondary mr-1">Billing (RMM):</span>
                                         @else
                                             <span class="font-weight-bold text-secondary mr-1">Billing:</span>
@@ -458,7 +458,7 @@
                                 <div class="d-flex align-items-baseline mb-3" tab-links>
                                     <a class="tab-link-active" href="#" tab-link="measurements-graph">Graph</a>
                                     <a class="" href="#" tab-link="measurements-calendar">Calendar</a>
-                                    @if($performer->pro->pro_type == 'ADMIN')
+                                    @if($pro->pro_type == 'ADMIN')
                                         <a class="" href="#" tab-link="measurements-admin">Admin</a>
                                     @endif
                                 </div>
@@ -473,7 +473,7 @@
                                     </div>
                                 </div>
 
-                                @if($performer->pro->pro_type == 'ADMIN')
+                                @if($pro->pro_type == 'ADMIN')
                                     <div class="cm-tab border p-3 d-none" tab-key="measurements-admin">
                                         <div>
                                             <div class="my-1 font-weight-bold text-secondary">Has Anyone Interacted With Client About RM: {{$careMonth->has_anyone_interacted_with_client_about_rm? 'Yes': 'No'}}</div>

resources/views/app/patient/care-months.blade.php

@@ -110,7 +110,7 @@
                 <th class="text-secondary border-bottom-0">RMM</th>
                 <th class="text-secondary border-bottom-0">RME</th>
                 <th class="text-secondary border-bottom-0">ICDs</th>
-                @if($performer->pro->pro_type === 'ADMIN')
+                @if($pro->pro_type === 'ADMIN')
                     <th class="text-secondary border-bottom-0">Claims</th>
                 @endif
                 <th class="text-secondary border-bottom-0">Matrix</th>
@@ -150,7 +150,7 @@
                             {{ implode(', ', $careMonthRmReasonCodes) }}
                         </div>
                     </td>
-                    @if($performer->pro->pro_type === 'ADMIN')
+                    @if($pro->pro_type === 'ADMIN')
                     <td>
                         @foreach($careMonth->claims as $claim)
                             <?php

resources/views/app/patient/dashboard.blade.php

@@ -391,7 +391,7 @@
                             <div class="mb-2">
                                 <textarea class="form-control form-control-sm" rows="5" name="content" placeholder="Content"></textarea>
                             </div>
-                            @if($performer->pro->pro_type === 'ADMIN')
+                            @if($pro->pro_type === 'ADMIN')
                             <div class="mb-2">
                                 <label for="" class="checkbox">
                                     <input type="checkbox" name="isAdminOnly">
@@ -411,7 +411,7 @@
                                 <th class="border-0 text-secondary">Category</th>
                                 <th class="border-0 text-secondary w-50">Summary</th>
                                 <th class="border-0 text-secondary">Created</th>
-                                @if($performer->pro->pro_type === 'ADMIN')
+                                @if($pro->pro_type === 'ADMIN')
                                 <th class="border-0 text-secondary">Admins Only</th>
                                 @endif
                                 <th class="border-0 text-secondary">Ack. by MCP</th>
@@ -420,7 +420,7 @@
                         </thead>
                         <tbody>
                             @foreach($clientMemos as $memo)
-                            @if(!$memo->is_admin_only || ($memo->is_admin_only && $performer->pro->pro_type === 'ADMIN') )
+                            @if(!$memo->is_admin_only || ($memo->is_admin_only && $pro->pro_type === 'ADMIN') )
                             <tr>
                                 <td class="text-nowrap">{{ $memo->category }}</td>
                                 <td class="px-2">
@@ -430,7 +430,7 @@
                                     <strong>{{$memo->createdBy->pro->name_first}} {{$memo->createdBy->pro->name_last}}</strong><br />
                                     {{ friendly_date_time($memo->created_at) }}
                                 </td>
-                                @if($performer->pro->pro_type === 'ADMIN' )
+                                @if($pro->pro_type === 'ADMIN' )
                                 <td class="text-secondary">
                                     @if($memo->is_admin_only)
                                     <span class="text-success"><i class="fas fa-lock"></i> YES</span>
@@ -447,7 +447,7 @@
                                     @endif
                                 </td>
                                 <td class="text-center delete-column">
-                                    @if($performer->pro->pro_type == 'ADMIN')
+                                    @if($pro->pro_type == 'ADMIN')
                                     <div moe relative bottom class="mr-2">
                                         <a start show><i class="fa fa-history"></i></a>
                                         <div action="" url right bottom>

resources/views/app/patient/measurements.blade.php

@@ -49,7 +49,7 @@
                     </form>
                 </div>
                 --}}
-{{--                @if($performer->pro->pro_type == 'ADMIN')--}}
+{{--                @if($pro->pro_type == 'ADMIN')--}}
 {{--                <span class="mx-2 text-secondary">|</span>--}}
 {{--                <div moe>--}}
 {{--                    <a start show class="py-0 font-weight-normal">Process Client BDT Measurements Report</a>--}}

resources/views/app/patient/memos.blade.php

@@ -37,7 +37,7 @@
                 </thead>
                 <tbody>
                 @foreach($patient->memos as $memo)
-                    @if(!$memo->is_admin_only || ($memo->is_admin_only && $performer->pro->pro_type === 'ADMIN') )
+                    @if(!$memo->is_admin_only || ($memo->is_admin_only && $pro->pro_type === 'ADMIN') )
                     <tr>
                         <td>{{ $memo->category }}</td>
                         <td><pre class="m-0 break-spaces">{{ $memo->content }}</pre></td>

resources/views/app/patient/note/partials/flag-note-by-supervisor.blade.php

@@ -23,7 +23,7 @@
         </div>        
     @else
         @if($note->is_flagged_for_supervising_physician_review)
-            @if($performer->pro->pro_type === 'ADMIN')
+            @if($pro->pro_type === 'ADMIN')
                 <div class="d-flex align-items-center">
                     <span class="text-danger mr-2"><i class="fas fa-flag text-danger"></i> Flagged for Review</span>
                     <span class="mr-2">by <b>{{ $note->flaggedForSupervisingPhysicianReviewBySession->pro->displayName() }}</b> at {{ friendlier_date($note->flagged_for_supervising_physician_review_at) }}</span>            
@@ -60,7 +60,7 @@
                 </div>
             @endif
         @else
-            @if($performer->pro->pro_type === 'ADMIN')
+            @if($pro->pro_type === 'ADMIN')
             <div moe class="mr-2">
                 <a href="#" start show><i class="fas fa-flag text-danger"></i> Flag Note for Review</a>
                 <form url="/api/note/markAsFlaggedForSupervisingPhysicianReview">

resources/views/app/patient/note/segment/suggestions_and_updates.blade.php

@@ -55,7 +55,7 @@
         <div class="alert alert-info">Your suggestion has been rejected.</div>
         @endif
         <div class="d-flex">
-            @if(($note->hcp_pro_id == $performer->pro_id || $performer->pro->pro_type === 'ADMIN') && $segment->proposedSegmentSummarySuggestion->status == 'PENDING')
+            @if(($note->hcp_pro_id == $performer->pro_id || $pro->pro_type === 'ADMIN') && $segment->proposedSegmentSummarySuggestion->status == 'PENDING')
             <div class="d-block mt-1 mr-2" moe>
                 <form url="/api/segment/acceptProposedSegmentSummarySuggestion" show>
                     <input type="hidden" name="uid" value="{{$segment->uid}}">
@@ -115,7 +115,7 @@
                         {!! 1 ? $segment->getRecalculatedHtml($performer, $performer->session_key, true)['summaryHtml'] : '' !!}
                     @endif 
                 </textarea>
-                @if($performer->pro->pro_type == 'ADMIN')
+                @if($pro->pro_type == 'ADMIN')
                 <div class="checkbox mt-1">
                     <input type="checkbox" name="autoAccept">
                     <label for="" class="checkbox-label">Auto-accept</label>

resources/views/app/patient/partials/quick-actions-buttons.blade.php

@@ -43,7 +43,7 @@
 			</form>
 		</span>
 	</div>
-	@if($performer->pro->pro_type == 'ADMIN')
+	@if($pro->pro_type == 'ADMIN')
 	<div>
 		<a href="#" start class="ml-2 d-block" show onclick="return openInRHS('/pro/check-video/{{ $patient->uid }}')"><i class="fa fa-eye mr-1"></i></a>
 	</div>

resources/views/app/patient/primary-coverage-view.blade.php

@@ -57,7 +57,7 @@
 							<tr v-if="cpc.plan_type == 'COMMERCIAL'">
 								<td>Patient Member Identifier</td>
 								<td>
-									@if($performer->pro->pro_type === 'ADMIN')
+									@if($pro->pro_type === 'ADMIN')
 										{{$cpc->commercial_member_identifier ?? '-'}}
 									@else
 										{{$cpc->commercial_member_identifier ? mask_string($cpc->commercial_member_identifier, '*', 4) : '-'}}
@@ -120,7 +120,7 @@
 							<tr v-if="cpc.plan_type == 'MEDICAID' || (cpc.plan_type == 'COMMERCIAL' && cpc.mcd_number)">
 								<td>Medicaid Number</td>
 								<td class="text-uppercase">
-									@if($performer->pro->pro_type === 'ADMIN')
+									@if($pro->pro_type === 'ADMIN')
 										{{$cpc->mcd_number ?? '-'}}
 									@else
 										{{$cpc->mcd_number ? mask_string($cpc->mcd_number, '*', 4) : '-'}}
@@ -130,7 +130,7 @@
 							<tr v-if="cpc.plan_type == 'MEDICARE' || (cpc.plan_type == 'COMMERCIAL' && cpc.mcr_number)">
 								<td>Medicare Number</td>
 								<td class="text-uppercase">
-									@if($performer->pro->pro_type === 'ADMIN')
+									@if($pro->pro_type === 'ADMIN')
 										{{$cpc->mcr_number ?? '-'}}
 									@else
 										{{$cpc->mcr_number ? mask_string($cpc->mcr_number, '*', 4) : '-'}}

resources/views/app/patient/review-requests/list.blade.php

@@ -3,7 +3,7 @@
 <div class="">
     <div class="d-flex align-items-center pb-2">
         <h4 class="font-weight-bold mb-0 mr-3">Review Requests</h4>
-        @if($performer->pro->pro_type === 'ADMIN')
+        @if($pro->pro_type === 'ADMIN')
             @include('app.patient.review-requests.partials.create')
         @endif
     </div>
@@ -37,7 +37,7 @@
                                 <i class="fas fa-info-circle text-muted" title="{{ $rr->reactivation_memo }}"></i>
                             @endif
                         </span>
-                        @if($performer->pro->pro_type === 'ADMIN')
+                        @if($pro->pro_type === 'ADMIN')
                             @include('app.patient.review-requests.partials.deactivate')
                         @endif
                     @else
@@ -46,7 +46,7 @@
                                 <i class="fas fa-info-circle text-muted" title="{{ $rr->deactivation_memo }}"></i>
                             @endif
                         </span>
-                        @if($performer->pro->pro_type === 'ADMIN')
+                        @if($pro->pro_type === 'ADMIN')
                             @include('app.patient.review-requests.partials.activate')
                         @endif
                     @endif
@@ -57,12 +57,12 @@
                             <i class="fas fa-info-circle text-muted" title="{{ $rr->status_memo }}"></i>
                         @endif
                     </span>
-                    @if($performer->pro->pro_type === 'ADMIN')
+                    @if($pro->pro_type === 'ADMIN')
                         @include('app.patient.review-requests.partials.update-status')
                     @endif
                 </td>
                 <td>
-                    @if($performer->pro->pro_type === 'ADMIN')
+                    @if($pro->pro_type === 'ADMIN')
                         @include('app.patient.review-requests.partials.edit')
                     @endif
                 </td>

resources/views/app/patient/settings.blade.php

@@ -706,7 +706,7 @@ $patientName = implode(', ', array_filter([$patient->name_last, $patient->name_f
                 </div>
                 @endif
 
-                @if($performer->pro->pro_type === 'ADMIN')
+                @if($pro->pro_type === 'ADMIN')
                 <hr class="m-negator-3 my-3">
                 <div>
                     <h3>Admin Engagement Assessment Status</h3>
@@ -840,7 +840,7 @@ $patientName = implode(', ', array_filter([$patient->name_last, $patient->name_f
                 </div>
                 @endif
 
-                @if($performer->pro->pro_type == 'ADMIN')
+                @if($pro->pro_type == 'ADMIN')
                 <hr class="m-negator-3 my-3">
                 <div>
                     <h3>Client Engagement Assessment Status</h3>

resources/views/app/patient/sms.blade.php

@@ -32,7 +32,7 @@
                 <th class="border-0 text-secondary w-25">To</th>
                 <th class="border-0 text-secondary w-50">Content</th>
                 <th></th>
-                @if($performer->pro->pro_type == 'ADMIN')
+                @if($pro->pro_type == 'ADMIN')
                     <th></th>
                 @endif
             </tr>
@@ -65,7 +65,7 @@
                             </div>
                         @endif
                     </td>
-                    @if($performer->pro->pro_type == 'ADMIN')
+                    @if($pro->pro_type == 'ADMIN')
                         <td class="text-nowrap">
                             <div moe relative>
                                 <a start show class="">Update Is Reply Needed</a>

resources/views/layouts/patient.blade.php

@@ -9,6 +9,7 @@ $leanLeftNav = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
 $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_create($patient->created_at))->invert === 1);
 
 $patientMcp = $patient->mcp;
+$patientCompanyClients = $patient->companyClients;
 ?>
 <style media="screen">
 	.pt-name {
@@ -347,9 +348,9 @@ $patientMcp = $patient->mcp;
 					</div>
 					<div class="ml-3">
 						<div class="d-flex align-items-center">
-							<b class="mr-2">Partners ({{ count($patient->companyClients)  }}):</b>
+							<b class="mr-2">Partners ({{ count($patientCompanyClients)  }}):</b>
 							<div class="d-flex align-items-center mr-2">
-								@foreach($patient->companyClients as $companyClient)
+								@foreach($patientCompanyClients as $companyClient)
 									<span class="mr-2">
 										{{$companyClient->company->name}}
 										<div moe class="d-inline-block">