fixed tree

.editorconfig

@@ -621,16 +621,6 @@ class clients_SINGLE_Controller extends Controller
 		return response()->view('pro/clients_SINGLE/ACTION_updateCmReasons', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
-	// GET /clients/view/{uid}/ACTION_updateRmReasons
-	public function ACTION_updateRmReasons(Request $request, $uid) {
-		$record = DB::table('client')->where('uid', $uid)->first();
-		if(!$record) {
-			$record = DB::table('client')->where('id', $uid)->first();
-			if($record) return redirect('/clients/view/' . $record->uid . '/ACTION_updateRmReasons');
-		}
-		return response()->view('pro/clients_SINGLE/ACTION_updateRmReasons', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-
 	// GET /clients/view/{uid}/ACTION_updateCmEnrollmentConsentInfo
 	public function ACTION_updateCmEnrollmentConsentInfo(Request $request, $uid) {
 		$record = DB::table('client')->where('uid', $uid)->first();
@@ -671,16 +661,6 @@ class clients_SINGLE_Controller extends Controller
 		return response()->view('pro/clients_SINGLE/ACTION_setIsEnrolledInRmToFalse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
-	// GET /clients/view/{uid}/ACTION_setIsEnrolledInRmToTrue
-	public function ACTION_setIsEnrolledInRmToTrue(Request $request, $uid) {
-		$record = DB::table('client')->where('uid', $uid)->first();
-		if(!$record) {
-			$record = DB::table('client')->where('id', $uid)->first();
-			if($record) return redirect('/clients/view/' . $record->uid . '/ACTION_setIsEnrolledInRmToTrue');
-		}
-		return response()->view('pro/clients_SINGLE/ACTION_setIsEnrolledInRmToTrue', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-
 	// GET /clients/view/{uid}/ACTION_updateWhyNotEnrolledInRm
 	public function ACTION_updateWhyNotEnrolledInRm(Request $request, $uid) {
 		$record = DB::table('client')->where('uid', $uid)->first();

app/Http/Controllers/companies_Controller.php

@@ -259,9 +259,6 @@ PRO
             updateCmReasons
                 cmReason1*=cm_reason1
                 cmReason2=cm_reason2
-            updateRmReasons
-                rmReason1*=rm_reason1
-                rmReason2=rm_reason2
             updateCmEnrollmentConsentInfo
                 cmEnrollmentConsentMethod=cm_enrollment_consent_method
                 cmEnrollmentConsentMethodMemo=cm_enrollment_consent_method_memo
@@ -275,9 +272,6 @@ PRO
             setIsEnrolledInRmToFalse
                 whyNotEnrolledInRmCategory=why_not_enrolled_in_rm_category
                 whyNotEnrolledInRmMemo=why_not_enrolled_in_rm_memo
-            setIsEnrolledInRmToTrue
-                rmReason1*=rm_reason1
-                rmReason2=rm_reason2
             updateWhyNotEnrolledInRm
                 whyNotEnrolledInRmCategory=why_not_enrolled_in_rm_category
                 whyNotEnrolledInRmMemo=why_not_enrolled_in_rm_memo
@@ -319,7 +313,6 @@ PRO
                 !grp:Other Key Pros:cm_pro_id,rme_pro_id,rmm_pro_id,rms_pro_id,rmg_pro_id,rd_pro_id
                 !grp:MNT Eligibility:eligible_for_mnt,number_of_mnt_hours_left_this_year:Update MNT Eligibility:circle=>/clients/view/$uid/ACTION_updateMntEligibility
                 !grp:CM Enrollment:is_eligible_for_cm,why_not_eligible_for_cm_category,why_not_eligible_for_cm_memo,is_enrolled_in_cm,cm_reason1,cm_reason2,cm_enrollment_consent_method,cm_enrollment_consent_method_memo,why_not_enrolled_in_cm_category,why_not_enrolled_in_cm_memo:Update CM Eligibility:circle=>/clients/view/$uid/ACTION_updateCmEligibility
-                !grp:RM Enrollment:is_eligible_for_rm,why_not_eligible_for_rm_category,why_not_eligible_for_rm_memo,is_enrolled_in_rm,rm_reason1,rm_reason2,why_not_enrolled_in_rm_category,why_not_enrolled_in_rm_memo:Update why not enrolled in RM:circle=>/clients/view/$uid/ACTION_updateRmEligibility
                 !grp:Equipment:is_equipment_awaiting_setup,what_equipment_is_awaiting_setup,is_equipment_setup_completed,what_equipment_setup_is_completed,is_equipment_service_needed,what_equipment_service_is_needed:Update equipment info:circle=>/clients/view/$uid/ACTION_updateEquipmentInfo
                 !act:is_duplicate:Set as duplicate of:circle:if-not:is_duplicate=>/clients/view/$uid/ACTION_setIsDuplicateToTrue
                 !act:is_duplicate:Set as not duplicate:circle:if:is_duplicate=>/clients/view/$uid/ACTION_setIsDuplicateToFalse
@@ -359,7 +352,6 @@ PRO
                 !act:is_eligible_for_rm:updateRmEligibility:circle=>/clients/view/$uid/ACTION_updateRmEligibility
                 !act:is_enrolled_in_rm:setIsEnrolledInRmToFalse:circle=>/clients/view/$uid/ACTION_setIsEnrolledInRmToFalse
                 !act:is_enrolled_in_rm:setIsEnrolledInRmToTrue:circle=>/clients/view/$uid/ACTION_setIsEnrolledInRmToTrue
-                !act:rm_reason1:updateRmReasons:circle=>/clients/view/$uid/ACTION_updateRmReasons
                 !act:why_not_enrolled_in_rm_category:updateWhyNotEnrolledInRm:circle=>/clients/view/$uid/ACTION_updateWhyNotEnrolledInRm
                 !act:is_mcp_onboarding_active:updateMcpOnboardingActiveInfo:circle=>/clients/view/$uid/ACTION_updateMcpOnboardingActiveInfo
                 !act:is_mcp_onboarding_strategy:updateMcpOnboardingActiveInfo:circle=>/clients/view/$uid/ACTION_updateMcpOnboardingStrategy

generatecv/tree_detailed.txt

@@ -13,17 +13,17 @@
             <thead>
             <tr>
 <th>&nbsp;</th>
+<th>Account Id</th>
+<th>Client Id</th>
+<th>Access Code</th>
+<th>Is Access Allowed</th>
+<th>Created By Session Id</th>
 <th>Created At</th>
 <th>Type</th>
 <th>Is Removed</th>
-<th>Removal Memo</th>
 <th>Removed At</th>
-<th>Access Code</th>
-<th>Is Access Allowed</th>
-<th>Created By Session Id</th>
 <th>Removed By Session Id</th>
-<th>Account Id</th>
-<th>Client Id</th>
+<th>Removal Memo</th>
 <th>Detail Json</th>
 <th>Brief History Json</th>
             </tr>
@@ -32,17 +32,17 @@
             @foreach($records as $record)
                 <tr>
 <td><a href="/account_clients/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
+<td><?= $record->account_id ?></td>
+<td><?= $record->client_id ?></td>
+<td><?= $record->access_code ?></td>
+<td><?= $record->is_access_allowed ?></td>
+<td><?= $record->created_by_session_id ?></td>
 <td><?= friendly_date_time($record->created_at) ?></td>
 <td><?= $record->type ?></td>
 <td><?= $record->is_removed ?></td>
-<td><?= $record->removal_memo ?></td>
 <td><?= friendly_date_time($record->removed_at) ?></td>
-<td><?= $record->access_code ?></td>
-<td><?= $record->is_access_allowed ?></td>
-<td><?= $record->created_by_session_id ?></td>
 <td><?= $record->removed_by_session_id ?></td>
-<td><?= $record->account_id ?></td>
-<td><?= $record->client_id ?></td>
+<td><?= $record->removal_memo ?></td>
 <td><?= $record->detail_json ?></td>
 <td><?= $record->brief_history_json ?></td>
                 </tr>

resources/views/admin/account_clients/info.blade.php

@@ -13,62 +13,70 @@
             <thead>
             <tr>
 <th>&nbsp;</th>
+<th>Name First</th>
+<th>Name Last</th>
+<th>Gender</th>
+<th>Dob</th>
+<th>Phone Number</th>
+<th>Email</th>
+<th>Password</th>
+<th>Is Authorized</th>
 <th>Created At</th>
+<th>Created By Session Id</th>
 <th>Type</th>
+<th>Is Active</th>
 <th>Deactivated At</th>
+<th>Deactivated By Session Id</th>
 <th>Deactivation Memo</th>
-<th>Is Active</th>
 <th>Reactivated At</th>
+<th>Reactivated By Session Id</th>
 <th>Reactivation Memo</th>
-<th>Dob</th>
-<th>Email</th>
-<th>Gender</th>
-<th>Name First</th>
-<th>Name Last</th>
-<th>Password</th>
-<th>Password Reset Requested At</th>
 <th>Password Reset Token</th>
-<th>Phone Number</th>
-<th>Created By Session Id</th>
-<th>Deactivated By Session Id</th>
-<th>Reactivated By Session Id</th>
+<th>Password Reset Requested At</th>
 <th>Email Confirmation Token</th>
 <th>Was Email Confirmed</th>
 <th>Email Confirmed At</th>
 <th>Detail Json</th>
-<th>Additional Detal Json</th>
 <th>Additional Detail Json</th>
+<th>Default Na Pro Id</th>
+<th>Default Mcp Pro Id</th>
+<th>Default Rd Pro Id</th>
+<th>Default Pro Team Id</th>
             </tr>
             </thead>
             <tbody>
             @foreach($records as $record)
                 <tr>
 <td><a href="/accounts/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
+<td><?= $record->name_first ?></td>
+<td><?= $record->name_last ?></td>
+<td><?= $record->gender ?></td>
+<td><?= $record->dob ?></td>
+<td><?= $record->phone_number ?></td>
+<td><?= $record->email ?></td>
+<td><?= $record->password ?></td>
+<td><?= $record->is_authorized ?></td>
 <td><?= friendly_date_time($record->created_at) ?></td>
+<td><?= $record->created_by_session_id ?></td>
 <td><?= $record->type ?></td>
+<td><?= $record->is_active ?></td>
 <td><?= friendly_date_time($record->deactivated_at) ?></td>
+<td><?= $record->deactivated_by_session_id ?></td>
 <td><?= $record->deactivation_memo ?></td>
-<td><?= $record->is_active ?></td>
 <td><?= friendly_date_time($record->reactivated_at) ?></td>
+<td><?= $record->reactivated_by_session_id ?></td>
 <td><?= $record->reactivation_memo ?></td>
-<td><?= $record->dob ?></td>
-<td><?= $record->email ?></td>
-<td><?= $record->gender ?></td>
-<td><?= $record->name_first ?></td>
-<td><?= $record->name_last ?></td>
-<td><?= $record->password ?></td>
-<td><?= friendly_date_time($record->password_reset_requested_at) ?></td>
 <td><?= $record->password_reset_token ?></td>
-<td><?= $record->phone_number ?></td>
-<td><?= $record->created_by_session_id ?></td>
-<td><?= $record->deactivated_by_session_id ?></td>
-<td><?= $record->reactivated_by_session_id ?></td>
+<td><?= friendly_date_time($record->password_reset_requested_at) ?></td>
 <td><?= $record->email_confirmation_token ?></td>
 <td><?= $record->was_email_confirmed ?></td>
 <td><?= friendly_date_time($record->email_confirmed_at) ?></td>
 <td><?= $record->detail_json ?></td>
-<td><?= $record->additional_detal_json ?></td>
 <td><?= $record->additional_detail_json ?></td>
+<td><?= $record->default_na_pro_id ?></td>
+<td><?= $record->default_mcp_pro_id ?></td>
+<td><?= $record->default_rd_pro_id ?></td>
+<td><?= $record->default_pro_team_id ?></td>
                 </tr>
             @endforeach
             </tbody>

resources/views/admin/accounts/info.blade.php

@@ -15,17 +15,17 @@
                 <thead>
                 <tr>
                     <th>&nbsp;</th>
+<th>Account Id</th>
+<th>Client Id</th>
+<th>Access Code</th>
+<th>Is Access Allowed</th>
+<th>Created By Session Id</th>
 <th>Created At</th>
 <th>Type</th>
 <th>Is Removed</th>
-<th>Removal Memo</th>
 <th>Removed At</th>
-<th>Access Code</th>
-<th>Is Access Allowed</th>
-<th>Created By Session Id</th>
 <th>Removed By Session Id</th>
-<th>Account Id</th>
-<th>Client Id</th>
+<th>Removal Memo</th>
 <th>Detail Json</th>
 <th>Brief History Json</th>
                 </tr>
@@ -34,17 +34,17 @@
                 @foreach($subRecords as $subRecord)
                     <tr>
                         <td><a href="/account_clients/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
+<td><?= $subRecord->account_id ?></td>
+<td><?= $subRecord->client_id ?></td>
+<td><?= $subRecord->access_code ?></td>
+<td><?= $subRecord->is_access_allowed ?></td>
+<td><?= $subRecord->created_by_session_id ?></td>
 <td><?= friendly_date_time($subRecord->created_at) ?></td>
 <td><?= $subRecord->type ?></td>
 <td><?= $subRecord->is_removed ?></td>
-<td><?= $subRecord->removal_memo ?></td>
 <td><?= friendly_date_time($subRecord->removed_at) ?></td>
-<td><?= $subRecord->access_code ?></td>
-<td><?= $subRecord->is_access_allowed ?></td>
-<td><?= $subRecord->created_by_session_id ?></td>
 <td><?= $subRecord->removed_by_session_id ?></td>
-<td><?= $subRecord->account_id ?></td>
-<td><?= $subRecord->client_id ?></td>
+<td><?= $subRecord->removal_memo ?></td>
 <td><?= $subRecord->detail_json ?></td>
 <td><?= $subRecord->brief_history_json ?></td>
                     </tr>

resources/views/admin/accounts_SINGLE/SUB_dashboard.blade.php

@@ -13,19 +13,19 @@
             <thead>
             <tr>
 <th>&nbsp;</th>
-<th>Created At</th>
-<th>Type</th>
-<th>Deactivated At</th>
-<th>Deactivation Memo</th>
-<th>Is Active</th>
-<th>Reactivated At</th>
-<th>Reactivation Memo</th>
 <th>Category</th>
 <th>Imei</th>
 <th>Memo</th>
+<th>Created At</th>
 <th>Created By Session Id</th>
+<th>Type</th>
+<th>Is Active</th>
+<th>Deactivated At</th>
 <th>Deactivated By Session Id</th>
+<th>Deactivation Memo</th>
+<th>Reactivated At</th>
 <th>Reactivated By Session Id</th>
+<th>Reactivation Memo</th>
 <th>Detail Json</th>
             </tr>
             </thead>
@@ -33,19 +33,19 @@
             @foreach($records as $record)
                 <tr>
 <td><a href="/bdt_devices/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
-<td><?= friendly_date_time($record->created_at) ?></td>
-<td><?= $record->type ?></td>
-<td><?= friendly_date_time($record->deactivated_at) ?></td>
-<td><?= $record->deactivation_memo ?></td>
-<td><?= $record->is_active ?></td>
-<td><?= friendly_date_time($record->reactivated_at) ?></td>
-<td><?= $record->reactivation_memo ?></td>
 <td><?= $record->category ?></td>
 <td><?= $record->imei ?></td>
 <td><?= $record->memo ?></td>
+<td><?= friendly_date_time($record->created_at) ?></td>
 <td><?= $record->created_by_session_id ?></td>
+<td><?= $record->type ?></td>
+<td><?= $record->is_active ?></td>
+<td><?= friendly_date_time($record->deactivated_at) ?></td>
 <td><?= $record->deactivated_by_session_id ?></td>
+<td><?= $record->deactivation_memo ?></td>
+<td><?= friendly_date_time($record->reactivated_at) ?></td>
 <td><?= $record->reactivated_by_session_id ?></td>
+<td><?= $record->reactivation_memo ?></td>
 <td><?= $record->detail_json ?></td>
                 </tr>
             @endforeach

resources/views/admin/bdt_devices/info.blade.php

@@ -13,26 +13,26 @@
             <thead>
             <tr>
 <th>&nbsp;</th>
-<th>Created At</th>
-<th>Type</th>
-<th>Battery Voltage</th>
-<th>Device Category</th>
-<th>Device Id</th>
-<th>Diastolic Bp In Mm Hg</th>
 <th>Imei</th>
-<th>Rssi</th>
-<th>Signal Strength</th>
-<th>Systolic Bp In Mm Hg</th>
 <th>Ts</th>
-<th>Value Diastolic</th>
-<th>Value Irregular</th>
-<th>Value Pulse</th>
-<th>Value Systolic</th>
+<th>Battery Voltage</th>
+<th>Signal Strength</th>
 <th>Value Tare</th>
-<th>Value Unit</th>
 <th>Value Weight</th>
 <th>Weight In Pounds</th>
+<th>Value Systolic</th>
+<th>Value Diastolic</th>
+<th>Value Pulse</th>
+<th>Value Unit</th>
+<th>Value Irregular</th>
+<th>Rssi</th>
+<th>Device Id</th>
+<th>Device Category</th>
+<th>Created At</th>
 <th>Created By Session Id</th>
+<th>Type</th>
+<th>Diastolic Bp In Mm Hg</th>
+<th>Systolic Bp In Mm Hg</th>
 <th>Client Bdt Measurement Id</th>
 <th>Is Cellular Zero</th>
 <th>Detail Json</th>
@@ -42,26 +42,26 @@
             @foreach($records as $record)
                 <tr>
 <td><a href="/bdt_measurements/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
-<td><?= friendly_date_time($record->created_at) ?></td>
-<td><?= $record->type ?></td>
-<td><?= $record->battery_voltage ?></td>
-<td><?= $record->device_category ?></td>
-<td><?= $record->device_id ?></td>
-<td><?= $record->diastolic_bp_in_mm_hg ?></td>
 <td><?= $record->imei ?></td>
-<td><?= $record->rssi ?></td>
-<td><?= $record->signal_strength ?></td>
-<td><?= $record->systolic_bp_in_mm_hg ?></td>
 <td><?= $record->ts ?></td>
-<td><?= $record->value_diastolic ?></td>
-<td><?= $record->value_irregular ?></td>
-<td><?= $record->value_pulse ?></td>
-<td><?= $record->value_systolic ?></td>
+<td><?= $record->battery_voltage ?></td>
+<td><?= $record->signal_strength ?></td>
 <td><?= $record->value_tare ?></td>
-<td><?= $record->value_unit ?></td>
 <td><?= $record->value_weight ?></td>
 <td><?= $record->weight_in_pounds ?></td>
+<td><?= $record->value_systolic ?></td>
+<td><?= $record->value_diastolic ?></td>
+<td><?= $record->value_pulse ?></td>
+<td><?= $record->value_unit ?></td>
+<td><?= $record->value_irregular ?></td>
+<td><?= $record->rssi ?></td>
+<td><?= $record->device_id ?></td>
+<td><?= $record->device_category ?></td>
+<td><?= friendly_date_time($record->created_at) ?></td>
 <td><?= $record->created_by_session_id ?></td>
+<td><?= $record->type ?></td>
+<td><?= $record->diastolic_bp_in_mm_hg ?></td>
+<td><?= $record->systolic_bp_in_mm_hg ?></td>
 <td><?= $record->client_bdt_measurement_id ?></td>
 <td><?= $record->is_cellular_zero ?></td>
 <td><?= $record->detail_json ?></td>

resources/views/admin/client_bdt_devices/actions.blade.php

@@ -13,22 +13,22 @@
             <thead>
             <tr>
 <th>&nbsp;</th>
-<th>Created At</th>
-<th>Type</th>
-<th>Deactivated At</th>
-<th>Deactivation Memo</th>
-<th>Is Active</th>
-<th>Reactivated At</th>
-<th>Reactivation Memo</th>
+<th>Client Id</th>
+<th>Device Id</th>
 <th>Instructions</th>
 <th>Internal Memo</th>
 <th>Status</th>
 <th>Status Memo</th>
+<th>Created At</th>
 <th>Created By Session Id</th>
+<th>Type</th>
+<th>Is Active</th>
+<th>Deactivated At</th>
 <th>Deactivated By Session Id</th>
+<th>Deactivation Memo</th>
+<th>Reactivated At</th>
 <th>Reactivated By Session Id</th>
-<th>Client Id</th>
-<th>Device Id</th>
+<th>Reactivation Memo</th>
 <th>Detail Json</th>
             </tr>
             </thead>
@@ -36,22 +36,22 @@
             @foreach($records as $record)
                 <tr>
 <td><a href="/client_bdt_devices/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
-<td><?= friendly_date_time($record->created_at) ?></td>
-<td><?= $record->type ?></td>
-<td><?= friendly_date_time($record->deactivated_at) ?></td>
-<td><?= $record->deactivation_memo ?></td>
-<td><?= $record->is_active ?></td>
-<td><?= friendly_date_time($record->reactivated_at) ?></td>
-<td><?= $record->reactivation_memo ?></td>
+<td><?= $record->client_id ?></td>
+<td><?= $record->device_id ?></td>
 <td><?= $record->instructions ?></td>
 <td><?= $record->internal_memo ?></td>
 <td><?= $record->status ?></td>
 <td><?= $record->status_memo ?></td>
+<td><?= friendly_date_time($record->created_at) ?></td>
 <td><?= $record->created_by_session_id ?></td>
+<td><?= $record->type ?></td>
+<td><?= $record->is_active ?></td>
+<td><?= friendly_date_time($record->deactivated_at) ?></td>
 <td><?= $record->deactivated_by_session_id ?></td>
+<td><?= $record->deactivation_memo ?></td>
+<td><?= friendly_date_time($record->reactivated_at) ?></td>
 <td><?= $record->reactivated_by_session_id ?></td>
-<td><?= $record->client_id ?></td>
-<td><?= $record->device_id ?></td>
+<td><?= $record->reactivation_memo ?></td>
 <td><?= $record->detail_json ?></td>
                 </tr>
             @endforeach

resources/views/admin/client_bdt_devices/info.blade.php

@@ -32,6 +32,26 @@
 <th>Status Memo</th>
 <th>Status Updated At</th>
 <th>Status Updated By Session Id</th>
+<th>Primary Authorized Signer Id</th>
+<th>Authorized Signer Signature Base64</th>
+<th>Secondary Authorized Signer Id</th>
+<th>Secondary Authorized Signer Signature Base64</th>
+<th>State</th>
+<th>Entity Type</th>
+<th>Tax Id</th>
+<th>Tax Id Type</th>
+<th>Entity</th>
+<th>Phone Number</th>
+<th>Npi</th>
+<th>Taxonomy Code</th>
+<th>Ein</th>
+<th>Submitter Contact Name</th>
+<th>Submitter Contact Email</th>
+<th>Submitter Contact Phone Number</th>
+<th>Submitter Contact Fax Number</th>
+<th>Sender Id</th>
+<th>Authorized Signer Title</th>
+<th>Authorized Signer Name</th>
             </tr>
             </thead>
             <tbody>
@@ -57,6 +77,26 @@
 <td><?= $record->status_memo ?></td>
 <td><?= friendly_date_time($record->status_updated_at) ?></td>
 <td><?= $record->status_updated_by_session_id ?></td>
+<td><?= $record->primary_authorized_signer_id ?></td>
+<td><?= $record->authorized_signer_signature_base64 ?></td>
+<td><?= $record->secondary_authorized_signer_id ?></td>
+<td><?= $record->secondary_authorized_signer_signature_base64 ?></td>
+<td><?= $record->state ?></td>
+<td><?= $record->entity_type ?></td>
+<td><?= $record->tax_id ?></td>
+<td><?= $record->tax_id_type ?></td>
+<td><?= $record->entity ?></td>
+<td><?= $record->phone_number ?></td>
+<td><?= $record->npi ?></td>
+<td><?= $record->taxonomy_code ?></td>
+<td><?= $record->ein ?></td>
+<td><?= $record->submitter_contact_name ?></td>
+<td><?= $record->submitter_contact_email ?></td>
+<td><?= $record->submitter_contact_phone_number ?></td>
+<td><?= $record->submitter_contact_fax_number ?></td>
+<td><?= $record->sender_id ?></td>
+<td><?= $record->authorized_signer_title ?></td>
+<td><?= $record->authorized_signer_name ?></td>
                 </tr>
             @endforeach
             </tbody>

resources/views/admin/companies/info.blade.php

@@ -30,6 +30,9 @@
 <th>Status Memo</th>
 <th>Status Updated At</th>
 <th>Status Updated By Session Id</th>
+<th>Signature Access Token</th>
+<th>Is Signature Access Token Valid</th>
+<th>Signature Access Token Set At</th>
             </tr>
             </thead>
             <tbody>
@@ -53,6 +56,9 @@
 <td><?= $record->status_memo ?></td>
 <td><?= friendly_date_time($record->status_updated_at) ?></td>
 <td><?= $record->status_updated_by_session_id ?></td>
+<td><?= $record->signature_access_token ?></td>
+<td><?= $record->is_signature_access_token_valid ?></td>
+<td><?= friendly_date_time($record->signature_access_token_set_at) ?></td>
                 </tr>
             @endforeach
             </tbody>

resources/views/admin/company_pros/info.blade.php

@@ -13,22 +13,22 @@
             <thead>
             <tr>
 <th>&nbsp;</th>
-<th>Created At</th>
-<th>Type</th>
-<th>Deactivated At</th>
-<th>Deactivation Memo</th>
-<th>Is Active</th>
-<th>Reactivated At</th>
-<th>Reactivation Memo</th>
-<th>Content Text</th>
-<th>Display Name</th>
 <th>Internal Name</th>
+<th>Display Name</th>
+<th>Tags</th>
 <th>Pdf File Path</th>
 <th>Pdf File Size In Bytes</th>
-<th>Tags</th>
+<th>Content Text</th>
+<th>Created At</th>
 <th>Created By Session Id</th>
+<th>Type</th>
+<th>Is Active</th>
+<th>Deactivated At</th>
 <th>Deactivated By Session Id</th>
+<th>Deactivation Memo</th>
+<th>Reactivated At</th>
 <th>Reactivated By Session Id</th>
+<th>Reactivation Memo</th>
 <th>Detail Json</th>
             </tr>
             </thead>
@@ -36,22 +36,22 @@
             @foreach($records as $record)
                 <tr>
 <td><a href="/handouts/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
-<td><?= friendly_date_time($record->created_at) ?></td>
-<td><?= $record->type ?></td>
-<td><?= friendly_date_time($record->deactivated_at) ?></td>
-<td><?= $record->deactivation_memo ?></td>
-<td><?= $record->is_active ?></td>
-<td><?= friendly_date_time($record->reactivated_at) ?></td>
-<td><?= $record->reactivation_memo ?></td>
-<td><?= $record->content_text ?></td>
-<td><?= $record->display_name ?></td>
 <td><?= $record->internal_name ?></td>
+<td><?= $record->display_name ?></td>
+<td><?= $record->tags ?></td>
 <td><?= $record->pdf_file_path ?></td>
 <td><?= $record->pdf_file_size_in_bytes ?></td>
-<td><?= $record->tags ?></td>
+<td><?= $record->content_text ?></td>
+<td><?= friendly_date_time($record->created_at) ?></td>
 <td><?= $record->created_by_session_id ?></td>
+<td><?= $record->type ?></td>
+<td><?= $record->is_active ?></td>
+<td><?= friendly_date_time($record->deactivated_at) ?></td>
 <td><?= $record->deactivated_by_session_id ?></td>
+<td><?= $record->deactivation_memo ?></td>
+<td><?= friendly_date_time($record->reactivated_at) ?></td>
 <td><?= $record->reactivated_by_session_id ?></td>
+<td><?= $record->reactivation_memo ?></td>
 <td><?= $record->detail_json ?></td>
                 </tr>
             @endforeach

resources/views/admin/handouts/info.blade.php

@@ -71,8 +71,20 @@
 <th>Cancelled At</th>
 <th>Cancelled By Session Id</th>
 <th>Cancellation Memo</th>
-<th>Payer Control Number</th>
 <th>Detail Json</th>
+<th>Claim Date</th>
+<th>Attending Provider First Name</th>
+<th>Attending Provider Last Name</th>
+<th>Attending Provider Npi</th>
+<th>Patient Chart Number</th>
+<th>Status</th>
+<th>Status Memo</th>
+<th>Status Updated At</th>
+<th>Status Updated By Session Id</th>
+<th>Claim Id</th>
+<th>Current Version Id</th>
+<th>Claim Version Id</th>
+<th>Company Location Id</th>
             </tr>
             </thead>
             <tbody>
@@ -137,8 +149,20 @@
 <td><?= friendly_date_time($record->cancelled_at) ?></td>
 <td><?= $record->cancelled_by_session_id ?></td>
 <td><?= $record->cancellation_memo ?></td>
-<td><?= $record->payer_control_number ?></td>
 <td><?= $record->detail_json ?></td>
+<td><?= $record->claim_date ?></td>
+<td><?= $record->attending_provider_first_name ?></td>
+<td><?= $record->attending_provider_last_name ?></td>
+<td><?= $record->attending_provider_npi ?></td>
+<td><?= $record->patient_chart_number ?></td>
+<td><?= $record->status ?></td>
+<td><?= $record->status_memo ?></td>
+<td><?= friendly_date_time($record->status_updated_at) ?></td>
+<td><?= $record->status_updated_by_session_id ?></td>
+<td><?= $record->claim_id ?></td>
+<td><?= $record->current_version_id ?></td>
+<td><?= $record->claim_version_id ?></td>
+<td><?= $record->company_location_id ?></td>
                 </tr>
             @endforeach
             </tbody>

resources/views/admin/mb_claim/info.blade.php

@@ -13,23 +13,23 @@
             <thead>
             <tr>
 <th>&nbsp;</th>
+<th>Owner Pro</th>
+<th>Accessible Pro</th>
+<th>Memo</th>
+<th>Can Assign As Rme</th>
+<th>Can Assign As Rmm</th>
+<th>Can Assign As Mcp</th>
 <th>Created At</th>
+<th>Created By Session Id</th>
 <th>Type</th>
+<th>Is Active</th>
 <th>Deactivated At</th>
+<th>Deactivated By Session Id</th>
 <th>Deactivation Memo</th>
-<th>Is Active</th>
 <th>Reactivated At</th>
+<th>Reactivated By Session Id</th>
 <th>Reactivation Memo</th>
-<th>Can Assign As Mcp</th>
-<th>Can Assign As Rme</th>
-<th>Can Assign As Rmm</th>
 <th>Can Book Appointments</th>
-<th>Memo</th>
-<th>Created By Session Id</th>
-<th>Deactivated By Session Id</th>
-<th>Reactivated By Session Id</th>
-<th>Accessible Pro</th>
-<th>Owner Pro</th>
 <th>Detail Json</th>
             </tr>
             </thead>
@@ -37,23 +37,23 @@
             @foreach($records as $record)
                 <tr>
 <td><a href="/pro_pro_access/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
+<td><a href="/pros/view/<?= $record->owner_pro_id ?>"><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->owner_pro_id], ], 'all'); ?></a></td>
+<td><a href="/pros/view/<?= $record->accessible_pro_id ?>"><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->accessible_pro_id], ], 'all'); ?></a></td>
+<td><?= $record->memo ?></td>
+<td><?= $record->can_assign_as_rme ?></td>
+<td><?= $record->can_assign_as_rmm ?></td>
+<td><?= $record->can_assign_as_mcp ?></td>
 <td><?= friendly_date_time($record->created_at) ?></td>
+<td><?= $record->created_by_session_id ?></td>
 <td><?= $record->type ?></td>
+<td><?= $record->is_active ?></td>
 <td><?= friendly_date_time($record->deactivated_at) ?></td>
+<td><?= $record->deactivated_by_session_id ?></td>
 <td><?= $record->deactivation_memo ?></td>
-<td><?= $record->is_active ?></td>
 <td><?= friendly_date_time($record->reactivated_at) ?></td>
+<td><?= $record->reactivated_by_session_id ?></td>
 <td><?= $record->reactivation_memo ?></td>
-<td><?= $record->can_assign_as_mcp ?></td>
-<td><?= $record->can_assign_as_rme ?></td>
-<td><?= $record->can_assign_as_rmm ?></td>
 <td><?= $record->can_book_appointments ?></td>
-<td><?= $record->memo ?></td>
-<td><?= $record->created_by_session_id ?></td>
-<td><?= $record->deactivated_by_session_id ?></td>
-<td><?= $record->reactivated_by_session_id ?></td>
-<td><a href="/pros/view/<?= $record->accessible_pro_id ?>"><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->accessible_pro_id], ], 'all'); ?></a></td>
-<td><a href="/pros/view/<?= $record->owner_pro_id ?>"><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->owner_pro_id], ], 'all'); ?></a></td>
 <td><?= $record->detail_json ?></td>
                 </tr>
             @endforeach

resources/views/admin/pro_pro_access/info.blade.php

@@ -13,16 +13,16 @@
             <thead>
             <tr>
 <th>&nbsp;</th>
-<th>Created At</th>
-<th>Type</th>
-<th>Is Removed</th>
-<th>Removal Memo</th>
-<th>Removed At</th>
+<th>Pro Id</th>
 <th>Shortcut</th>
 <th>Text</th>
-<th>Created By Session Id</th>
+<th>Is Removed</th>
+<th>Removed At</th>
 <th>Removed By Session Id</th>
-<th>Pro Id</th>
+<th>Removal Memo</th>
+<th>Created At</th>
+<th>Created By Session Id</th>
+<th>Type</th>
 <th>Detail Json</th>
             </tr>
             </thead>
@@ -30,16 +30,16 @@
             @foreach($records as $record)
                 <tr>
 <td><a href="/pro_text_shortcuts/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
-<td><?= friendly_date_time($record->created_at) ?></td>
-<td><?= $record->type ?></td>
-<td><?= $record->is_removed ?></td>
-<td><?= $record->removal_memo ?></td>
-<td><?= friendly_date_time($record->removed_at) ?></td>
+<td><?= $record->pro_id ?></td>
 <td><?= $record->shortcut ?></td>
 <td><?= $record->text ?></td>
-<td><?= $record->created_by_session_id ?></td>
+<td><?= $record->is_removed ?></td>
+<td><?= friendly_date_time($record->removed_at) ?></td>
 <td><?= $record->removed_by_session_id ?></td>
-<td><?= $record->pro_id ?></td>
+<td><?= $record->removal_memo ?></td>
+<td><?= friendly_date_time($record->created_at) ?></td>
+<td><?= $record->created_by_session_id ?></td>
+<td><?= $record->type ?></td>
 <td><?= $record->detail_json ?></td>
                 </tr>
             @endforeach

resources/views/admin/pro_text_shortcuts/info.blade.php

@@ -29,7 +29,7 @@
         </tr>
         </thead>
         <tbody>
-            <tr><td class="w-25 px-2 text-secondary border-right">Company Id</td><td class="w-75 px-2 font-weight-bold"><?= isset($record->company_id) ? $record->company_id : '-' ?></td></tr>
+            <tr><td class="w-25 px-2 text-secondary border-right">Company Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->company_id ?></td></tr>
         </tbody>
     </table>
 </div>

resources/views/admin/pros_SINGLE/SUB_erx.blade.php

@@ -15,23 +15,23 @@
                 <thead>
                 <tr>
                     <th>&nbsp;</th>
+<th>Owner Pro</th>
+<th>Accessible Pro</th>
+<th>Memo</th>
+<th>Can Assign As Rme</th>
+<th>Can Assign As Rmm</th>
+<th>Can Assign As Mcp</th>
 <th>Created At</th>
+<th>Created By Session Id</th>
 <th>Type</th>
+<th>Is Active</th>
 <th>Deactivated At</th>
+<th>Deactivated By Session Id</th>
 <th>Deactivation Memo</th>
-<th>Is Active</th>
 <th>Reactivated At</th>
+<th>Reactivated By Session Id</th>
 <th>Reactivation Memo</th>
-<th>Can Assign As Mcp</th>
-<th>Can Assign As Rme</th>
-<th>Can Assign As Rmm</th>
 <th>Can Book Appointments</th>
-<th>Memo</th>
-<th>Created By Session Id</th>
-<th>Deactivated By Session Id</th>
-<th>Reactivated By Session Id</th>
-<th>Accessible Pro</th>
-<th>Owner Pro</th>
 <th>Detail Json</th>
                 </tr>
                 </thead>
@@ -39,23 +39,23 @@
                 @foreach($subRecords as $subRecord)
                     <tr>
                         <td><a href="/pro_access/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
+<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $subRecord->owner_pro_id], ], 'all'); ?></td>
+<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $subRecord->accessible_pro_id], ], 'all'); ?></td>
+<td><?= $subRecord->memo ?></td>
+<td><?= $subRecord->can_assign_as_rme ?></td>
+<td><?= $subRecord->can_assign_as_rmm ?></td>
+<td><?= $subRecord->can_assign_as_mcp ?></td>
 <td><?= friendly_date_time($subRecord->created_at) ?></td>
+<td><?= $subRecord->created_by_session_id ?></td>
 <td><?= $subRecord->type ?></td>
+<td><?= $subRecord->is_active ?></td>
 <td><?= friendly_date_time($subRecord->deactivated_at) ?></td>
+<td><?= $subRecord->deactivated_by_session_id ?></td>
 <td><?= $subRecord->deactivation_memo ?></td>
-<td><?= $subRecord->is_active ?></td>
 <td><?= friendly_date_time($subRecord->reactivated_at) ?></td>
+<td><?= $subRecord->reactivated_by_session_id ?></td>
 <td><?= $subRecord->reactivation_memo ?></td>
-<td><?= $subRecord->can_assign_as_mcp ?></td>
-<td><?= $subRecord->can_assign_as_rme ?></td>
-<td><?= $subRecord->can_assign_as_rmm ?></td>
 <td><?= $subRecord->can_book_appointments ?></td>
-<td><?= $subRecord->memo ?></td>
-<td><?= $subRecord->created_by_session_id ?></td>
-<td><?= $subRecord->deactivated_by_session_id ?></td>
-<td><?= $subRecord->reactivated_by_session_id ?></td>
-<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $subRecord->accessible_pro_id], ], 'all'); ?></td>
-<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $subRecord->owner_pro_id], ], 'all'); ?></td>
 <td><?= $subRecord->detail_json ?></td>
                     </tr>
                 @endforeach

resources/views/admin/pros_SINGLE/SUB_pro_program.blade.php

@@ -13,19 +13,19 @@
             <thead>
             <tr>
 <th>&nbsp;</th>
+<th>Pro Id</th>
+<th>Stag App Id</th>
+<th>Memo</th>
 <th>Created At</th>
+<th>Created By Session Id</th>
 <th>Type</th>
+<th>Is Active</th>
 <th>Deactivated At</th>
+<th>Deactivated By Session Id</th>
 <th>Deactivation Memo</th>
-<th>Is Active</th>
 <th>Reactivated At</th>
-<th>Reactivation Memo</th>
-<th>Memo</th>
-<th>Created By Session Id</th>
-<th>Deactivated By Session Id</th>
 <th>Reactivated By Session Id</th>
-<th>Pro Id</th>
-<th>Stag App Id</th>
+<th>Reactivation Memo</th>
 <th>Detail Json</th>
             </tr>
             </thead>
@@ -33,19 +33,19 @@
             @foreach($records as $record)
                 <tr>
 <td><a href="/stag_app_pro_access/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
+<td><?= $record->pro_id ?></td>
+<td><?= $record->stag_app_id ?></td>
+<td><?= $record->memo ?></td>
 <td><?= friendly_date_time($record->created_at) ?></td>
+<td><?= $record->created_by_session_id ?></td>
 <td><?= $record->type ?></td>
+<td><?= $record->is_active ?></td>
 <td><?= friendly_date_time($record->deactivated_at) ?></td>
+<td><?= $record->deactivated_by_session_id ?></td>
 <td><?= $record->deactivation_memo ?></td>
-<td><?= $record->is_active ?></td>
 <td><?= friendly_date_time($record->reactivated_at) ?></td>
-<td><?= $record->reactivation_memo ?></td>
-<td><?= $record->memo ?></td>
-<td><?= $record->created_by_session_id ?></td>
-<td><?= $record->deactivated_by_session_id ?></td>
 <td><?= $record->reactivated_by_session_id ?></td>
-<td><?= $record->pro_id ?></td>
-<td><?= $record->stag_app_id ?></td>
+<td><?= $record->reactivation_memo ?></td>
 <td><?= $record->detail_json ?></td>
                 </tr>
             @endforeach

resources/views/admin/stag_app_pro_access/info.blade.php

@@ -13,44 +13,46 @@
             <thead>
             <tr>
 <th>&nbsp;</th>
+<th>Name</th>
+<th>Url</th>
+<th>Description</th>
+<th>Position Index</th>
 <th>Created At</th>
+<th>Created By Session Id</th>
 <th>Type</th>
+<th>Is Active</th>
 <th>Deactivated At</th>
+<th>Deactivated By Session Id</th>
 <th>Deactivation Memo</th>
-<th>Is Active</th>
 <th>Reactivated At</th>
+<th>Reactivated By Session Id</th>
 <th>Reactivation Memo</th>
-<th>Description</th>
-<th>Name</th>
-<th>Position Index</th>
 <th>Requires Admin</th>
-<th>Url</th>
-<th>Created By Session Id</th>
-<th>Deactivated By Session Id</th>
-<th>Reactivated By Session Id</th>
 <th>Detail Json</th>
+<th>Internal Name</th>
             </tr>
             </thead>
             <tbody>
             @foreach($records as $record)
                 <tr>
 <td><a href="/stag_apps/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
+<td><?= $record->name ?></td>
+<td><?= $record->url ?></td>
+<td><?= $record->description ?></td>
+<td><?= $record->position_index ?></td>
 <td><?= friendly_date_time($record->created_at) ?></td>
+<td><?= $record->created_by_session_id ?></td>
 <td><?= $record->type ?></td>
+<td><?= $record->is_active ?></td>
 <td><?= friendly_date_time($record->deactivated_at) ?></td>
+<td><?= $record->deactivated_by_session_id ?></td>
 <td><?= $record->deactivation_memo ?></td>
-<td><?= $record->is_active ?></td>
 <td><?= friendly_date_time($record->reactivated_at) ?></td>
+<td><?= $record->reactivated_by_session_id ?></td>
 <td><?= $record->reactivation_memo ?></td>
-<td><?= $record->description ?></td>
-<td><?= $record->name ?></td>
-<td><?= $record->position_index ?></td>
 <td><?= $record->requires_admin ?></td>
-<td><?= $record->url ?></td>
-<td><?= $record->created_by_session_id ?></td>
-<td><?= $record->deactivated_by_session_id ?></td>
-<td><?= $record->reactivated_by_session_id ?></td>
 <td><?= $record->detail_json ?></td>
+<td><?= $record->internal_name ?></td>
                 </tr>
             @endforeach
             </tbody>

resources/views/admin/stag_apps/info.blade.php

@@ -18,8 +18,6 @@
 <th>Action Item Category</th>
 <th>Content Detail</th>
 <th>Content Text</th>
-<th>Dose</th>
-<th>Facility Memo</th>
 <th>Is Signed By Ally</th>
 <th>Is Signed By Prescriber</th>
 <th>Signed By Ally At</th>
@@ -35,6 +33,8 @@
 <th>Signed By Ally Session Id</th>
 <th>Signed By Prescriber Session Id</th>
 <th>To Facility Id</th>
+<th>Facility Memo</th>
+<th>Dose</th>
 <th>Detail Json</th>
             </tr>
             </thead>
@@ -47,8 +47,6 @@
 <td><?= $record->action_item_category ?></td>
 <td><?= $record->content_detail ?></td>
 <td><?= $record->content_text ?></td>
-<td><?= $record->dose ?></td>
-<td><?= $record->facility_memo ?></td>
 <td><?= $record->is_signed_by_ally ?></td>
 <td><?= $record->is_signed_by_prescriber ?></td>
 <td><?= friendly_date_time($record->signed_by_ally_at) ?></td>
@@ -64,6 +62,8 @@
 <td><?= $record->signed_by_ally_session_id ?></td>
 <td><?= $record->signed_by_prescriber_session_id ?></td>
 <td><?= $record->to_facility_id ?></td>
+<td><?= $record->facility_memo ?></td>
+<td><?= $record->dose ?></td>
 <td><?= $record->detail_json ?></td>
                 </tr>
             @endforeach

resources/views/pro/action_items/info.blade.php

@@ -26,8 +26,8 @@
 <th>Created By Session Id</th>
 <th>Bill Id</th>
 <th>Client Id</th>
-<th>Client Program Month Entry Id</th>
 <th>Pro Id</th>
+<th>Client Program Month Entry Id</th>
 <th>Detail Json</th>
                 </tr>
                 </thead>
@@ -46,8 +46,8 @@
 <td><?= $subRecord->created_by_session_id ?></td>
 <td><?= $subRecord->bill_id ?></td>
 <td><?= $subRecord->client_id ?></td>
-<td><?= $subRecord->client_program_month_entry_id ?></td>
 <td><?= $subRecord->pro_id ?></td>
+<td><?= $subRecord->client_program_month_entry_id ?></td>
 <td><?= $subRecord->detail_json ?></td>
                     </tr>
                 @endforeach

resources/views/pro/care_month_entries/actions.blade.php

@@ -26,8 +26,6 @@
 <th>Is Cm Canceled This Month</th>
 <th>Is Rm Canceled This Month</th>
 <th>Is Tm This Month</th>
-<th>Rm Reason1</th>
-<th>Rm Reason2</th>
 <th>Rm Total Time In Seconds</th>
 <th>Rm Total Time In Seconds By Mcp</th>
 <th>Rm Total Time In Seconds By Rme Pro</th>
@@ -52,6 +50,27 @@
 <th>Rm Total Time In Seconds By Rms Pro</th>
 <th>Rm Total Time In Seconds By Rmg Pro</th>
 <th>Detail Json</th>
+<th>Rm Reasons</th>
+<th>Number Of Days With Remote Measurements</th>
+<th>Is Bill Closed</th>
+<th>Bill Closed At</th>
+<th>Bill Closed By Session Id</th>
+<th>Bill Closed By Pro Id</th>
+<th>Is Billing Marked Done</th>
+<th>Billing Marked Done By Session Id</th>
+<th>Billing Marked Done By Pro Id</th>
+<th>Billing Marked Done At</th>
+<th>Claim Total Expected</th>
+<th>Is Claim Closed</th>
+<th>Claim Closed At</th>
+<th>Claim Closed By Session Id</th>
+<th>Claim Closed By Pro Id</th>
+<th>Claim Summary</th>
+<th>Claim Total Paid</th>
+<th>Company Pro Payer Id</th>
+<th>Company Pro Id</th>
+<th>Company Id</th>
+<th>Company Location Id</th>
             </tr>
             </thead>
             <tbody>
@@ -71,8 +90,6 @@
 <td><?= $record->is_cm_canceled_this_month ?></td>
 <td><?= $record->is_rm_canceled_this_month ?></td>
 <td><?= $record->is_tm_this_month ?></td>
-<td><?= $record->rm_reason1 ?></td>
-<td><?= $record->rm_reason2 ?></td>
 <td><?= $record->rm_total_time_in_seconds ?></td>
 <td><?= $record->rm_total_time_in_seconds_by_mcp ?></td>
 <td><?= $record->rm_total_time_in_seconds_by_rme_pro ?></td>
@@ -97,6 +114,27 @@
 <td><?= $record->rm_total_time_in_seconds_by_rms_pro ?></td>
 <td><?= $record->rm_total_time_in_seconds_by_rmg_pro ?></td>
 <td><?= $record->detail_json ?></td>
+<td><?= $record->rm_reasons ?></td>
+<td><?= $record->number_of_days_with_remote_measurements ?></td>
+<td><?= $record->is_bill_closed ?></td>
+<td><?= friendly_date_time($record->bill_closed_at) ?></td>
+<td><?= $record->bill_closed_by_session_id ?></td>
+<td><?= $record->bill_closed_by_pro_id ?></td>
+<td><?= $record->is_billing_marked_done ?></td>
+<td><?= $record->billing_marked_done_by_session_id ?></td>
+<td><?= $record->billing_marked_done_by_pro_id ?></td>
+<td><?= friendly_date_time($record->billing_marked_done_at) ?></td>
+<td><?= $record->claim_total_expected ?></td>
+<td><?= $record->is_claim_closed ?></td>
+<td><?= friendly_date_time($record->claim_closed_at) ?></td>
+<td><?= $record->claim_closed_by_session_id ?></td>
+<td><?= $record->claim_closed_by_pro_id ?></td>
+<td><?= $record->claim_summary ?></td>
+<td><?= $record->claim_total_paid ?></td>
+<td><?= $record->company_pro_payer_id ?></td>
+<td><?= $record->company_pro_id ?></td>
+<td><?= $record->company_id ?></td>
+<td><?= $record->company_location_id ?></td>
                 </tr>
             @endforeach
             </tbody>

resources/views/pro/care_months/info.blade.php

@@ -106,18 +106,10 @@
 <th>Is Cancelled By Administrator</th>
 <th>Total Expected</th>
 <th>Total Paid</th>
-<th>Bill Closed By Session Id</th>
-<th>Bill Closed By Pro Id</th>
-<th>Claim Closed By Session Id</th>
-<th>Claim Closed By Pro Id</th>
 <th>Detail Json</th>
 <th>Is Signed By Na</th>
 <th>Signed By Na At</th>
 <th>Signed By Na Session Id</th>
-<th>Is Billing Marked Done</th>
-<th>Billing Marked Done By Session Id</th>
-<th>Billing Marked Done By Pro Id</th>
-<th>Billing Marked Done At</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -215,18 +207,10 @@
 <td><?= $subRecord->is_cancelled_by_administrator ?></td>
 <td><?= $subRecord->total_expected ?></td>
 <td><?= $subRecord->total_paid ?></td>
-<td><?= $subRecord->bill_closed_by_session_id ?></td>
-<td><?= $subRecord->bill_closed_by_pro_id ?></td>
-<td><?= $subRecord->claim_closed_by_session_id ?></td>
-<td><?= $subRecord->claim_closed_by_pro_id ?></td>
 <td><?= $subRecord->detail_json ?></td>
 <td><?= $subRecord->is_signed_by_na ?></td>
 <td><?= friendly_date_time($subRecord->signed_by_na_at) ?></td>
 <td><?= $subRecord->signed_by_na_session_id ?></td>
-<td><?= $subRecord->is_billing_marked_done ?></td>
-<td><?= $subRecord->billing_marked_done_by_session_id ?></td>
-<td><?= $subRecord->billing_marked_done_by_pro_id ?></td>
-<td><?= friendly_date_time($subRecord->billing_marked_done_at) ?></td>
                     </tr>
                 @endforeach
                 </tbody>

resources/views/pro/care_months_SINGLE/SUB_cm_time_entries .blade.php

@@ -59,11 +59,9 @@
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_setIsEnrolledInCmToFalse?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Set Is Enrolled In Cm To False</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_setIsEnrolledInCmToTrue?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Set Is Enrolled In Cm To True</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_updateCmReasons?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Update Cm Reasons</a>
-<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_updateRmReasons?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Update Rm Reasons</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_updateCmEnrollmentConsentInfo?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Update Cm Enrollment Consent Info</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_updateWhyNotEnrolledInCm?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Update Why Not Enrolled In Cm</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_updateRmEligibility?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Update Rm Eligibility</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_setIsEnrolledInRmToFalse?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Set Is Enrolled In Rm To False</a>
-<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_setIsEnrolledInRmToTrue?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Set Is Enrolled In Rm To True</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_updateWhyNotEnrolledInRm?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Update Why Not Enrolled In Rm</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_updateEquipmentInfo?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Update Equipment Info</a>

resources/views/pro/clients/add_new.blade.php

@@ -20,8 +20,6 @@
 <th>Action Item Category</th>
 <th>Content Detail</th>
 <th>Content Text</th>
-<th>Dose</th>
-<th>Facility Memo</th>
 <th>Is Signed By Ally</th>
 <th>Is Signed By Prescriber</th>
 <th>Signed By Ally At</th>
@@ -37,6 +35,8 @@
 <th>Signed By Ally Session Id</th>
 <th>Signed By Prescriber Session Id</th>
 <th>To Facility Id</th>
+<th>Facility Memo</th>
+<th>Dose</th>
 <th>Detail Json</th>
                 </tr>
                 </thead>
@@ -49,8 +49,6 @@
 <td><?= $subRecord->action_item_category ?></td>
 <td><?= $subRecord->content_detail ?></td>
 <td><?= $subRecord->content_text ?></td>
-<td><?= $subRecord->dose ?></td>
-<td><?= $subRecord->facility_memo ?></td>
 <td><?= $subRecord->is_signed_by_ally ?></td>
 <td><?= $subRecord->is_signed_by_prescriber ?></td>
 <td><?= friendly_date_time($subRecord->signed_by_ally_at) ?></td>
@@ -66,6 +64,8 @@
 <td><?= $subRecord->signed_by_ally_session_id ?></td>
 <td><?= $subRecord->signed_by_prescriber_session_id ?></td>
 <td><?= $subRecord->to_facility_id ?></td>
+<td><?= $subRecord->facility_memo ?></td>
+<td><?= $subRecord->dose ?></td>
 <td><?= $subRecord->detail_json ?></td>
                     </tr>
                 @endforeach

resources/views/pro/clients_SINGLE/SUB_ally_updates.blade.php

@@ -15,22 +15,22 @@
                 <thead>
                 <tr>
                     <th>&nbsp;</th>
-<th>Created At</th>
-<th>Type</th>
-<th>Deactivated At</th>
-<th>Deactivation Memo</th>
-<th>Is Active</th>
-<th>Reactivated At</th>
-<th>Reactivation Memo</th>
+<th>Client Id</th>
+<th>Device Id</th>
 <th>Instructions</th>
 <th>Internal Memo</th>
 <th>Status</th>
 <th>Status Memo</th>
+<th>Created At</th>
 <th>Created By Session Id</th>
+<th>Type</th>
+<th>Is Active</th>
+<th>Deactivated At</th>
 <th>Deactivated By Session Id</th>
+<th>Deactivation Memo</th>
+<th>Reactivated At</th>
 <th>Reactivated By Session Id</th>
-<th>Client Id</th>
-<th>Device Id</th>
+<th>Reactivation Memo</th>
 <th>Detail Json</th>
                 </tr>
                 </thead>
@@ -38,22 +38,22 @@
                 @foreach($subRecords as $subRecord)
                     <tr>
                         <td><a href="/client_bdt_devices/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
-<td><?= friendly_date_time($subRecord->created_at) ?></td>
-<td><?= $subRecord->type ?></td>
-<td><?= friendly_date_time($subRecord->deactivated_at) ?></td>
-<td><?= $subRecord->deactivation_memo ?></td>
-<td><?= $subRecord->is_active ?></td>
-<td><?= friendly_date_time($subRecord->reactivated_at) ?></td>
-<td><?= $subRecord->reactivation_memo ?></td>
+<td><?= $subRecord->client_id ?></td>
+<td><?= $subRecord->device_id ?></td>
 <td><?= $subRecord->instructions ?></td>
 <td><?= $subRecord->internal_memo ?></td>
 <td><?= $subRecord->status ?></td>
 <td><?= $subRecord->status_memo ?></td>
+<td><?= friendly_date_time($subRecord->created_at) ?></td>
 <td><?= $subRecord->created_by_session_id ?></td>
+<td><?= $subRecord->type ?></td>
+<td><?= $subRecord->is_active ?></td>
+<td><?= friendly_date_time($subRecord->deactivated_at) ?></td>
 <td><?= $subRecord->deactivated_by_session_id ?></td>
+<td><?= $subRecord->deactivation_memo ?></td>
+<td><?= friendly_date_time($subRecord->reactivated_at) ?></td>
 <td><?= $subRecord->reactivated_by_session_id ?></td>
-<td><?= $subRecord->client_id ?></td>
-<td><?= $subRecord->device_id ?></td>
+<td><?= $subRecord->reactivation_memo ?></td>
 <td><?= $subRecord->detail_json ?></td>
                     </tr>
                 @endforeach

resources/views/pro/clients_SINGLE/SUB_bills.blade.php

@@ -106,18 +106,10 @@
 <th>Is Cancelled By Administrator</th>
 <th>Total Expected</th>
 <th>Total Paid</th>
-<th>Bill Closed By Session Id</th>
-<th>Bill Closed By Pro Id</th>
-<th>Claim Closed By Session Id</th>
-<th>Claim Closed By Pro Id</th>
 <th>Detail Json</th>
 <th>Is Signed By Na</th>
 <th>Signed By Na At</th>
 <th>Signed By Na Session Id</th>
-<th>Is Billing Marked Done</th>
-<th>Billing Marked Done By Session Id</th>
-<th>Billing Marked Done By Pro Id</th>
-<th>Billing Marked Done At</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -215,18 +207,10 @@
 <td><?= $subRecord->is_cancelled_by_administrator ?></td>
 <td><?= $subRecord->total_expected ?></td>
 <td><?= $subRecord->total_paid ?></td>
-<td><?= $subRecord->bill_closed_by_session_id ?></td>
-<td><?= $subRecord->bill_closed_by_pro_id ?></td>
-<td><?= $subRecord->claim_closed_by_session_id ?></td>
-<td><?= $subRecord->claim_closed_by_pro_id ?></td>
 <td><?= $subRecord->detail_json ?></td>
 <td><?= $subRecord->is_signed_by_na ?></td>
 <td><?= friendly_date_time($subRecord->signed_by_na_at) ?></td>
 <td><?= $subRecord->signed_by_na_session_id ?></td>
-<td><?= $subRecord->is_billing_marked_done ?></td>
-<td><?= $subRecord->billing_marked_done_by_session_id ?></td>
-<td><?= $subRecord->billing_marked_done_by_pro_id ?></td>
-<td><?= friendly_date_time($subRecord->billing_marked_done_at) ?></td>
                     </tr>
                 @endforeach
                 </tbody>

resources/views/pro/clients_SINGLE/SUB_care_month_entries.blade.php

@@ -28,8 +28,6 @@
 <th>Is Cm Canceled This Month</th>
 <th>Is Rm Canceled This Month</th>
 <th>Is Tm This Month</th>
-<th>Rm Reason1</th>
-<th>Rm Reason2</th>
 <th>Rm Total Time In Seconds</th>
 <th>Rm Total Time In Seconds By Mcp</th>
 <th>Rm Total Time In Seconds By Rme Pro</th>
@@ -54,6 +52,27 @@
 <th>Rm Total Time In Seconds By Rms Pro</th>
 <th>Rm Total Time In Seconds By Rmg Pro</th>
 <th>Detail Json</th>
+<th>Rm Reasons</th>
+<th>Number Of Days With Remote Measurements</th>
+<th>Is Bill Closed</th>
+<th>Bill Closed At</th>
+<th>Bill Closed By Session Id</th>
+<th>Bill Closed By Pro Id</th>
+<th>Is Billing Marked Done</th>
+<th>Billing Marked Done By Session Id</th>
+<th>Billing Marked Done By Pro Id</th>
+<th>Billing Marked Done At</th>
+<th>Claim Total Expected</th>
+<th>Is Claim Closed</th>
+<th>Claim Closed At</th>
+<th>Claim Closed By Session Id</th>
+<th>Claim Closed By Pro Id</th>
+<th>Claim Summary</th>
+<th>Claim Total Paid</th>
+<th>Company Pro Payer Id</th>
+<th>Company Pro Id</th>
+<th>Company Id</th>
+<th>Company Location Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -73,8 +92,6 @@
 <td><?= $subRecord->is_cm_canceled_this_month ?></td>
 <td><?= $subRecord->is_rm_canceled_this_month ?></td>
 <td><?= $subRecord->is_tm_this_month ?></td>
-<td><?= $subRecord->rm_reason1 ?></td>
-<td><?= $subRecord->rm_reason2 ?></td>
 <td><?= $subRecord->rm_total_time_in_seconds ?></td>
 <td><?= $subRecord->rm_total_time_in_seconds_by_mcp ?></td>
 <td><?= $subRecord->rm_total_time_in_seconds_by_rme_pro ?></td>
@@ -99,6 +116,27 @@
 <td><?= $subRecord->rm_total_time_in_seconds_by_rms_pro ?></td>
 <td><?= $subRecord->rm_total_time_in_seconds_by_rmg_pro ?></td>
 <td><?= $subRecord->detail_json ?></td>
+<td><?= $subRecord->rm_reasons ?></td>
+<td><?= $subRecord->number_of_days_with_remote_measurements ?></td>
+<td><?= $subRecord->is_bill_closed ?></td>
+<td><?= friendly_date_time($subRecord->bill_closed_at) ?></td>
+<td><?= $subRecord->bill_closed_by_session_id ?></td>
+<td><?= $subRecord->bill_closed_by_pro_id ?></td>
+<td><?= $subRecord->is_billing_marked_done ?></td>
+<td><?= $subRecord->billing_marked_done_by_session_id ?></td>
+<td><?= $subRecord->billing_marked_done_by_pro_id ?></td>
+<td><?= friendly_date_time($subRecord->billing_marked_done_at) ?></td>
+<td><?= $subRecord->claim_total_expected ?></td>
+<td><?= $subRecord->is_claim_closed ?></td>
+<td><?= friendly_date_time($subRecord->claim_closed_at) ?></td>
+<td><?= $subRecord->claim_closed_by_session_id ?></td>
+<td><?= $subRecord->claim_closed_by_pro_id ?></td>
+<td><?= $subRecord->claim_summary ?></td>
+<td><?= $subRecord->claim_total_paid ?></td>
+<td><?= $subRecord->company_pro_payer_id ?></td>
+<td><?= $subRecord->company_pro_id ?></td>
+<td><?= $subRecord->company_id ?></td>
+<td><?= $subRecord->company_location_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

resources/views/pro/clients_SINGLE/SUB_client_documents.blade.php

@@ -582,29 +582,6 @@
     </table>
 </div>
 
-<div class="table-responsive p-0 bg-white table-sm mb-3">
-    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
-        <thead>
-        <tr>
-            <th colspan="2" class="px-2">RM Enrollment
-                <span class="ml-auto"><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_updateRmEligibility' title='Update why not enrolled in RM?optimised=1'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Update Why Not Enrolled In RM</span></a></span>
-            </th>
-        </tr>
-        </thead>
-        <tbody>
-            <tr><td class="w-25 px-2 text-secondary border-right">Is Eligible For Rm</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_eligible_for_rm ?><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_updateRmEligibility?optimised=1' title='updateRmEligibility' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Update Rm Eligibility</span></a></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Why Not Eligible For Rm Category</td><td class="w-75 px-2 font-weight-bold"><?= $record->why_not_eligible_for_rm_category ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Why Not Eligible For Rm Memo</td><td class="w-75 px-2 font-weight-bold"><?= $record->why_not_eligible_for_rm_memo ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Is Enrolled In Rm</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_enrolled_in_rm ?><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_setIsEnrolledInRmToFalse?optimised=1' title='setIsEnrolledInRmToFalse' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Set Is Enrolled In Rm To False</span></a>
-<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_setIsEnrolledInRmToTrue?optimised=1' title='setIsEnrolledInRmToTrue' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Set Is Enrolled In Rm To True</span></a></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Rm Reason1</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_reason1 ?><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_updateRmReasons?optimised=1' title='updateRmReasons' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Update Rm Reasons</span></a></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Rm Reason2</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_reason2 ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Why Not Enrolled In Rm Category</td><td class="w-75 px-2 font-weight-bold"><?= $record->why_not_enrolled_in_rm_category ?><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_updateWhyNotEnrolledInRm?optimised=1' title='updateWhyNotEnrolledInRm' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Update Why Not Enrolled In Rm</span></a></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Why Not Enrolled In Rm Memo</td><td class="w-75 px-2 font-weight-bold"><?= $record->why_not_enrolled_in_rm_memo ?></td></tr>
-        </tbody>
-    </table>
-</div>
-
 <div class="table-responsive p-0 bg-white table-sm mb-3">
     <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
         <thead>

resources/views/pro/clients_SINGLE/SUB_device_measurements.blade.php

@@ -15,13 +15,13 @@
                 <thead>
                 <tr>
                     <th>&nbsp;</th>
-<th>Created At</th>
-<th>Type</th>
+<th>Client Id</th>
+<th>Bdt Measurement Id</th>
 <th>Status</th>
 <th>Status Memo</th>
+<th>Created At</th>
 <th>Created By Session Id</th>
-<th>Bdt Measurement Id</th>
-<th>Client Id</th>
+<th>Type</th>
 <th>Measurement Id</th>
 <th>Detail Json</th>
                 </tr>
@@ -30,13 +30,13 @@
                 @foreach($subRecords as $subRecord)
                     <tr>
                         <td><a href=""><i class="fas fa-share-square"></i></a></td>
-<td><?= friendly_date_time($subRecord->created_at) ?></td>
-<td><?= $subRecord->type ?></td>
+<td><?= $subRecord->client_id ?></td>
+<td><?= $subRecord->bdt_measurement_id ?></td>
 <td><?= $subRecord->status ?></td>
 <td><?= $subRecord->status_memo ?></td>
+<td><?= friendly_date_time($subRecord->created_at) ?></td>
 <td><?= $subRecord->created_by_session_id ?></td>
-<td><?= $subRecord->bdt_measurement_id ?></td>
-<td><?= $subRecord->client_id ?></td>
+<td><?= $subRecord->type ?></td>
 <td><?= $subRecord->measurement_id ?></td>
 <td><?= $subRecord->detail_json ?></td>
                     </tr>

resources/views/pro/clients_SINGLE/SUB_erx.blade.php

@@ -20,8 +20,6 @@
 <th>Action Item Category</th>
 <th>Content Detail</th>
 <th>Content Text</th>
-<th>Dose</th>
-<th>Facility Memo</th>
 <th>Is Signed By Ally</th>
 <th>Is Signed By Prescriber</th>
 <th>Signed By Ally At</th>
@@ -37,6 +35,8 @@
 <th>Signed By Ally Session Id</th>
 <th>Signed By Prescriber Session Id</th>
 <th>To Facility Id</th>
+<th>Facility Memo</th>
+<th>Dose</th>
 <th>Detail Json</th>
                 </tr>
                 </thead>
@@ -49,8 +49,6 @@
 <td><?= $subRecord->action_item_category ?></td>
 <td><?= $subRecord->content_detail ?></td>
 <td><?= $subRecord->content_text ?></td>
-<td><?= $subRecord->dose ?></td>
-<td><?= $subRecord->facility_memo ?></td>
 <td><?= $subRecord->is_signed_by_ally ?></td>
 <td><?= $subRecord->is_signed_by_prescriber ?></td>
 <td><?= friendly_date_time($subRecord->signed_by_ally_at) ?></td>
@@ -66,6 +64,8 @@
 <td><?= $subRecord->signed_by_ally_session_id ?></td>
 <td><?= $subRecord->signed_by_prescriber_session_id ?></td>
 <td><?= $subRecord->to_facility_id ?></td>
+<td><?= $subRecord->facility_memo ?></td>
+<td><?= $subRecord->dose ?></td>
 <td><?= $subRecord->detail_json ?></td>
                     </tr>
                 @endforeach

resources/views/pro/clients_SINGLE/SUB_mcp_updates.blade.php

@@ -26,8 +26,8 @@
 <th>Created By Session Id</th>
 <th>Bill Id</th>
 <th>Client Id</th>
-<th>Client Program Month Entry Id</th>
 <th>Pro Id</th>
+<th>Client Program Month Entry Id</th>
 <th>Detail Json</th>
                 </tr>
                 </thead>
@@ -46,8 +46,8 @@
 <td><?= $subRecord->created_by_session_id ?></td>
 <td><?= $subRecord->bill_id ?></td>
 <td><?= $subRecord->client_id ?></td>
-<td><?= $subRecord->client_program_month_entry_id ?></td>
 <td><?= $subRecord->pro_id ?></td>
+<td><?= $subRecord->client_program_month_entry_id ?></td>
 <td><?= $subRecord->detail_json ?></td>
                     </tr>
                 @endforeach

resources/views/pro/clients_SINGLE/SUB_relationships.blade.php

@@ -18,8 +18,6 @@
 <th>Action Item Category</th>
 <th>Content Detail</th>
 <th>Content Text</th>
-<th>Dose</th>
-<th>Facility Memo</th>
 <th>Is Signed By Ally</th>
 <th>Is Signed By Prescriber</th>
 <th>Signed By Ally At</th>
@@ -35,6 +33,8 @@
 <th>Signed By Ally Session Id</th>
 <th>Signed By Prescriber Session Id</th>
 <th>To Facility Id</th>
+<th>Facility Memo</th>
+<th>Dose</th>
 <th>Detail Json</th>
             </tr>
             </thead>
@@ -47,8 +47,6 @@
 <td><?= $record->action_item_category ?></td>
 <td><?= $record->content_detail ?></td>
 <td><?= $record->content_text ?></td>
-<td><?= $record->dose ?></td>
-<td><?= $record->facility_memo ?></td>
 <td><?= $record->is_signed_by_ally ?></td>
 <td><?= $record->is_signed_by_prescriber ?></td>
 <td><?= friendly_date_time($record->signed_by_ally_at) ?></td>
@@ -64,6 +62,8 @@
 <td><?= $record->signed_by_ally_session_id ?></td>
 <td><?= $record->signed_by_prescriber_session_id ?></td>
 <td><?= $record->to_facility_id ?></td>
+<td><?= $record->facility_memo ?></td>
+<td><?= $record->dose ?></td>
 <td><?= $record->detail_json ?></td>
                 </tr>
             @endforeach

resources/views/pro/erx/info.blade.php

@@ -13,22 +13,22 @@
             <thead>
             <tr>
 <th>&nbsp;</th>
-<th>Created At</th>
-<th>Type</th>
-<th>Address</th>
+<th>Program</th>
+<th>Name First</th>
+<th>Name Last</th>
 <th>Dob</th>
-<th>Email</th>
-<th>Full Eligible Api Response</th>
-<th>Full Lead Form Data</th>
+<th>Mcn</th>
 <th>Is Mcn Valid</th>
+<th>Client Id</th>
+<th>Full Lead Form Data</th>
+<th>Full Eligible Api Response</th>
+<th>Created At</th>
+<th>Created By Session Id</th>
+<th>Type</th>
 <th>Lead Data</th>
-<th>Mcn</th>
-<th>Name First</th>
-<th>Name Last</th>
 <th>Phone</th>
-<th>Program</th>
-<th>Created By Session Id</th>
-<th>Client Id</th>
+<th>Email</th>
+<th>Address</th>
 <th>Detail Json</th>
             </tr>
             </thead>
@@ -36,22 +36,22 @@
             @foreach($records as $record)
                 <tr>
 <td><a href="/leads/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
-<td><?= friendly_date_time($record->created_at) ?></td>
-<td><?= $record->type ?></td>
-<td><?= $record->address ?></td>
+<td><?= $record->program ?></td>
+<td><?= $record->name_first ?></td>
+<td><?= $record->name_last ?></td>
 <td><?= $record->dob ?></td>
-<td><?= $record->email ?></td>
-<td><?= $record->full_eligible_api_response ?></td>
-<td><?= $record->full_lead_form_data ?></td>
+<td><?= $record->mcn ?></td>
 <td><?= $record->is_mcn_valid ?></td>
+<td><?= $record->client_id ?></td>
+<td><?= $record->full_lead_form_data ?></td>
+<td><?= $record->full_eligible_api_response ?></td>
+<td><?= friendly_date_time($record->created_at) ?></td>
+<td><?= $record->created_by_session_id ?></td>
+<td><?= $record->type ?></td>
 <td><?= $record->lead_data ?></td>
-<td><?= $record->mcn ?></td>
-<td><?= $record->name_first ?></td>
-<td><?= $record->name_last ?></td>
 <td><?= $record->phone ?></td>
-<td><?= $record->program ?></td>
-<td><?= $record->created_by_session_id ?></td>
-<td><?= $record->client_id ?></td>
+<td><?= $record->email ?></td>
+<td><?= $record->address ?></td>
 <td><?= $record->detail_json ?></td>
                 </tr>
             @endforeach

resources/views/pro/mcp_updates/index.blade.php

@@ -106,18 +106,10 @@
 <th>Is Cancelled By Administrator</th>
 <th>Total Expected</th>
 <th>Total Paid</th>
-<th>Bill Closed By Session Id</th>
-<th>Bill Closed By Pro Id</th>
-<th>Claim Closed By Session Id</th>
-<th>Claim Closed By Pro Id</th>
 <th>Detail Json</th>
 <th>Is Signed By Na</th>
 <th>Signed By Na At</th>
 <th>Signed By Na Session Id</th>
-<th>Is Billing Marked Done</th>
-<th>Billing Marked Done By Session Id</th>
-<th>Billing Marked Done By Pro Id</th>
-<th>Billing Marked Done At</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -215,18 +207,10 @@
 <td><?= $subRecord->is_cancelled_by_administrator ?></td>
 <td><?= $subRecord->total_expected ?></td>
 <td><?= $subRecord->total_paid ?></td>
-<td><?= $subRecord->bill_closed_by_session_id ?></td>
-<td><?= $subRecord->bill_closed_by_pro_id ?></td>
-<td><?= $subRecord->claim_closed_by_session_id ?></td>
-<td><?= $subRecord->claim_closed_by_pro_id ?></td>
 <td><?= $subRecord->detail_json ?></td>
 <td><?= $subRecord->is_signed_by_na ?></td>
 <td><?= friendly_date_time($subRecord->signed_by_na_at) ?></td>
 <td><?= $subRecord->signed_by_na_session_id ?></td>
-<td><?= $subRecord->is_billing_marked_done ?></td>
-<td><?= $subRecord->billing_marked_done_by_session_id ?></td>
-<td><?= $subRecord->billing_marked_done_by_pro_id ?></td>
-<td><?= friendly_date_time($subRecord->billing_marked_done_at) ?></td>
                     </tr>
                 @endforeach
                 </tbody>

resources/views/pro/notes_SINGLE/SUB_dashboard.blade.php

@@ -13,82 +13,86 @@
             <thead>
             <tr>
 <th>&nbsp;</th>
-<th>Created At</th>
-<th>Type</th>
+<th>Client Id</th>
 <th>Category</th>
+<th>Current Ticket Update Id</th>
+<th>Previous Ticket Update Id</th>
 <th>Data</th>
 <th>Data Status</th>
 <th>Data Status Memo</th>
-<th>Has Assigned Pro Signed</th>
-<th>Has Initiating Pro Signed</th>
-<th>Has Manager Pro Signed</th>
-<th>Has Ordering Pro Signed</th>
-<th>Is Entry Error</th>
 <th>Is Open</th>
-<th>Created By Session Id</th>
+<th>Ticket Open Change Id</th>
+<th>Is Entry Error</th>
+<th>Ticket Entry Error Change Id</th>
 <th>Assigned Pro Id</th>
 <th>Assigned Pro Change Id</th>
-<th>Client Id</th>
-<th>Current Ticket Update Id</th>
-<th>Initiating Pro Id</th>
-<th>Initiating Pro Change Id</th>
+<th>Previous Assigned Pro Id</th>
+<th>Ticket Pro Change Id</th>
+<th>Has Assigned Pro Signed</th>
 <th>Manager Pro Id</th>
+<th>Previous Manager Pro Id</th>
 <th>Manager Pro Change Id</th>
+<th>Has Manager Pro Signed</th>
 <th>Ordering Pro Id</th>
+<th>Previous Ordering Pro Id</th>
 <th>Ordering Pro Change Id</th>
-<th>Previous Assigned Pro Id</th>
+<th>Has Ordering Pro Signed</th>
+<th>Initiating Pro Id</th>
 <th>Previous Initiating Pro Id</th>
-<th>Previous Manager Pro Id</th>
-<th>Previous Ordering Pro Id</th>
-<th>Previous Ticket Update Id</th>
-<th>Ticket Entry Error Change Id</th>
-<th>Ticket Open Change Id</th>
+<th>Initiating Pro Change Id</th>
+<th>Has Initiating Pro Signed</th>
+<th>Created At</th>
+<th>Created By Session Id</th>
+<th>Type</th>
 <th>Order File Path</th>
 <th>Order Pdf Path</th>
 <th>Current Ticket Fax Id</th>
 <th>Current Ticket Email Id</th>
 <th>Detail Json</th>
+<th>Note Id</th>
             </tr>
             </thead>
             <tbody>
             @foreach($records as $record)
                 <tr>
 <td><a href="/tickets/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
-<td><?= friendly_date_time($record->created_at) ?></td>
-<td><?= $record->type ?></td>
+<td><?= $record->client_id ?></td>
 <td><?= $record->category ?></td>
+<td><?= $record->current_ticket_update_id ?></td>
+<td><?= $record->previous_ticket_update_id ?></td>
 <td><?= $record->data ?></td>
 <td><?= $record->data_status ?></td>
 <td><?= $record->data_status_memo ?></td>
-<td><?= $record->has_assigned_pro_signed ?></td>
-<td><?= $record->has_initiating_pro_signed ?></td>
-<td><?= $record->has_manager_pro_signed ?></td>
-<td><?= $record->has_ordering_pro_signed ?></td>
-<td><?= $record->is_entry_error ?></td>
 <td><?= $record->is_open ?></td>
-<td><?= $record->created_by_session_id ?></td>
+<td><?= $record->ticket_open_change_id ?></td>
+<td><?= $record->is_entry_error ?></td>
+<td><?= $record->ticket_entry_error_change_id ?></td>
 <td><?= $record->assigned_pro_id ?></td>
 <td><?= $record->assigned_pro_change_id ?></td>
-<td><?= $record->client_id ?></td>
-<td><?= $record->current_ticket_update_id ?></td>
-<td><?= $record->initiating_pro_id ?></td>
-<td><?= $record->initiating_pro_change_id ?></td>
+<td><?= $record->previous_assigned_pro_id ?></td>
+<td><?= $record->ticket_pro_change_id ?></td>
+<td><?= $record->has_assigned_pro_signed ?></td>
 <td><?= $record->manager_pro_id ?></td>
+<td><?= $record->previous_manager_pro_id ?></td>
 <td><?= $record->manager_pro_change_id ?></td>
+<td><?= $record->has_manager_pro_signed ?></td>
 <td><?= $record->ordering_pro_id ?></td>
+<td><?= $record->previous_ordering_pro_id ?></td>
 <td><?= $record->ordering_pro_change_id ?></td>
-<td><?= $record->previous_assigned_pro_id ?></td>
+<td><?= $record->has_ordering_pro_signed ?></td>
+<td><?= $record->initiating_pro_id ?></td>
 <td><?= $record->previous_initiating_pro_id ?></td>
-<td><?= $record->previous_manager_pro_id ?></td>
-<td><?= $record->previous_ordering_pro_id ?></td>
-<td><?= $record->previous_ticket_update_id ?></td>
-<td><?= $record->ticket_entry_error_change_id ?></td>
-<td><?= $record->ticket_open_change_id ?></td>
+<td><?= $record->initiating_pro_change_id ?></td>
+<td><?= $record->has_initiating_pro_signed ?></td>
+<td><?= friendly_date_time($record->created_at) ?></td>
+<td><?= $record->created_by_session_id ?></td>
+<td><?= $record->type ?></td>
 <td><?= $record->order_file_path ?></td>
 <td><?= $record->order_pdf_path ?></td>
 <td><?= $record->current_ticket_fax_id ?></td>
 <td><?= $record->current_ticket_email_id ?></td>
 <td><?= $record->detail_json ?></td>
+<td><?= $record->note_id ?></td>
                 </tr>
             @endforeach
             </tbody>

resources/views/pro/tickets/info.blade.php

@@ -24,8 +24,8 @@
 <th>Created By Session Id</th>
 <th>Bill Id</th>
 <th>Client Id</th>
-<th>Client Program Month Entry Id</th>
 <th>Pro Id</th>
+<th>Client Program Month Entry Id</th>
 <th>Detail Json</th>
             </tr>
             </thead>
@@ -44,8 +44,8 @@
 <td><?= $record->created_by_session_id ?></td>
 <td><?= $record->bill_id ?></td>
 <td><?= $record->client_id ?></td>
-<td><?= $record->client_program_month_entry_id ?></td>
 <td><?= $record->pro_id ?></td>
+<td><?= $record->client_program_month_entry_id ?></td>
 <td><?= $record->detail_json ?></td>
                 </tr>
             @endforeach

resources/views/pro/transactions/info.blade.php

@@ -77,12 +77,10 @@ Route::prefix('/clients/view/{uid}')->group(function () {
 	Route::get('ACTION_setIsEnrolledInCmToFalse', 'clients_SINGLE_Controller@ACTION_setIsEnrolledInCmToFalse')->name('clients_SINGLE-ACTION_setIsEnrolledInCmToFalse');
 	Route::get('ACTION_setIsEnrolledInCmToTrue', 'clients_SINGLE_Controller@ACTION_setIsEnrolledInCmToTrue')->name('clients_SINGLE-ACTION_setIsEnrolledInCmToTrue');
 	Route::get('ACTION_updateCmReasons', 'clients_SINGLE_Controller@ACTION_updateCmReasons')->name('clients_SINGLE-ACTION_updateCmReasons');
-	Route::get('ACTION_updateRmReasons', 'clients_SINGLE_Controller@ACTION_updateRmReasons')->name('clients_SINGLE-ACTION_updateRmReasons');
 	Route::get('ACTION_updateCmEnrollmentConsentInfo', 'clients_SINGLE_Controller@ACTION_updateCmEnrollmentConsentInfo')->name('clients_SINGLE-ACTION_updateCmEnrollmentConsentInfo');
 	Route::get('ACTION_updateWhyNotEnrolledInCm', 'clients_SINGLE_Controller@ACTION_updateWhyNotEnrolledInCm')->name('clients_SINGLE-ACTION_updateWhyNotEnrolledInCm');
 	Route::get('ACTION_updateRmEligibility', 'clients_SINGLE_Controller@ACTION_updateRmEligibility')->name('clients_SINGLE-ACTION_updateRmEligibility');
 	Route::get('ACTION_setIsEnrolledInRmToFalse', 'clients_SINGLE_Controller@ACTION_setIsEnrolledInRmToFalse')->name('clients_SINGLE-ACTION_setIsEnrolledInRmToFalse');
-	Route::get('ACTION_setIsEnrolledInRmToTrue', 'clients_SINGLE_Controller@ACTION_setIsEnrolledInRmToTrue')->name('clients_SINGLE-ACTION_setIsEnrolledInRmToTrue');
 	Route::get('ACTION_updateWhyNotEnrolledInRm', 'clients_SINGLE_Controller@ACTION_updateWhyNotEnrolledInRm')->name('clients_SINGLE-ACTION_updateWhyNotEnrolledInRm');
 	Route::get('ACTION_updateEquipmentInfo', 'clients_SINGLE_Controller@ACTION_updateEquipmentInfo')->name('clients_SINGLE-ACTION_updateEquipmentInfo');
 	Route::get('SUB_dashboard', 'clients_SINGLE_Controller@SUB_dashboard')->name('clients_SINGLE-SUB_dashboard');