merged

.editorconfig

@@ -1,6 +1,6 @@
 APP_NAME=Laravel
 APP_ENV=local
-APP_KEY=
+APP_KEY=base64:gl8JWA/4loYWQiFljFEN99y2wl1r6Gc+b2SHM9pb1YM=
 APP_DEBUG=true
 APP_URL=http://localhost
 
@@ -9,9 +9,9 @@ LOG_CHANNEL=stack
 DB_CONNECTION=pgsql
 DB_HOST=127.0.0.1
 DB_PORT=5432
-DB_DATABASE=stag
-DB_USERNAME=root
-DB_PASSWORD=
+DB_DATABASE=stag2
+DB_USERNAME=postgres
+DB_PASSWORD=pass
 
 BROADCAST_DRIVER=log
 CACHE_DRIVER=file
@@ -59,5 +59,5 @@ TWILIO_NUMBER=+12023359983
 MIX_APP_URL="http://app.lobby.localhost"
 
 BACKEND_URL="http://localhost:8080"
-
-AUTH_URL=http://localhost:3000
+HCP_PORTAL_URL="http://localhost:3001"
+AUTH_URL="http://localhost:8002" 

.gitattributes

@@ -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

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
+
+class isms_Controller extends Controller
+{
+    public $selfName = 'isms_Controller';
+    public $dashboardName = 'dashboard';
+
+	// GET /isms
+	public function index(Request $request) {
+		$records = DB::table('isms')->get();
+		return response()->view('admin/isms/index', compact('records'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+}

app/Http/Controllers/leads_Controller.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
+
+class note_template_section_templates_Controller extends Controller
+{
+    public $selfName = 'note_template_section_templates_Controller';
+    public $dashboardName = 'dashboard';
+
+	// GET /note_template_section_templates
+	public function index(Request $request) {
+		$records = DB::table('note_template_section_template')->get();
+		return response()->view('admin/note_template_section_templates/index', compact('records'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /note_template_section_templates/view/{uid}
+	public function view(Request $request, $uid) {
+		return redirect("/note_template_section_templates/view/$uid/SUB_dashboard");
+	}
+}

app/Http/Controllers/note_template_section_templates_SINGLE_Controller.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
+
+class note_template_section_templates_SINGLE_Controller extends Controller
+{
+    public $selfName = 'note_template_section_templates_SINGLE_Controller';
+    public $dashboardName = 'dashboard';
+
+	// GET /note_template_section_templates/view/{uid}/ACTION_updateHeading
+	public function ACTION_updateHeading(Request $request, $uid) {
+		$record = DB::table('note_template_section_template')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('note_template_section_template')->where('id', $uid)->first();
+			if($record) return redirect('/note_template_section_templates/view/' . $record->uid . '/ACTION_updateHeading');
+		}
+		return response()->view('admin/note_template_section_templates_SINGLE/ACTION_updateHeading', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /note_template_section_templates/view/{uid}/SUB_dashboard
+	public function SUB_dashboard(Request $request, $uid) {
+		$record = DB::table('note_template_section_template')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('note_template_section_template')->where('id', $uid)->first();
+			if($record) return redirect('/note_template_section_templates/view/' . $record->uid . '/SUB_dashboard');
+		}
+		return response()->view('admin/note_template_section_templates_SINGLE/SUB_dashboard', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+}

app/Http/Controllers/note_templates_Controller.php

@@ -3,6 +3,8 @@
 
 namespace App\Http\Controllers;
 
+use App\Models\CompanyPro;
+use App\Models\Pro;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Auth;
@@ -668,8 +670,14 @@ class pros_SINGLE_Controller extends Controller
 		}
 		$subRecords = DB::table('pro_transaction')->where('pro_id', $record->id)->get();
 		$result_clients = DB::select("select id, concat(name_last, ', ', name_first) as name_display from client");
+	
+		$companyPros = [];
+		foreach($subRecords as $subRecord){
+			$companyPros[$subRecord->company_pro_id] = CompanyPro::find($subRecord->company_pro_id);
+		}
+
 		$result_pros = DB::select("select id, concat(name_last, ', ', name_first) as name_display from pro");
-		return response()->view('admin/pros_SINGLE/SUB_transactions', compact('record', 'subRecords', 'result_clients', 'result_pros'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		return response()->view('admin/pros_SINGLE/SUB_transactions', compact('record', 'subRecords', 'companyPros','result_clients', 'result_pros'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/SUB_sessions
@@ -741,7 +749,8 @@ class pros_SINGLE_Controller extends Controller
 			$record = DB::table('pro')->where('id', $uid)->first();
 			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_add_new_credit_pro_transaction');
 		}
-		return response()->view('admin/pros_SINGLE/ACTION_add_new_credit_pro_transaction', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		$pro  = Pro::find($record->id);
+		return response()->view('admin/pros_SINGLE/ACTION_add_new_credit_pro_transaction', compact('record', 'pro'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_add_new_debit_pro_transaction
@@ -751,7 +760,8 @@ class pros_SINGLE_Controller extends Controller
 			$record = DB::table('pro')->where('id', $uid)->first();
 			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_add_new_debit_pro_transaction');
 		}
-		return response()->view('admin/pros_SINGLE/ACTION_add_new_debit_pro_transaction', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		$pro  = Pro::find($record->id);
+		return response()->view('admin/pros_SINGLE/ACTION_add_new_debit_pro_transaction', compact('record', 'pro'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_add_new_stag_app_pro_access

app/Http/Controllers/relationships_Controller.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+
+class CompanyPro extends Model
+{
+    protected $table = 'company_pro';
+
+
+    public function company(){
+        return $this->hasOne(Company::class, 'id', 'company_id');
+    }
+
+    public function pro(){
+        return $this->hasOne(Pro::class, 'id', 'pro_id');
+    }
+}

app/Models/Facility.php

@@ -19,4 +19,9 @@ class Pro extends Model
         return $this->hasOne(Company::class, 'id', 'company_id');
     }
 
+    public function companyPros()
+    {
+        return $this->hasMany(CompanyPro::class, 'pro_id', 'id');
+    }
+
 }

app/Models/ProRate.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
@@ -1083,7 +1075,6 @@ ADMIN
         SUB
             dashboard
                 !grp:Pro Type:pro_type:Change:circle=>/pros/view/$uid/ACTION_setProType
-                !grp:Company:company_id:Change:circle=>/pros/view/$uid/ACTION_putCompany
                 !grp:Initiative:initiatives:Change:circle=>/pros/view/$uid/ACTION_setInitiative
                 !grp:Profile Slug:slug:Change:circle=>/pros/view/$uid/ACTION_putSlug
                 !grp:Profile Image:profile_image_file_path:Change:circle=>/pros/view/$uid/ACTION_updateProfileImage
@@ -1141,7 +1132,7 @@ ADMIN
                 !inc:@uid,responsibility,code,amount
                 add_new:pro_rate:create
                     proUid:hidden=uid
-                    responsibility:select:HCP,NA,CM,RME,RMM
+                    responsibility:select:HCP,NA,CM,RME,RMM,GENERIC
                     code*
                     amount:text
             note_templates
@@ -1283,12 +1274,13 @@ ADMIN
             dashboard
             note_template_section_templates|note_template_section_template|add
                 id=note_template_section_template.note_template_id=>/note_template_section_templates/view/UID
-                !inc:@uid,section_template_id
+                !inc:@uid,section_template_id,heading
                 !qry:section_templates:SELECT id, title FROM section_template
                 !col:section_template_id:Section Template:~section_templates:title:id,=,$$section_template_id:all
                 add_new:note_template_section_template:create
                     noteTemplateUID:hidden=uid
                     sectionTemplateUID:record:section_template:uid,title
+                    heading
     invitations|invitation|add|view|icon:user-md
         !inc:@id,pro_id,first_name,last_name,dob,mcn,email,cell_number,memo,invitation_key,last_email_sent_at,last_sms_sent_at,has_invitation_been_viewed,guest_first_name,guest_last_name,guest_dob,guest_mcn,is_client_already_in_system,client_id,created_at,is_active
     invitations/add_new:create
@@ -1596,3 +1588,11 @@ ADMIN
             remove
         SUB
             dashboard
+    note_template_section_templates|note_template_section_template|view|icon:check
+    note_template_section_templates/view/{uid}
+        ACTIONS
+            updateHeading
+                heading=heading
+        SUB
+            dashboard
+    isms|isms|view|icon:phone

generatecv/tree_detailed.txt

@@ -13,38 +13,40 @@
             <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>
+<th>Created By Pro Id</th>
             </tr>
             </thead>
             <tbody>
             @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>
+<td><?= $record->created_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -13,62 +13,72 @@
             <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>
+<th>Created By Pro 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>
+<td><?= $record->created_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -15,38 +15,40 @@
                 <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>
+<th>Created By Pro Id</th>
                 </tr>
                 </thead>
                 <tbody>
                 @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>
+<td><?= $subRecord->created_by_pro_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -13,40 +13,42 @@
             <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>
+<th>Created By Pro Id</th>
             </tr>
             </thead>
             <tbody>
             @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>
+<td><?= $record->created_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -13,58 +13,60 @@
             <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>
+<th>Created By Pro Id</th>
             </tr>
             </thead>
             <tbody>
             @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>
+<td><?= $record->created_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -13,46 +13,66 @@
             <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>
+<th>Client Confirmed Receipt Memo</th>
+<th>Declared Intent To Use Id</th>
+<th>Delivery Memo</th>
+<th>Delivery Reported At</th>
+<th>First Measurement Id</th>
+<th>Has Been Delivered</th>
+<th>Has Client Confirmed Receipt</th>
+<th>Most Recent Measurement Id</th>
+<th>Baseline Am Resting Dbp Max</th>
+<th>Created By Pro Id</th>
             </tr>
             </thead>
             <tbody>
             @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>
+<td><?= $record->client_confirmed_receipt_memo ?></td>
+<td><?= $record->declared_intent_to_use_id ?></td>
+<td><?= $record->delivery_memo ?></td>
+<td><?= friendly_date_time($record->delivery_reported_at) ?></td>
+<td><?= $record->first_measurement_id ?></td>
+<td><?= $record->has_been_delivered ?></td>
+<td><?= $record->has_client_confirmed_receipt ?></td>
+<td><?= $record->most_recent_measurement_id ?></td>
+<td><?= $record->baseline_am_resting_dbp_max ?></td>
+<td><?= $record->created_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -28,6 +28,7 @@
 <th>Client Id</th>
 <th>Pro Id</th>
 <th>Detail Json</th>
+<th>Created By Pro Id</th>
             </tr>
             </thead>
             <tbody>
@@ -49,6 +50,7 @@
 <td><?= $record->client_id ?></td>
 <td><?= $record->pro_id ?></td>
 <td><?= $record->detail_json ?></td>
+<td><?= $record->created_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -32,6 +32,47 @@
 <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>
+<th>Authorized Signer Email</th>
+<th>Authorized Signer Phone</th>
+<th>Created By Pro Id</th>
+<th>Group Mailing Address Line1</th>
+<th>Group Mailing Address Line2</th>
+<th>Group Mailing Address City</th>
+<th>Group Mailing Address State</th>
+<th>Group Mailing Address Zip</th>
+<th>Group Mailing Address County</th>
+<th>Group Authorized Official Name</th>
+<th>Group Authorized Official Ssn</th>
+<th>Group Authorized Official Dob</th>
+<th>Group Authorized Official Home Address</th>
+<th>Group Authorized Official Cell Number</th>
+<th>Group Authorized Official Pecos Username</th>
+<th>Group Authorized Official Pecos Password</th>
+<th>Group Authorized Official Caqh Id</th>
+<th>Group Authorized Official Caqh Username</th>
+<th>Group Authorized Official Caqh Password</th>
+<th>Group Authorized Official Email</th>
+<th>Group Authorized Official Specialty</th>
             </tr>
             </thead>
             <tbody>
@@ -57,6 +98,47 @@
 <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>
+<td><?= $record->authorized_signer_email ?></td>
+<td><?= $record->authorized_signer_phone ?></td>
+<td><?= $record->created_by_pro_id ?></td>
+<td><?= $record->group_mailing_address_line1 ?></td>
+<td><?= $record->group_mailing_address_line2 ?></td>
+<td><?= $record->group_mailing_address_city ?></td>
+<td><?= $record->group_mailing_address_state ?></td>
+<td><?= $record->group_mailing_address_zip ?></td>
+<td><?= $record->group_mailing_address_county ?></td>
+<td><?= $record->group_authorized_official_name ?></td>
+<td><?= $record->group_authorized_official_ssn ?></td>
+<td><?= $record->group_authorized_official_dob ?></td>
+<td><?= $record->group_authorized_official_home_address ?></td>
+<td><?= $record->group_authorized_official_cell_number ?></td>
+<td><?= $record->group_authorized_official_pecos_username ?></td>
+<td><?= $record->group_authorized_official_pecos_password ?></td>
+<td><?= $record->group_authorized_official_caqh_id ?></td>
+<td><?= $record->group_authorized_official_caqh_username ?></td>
+<td><?= $record->group_authorized_official_caqh_password ?></td>
+<td><?= $record->group_authorized_official_email ?></td>
+<td><?= $record->group_authorized_official_specialty ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -30,6 +30,16 @@
 <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>
+<th>Balance</th>
+<th>Created By Pro Id</th>
+<th>Individual Medicaid Id</th>
+<th>Individual Medicare Id</th>
+<th>Main Collaborative Physician Memo</th>
+<th>Main Collaborative Physician Pro Id</th>
+<th>Main Collaborative Physician State</th>
             </tr>
             </thead>
             <tbody>
@@ -53,6 +63,16 @@
 <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>
+<td><?= $record->balance ?></td>
+<td><?= $record->created_by_pro_id ?></td>
+<td><?= $record->individual_medicaid_id ?></td>
+<td><?= $record->individual_medicare_id ?></td>
+<td><?= $record->main_collaborative_physician_memo ?></td>
+<td><?= $record->main_collaborative_physician_pro_id ?></td>
+<td><?= $record->main_collaborative_physician_state ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -38,6 +38,7 @@
 <th>Reactivated By Session Id</th>
 <th>Facility Type</th>
 <th>Detail Json</th>
+<th>Created By Pro Id</th>
             </tr>
             </thead>
             <tbody>
@@ -69,6 +70,7 @@
 <td><?= $record->reactivated_by_session_id ?></td>
 <td><?= $record->facility_type ?></td>
 <td><?= $record->detail_json ?></td>
+<td><?= $record->created_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -13,46 +13,48 @@
             <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>
+<th>Created By Pro Id</th>
             </tr>
             </thead>
             <tbody>
             @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>
+<td><?= $record->created_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -0,0 +1,52 @@
+@extends('layouts.pro-logged-in')
+@section('content')
+
+    <h3 class="d-flex my-3 px-3 stag-heading stag-heading-index">
+        <div>Isms: List</div>
+        <div class="ml-auto">
+            <!-- _ADD_NEW_LINK_ -->
+        </div>
+    </h3>
+
+    <div class="table-responsive p-0 bg-white border stag-table stag-table-index">
+        <table class="table table-hover text-nowrap table-striped">
+            <thead>
+            <tr>
+<th>&nbsp;</th>
+<th>Message</th>
+<th>To Number</th>
+<th>From Number</th>
+<th>Was Sending Attempted</th>
+<th>Sending Attempted At</th>
+<th>Was Sending Successful</th>
+<th>Sending Attempt Response</th>
+<th>Created At</th>
+<th>Created By Session Id</th>
+<th>Type</th>
+<th>Detail Json</th>
+<th>Created By Pro Id</th>
+            </tr>
+            </thead>
+            <tbody>
+            @foreach($records as $record)
+                <tr>
+<td><a href="/isms/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
+<td><?= $record->message ?></td>
+<td><?= $record->to_number ?></td>
+<td><?= $record->from_number ?></td>
+<td><?= $record->was_sending_attempted ?></td>
+<td><?= friendly_date_time($record->sending_attempted_at) ?></td>
+<td><?= $record->was_sending_successful ?></td>
+<td><?= $record->sending_attempt_response ?></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>
+<td><?= $record->created_by_pro_id ?></td>
+                </tr>
+            @endforeach
+            </tbody>
+        </table>
+    </div>
+
+@endsection

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

@@ -71,8 +71,24 @@
 <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>
+<th>Created By Pro Id</th>
+<th>Status Detail Json</th>
+<th>Status Log Id</th>
+<th>Status Updated By Pro Id</th>
             </tr>
             </thead>
             <tbody>
@@ -137,8 +153,24 @@
 <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>
+<td><?= $record->created_by_pro_id ?></td>
+<td><?= $record->status_detail_json ?></td>
+<td><?= $record->status_log_id ?></td>
+<td><?= $record->status_updated_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -0,0 +1 @@
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/note_template_section_templates/view/<?= $record->uid ?>/ACTION_updateHeading?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Update Heading</a>

resources/views/admin/note_template_section_templates/index.blade.php

@@ -0,0 +1,48 @@
+@extends('layouts.pro-logged-in')
+@section('content')
+
+    <h3 class="d-flex my-3 px-3 stag-heading stag-heading-index">
+        <div>Note Template Section Templates: List</div>
+        <div class="ml-auto">
+            <!-- _ADD_NEW_LINK_ -->
+        </div>
+    </h3>
+
+    <div class="table-responsive p-0 bg-white border stag-table stag-table-index">
+        <table class="table table-hover text-nowrap table-striped">
+            <thead>
+            <tr>
+<th>&nbsp;</th>
+<th>Created At</th>
+<th>Type</th>
+<th>Position Index</th>
+<th>Created By Session Id</th>
+<th>Note Template Id</th>
+<th>Section Template Id</th>
+<th>Detail Json</th>
+<th>Is Removable</th>
+<th>Heading</th>
+<th>Created By Pro Id</th>
+            </tr>
+            </thead>
+            <tbody>
+            @foreach($records as $record)
+                <tr>
+<td><a href="/note_template_section_templates/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->position_index ?></td>
+<td><?= $record->created_by_session_id ?></td>
+<td><?= $record->note_template_id ?></td>
+<td><?= $record->section_template_id ?></td>
+<td><?= $record->detail_json ?></td>
+<td><?= $record->is_removable ?></td>
+<td><?= $record->heading ?></td>
+<td><?= $record->created_by_pro_id ?></td>
+                </tr>
+            @endforeach
+            </tbody>
+        </table>
+    </div>
+
+@endsection

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

@@ -0,0 +1,3 @@
+<h4 class="d-flex my-3 px-3 stag-heading stag-heading-info">
+    <div>Note Template Section Templates: Single [<?= $record->uid ?>]</div>
+</h4>

resources/views/admin/note_template_section_templates/subs.blade.php

@@ -0,0 +1 @@
+<a href='/note_template_section_templates/view/<?= $record->uid ?>/SUB_dashboard' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_dashboard' ? 'bg-secondary text-white font-weight-bold' : '' }}{{ strpos(request()->route()->getActionMethod(), 'ACTION_') === 0 ? 'bg-secondary text-white font-weight-bold' : '' }}'>Dashboard</a>

resources/views/admin/note_template_section_templates/view.blade.php

@@ -0,0 +1,20 @@
+@extends('layouts.pro-logged-in')
+@section('content')
+
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('admin/note_template_section_templates/info')</div>
+        <div class="d-flex align-items-stretch">
+            <div class="inner-side-nav">
+                <div class="border-right h-100">
+                    @include('admin/note_template_section_templates/subs')
+                </div>
+            </div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
+                <div>
+                    @yield('content-inner')
+                </div>
+            </div>
+        </div>
+    </div>
+
+@endsection

resources/views/admin/note_template_section_templates_SINGLE/ACTION_updateHeading.blade.php

@@ -0,0 +1,41 @@
+@extends('admin.note_template_section_templates.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Update Heading</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="false"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/noteTemplateSectionTemplate/updateHeading">
+        <input type="hidden" name="_success" value="{{route('note_template_section_templates-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('note_template_section_templates_SINGLE-ACTION_updateHeading', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Heading </label>
+<input class='form-control' type='text' name='heading' value='{{ old('heading') ? old('heading') : $record->heading }}' >
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('note_template_section_templates-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

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

@@ -0,0 +1,41 @@
+@extends('admin.note_template_section_templates.view')
+@section('content-inner')
+
+    <div class="row mt-3">
+    <div class="col-8">
+
+        <div class="table-responsive p-0 bg-white table-sm stag-table border-top">
+            <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+                <thead>
+                <tr>
+                    <th colspan="2" class="px-2">Record Details</th>
+                </tr>
+                </thead>
+                <tbody>
+                <?php foreach($record as $k => $v): ?>
+                    <?php
+                    if($k === 'id' || $k === 'uid') continue;
+                    $displayValue = $record->$k;
+                    if(substr($k, -3) === '_at') {
+                        $displayValue = friendly_date_time($record->$k);
+                    }
+                    ?>
+                    <tr>
+                        <td class="px-2 text-secondary border-right w-50">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold w-50">{{ $displayValue }}</td>
+                    </tr>
+                <?php endforeach; ?>
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+    <div class="col-4">
+        <div class="border-left h-100 pl-3">
+            @include('admin/note_template_section_templates/actions')
+        </div>
+    </div>
+</div>
+
+
+@endsection

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

@@ -36,6 +36,10 @@
 <option <?= $o->uid === (old('sectionTemplateUID') ? old('sectionTemplateUID') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->title ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Heading </label>
+<input class='form-control' type='text' name='heading' value='{{ old('heading') ? old('heading') : '' }}' >
 </div>
         <div class="form-group mb-3 d-flex justify-content-center">
             <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>

resources/views/admin/note_templates_SINGLE/ACTION_updateBasic.blade.php

@@ -15,14 +15,18 @@
                 <thead>
                 <tr>
                     <th>&nbsp;</th>
-<th>Section Template</th>
+                    <th>Section Template</th>
+                    <th>Heading</th>
+                    <th></th>
                 </tr>
                 </thead>
                 <tbody>
                 @foreach($subRecords as $subRecord)
                     <tr>
                         <td><a href="/note_template_section_templates/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
-<td><?= value_from_rs($result_section_templates, 'title', [['id', '=', $subRecord->section_template_id], ], 'all'); ?></td>
+                        <td><?= value_from_rs($result_section_templates, 'title', [['id', '=', $subRecord->section_template_id], ], 'all'); ?></td>
+                        <td>{{ $subRecord->heading }}</td>
+                        <td><a href=""><i class="fa fa-bars"></i></a></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -13,48 +13,50 @@
             <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>
+<th>Created By Pro Id</th>
             </tr>
             </thead>
             <tbody>
             @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>
+<td><?= $record->created_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -33,6 +33,7 @@
 <th>Created By Session Id</th>
 <th>Type</th>
 <th>Detail Json</th>
+<th>Created By Pro Id</th>
             </tr>
             </thead>
             <tbody>
@@ -59,6 +60,7 @@
 <td><?= $record->created_by_session_id ?></td>
 <td><?= $record->type ?></td>
 <td><?= $record->detail_json ?></td>
+<td><?= $record->created_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -13,34 +13,36 @@
             <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>
+<th>Created By Pro Id</th>
             </tr>
             </thead>
             <tbody>
             @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>
+<td><?= $record->created_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -0,0 +1,41 @@
+@extends('admin.pro_text_shortcuts.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Update Heading</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="false"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/proTextShortcut/updateHeading">
+        <input type="hidden" name="_success" value="{{route('pro_text_shortcuts-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('pro_text_shortcuts_SINGLE-ACTION_updateHeading', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Heading </label>
+<input class='form-control' type='text' name='heading' value='{{ old('heading') ? old('heading') : $record->heading }}' >
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('pro_text_shortcuts-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

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

@@ -34,6 +34,8 @@
 <th>Reactivated By Session Id</th>
 <th>Reactivation Memo</th>
 <th>Detail Json</th>
+<th>Is For Cm</th>
+<th>Created By Pro Id</th>
             </tr>
             </thead>
             <tbody>
@@ -61,6 +63,8 @@
 <td><?= $record->reactivated_by_session_id ?></td>
 <td><?= $record->reactivation_memo ?></td>
 <td><?= $record->detail_json ?></td>
+<td><?= $record->is_for_cm ?></td>
+<td><?= $record->created_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -36,6 +36,8 @@
 <th>Reactivated By Session Id</th>
 <th>Reactivation Memo</th>
 <th>Detail Json</th>
+<th>Is For Cm</th>
+<th>Created By Pro Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -63,6 +65,8 @@
 <td><?= $subRecord->reactivated_by_session_id ?></td>
 <td><?= $subRecord->reactivation_memo ?></td>
 <td><?= $subRecord->detail_json ?></td>
+<td><?= $subRecord->is_for_cm ?></td>
+<td><?= $subRecord->created_by_pro_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -1,3 +1,5 @@
+<?php /* DO NOT GENERATE */ ?>
+
 @extends('admin.pros.view')
 @section('content-inner')
 
@@ -27,18 +29,27 @@
         <input type="hidden" name="_success" value="{{route('pros_SINGLE-SUB_transactions', ['uid' => $record->uid])}}">
         <input type="hidden" name="_return" value="{{route('pros_SINGLE-ACTION_add_new_credit_pro_transaction', ['uid' => $record->uid])}}">
         <input class='form-control' type='hidden' name='proUid' value='{{ old('proUid') ? old('proUid') : $record->uid }}' >
-<div class='form-group mb-3'>
-<label class='control-label'>Amount </label>
-<input class='form-control' type='text' name='amount' value='{{ old('amount') ? old('amount') : '' }}' >
-</div>
-<div class='form-group mb-3'>
-<label class='control-label'>Intended Resulting Balance </label>
-<input class='form-control' type='text' name='intendedResultingBalance' value='{{ old('intendedResultingBalance') ? old('intendedResultingBalance') : '' }}' >
-</div>
-<div class='form-group mb-3'>
-<label class='control-label'>Custom Memo </label>
-<input class='form-control' type='text' name='customMemo' value='{{ old('customMemo') ? old('customMemo') : '' }}' >
-</div>
+        <div class="form-group mb-3">
+            <lable class="control-label">Company Pro</lable>
+            <select name="companyProUid"  class="form-control">
+                <option value="">--</option>
+                @foreach($pro->companyPros as $companyPro)
+                    <option value="{{$companyPro->uid}}">{{$companyPro->company->name}}</option>
+                @endforeach 
+            </select>
+        </div>
+        <div class='form-group mb-3'>
+            <label class='control-label'>Amount </label>
+            <input class='form-control' type='text' name='amount' value='{{ old('amount') ? old('amount') : '' }}' >
+        </div>
+        <div class='form-group mb-3'>
+            <label class='control-label'>Intended Resulting Balance </label>
+            <input class='form-control' type='text' name='intendedResultingBalance' value='{{ old('intendedResultingBalance') ? old('intendedResultingBalance') : '' }}' >
+        </div>
+        <div class='form-group mb-3'>
+            <label class='control-label'>Custom Memo </label>
+            <input class='form-control' type='text' name='customMemo' value='{{ old('customMemo') ? old('customMemo') : '' }}' >
+        </div>
         <div class="form-group mb-3 d-flex justify-content-center">
             <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
             <a href="{{route('pros_SINGLE-SUB_transactions', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>

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

@@ -1,3 +1,5 @@
+<?php /* DO NOT GENERATE */ ?>
+
 @extends('admin.pros.view')
 @section('content-inner')
 
@@ -26,19 +28,27 @@
         <input type="hidden" name="_api" value="/api/proTransaction/createManualMinusForPro">
         <input type="hidden" name="_success" value="{{route('pros_SINGLE-SUB_transactions', ['uid' => $record->uid])}}">
         <input type="hidden" name="_return" value="{{route('pros_SINGLE-ACTION_add_new_debit_pro_transaction', ['uid' => $record->uid])}}">
-        <input class='form-control' type='hidden' name='proUid' value='{{ old('proUid') ? old('proUid') : $record->uid }}' >
-<div class='form-group mb-3'>
-<label class='control-label'>Amount </label>
-<input class='form-control' type='text' name='amount' value='{{ old('amount') ? old('amount') : '' }}' >
-</div>
-<div class='form-group mb-3'>
-<label class='control-label'>Intended Resulting Balance </label>
-<input class='form-control' type='text' name='intendedResultingBalance' value='{{ old('intendedResultingBalance') ? old('intendedResultingBalance') : '' }}' >
-</div>
-<div class='form-group mb-3'>
-<label class='control-label'>Custom Memo </label>
-<input class='form-control' type='text' name='customMemo' value='{{ old('customMemo') ? old('customMemo') : '' }}' >
-</div>
+        <div class="form-group mb-3">
+            <lable class="control-label">Company Pro</lable>
+            <select name="companyProUid"  class="form-control">
+                <option value="">--</option>
+                @foreach($pro->companyPros as $companyPro)
+                    <option value="{{$companyPro->uid}}">{{$companyPro->company->name}}</option>
+                @endforeach 
+            </select>
+        </div>
+        <div class='form-group mb-3'>
+            <label class='control-label'>Amount </label>
+            <input class='form-control' type='text' name='amount' value='{{ old('amount') ? old('amount') : '' }}' >
+        </div>
+        <div class='form-group mb-3'>
+            <label class='control-label'>Intended Resulting Balance </label>
+            <input class='form-control' type='text' name='intendedResultingBalance' value='{{ old('intendedResultingBalance') ? old('intendedResultingBalance') : '' }}' >
+        </div>
+        <div class='form-group mb-3'>
+            <label class='control-label'>Custom Memo </label>
+            <input class='form-control' type='text' name='customMemo' value='{{ old('customMemo') ? old('customMemo') : '' }}' >
+        </div>
         <div class="form-group mb-3 d-flex justify-content-center">
             <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
             <a href="{{route('pros_SINGLE-SUB_transactions', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>

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

@@ -36,6 +36,7 @@
 <option <?= 'CM' === (old('responsibility') ? old('responsibility') : '') ? 'selected' : '' ?> value='CM'>CM</option>
 <option <?= 'RME' === (old('responsibility') ? old('responsibility') : '') ? 'selected' : '' ?> value='RME'>RME</option>
 <option <?= 'RMM' === (old('responsibility') ? old('responsibility') : '') ? 'selected' : '' ?> value='RMM'>RMM</option>
+<option <?= 'GENERIC' === (old('responsibility') ? old('responsibility') : '') ? 'selected' : '' ?> value='GENERIC'>GENERIC</option>
 </select>
 </div>
 <div class='form-group mb-3'>

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

@@ -19,21 +19,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">Company
-                <span class="ml-auto"><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_putCompany' title='Change?optimised=1'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Change</span></a></span>
-            </th>
-        </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>
-        </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/admin/pros_SINGLE/SUB_erx.blade.php

@@ -31,9 +31,6 @@
                 <tbody>
                 @foreach($subRecords as $subRecord)
                     <tr>
-<<<<<<< HEAD
-                        <td><a href="/pro_rates/view/{{ $subRecord->uid }}"><?= $subRecord->uid ?></a></td>
-=======
                         <td><a href="/pro_rates/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
 <td><?= friendly_date_time($record->created_at) ?></td>
 <td><?= $subRecord->type ?></td>
@@ -43,7 +40,6 @@
 <td><?= friendly_date_time($record->reactivated_at) ?></td>
 <td><?= $subRecord->reactivation_memo ?></td>
 <td><?= $subRecord->amount ?></td>
->>>>>>> f18f1950c1c00e1cf4b28c759c8297a5c34bbab6
 <td><?= $subRecord->code ?></td>
 <td><?= $subRecord->amount ?></td>
 <td><?= $subRecord->responsibility ?></td>

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

@@ -15,48 +15,50 @@
                 <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>
+<th>Created By Pro Id</th>
                 </tr>
                 </thead>
                 <tbody>
                 @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>
+<td><?= $subRecord->created_by_pro_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -1,3 +1,5 @@
+<?php /* DO NOT GENERATE */ ?>
+
 @extends('admin.pros.view')
 @section('content-inner')
 
@@ -13,28 +15,30 @@
         <div class="table-responsive p-0 bg-white border stag-table stag-table-sub">
             <table class="table table-hover text-nowrap">
                 <thead>
-                <tr>
-                    <th>&nbsp;</th>
-<th>Created At</th>
-<th>Pro</th>
-<th>Client</th>
-<th>Plus Or Minus</th>
-<th>Reason Type</th>
-<th>Amount</th>
-<th>Resulting Balance</th>
-                </tr>
+                    <tr>
+                        <th>&nbsp;</th>
+                        <th>Created At</th>
+                        <th>Pro</th>
+                        <th>Company</th>
+                        <th>Client</th>
+                        <th>Plus Or Minus</th>
+                        <th>Reason Type</th>
+                        <th>Amount</th>
+                        <th>Resulting Balance</th>
+                    </tr>
                 </thead>
                 <tbody>
                 @foreach($subRecords as $subRecord)
                     <tr>
                         <td><a href="/transactions/view/{{ $subRecord->uid }}/SUB_dashboard"><i class="fas fa-share-square"></i></a></td>
-<td><a href="/transactions/view/{{ $subRecord->uid }}/SUB_dashboard"><?= friendly_date_time($subRecord->created_at) ?></a></td>
-<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $subRecord->pro_id], ], 'all'); ?></td>
-<td><?= value_from_rs($result_clients, 'name_display', [['id', '=', $subRecord->client_id], ], 'all'); ?></td>
-<td><?= $subRecord->plus_or_minus ?></td>
-<td><?= $subRecord->reason_type ?></td>
-<td><?= $subRecord->amount ?></td>
-<td><?= $subRecord->resulting_balance ?></td>
+                        <td><a href="/transactions/view/{{ $subRecord->uid }}/SUB_dashboard"><?= friendly_date_time($subRecord->created_at) ?></a></td>
+                        <td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $subRecord->pro_id], ], 'all'); ?></td>
+                        <td>{{isset($companyPros[$subRecord->company_pro_id])?$companyPros[$subRecord->company_pro_id]->company->name:'-'}}</td>
+                        <td><?= value_from_rs($result_clients, 'name_display', [['id', '=', $subRecord->client_id], ], 'all'); ?></td>
+                        <td><?= $subRecord->plus_or_minus ?></td>
+                        <td><?= $subRecord->reason_type ?></td>
+                        <td><?= $subRecord->amount ?></td>
+                        <td><?= $subRecord->resulting_balance ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -13,40 +13,42 @@
             <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>
+<th>Created By Pro Id</th>
             </tr>
             </thead>
             <tbody>
             @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>
+<td><?= $record->created_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -13,44 +13,48 @@
             <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>
+<th>Created By Pro Id</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>
+<td><?= $record->created_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -298,3 +298,17 @@
 		<p>Pro Text Shortcuts</p>
 	</a>
 </li>
+
+<li class='nav-item'>
+	<a href='/note_template_section_templates' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'note_template_section_templates') === 0 ? 'active' : '') }} '>
+		<i class='nav-icon fa fa-check'></i>
+		<p>Note Template Section Templates</p>
+	</a>
+</li>
+
+<li class='nav-item'>
+	<a href='/isms' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'isms') === 0 ? 'active' : '') }} '>
+		<i class='nav-icon fa fa-phone'></i>
+		<p>Isms</p>
+	</a>
+</li>

resources/views/layouts/guest-home.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,7 +33,10 @@
 <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>
+<th>Created By Pro Id</th>
             </tr>
             </thead>
             <tbody>
@@ -47,8 +48,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,7 +63,10 @@
 <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>
+<td><?= $record->created_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -26,9 +26,13 @@
 <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>
+<th>Resulting Company Pro Balance</th>
+<th>Company Pro Id</th>
+<th>Company Id</th>
+<th>Created By Pro Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -46,9 +50,13 @@
 <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>
+<td><?= $subRecord->resulting_company_pro_balance ?></td>
+<td><?= $subRecord->company_pro_id ?></td>
+<td><?= $subRecord->company_id ?></td>
+<td><?= $subRecord->created_by_pro_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -39,6 +39,7 @@
 <th>Achieved Rms Pro Time In Seconds</th>
 <th>Achieved Rmg Pro Time In Seconds</th>
 <th>Detail Json</th>
+<th>Created By Pro Id</th>
             </tr>
             </thead>
             <tbody>
@@ -71,6 +72,7 @@
 <td><?= $record->achieved_rms_pro_time_in_seconds ?></td>
 <td><?= $record->achieved_rmg_pro_time_in_seconds ?></td>
 <td><?= $record->detail_json ?></td>
+<td><?= $record->created_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -15,8 +15,6 @@
 <th>&nbsp;</th>
 <th>Created At</th>
 <th>Type</th>
-<th>Cm Reason1</th>
-<th>Cm Reason2</th>
 <th>Cm Total Time In Seconds</th>
 <th>Cm Total Time In Seconds By Cm Pro</th>
 <th>Cm Total Time In Seconds By Mcp</th>
@@ -26,8 +24,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 +48,39 @@
 <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>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>
+<th>Rm Num Measurements Not Stamped By Mcp</th>
+<th>Rm Num Measurements Not Stamped By Non Hcp</th>
+<th>Rm Num Measurements Not Stamped By Rmm</th>
+<th>Rm Num Measurements Not Stamped By Rme</th>
+<th>Has Mcp Rm Interacted By Note</th>
+<th>Mcp Rm Interaction Note Id</th>
+<th>Is Rm Interaction Waived</th>
+<th>Was Rm Setup Performed</th>
+<th>Rm Setup Claim Id</th>
+<th>Created By Pro Id</th>
+<th>Has Anyone Interacted With Client About Rm Outside Note</th>
+<th>Is Rm Time Waived</th>
+<th>Did Previous Care Month Have Mcp Note</th>
             </tr>
             </thead>
             <tbody>
@@ -60,8 +89,6 @@
 <td><a href="/care_months/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->cm_reason1 ?></td>
-<td><?= $record->cm_reason2 ?></td>
 <td><?= $record->cm_total_time_in_seconds ?></td>
 <td><?= $record->cm_total_time_in_seconds_by_cm_pro ?></td>
 <td><?= $record->cm_total_time_in_seconds_by_mcp ?></td>
@@ -71,8 +98,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 +122,39 @@
 <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->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>
+<td><?= $record->rm_num_measurements_not_stamped_by_mcp ?></td>
+<td><?= $record->rm_num_measurements_not_stamped_by_non_hcp ?></td>
+<td><?= $record->rm_num_measurements_not_stamped_by_rmm ?></td>
+<td><?= $record->rm_num_measurements_not_stamped_by_rme ?></td>
+<td><?= $record->has_mcp_rm_interacted_by_note ?></td>
+<td><?= $record->mcp_rm_interaction_note_id ?></td>
+<td><?= $record->is_rm_interaction_waived ?></td>
+<td><?= $record->was_rm_setup_performed ?></td>
+<td><?= $record->rm_setup_claim_id ?></td>
+<td><?= $record->created_by_pro_id ?></td>
+<td><?= $record->has_anyone_interacted_with_client_about_rm_outside_note ?></td>
+<td><?= $record->is_rm_time_waived ?></td>
+<td><?= $record->did_previous_care_month_have_mcp_note ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -106,18 +106,42 @@
 <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>
+<th>Generic Pro Id</th>
+<th>Generic Description</th>
+<th>Generic Description Data</th>
+<th>Is Signed By Generic Pro</th>
+<th>Signed By Generic Pro At</th>
+<th>Signed By Generic Pro Session Id</th>
+<th>Generic Pro Expected Payment Amount</th>
+<th>Has Generic Pro Been Paid</th>
+<th>Generic Pro Payment Amount</th>
+<th>Generic Pro Payment Pro Transaction Id</th>
+<th>Generic Target Entity Type</th>
+<th>Generic Target Entity Uid</th>
+<th>Debit Pro Id</th>
+<th>Debit Company Pro Id</th>
+<th>Debit Description</th>
+<th>Debit Description Data</th>
+<th>Is Signed By Debit Pro</th>
+<th>Signed By Debit Pro At</th>
+<th>Signed By Debit Pro Session Id</th>
+<th>Debit Pro Expected Amount</th>
+<th>Has Debit Pro Been Debited</th>
+<th>Debit Pro Debit Amount</th>
+<th>Debit Pro Debit Pro Transaction Id</th>
+<th>Hcp Company Pro Id</th>
+<th>Cm Company Pro Id</th>
+<th>Rme Company Pro Id</th>
+<th>Rmm Company Pro Id</th>
+<th>Rms Company Pro Id</th>
+<th>Rmg Company Pro Id</th>
+<th>Na Company Pro Id</th>
+<th>Generic Company Pro Id</th>
+<th>Created By Pro Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -215,18 +239,42 @@
 <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>
+<td><?= $subRecord->generic_pro_id ?></td>
+<td><?= $subRecord->generic_description ?></td>
+<td><?= $subRecord->generic_description_data ?></td>
+<td><?= $subRecord->is_signed_by_generic_pro ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_generic_pro_at) ?></td>
+<td><?= $subRecord->signed_by_generic_pro_session_id ?></td>
+<td><?= $subRecord->generic_pro_expected_payment_amount ?></td>
+<td><?= $subRecord->has_generic_pro_been_paid ?></td>
+<td><?= $subRecord->generic_pro_payment_amount ?></td>
+<td><?= $subRecord->generic_pro_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->generic_target_entity_type ?></td>
+<td><?= $subRecord->generic_target_entity_uid ?></td>
+<td><?= $subRecord->debit_pro_id ?></td>
+<td><?= $subRecord->debit_company_pro_id ?></td>
+<td><?= $subRecord->debit_description ?></td>
+<td><?= $subRecord->debit_description_data ?></td>
+<td><?= $subRecord->is_signed_by_debit_pro ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_debit_pro_at) ?></td>
+<td><?= $subRecord->signed_by_debit_pro_session_id ?></td>
+<td><?= $subRecord->debit_pro_expected_amount ?></td>
+<td><?= $subRecord->has_debit_pro_been_debited ?></td>
+<td><?= $subRecord->debit_pro_debit_amount ?></td>
+<td><?= $subRecord->debit_pro_debit_pro_transaction_id ?></td>
+<td><?= $subRecord->hcp_company_pro_id ?></td>
+<td><?= $subRecord->cm_company_pro_id ?></td>
+<td><?= $subRecord->rme_company_pro_id ?></td>
+<td><?= $subRecord->rmm_company_pro_id ?></td>
+<td><?= $subRecord->rms_company_pro_id ?></td>
+<td><?= $subRecord->rmg_company_pro_id ?></td>
+<td><?= $subRecord->na_company_pro_id ?></td>
+<td><?= $subRecord->generic_company_pro_id ?></td>
+<td><?= $subRecord->created_by_pro_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -41,6 +41,7 @@
 <th>Achieved Rms Pro Time In Seconds</th>
 <th>Achieved Rmg Pro Time In Seconds</th>
 <th>Detail Json</th>
+<th>Created By Pro Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -73,6 +74,7 @@
 <td><?= $subRecord->achieved_rms_pro_time_in_seconds ?></td>
 <td><?= $subRecord->achieved_rmg_pro_time_in_seconds ?></td>
 <td><?= $subRecord->detail_json ?></td>
+<td><?= $subRecord->created_by_pro_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

resources/views/pro/care_months_SINGLE/SUB_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,7 +35,10 @@
 <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>
+<th>Created By Pro Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -49,8 +50,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,7 +65,10 @@
 <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>
+<td><?= $subRecord->created_by_pro_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -15,46 +15,66 @@
                 <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>
+<th>Client Confirmed Receipt Memo</th>
+<th>Declared Intent To Use Id</th>
+<th>Delivery Memo</th>
+<th>Delivery Reported At</th>
+<th>First Measurement Id</th>
+<th>Has Been Delivered</th>
+<th>Has Client Confirmed Receipt</th>
+<th>Most Recent Measurement Id</th>
+<th>Baseline Am Resting Dbp Max</th>
+<th>Created By Pro Id</th>
                 </tr>
                 </thead>
                 <tbody>
                 @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>
+<td><?= $subRecord->client_confirmed_receipt_memo ?></td>
+<td><?= $subRecord->declared_intent_to_use_id ?></td>
+<td><?= $subRecord->delivery_memo ?></td>
+<td><?= friendly_date_time($subRecord->delivery_reported_at) ?></td>
+<td><?= $subRecord->first_measurement_id ?></td>
+<td><?= $subRecord->has_been_delivered ?></td>
+<td><?= $subRecord->has_client_confirmed_receipt ?></td>
+<td><?= $subRecord->most_recent_measurement_id ?></td>
+<td><?= $subRecord->baseline_am_resting_dbp_max ?></td>
+<td><?= $subRecord->created_by_pro_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -106,18 +106,42 @@
 <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>
+<th>Generic Pro Id</th>
+<th>Generic Description</th>
+<th>Generic Description Data</th>
+<th>Is Signed By Generic Pro</th>
+<th>Signed By Generic Pro At</th>
+<th>Signed By Generic Pro Session Id</th>
+<th>Generic Pro Expected Payment Amount</th>
+<th>Has Generic Pro Been Paid</th>
+<th>Generic Pro Payment Amount</th>
+<th>Generic Pro Payment Pro Transaction Id</th>
+<th>Generic Target Entity Type</th>
+<th>Generic Target Entity Uid</th>
+<th>Debit Pro Id</th>
+<th>Debit Company Pro Id</th>
+<th>Debit Description</th>
+<th>Debit Description Data</th>
+<th>Is Signed By Debit Pro</th>
+<th>Signed By Debit Pro At</th>
+<th>Signed By Debit Pro Session Id</th>
+<th>Debit Pro Expected Amount</th>
+<th>Has Debit Pro Been Debited</th>
+<th>Debit Pro Debit Amount</th>
+<th>Debit Pro Debit Pro Transaction Id</th>
+<th>Hcp Company Pro Id</th>
+<th>Cm Company Pro Id</th>
+<th>Rme Company Pro Id</th>
+<th>Rmm Company Pro Id</th>
+<th>Rms Company Pro Id</th>
+<th>Rmg Company Pro Id</th>
+<th>Na Company Pro Id</th>
+<th>Generic Company Pro Id</th>
+<th>Created By Pro Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -215,18 +239,42 @@
 <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>
+<td><?= $subRecord->generic_pro_id ?></td>
+<td><?= $subRecord->generic_description ?></td>
+<td><?= $subRecord->generic_description_data ?></td>
+<td><?= $subRecord->is_signed_by_generic_pro ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_generic_pro_at) ?></td>
+<td><?= $subRecord->signed_by_generic_pro_session_id ?></td>
+<td><?= $subRecord->generic_pro_expected_payment_amount ?></td>
+<td><?= $subRecord->has_generic_pro_been_paid ?></td>
+<td><?= $subRecord->generic_pro_payment_amount ?></td>
+<td><?= $subRecord->generic_pro_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->generic_target_entity_type ?></td>
+<td><?= $subRecord->generic_target_entity_uid ?></td>
+<td><?= $subRecord->debit_pro_id ?></td>
+<td><?= $subRecord->debit_company_pro_id ?></td>
+<td><?= $subRecord->debit_description ?></td>
+<td><?= $subRecord->debit_description_data ?></td>
+<td><?= $subRecord->is_signed_by_debit_pro ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_debit_pro_at) ?></td>
+<td><?= $subRecord->signed_by_debit_pro_session_id ?></td>
+<td><?= $subRecord->debit_pro_expected_amount ?></td>
+<td><?= $subRecord->has_debit_pro_been_debited ?></td>
+<td><?= $subRecord->debit_pro_debit_amount ?></td>
+<td><?= $subRecord->debit_pro_debit_pro_transaction_id ?></td>
+<td><?= $subRecord->hcp_company_pro_id ?></td>
+<td><?= $subRecord->cm_company_pro_id ?></td>
+<td><?= $subRecord->rme_company_pro_id ?></td>
+<td><?= $subRecord->rmm_company_pro_id ?></td>
+<td><?= $subRecord->rms_company_pro_id ?></td>
+<td><?= $subRecord->rmg_company_pro_id ?></td>
+<td><?= $subRecord->na_company_pro_id ?></td>
+<td><?= $subRecord->generic_company_pro_id ?></td>
+<td><?= $subRecord->created_by_pro_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -41,6 +41,7 @@
 <th>Achieved Rms Pro Time In Seconds</th>
 <th>Achieved Rmg Pro Time In Seconds</th>
 <th>Detail Json</th>
+<th>Created By Pro Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -73,6 +74,7 @@
 <td><?= $subRecord->achieved_rms_pro_time_in_seconds ?></td>
 <td><?= $subRecord->achieved_rmg_pro_time_in_seconds ?></td>
 <td><?= $subRecord->detail_json ?></td>
+<td><?= $subRecord->created_by_pro_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -17,8 +17,6 @@
                     <th>&nbsp;</th>
 <th>Created At</th>
 <th>Type</th>
-<th>Cm Reason1</th>
-<th>Cm Reason2</th>
 <th>Cm Total Time In Seconds</th>
 <th>Cm Total Time In Seconds By Cm Pro</th>
 <th>Cm Total Time In Seconds By Mcp</th>
@@ -28,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>
@@ -54,6 +50,39 @@
 <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>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>
+<th>Rm Num Measurements Not Stamped By Mcp</th>
+<th>Rm Num Measurements Not Stamped By Non Hcp</th>
+<th>Rm Num Measurements Not Stamped By Rmm</th>
+<th>Rm Num Measurements Not Stamped By Rme</th>
+<th>Has Mcp Rm Interacted By Note</th>
+<th>Mcp Rm Interaction Note Id</th>
+<th>Is Rm Interaction Waived</th>
+<th>Was Rm Setup Performed</th>
+<th>Rm Setup Claim Id</th>
+<th>Created By Pro Id</th>
+<th>Has Anyone Interacted With Client About Rm Outside Note</th>
+<th>Is Rm Time Waived</th>
+<th>Did Previous Care Month Have Mcp Note</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -62,8 +91,6 @@
                         <td><a href="/care_months/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><?= $subRecord->cm_reason1 ?></td>
-<td><?= $subRecord->cm_reason2 ?></td>
 <td><?= $subRecord->cm_total_time_in_seconds ?></td>
 <td><?= $subRecord->cm_total_time_in_seconds_by_cm_pro ?></td>
 <td><?= $subRecord->cm_total_time_in_seconds_by_mcp ?></td>
@@ -73,8 +100,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 +124,39 @@
 <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->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>
+<td><?= $subRecord->rm_num_measurements_not_stamped_by_mcp ?></td>
+<td><?= $subRecord->rm_num_measurements_not_stamped_by_non_hcp ?></td>
+<td><?= $subRecord->rm_num_measurements_not_stamped_by_rmm ?></td>
+<td><?= $subRecord->rm_num_measurements_not_stamped_by_rme ?></td>
+<td><?= $subRecord->has_mcp_rm_interacted_by_note ?></td>
+<td><?= $subRecord->mcp_rm_interaction_note_id ?></td>
+<td><?= $subRecord->is_rm_interaction_waived ?></td>
+<td><?= $subRecord->was_rm_setup_performed ?></td>
+<td><?= $subRecord->rm_setup_claim_id ?></td>
+<td><?= $subRecord->created_by_pro_id ?></td>
+<td><?= $subRecord->has_anyone_interacted_with_client_about_rm_outside_note ?></td>
+<td><?= $subRecord->is_rm_time_waived ?></td>
+<td><?= $subRecord->did_previous_care_month_have_mcp_note ?></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,30 +15,32 @@
                 <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>
+<th>Created By Pro Id</th>
                 </tr>
                 </thead>
                 <tbody>
                 @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>
+<td><?= $subRecord->created_by_pro_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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,7 +35,10 @@
 <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>
+<th>Created By Pro Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -49,8 +50,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,7 +65,10 @@
 <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>
+<td><?= $subRecord->created_by_pro_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -30,6 +30,7 @@
 <th>Client Id</th>
 <th>Pro Id</th>
 <th>Detail Json</th>
+<th>Created By Pro Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -51,6 +52,7 @@
 <td><?= $subRecord->client_id ?></td>
 <td><?= $subRecord->pro_id ?></td>
 <td><?= $subRecord->detail_json ?></td>
+<td><?= $subRecord->created_by_pro_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -26,9 +26,13 @@
 <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>
+<th>Resulting Company Pro Balance</th>
+<th>Company Pro Id</th>
+<th>Company Id</th>
+<th>Created By Pro Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -46,9 +50,13 @@
 <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>
+<td><?= $subRecord->resulting_company_pro_balance ?></td>
+<td><?= $subRecord->company_pro_id ?></td>
+<td><?= $subRecord->company_id ?></td>
+<td><?= $subRecord->created_by_pro_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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,7 +33,10 @@
 <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>
+<th>Created By Pro Id</th>
             </tr>
             </thead>
             <tbody>
@@ -47,8 +48,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,7 +63,10 @@
 <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>
+<td><?= $record->created_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -13,46 +13,48 @@
             <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>
+<th>Created By Pro Id</th>
             </tr>
             </thead>
             <tbody>
             @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>
+<td><?= $record->created_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -24,6 +24,7 @@
 <th>Client Info Line Id</th>
 <th>Marked Data Enetered By Id</th>
 <th>Detail Json</th>
+<th>Created By Pro Id</th>
             </tr>
             </thead>
             <tbody>
@@ -41,6 +42,7 @@
 <td><?= $record->client_info_line_id ?></td>
 <td><?= $record->marked_data_enetered_by_id ?></td>
 <td><?= $record->detail_json ?></td>
+<td><?= $record->created_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -25,6 +25,7 @@
 <th>Removed By Session Id</th>
 <th>Client Id</th>
 <th>Detail Json</th>
+<th>Created By Pro Id</th>
             </tr>
             </thead>
             <tbody>
@@ -43,6 +44,7 @@
 <td><?= $record->removed_by_session_id ?></td>
 <td><?= $record->client_id ?></td>
 <td><?= $record->detail_json ?></td>
+<td><?= $record->created_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -106,18 +106,42 @@
 <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>
+<th>Generic Pro Id</th>
+<th>Generic Description</th>
+<th>Generic Description Data</th>
+<th>Is Signed By Generic Pro</th>
+<th>Signed By Generic Pro At</th>
+<th>Signed By Generic Pro Session Id</th>
+<th>Generic Pro Expected Payment Amount</th>
+<th>Has Generic Pro Been Paid</th>
+<th>Generic Pro Payment Amount</th>
+<th>Generic Pro Payment Pro Transaction Id</th>
+<th>Generic Target Entity Type</th>
+<th>Generic Target Entity Uid</th>
+<th>Debit Pro Id</th>
+<th>Debit Company Pro Id</th>
+<th>Debit Description</th>
+<th>Debit Description Data</th>
+<th>Is Signed By Debit Pro</th>
+<th>Signed By Debit Pro At</th>
+<th>Signed By Debit Pro Session Id</th>
+<th>Debit Pro Expected Amount</th>
+<th>Has Debit Pro Been Debited</th>
+<th>Debit Pro Debit Amount</th>
+<th>Debit Pro Debit Pro Transaction Id</th>
+<th>Hcp Company Pro Id</th>
+<th>Cm Company Pro Id</th>
+<th>Rme Company Pro Id</th>
+<th>Rmm Company Pro Id</th>
+<th>Rms Company Pro Id</th>
+<th>Rmg Company Pro Id</th>
+<th>Na Company Pro Id</th>
+<th>Generic Company Pro Id</th>
+<th>Created By Pro Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -215,18 +239,42 @@
 <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>
+<td><?= $subRecord->generic_pro_id ?></td>
+<td><?= $subRecord->generic_description ?></td>
+<td><?= $subRecord->generic_description_data ?></td>
+<td><?= $subRecord->is_signed_by_generic_pro ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_generic_pro_at) ?></td>
+<td><?= $subRecord->signed_by_generic_pro_session_id ?></td>
+<td><?= $subRecord->generic_pro_expected_payment_amount ?></td>
+<td><?= $subRecord->has_generic_pro_been_paid ?></td>
+<td><?= $subRecord->generic_pro_payment_amount ?></td>
+<td><?= $subRecord->generic_pro_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->generic_target_entity_type ?></td>
+<td><?= $subRecord->generic_target_entity_uid ?></td>
+<td><?= $subRecord->debit_pro_id ?></td>
+<td><?= $subRecord->debit_company_pro_id ?></td>
+<td><?= $subRecord->debit_description ?></td>
+<td><?= $subRecord->debit_description_data ?></td>
+<td><?= $subRecord->is_signed_by_debit_pro ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_debit_pro_at) ?></td>
+<td><?= $subRecord->signed_by_debit_pro_session_id ?></td>
+<td><?= $subRecord->debit_pro_expected_amount ?></td>
+<td><?= $subRecord->has_debit_pro_been_debited ?></td>
+<td><?= $subRecord->debit_pro_debit_amount ?></td>
+<td><?= $subRecord->debit_pro_debit_pro_transaction_id ?></td>
+<td><?= $subRecord->hcp_company_pro_id ?></td>
+<td><?= $subRecord->cm_company_pro_id ?></td>
+<td><?= $subRecord->rme_company_pro_id ?></td>
+<td><?= $subRecord->rmm_company_pro_id ?></td>
+<td><?= $subRecord->rms_company_pro_id ?></td>
+<td><?= $subRecord->rmg_company_pro_id ?></td>
+<td><?= $subRecord->na_company_pro_id ?></td>
+<td><?= $subRecord->generic_company_pro_id ?></td>
+<td><?= $subRecord->created_by_pro_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -13,82 +13,88 @@
             <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>
+<th>Created By Pro 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>
+<td><?= $record->created_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -24,9 +24,13 @@
 <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>
+<th>Resulting Company Pro Balance</th>
+<th>Company Pro Id</th>
+<th>Company Id</th>
+<th>Created By Pro Id</th>
             </tr>
             </thead>
             <tbody>
@@ -44,9 +48,13 @@
 <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>
+<td><?= $record->resulting_company_pro_balance ?></td>
+<td><?= $record->company_pro_id ?></td>
+<td><?= $record->company_id ?></td>
+<td><?= $record->created_by_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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');
@@ -760,6 +758,13 @@ Route::prefix('/pro_teams/view/{uid}')->group(function () {
 	Route::get('SUB_dashboard', 'pro_teams_SINGLE_Controller@SUB_dashboard')->name('pro_teams_SINGLE-SUB_dashboard');
 });
 
+// --- admin: pro_text_shortcuts --- //
+Route::prefix('/pro_text_shortcuts')->group(function () {
+	Route::get('', 'pro_text_shortcuts_Controller@index')->name('pro_text_shortcuts-index');
+	Route::get('add_new', 'pro_text_shortcuts_Controller@add_new')->name('pro_text_shortcuts-add_new');
+	Route::get('view/{uid}', 'pro_text_shortcuts_Controller@view')->name('pro_text_shortcuts-view');
+});
+
 // --- admin: pro_text_shortcuts_SINGLE --- //
 Route::prefix('/pro_text_shortcuts/view/{uid}')->group(function () {
 	Route::get('ACTION_update', 'pro_text_shortcuts_SINGLE_Controller@ACTION_update')->name('pro_text_shortcuts_SINGLE-ACTION_update');
@@ -767,9 +772,19 @@ Route::prefix('/pro_text_shortcuts/view/{uid}')->group(function () {
 	Route::get('SUB_dashboard', 'pro_text_shortcuts_SINGLE_Controller@SUB_dashboard')->name('pro_text_shortcuts_SINGLE-SUB_dashboard');
 });
 
-// --- admin: pro_text_shortcuts --- //
-Route::prefix('/pro_text_shortcuts')->group(function () {
-	Route::get('', 'pro_text_shortcuts_Controller@index')->name('pro_text_shortcuts-index');
-	Route::get('add_new', 'pro_text_shortcuts_Controller@add_new')->name('pro_text_shortcuts-add_new');
-	Route::get('view/{uid}', 'pro_text_shortcuts_Controller@view')->name('pro_text_shortcuts-view');
+// --- admin: note_template_section_templates --- //
+Route::prefix('/note_template_section_templates')->group(function () {
+	Route::get('', 'note_template_section_templates_Controller@index')->name('note_template_section_templates-index');
+	Route::get('view/{uid}', 'note_template_section_templates_Controller@view')->name('note_template_section_templates-view');
+});
+
+// --- admin: note_template_section_templates_SINGLE --- //
+Route::prefix('/note_template_section_templates/view/{uid}')->group(function () {
+	Route::get('ACTION_updateHeading', 'note_template_section_templates_SINGLE_Controller@ACTION_updateHeading')->name('note_template_section_templates_SINGLE-ACTION_updateHeading');
+	Route::get('SUB_dashboard', 'note_template_section_templates_SINGLE_Controller@SUB_dashboard')->name('note_template_section_templates_SINGLE-SUB_dashboard');
+});
+
+// --- admin: isms --- //
+Route::prefix('/isms')->group(function () {
+	Route::get('', 'isms_Controller@index')->name('isms-index');
 });