updated tree.txt

app/Http/Controllers/bills_SINGLE_Controller.php

@@ -22,6 +22,24 @@ class bills_SINGLE_Controller extends Controller
 		return response()->view('pro/bills_SINGLE/ACTION_payHcpDifferentAmount', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
+	// GET /bills/view/{uid}/ACTION_payCmDifferentAmount
+	public function ACTION_payCmDifferentAmount(Request $request, $uid) {
+		$record = DB::table('bill')->where('uid', $uid)->first();
+		return response()->view('pro/bills_SINGLE/ACTION_payCmDifferentAmount', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /bills/view/{uid}/ACTION_payRmeDifferentAmount
+	public function ACTION_payRmeDifferentAmount(Request $request, $uid) {
+		$record = DB::table('bill')->where('uid', $uid)->first();
+		return response()->view('pro/bills_SINGLE/ACTION_payRmeDifferentAmount', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /bills/view/{uid}/ACTION_payRmmDifferentAmount
+	public function ACTION_payRmmDifferentAmount(Request $request, $uid) {
+		$record = DB::table('bill')->where('uid', $uid)->first();
+		return response()->view('pro/bills_SINGLE/ACTION_payRmmDifferentAmount', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
 	// GET /bills/view/{uid}/ACTION_signAsHcp
 	public function ACTION_signAsHcp(Request $request, $uid) {
 		$record = DB::table('bill')->where('uid', $uid)->first();
@@ -34,6 +52,12 @@ class bills_SINGLE_Controller extends Controller
 		return response()->view('pro/bills_SINGLE/ACTION_markSubmitted', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
+	// GET /bills/view/{uid}/ACTION_markCancelled
+	public function ACTION_markCancelled(Request $request, $uid) {
+		$record = DB::table('bill')->where('uid', $uid)->first();
+		return response()->view('pro/bills_SINGLE/ACTION_markCancelled', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
 	// GET /bills/view/{uid}/ACTION_putCollectedAmount
 	public function ACTION_putCollectedAmount(Request $request, $uid) {
 		$record = DB::table('bill')->where('uid', $uid)->first();

app/Http/Controllers/pros_SINGLE_Controller.php

@@ -202,11 +202,11 @@ class pros_SINGLE_Controller extends Controller
 		return response()->view('admin/pros_SINGLE/SUB_dashboard', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
-	// GET /pros/view/{uid}/SUB_payment_schedule
-	public function SUB_payment_schedule(Request $request, $uid) {
+	// GET /pros/view/{uid}/SUB_my_payment_schedule
+	public function SUB_my_payment_schedule(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
 		$subRecords = DB::table('pro_rate')->where('pro_id', $record->id)->get();
-		return response()->view('admin/pros_SINGLE/SUB_payment_schedule', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		return response()->view('admin/pros_SINGLE/SUB_my_payment_schedule', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/SUB_clients
@@ -294,10 +294,10 @@ class pros_SINGLE_Controller extends Controller
 		return response()->view('admin/pros_SINGLE/SUB_audit_log', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
-	// GET /pros/view/{uid}/ACTION_payment_scheduleAddNew
-	public function ACTION_payment_scheduleAddNew(Request $request, $uid) {
+	// GET /pros/view/{uid}/ACTION_my_payment_scheduleAddNew
+	public function ACTION_my_payment_scheduleAddNew(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
-		return response()->view('admin/pros_SINGLE/ACTION_payment_scheduleAddNew', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		return response()->view('admin/pros_SINGLE/ACTION_my_payment_scheduleAddNew', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_lobby_prosAddNew

generatecv/tree.txt

@@ -7,17 +7,21 @@ PRO
         !col:amount:Amount
         !col:earnings:Earnings:select '- TODO -' as result
     my_clients|client|add|view|icon:user-injured
-        !inc:@name_display,date_of_birth,gender,is_client_enrolled_in_cm,is_client_enrolled_in_rm,mcp_pro_id,ally_pro_id
+        !inc:@name_display,date_of_birth,gender,is_client_enrolled_in_cm,is_client_enrolled_in_rm,mcp_pro_id,cm_pro_id,rme_pro_id,rmm_pro_id
         !col:name_display:Name
         !col:date_of_birth:DOB
         !col:gender:Sex
         !col:is_client_enrolled_in_cm:CM
         !col:is_client_enrolled_in_rm:RM
         !col:mcp_pro_id:MCP:SELECT name_display AS result FROM pro WHERE id = $mcp_pro_id
-        !col:ally_pro_id:Ally:SELECT name_display AS result FROM pro WHERE id = $ally_pro_id
+        !col:cm_pro_id:CM:SELECT name_display AS result FROM pro WHERE id = $cm_pro_id
+        !col:rme_pro_id:RME:SELECT name_display AS result FROM pro WHERE id = $rme_pro_id
+        !col:rmm_pro_id:RMM:SELECT name_display AS result FROM pro WHERE id = $rmm_pro_id
     my_clients/add_new:create
         mcpProUid:record:pro:uid,name_display
-        allyProUid:record:pro:uid,name_display
+        cmProUid:record:pro:uid,name_display
+        rmeProUid:record:pro:uid,name_display
+        rmmProUid:record:pro:uid,name_display
         nameDisplay
         namePrefix
         nameFirst
@@ -314,9 +318,9 @@ PRO
                 whyNotEnrolledInRmCategory
                 whyNotEnrolledInRmMemo
             generateBillForCm
-                numberOfMinutes:number
+                cmCode:select:CM20,CM30_HCP,CM60,CM90
             generateBillForRm
-                numberOfMinutes:number
+                rmCode:select:RM1,RM20,RM30,RM60
             setIsCmCanceledThisMonthToTrue
             updateWhyIsCmCanceledThisMonth
             setIsCmCanceledThisMonthToFalse
@@ -327,7 +331,7 @@ PRO
             setIsTmThisMonthToFalse
         SUB
             dashboard
-                !grp:Care Month Details:id,created_at,type,uid,cm_reason1,cm_reason2,cm_total_time_in_seconds,cm_total_time_in_seconds_by_ally,cm_total_time_in_seconds_by_mcp,has_mcp_done_em_visit,is_client_enrolled_in_cm,is_client_enrolled_in_rm,is_cm_canceled_this_month,is_rm_canceled_this_month,is_tm_this_month,rm_reason1,rm_reason2,rm_total_time_in_seconds,rm_total_time_in_seconds_by_ally,rm_total_time_in_seconds_by_mcp,start_date,why_is_cm_canceled_this_month,why_is_rm_canceled_this_month,why_not_enrolled_in_cm_category,why_not_enrolled_in_cm_memo,why_not_enrolled_in_rm_category,why_not_enrolled_in_rm_memo,created_by_session_id,ally_pro_id,client_id,cm_bill_id,mcp_pro_id,rm_bill_id,cm_total_time_in_seconds_by_cm_pro,rm_total_time_in_seconds_by_rme_pro,rm_total_time_in_seconds_by_rmm_pro,cm_pro_id,rme_pro_id,rmm_pro_id
+                !grp:Care Month Details:id,created_at,type,uid,cm_reason1,cm_reason2,cm_total_time_in_seconds,cm_total_time_in_seconds_by_cm_pro,cm_total_time_in_seconds_by_mcp,has_mcp_done_em_visit,is_client_enrolled_in_cm,is_client_enrolled_in_rm,is_cm_canceled_this_month,is_rm_canceled_this_month,is_tm_this_month,rm_reason1,rm_reason2,rm_total_time_in_seconds,rm_total_time_in_seconds_by_mcp,rm_total_time_in_seconds_by_rme_pro,rm_total_time_in_seconds_by_rmm_pro,start_date,why_is_cm_canceled_this_month,why_is_rm_canceled_this_month,why_not_enrolled_in_cm_category,why_not_enrolled_in_cm_memo,why_not_enrolled_in_rm_category,why_not_enrolled_in_rm_memo,created_by_session_id,client_id,cm_bill_id,cm_pro_id,mcp_pro_id,rm_bill_id,rme_pro_id,rmm_pro_id
 # :: need remove
             cm_time_entries
                 id=care_month_entry.care_month_id,cm_or_rm='CM'
@@ -377,8 +381,15 @@ PRO
                 hcpPaymentAmount:number
             payHcpDifferentAmount
                 differentHcpPaymentAmount:number
+            payCmDifferentAmount
+                differentCmPaymentAmount:number
+            payRmeDifferentAmount
+                differentRmePaymentAmount:number
+            payRmmDifferentAmount
+                differentRmmPaymentAmount:number
             signAsHcp
             markSubmitted
+            markCancelled
             putCollectedAmount
                 collectedAmount
         SUB
@@ -405,6 +416,7 @@ PRO
                 memo=reactivation_memo
         SUB
             dashboard
+                !grp:Bill Details:id,created_at,type,uid,bill_service_type,cm_expected_payment_amount,cm_or_rm,cm_payment_amount,code,collected_amount,effective_date,has_cm_been_paid,has_hcp_been_paid,has_rme_been_paid,has_rmm_been_paid,hcp_expected_payment_amount,hcp_payment_amount,is_cancelled,is_signed_by_cm,is_signed_by_hcp,is_signed_by_rme,is_signed_by_rmm,is_submitted,marked_cancelled_at,marked_submitted_at,modifier,number_of_units,reason1,reason2,reason3,reason3plus,rme_expected_payment_amount,rme_payment_amount,rmm_expected_payment_amount,rmm_payment_amount,service_location,signed_by_cm_at,signed_by_hcp_at,signed_by_rme_at,signed_by_rmm_at,created_by_session_id,care_month_id,client_id,cm_payment_pro_transaction_id,cm_pro_id,hcp_payment_pro_transaction_id,hcp_pro_id,marked_cancelled_by_session_id,marked_submitted_by_session_id,note_id,note_ally_id,rme_payment_pro_transaction_id,rme_pro_id,rmm_payment_pro_transaction_id,rmm_pro_id,signed_by_cm_session_id,signed_by_hcp_session_id,signed_by_rme_session_id,signed_by_rmm_session_id
     mcp_updates|client_mcp_update|icon:user-edit
     ally_updates|client_ally_update|icon:user-edit
 #   audit_log :: coming soon
@@ -443,6 +455,10 @@ ADMIN
             action_items
             audit_log
     pros|pro|add|view|icon:user-md
+        !inc:@name_display,name_first,name_last
+        col:name_display
+        name_first
+        name_last
     pros/add_new:create
         cellNumber:tel
         emailAddress:email
@@ -545,12 +561,13 @@ ADMIN
             setIsSsnCompleteToFalse
         SUB
             dashboard
-            payment_schedule
+            my_payment_schedule
                 id=pro_rate.pro_id=>/pro_rates/view/UID
-                add_new:pro_rate
+                !inc:@uid,code,amount,responsibility
+                add_new:pro_rate:create
                     proUid:hidden=uid
-                    asHcpOrAlly:select:HCP,ALLY
-                    code
+                    responsibility:select:HCP,NA,CM,RME,RMM
+                    code:select:CM20,CM30_HCP,CM60,CM90,RM1,RM20,RM30,RM60
                     amount:number
             clients
             pro_access

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

@@ -12,179 +12,17 @@
         <table class="table table-hover text-nowrap">
             <thead>
             <tr>
-<th>Id</th>
-<th>Created At</th>
-<th>Type</th>
-<th>Uid</th>
-<th>Deactivated At</th>
-<th>Deactivation Memo</th>
-<th>Is Active</th>
-<th>Reactivated At</th>
-<th>Reactivation Memo</th>
-<th>Balance</th>
-<th>Cell Number</th>
-<th>Cell Number Confirmation Token</th>
-<th>Cell Number Confirmed At</th>
-<th>Current Profession Category</th>
-<th>Driver License Expiration Date</th>
-<th>Driver License File Path</th>
-<th>Driver License Issue Date</th>
-<th>Driver License State</th>
-<th>Email Address</th>
-<th>Email Address Confirmation Token</th>
-<th>Email Address Confirmed At</th>
-<th>Enrolled Hcp Category</th>
-<th>Enrolled Hcp Npi</th>
-<th>Enrolled Hcp Subcategory</th>
-<th>Hcp Category</th>
-<th>Hcp Npi</th>
-<th>Hcp Subcategory</th>
-<th>Home Address City</th>
-<th>Home Address Country</th>
-<th>Home Address Lat</th>
-<th>Home Address Line1</th>
-<th>Home Address Line2</th>
-<th>Home Address Long</th>
-<th>Home Address State</th>
-<th>Home Address Zip</th>
-<th>Home Phone Number</th>
-<th>Is Cell Number Confirmation Pending</th>
-<th>Is Cell Number Confirmed</th>
-<th>Is Contract Complete</th>
-<th>Is Currently Clocked In</th>
-<th>Is Currently In Meeting</th>
-<th>Is Driver License Complete</th>
-<th>Is Email Address Confirmation Pending</th>
-<th>Is Email Address Confirmed</th>
-<th>Is Enrolled As Hcp</th>
-<th>Is Enrolled As Mcp</th>
-<th>Is Hcp</th>
-<th>Is Payment Processing Detail Complete</th>
-<th>Is Sms Auth Pending</th>
-<th>Isw9complete</th>
-<th>Mailing Address City</th>
-<th>Mailing Address Country</th>
-<th>Mailing Address Lat</th>
-<th>Mailing Address Line1</th>
-<th>Mailing Address Line2</th>
-<th>Mailing Address Long</th>
-<th>Mailing Address State</th>
-<th>Mailing Address Zip</th>
-<th>Name Credential</th>
 <th>Name Display</th>
 <th>Name First</th>
 <th>Name Last</th>
-<th>Name Middle</th>
-<th>Name Prefix</th>
-<th>Name Suffix</th>
-<th>Payment Processing Detail</th>
-<th>Phone Numbers Memo</th>
-<th>Previous Profession Category</th>
-<th>Pro Type</th>
-<th>Profile Picture Base64</th>
-<th>Signed Contract Pdf File Path</th>
-<th>Sms Auth Token</th>
-<th>Sms Auth Token Sent At</th>
-<th>Ssn</th>
-<th>Supporter Memo</th>
-<th>Supporter Phone Number</th>
-<th>W9detail</th>
-<th>Web Socket Uid</th>
-<th>Work Phone Number</th>
-<th>Created By Session Id</th>
-<th>Deactivated By Session Id</th>
-<th>Reactivated By Session Id</th>
-<th>Current Meeting Participant Id</th>
-<th>Currently In Meeting Id</th>
             </tr>
             </thead>
             <tbody>
             @foreach($records as $record)
                 <tr>
-<td><?= $record->id ?></td>
-<td><?= $record->created_at ?></td>
-<td><?= $record->type ?></td>
-<td><a href="/pros/view/<?= $record->uid ?>"><?= $record->uid ?></a></td>
-<td><?= $record->deactivated_at ?></td>
-<td><?= $record->deactivation_memo ?></td>
-<td><?= $record->is_active ?></td>
-<td><?= $record->reactivated_at ?></td>
-<td><?= $record->reactivation_memo ?></td>
-<td><?= $record->balance ?></td>
-<td><?= $record->cell_number ?></td>
-<td><?= $record->cell_number_confirmation_token ?></td>
-<td><?= $record->cell_number_confirmed_at ?></td>
-<td><?= $record->current_profession_category ?></td>
-<td><?= $record->driver_license_expiration_date ?></td>
-<td><?= $record->driver_license_file_path ?></td>
-<td><?= $record->driver_license_issue_date ?></td>
-<td><?= $record->driver_license_state ?></td>
-<td><?= $record->email_address ?></td>
-<td><?= $record->email_address_confirmation_token ?></td>
-<td><?= $record->email_address_confirmed_at ?></td>
-<td><?= $record->enrolled_hcp_category ?></td>
-<td><?= $record->enrolled_hcp_npi ?></td>
-<td><?= $record->enrolled_hcp_subcategory ?></td>
-<td><?= $record->hcp_category ?></td>
-<td><?= $record->hcp_npi ?></td>
-<td><?= $record->hcp_subcategory ?></td>
-<td><?= $record->home_address_city ?></td>
-<td><?= $record->home_address_country ?></td>
-<td><?= $record->home_address_lat ?></td>
-<td><?= $record->home_address_line1 ?></td>
-<td><?= $record->home_address_line2 ?></td>
-<td><?= $record->home_address_long ?></td>
-<td><?= $record->home_address_state ?></td>
-<td><?= $record->home_address_zip ?></td>
-<td><?= $record->home_phone_number ?></td>
-<td><?= $record->is_cell_number_confirmation_pending ?></td>
-<td><?= $record->is_cell_number_confirmed ?></td>
-<td><?= $record->is_contract_complete ?></td>
-<td><?= $record->is_currently_clocked_in ?></td>
-<td><?= $record->is_currently_in_meeting ?></td>
-<td><?= $record->is_driver_license_complete ?></td>
-<td><?= $record->is_email_address_confirmation_pending ?></td>
-<td><?= $record->is_email_address_confirmed ?></td>
-<td><?= $record->is_enrolled_as_hcp ?></td>
-<td><?= $record->is_enrolled_as_mcp ?></td>
-<td><?= $record->is_hcp ?></td>
-<td><?= $record->is_payment_processing_detail_complete ?></td>
-<td><?= $record->is_sms_auth_pending ?></td>
-<td><?= $record->isw9complete ?></td>
-<td><?= $record->mailing_address_city ?></td>
-<td><?= $record->mailing_address_country ?></td>
-<td><?= $record->mailing_address_lat ?></td>
-<td><?= $record->mailing_address_line1 ?></td>
-<td><?= $record->mailing_address_line2 ?></td>
-<td><?= $record->mailing_address_long ?></td>
-<td><?= $record->mailing_address_state ?></td>
-<td><?= $record->mailing_address_zip ?></td>
-<td><?= $record->name_credential ?></td>
-<td><?= $record->name_display ?></td>
+<td><a href="/pros/view/<?= $record->uid ?>"><?= $record->name_display ?></a></td>
 <td><?= $record->name_first ?></td>
 <td><?= $record->name_last ?></td>
-<td><?= $record->name_middle ?></td>
-<td><?= $record->name_prefix ?></td>
-<td><?= $record->name_suffix ?></td>
-<td><?= $record->payment_processing_detail ?></td>
-<td><?= $record->phone_numbers_memo ?></td>
-<td><?= $record->previous_profession_category ?></td>
-<td><?= $record->pro_type ?></td>
-<td><?= $record->profile_picture_base64 ?></td>
-<td><?= $record->signed_contract_pdf_file_path ?></td>
-<td><?= $record->sms_auth_token ?></td>
-<td><?= $record->sms_auth_token_sent_at ?></td>
-<td><?= $record->ssn ?></td>
-<td><?= $record->supporter_memo ?></td>
-<td><?= $record->supporter_phone_number ?></td>
-<td><?= $record->w9detail ?></td>
-<td><?= $record->web_socket_uid ?></td>
-<td><?= $record->work_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><?= $record->current_meeting_participant_id ?></td>
-<td><?= $record->currently_in_meeting_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -1,5 +1,5 @@
 <a href='/pros/view/<?= $record->uid ?>/SUB_dashboard' class='d-block px-3 py-2 border-bottom {{ 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>
-<a href='/pros/view/<?= $record->uid ?>/SUB_payment_schedule' class='d-block px-3 py-2 border-bottom {{ request()->route()->getActionMethod() === 'SUB_payment_schedule' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Payment Schedule</a>
+<a href='/pros/view/<?= $record->uid ?>/SUB_my_payment_schedule' class='d-block px-3 py-2 border-bottom {{ request()->route()->getActionMethod() === 'SUB_my_payment_schedule' ? 'bg-secondary text-white font-weight-bold' : '' }}'>My Payment Schedule</a>
 <a href='/pros/view/<?= $record->uid ?>/SUB_clients' class='d-block px-3 py-2 border-bottom {{ request()->route()->getActionMethod() === 'SUB_clients' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Clients</a>
 <a href='/pros/view/<?= $record->uid ?>/SUB_pro_access' class='d-block px-3 py-2 border-bottom {{ request()->route()->getActionMethod() === 'SUB_pro_access' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Pro Access</a>
 <a href='/pros/view/<?= $record->uid ?>/SUB_mcp_updates' class='d-block px-3 py-2 border-bottom {{ request()->route()->getActionMethod() === 'SUB_mcp_updates' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Mcp Updates</a>

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

@@ -0,0 +1,67 @@
+@extends('admin.pros.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3">
+        <div>My Payment Schedule Add New</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="true"
+          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/proRate/create">
+        <input type="hidden" name="_success" value="{{route('pros_SINGLE-SUB_my_payment_schedule', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('pros_SINGLE-ACTION_my_payment_scheduleAddNew', ['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'>Responsibility </label>
+<select class='form-control' name='responsibility' value='{{ old('responsibility') ? old('responsibility') : '' }}' >
+<option value=''>-- Select --</option>
+<option <?= 'HCP' === (old('responsibility') ? old('responsibility') : '') ? 'selected' : '' ?> value='HCP'>HCP</option>
+<option <?= 'NA' === (old('responsibility') ? old('responsibility') : '') ? 'selected' : '' ?> value='NA'>NA</option>
+<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>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Code </label>
+<select class='form-control' name='code' value='{{ old('code') ? old('code') : '' }}' >
+<option value=''>-- Select --</option>
+<option <?= 'CM20' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='CM20'>CM20</option>
+<option <?= 'CM30_HCP' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='CM30_HCP'>CM30_HCP</option>
+<option <?= 'CM60' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='CM60'>CM60</option>
+<option <?= 'CM90' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='CM90'>CM90</option>
+<option <?= 'RM1' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='RM1'>RM1</option>
+<option <?= 'RM20' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='RM20'>RM20</option>
+<option <?= 'RM30' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='RM30'>RM30</option>
+<option <?= 'RM60' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='RM60'>RM60</option>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Amount </label>
+<input class='form-control' type='number' name='amount' value='{{ old('amount') ? old('amount') : '' }}' >
+</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_my_payment_schedule', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

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

@@ -28,16 +28,30 @@
         <input type="hidden" name="_return" value="{{route('pros_SINGLE-ACTION_payment_scheduleAddNew', ['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'>As Hcp Or Ally </label>
-<select class='form-control' name='asHcpOrAlly' value='{{ old('asHcpOrAlly') ? old('asHcpOrAlly') : '' }}' >
+<label class='control-label'>Responsibility </label>
+<select class='form-control' name='responsibility' value='{{ old('responsibility') ? old('responsibility') : '' }}' >
 <option value=''>-- Select --</option>
-<option <?= 'HCP' === (old('asHcpOrAlly') ? old('asHcpOrAlly') : '') ? 'selected' : '' ?> value='HCP'>HCP</option>
-<option <?= 'ALLY' === (old('asHcpOrAlly') ? old('asHcpOrAlly') : '') ? 'selected' : '' ?> value='ALLY'>ALLY</option>
+<option <?= 'HCP' === (old('responsibility') ? old('responsibility') : '') ? 'selected' : '' ?> value='HCP'>HCP</option>
+<option <?= 'NA' === (old('responsibility') ? old('responsibility') : '') ? 'selected' : '' ?> value='NA'>NA</option>
+<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>
 </select>
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Code </label>
-<input class='form-control' type='text' name='code' value='{{ old('code') ? old('code') : '' }}' >
+<select class='form-control' name='code' value='{{ old('code') ? old('code') : '' }}' >
+<option value=''>-- Select --</option>
+<option <?= 'CM20' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='CM20'>CM20</option>
+<option <?= 'CM30' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='CM30'>CM30</option>
+<option <?= 'CM60' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='CM60'>CM60</option>
+<option <?= 'CM90' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='CM90'>CM90</option>
+<option <?= 'RM20' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='RM20'>RM20</option>
+<option <?= 'RM1' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='RM1'>RM1</option>
+<option <?= 'RM20' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='RM20'>RM20</option>
+<option <?= 'RM30' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='RM30'>RM30</option>
+<option <?= 'RM60' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='RM60'>RM60</option>
+</select>
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Amount </label>

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

@@ -0,0 +1,38 @@
+@extends('admin.pros.view')
+@section('content-inner')
+
+    <div class="pb-3">
+
+        <h5 class='my-3 d-flex'>
+            <div>My Payment Schedule</div>
+            <div class="ml-auto">
+                <a class="btn btn-primary btn-sm" up-modal=".form-contents" up-width="800" up-history="false" href="{{route('pros_SINGLE-ACTION_my_payment_scheduleAddNew', ['uid' => $record->uid])}}"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+            </div>
+        </h5>
+
+        <div class="table-responsive p-0 bg-white border">
+            <table class="table table-hover text-nowrap">
+                <thead>
+                <tr>
+                    <th>Uid</th>
+<th>Code</th>
+<th>Amount</th>
+<th>Responsibility</th>
+                </tr>
+                </thead>
+                <tbody>
+                @foreach($subRecords as $subRecord)
+                    <tr>
+                        <td><a href="/pro_rates/view/{{ $subRecord->uid }}"><?= $subRecord->uid ?></a></td>
+<td><?= $subRecord->code ?></td>
+<td><?= $subRecord->amount ?></td>
+<td><?= $subRecord->responsibility ?></td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+
+@endsection

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

@@ -6,7 +6,7 @@
         <h5 class='my-3 d-flex'>
             <div>Payment Schedule</div>
             <div class="ml-auto">
-                <a class="btn btn-primary btn-sm" up-modal=".form-contents" up-width="800" up-history="false" href="{{route('pros_SINGLE-ACTION_payment_scheduleAddNew', ['uid' => $record->uid])}}"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+                <!-- _ADD_NEW_LINK_ -->
             </div>
         </h5>
 
@@ -14,43 +14,19 @@
             <table class="table table-hover text-nowrap">
                 <thead>
                 <tr>
-                    <th>Id</th>
-<th>Created At</th>
-<th>Type</th>
-<th>Uid</th>
-<th>Deactivated At</th>
-<th>Deactivation Memo</th>
-<th>Is Active</th>
-<th>Reactivated At</th>
-<th>Reactivation Memo</th>
-<th>Amount</th>
+                    <th>Uid</th>
 <th>Code</th>
+<th>Amount</th>
 <th>Responsibility</th>
-<th>Created By Session Id</th>
-<th>Deactivated By Session Id</th>
-<th>Reactivated By Session Id</th>
-<th>Pro Id</th>
                 </tr>
                 </thead>
                 <tbody>
                 @foreach($subRecords as $subRecord)
                     <tr>
-                        <td><?= $subRecord->id ?></td>
-<td><?= $subRecord->created_at ?></td>
-<td><?= $subRecord->type ?></td>
-<td><a href="/pro_rates/view/{{ $subRecord->uid }}"><?= $subRecord->uid ?></a></td>
-<td><?= $subRecord->deactivated_at ?></td>
-<td><?= $subRecord->deactivation_memo ?></td>
-<td><?= $subRecord->is_active ?></td>
-<td><?= $subRecord->reactivated_at ?></td>
-<td><?= $subRecord->reactivation_memo ?></td>
-<td><?= $subRecord->amount ?></td>
+                        <td><a href="/pro_rates/view/{{ $subRecord->uid }}"><?= $subRecord->uid ?></a></td>
 <td><?= $subRecord->code ?></td>
+<td><?= $subRecord->amount ?></td>
 <td><?= $subRecord->responsibility ?></td>
-<td><?= $subRecord->created_by_session_id ?></td>
-<td><?= $subRecord->deactivated_by_session_id ?></td>
-<td><?= $subRecord->reactivated_by_session_id ?></td>
-<td><?= $subRecord->pro_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -1,5 +1,9 @@
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_payHcpAmount' class='d-block btn btn-sm btn-default mb-3'>Pay Hcp Amount</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_payHcpDifferentAmount' class='d-block btn btn-sm btn-default mb-3'>Pay Hcp Different Amount</a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_payCmDifferentAmount' class='d-block btn btn-sm btn-default mb-3'>Pay Cm Different Amount</a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_payRmeDifferentAmount' class='d-block btn btn-sm btn-default mb-3'>Pay Rme Different Amount</a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_payRmmDifferentAmount' class='d-block btn btn-sm btn-default mb-3'>Pay Rmm Different Amount</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_signAsHcp' class='d-block btn btn-sm btn-default mb-3'>Sign As Hcp</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_markSubmitted' class='d-block btn btn-sm btn-default mb-3'>Mark Submitted</a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_markCancelled' class='d-block btn btn-sm btn-default mb-3'>Mark Cancelled</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_putCollectedAmount' class='d-block btn btn-sm btn-default mb-3'>Put Collected Amount</a>

resources/views/pro/bills_SINGLE/ACTION_markCancelled.blade.php

@@ -0,0 +1,38 @@
+@extends('pro.bills.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3">
+        <div>Mark Cancelled</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="true"
+          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/bill/markCancelled">
+        <input type="hidden" name="_success" value="{{route('bills-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('bills_SINGLE-ACTION_markCancelled', ['uid' => $record->uid])}}">
+        
+        <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('bills-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

resources/views/pro/bills_SINGLE/ACTION_payCmDifferentAmount.blade.php

@@ -0,0 +1,41 @@
+@extends('pro.bills.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3">
+        <div>Pay Cm Different Amount</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="true"
+          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/bill/payCmDifferentAmount">
+        <input type="hidden" name="_success" value="{{route('bills-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('bills_SINGLE-ACTION_payCmDifferentAmount', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Different Cm Payment Amount </label>
+<input class='form-control' type='number' name='differentCmPaymentAmount' value='{{ old('differentCmPaymentAmount') ? old('differentCmPaymentAmount') : '' }}' >
+</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('bills-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

resources/views/pro/bills_SINGLE/ACTION_payRmeDifferentAmount.blade.php

@@ -0,0 +1,41 @@
+@extends('pro.bills.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3">
+        <div>Pay Rme Different Amount</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="true"
+          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/bill/payRmeDifferentAmount">
+        <input type="hidden" name="_success" value="{{route('bills-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('bills_SINGLE-ACTION_payRmeDifferentAmount', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Different Rme Payment Amount </label>
+<input class='form-control' type='number' name='differentRmePaymentAmount' value='{{ old('differentRmePaymentAmount') ? old('differentRmePaymentAmount') : '' }}' >
+</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('bills-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

resources/views/pro/bills_SINGLE/ACTION_payRmmDifferentAmount.blade.php

@@ -0,0 +1,41 @@
+@extends('pro.bills.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3">
+        <div>Pay Rmm Different Amount</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="true"
+          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/bill/payRmmDifferentAmount">
+        <input type="hidden" name="_success" value="{{route('bills-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('bills_SINGLE-ACTION_payRmmDifferentAmount', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Different Rmm Payment Amount </label>
+<input class='form-control' type='number' name='differentRmmPaymentAmount' value='{{ old('differentRmmPaymentAmount') ? old('differentRmmPaymentAmount') : '' }}' >
+</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('bills-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

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

@@ -27,8 +27,14 @@
         <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
         <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_generateBillForCm', ['uid' => $record->uid])}}">
         <div class='form-group mb-3'>
-<label class='control-label'>Number Of Minutes </label>
-<input class='form-control' type='number' name='numberOfMinutes' value='{{ old('numberOfMinutes') ? old('numberOfMinutes') : '' }}' >
+<label class='control-label'>Cm Code </label>
+<select class='form-control' name='cmCode' value='{{ old('cmCode') ? old('cmCode') : '' }}' >
+<option value=''>-- Select --</option>
+<option <?= 'CM20' === (old('cmCode') ? old('cmCode') : '') ? 'selected' : '' ?> value='CM20'>CM20</option>
+<option <?= 'CM30_HCP' === (old('cmCode') ? old('cmCode') : '') ? 'selected' : '' ?> value='CM30_HCP'>CM30_HCP</option>
+<option <?= 'CM60' === (old('cmCode') ? old('cmCode') : '') ? 'selected' : '' ?> value='CM60'>CM60</option>
+<option <?= 'CM90' === (old('cmCode') ? old('cmCode') : '') ? 'selected' : '' ?> value='CM90'>CM90</option>
+</select>
 </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/pro/care_months_SINGLE/ACTION_generateBillForRm.blade.php

@@ -27,8 +27,14 @@
         <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
         <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_generateBillForRm', ['uid' => $record->uid])}}">
         <div class='form-group mb-3'>
-<label class='control-label'>Number Of Minutes </label>
-<input class='form-control' type='number' name='numberOfMinutes' value='{{ old('numberOfMinutes') ? old('numberOfMinutes') : '' }}' >
+<label class='control-label'>Rm Code </label>
+<select class='form-control' name='rmCode' value='{{ old('rmCode') ? old('rmCode') : '' }}' >
+<option value=''>-- Select --</option>
+<option <?= 'RM1' === (old('rmCode') ? old('rmCode') : '') ? 'selected' : '' ?> value='RM1'>RM1</option>
+<option <?= 'RM20' === (old('rmCode') ? old('rmCode') : '') ? 'selected' : '' ?> value='RM20'>RM20</option>
+<option <?= 'RM30' === (old('rmCode') ? old('rmCode') : '') ? 'selected' : '' ?> value='RM30'>RM30</option>
+<option <?= 'RM60' === (old('rmCode') ? old('rmCode') : '') ? 'selected' : '' ?> value='RM60'>RM60</option>
+</select>
 </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/pro/care_months_SINGLE/SUB_dashboard.blade.php

@@ -21,7 +21,7 @@
 <tr><td class="w-25 px-2 text-secondary border-right">Cm Reason1</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_reason1 ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Cm Reason2</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_reason2 ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Cm Total Time In Seconds</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_total_time_in_seconds ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Cm Total Time In Seconds By Ally</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_total_time_in_seconds_by_ally ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Cm Total Time In Seconds By Cm Pro</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_total_time_in_seconds_by_cm_pro ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Cm Total Time In Seconds By Mcp</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_total_time_in_seconds_by_mcp ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Has Mcp Done Em Visit</td><td class="w-75 px-2 font-weight-bold"><?= $record->has_mcp_done_em_visit ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Is Client Enrolled In Cm</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_client_enrolled_in_cm ?></td></tr>
@@ -32,8 +32,9 @@
 <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 ?></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">Rm Total Time In Seconds</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_total_time_in_seconds ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Rm Total Time In Seconds By Ally</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_total_time_in_seconds_by_ally ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Rm Total Time In Seconds By Mcp</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_total_time_in_seconds_by_mcp ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rm Total Time In Seconds By Rme Pro</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_total_time_in_seconds_by_rme_pro ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rm Total Time In Seconds By Rmm Pro</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_total_time_in_seconds_by_rmm_pro ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Start Date</td><td class="w-75 px-2 font-weight-bold"><?= $record->start_date ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Why Is Cm Canceled This Month</td><td class="w-75 px-2 font-weight-bold"><?= $record->why_is_cm_canceled_this_month ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Why Is Rm Canceled This Month</td><td class="w-75 px-2 font-weight-bold"><?= $record->why_is_rm_canceled_this_month ?></td></tr>
@@ -42,15 +43,11 @@
 <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 ?></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>
 <tr><td class="w-25 px-2 text-secondary border-right">Created By Session Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->created_by_session_id ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Ally Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->ally_pro_id ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Client Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->client_id ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Cm Bill Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_bill_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Cm Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_pro_id ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Mcp Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->mcp_pro_id ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Rm Bill Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_bill_id ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Cm Total Time In Seconds By Cm Pro</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_total_time_in_seconds_by_cm_pro ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Rm Total Time In Seconds By Rme Pro</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_total_time_in_seconds_by_rme_pro ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Rm Total Time In Seconds By Rmm Pro</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_total_time_in_seconds_by_rmm_pro ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Cm Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_pro_id ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Rme Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->rme_pro_id ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Rmm Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->rmm_pro_id ?></td></tr>
         </tbody>

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

@@ -36,12 +36,32 @@
 </select>
 </div>
 <div class='form-group mb-3'>
-<label class='control-label'>Ally Pro </label>
-<select class='form-control' name='allyProUid' value='{{ old('allyProUid') ? old('allyProUid') : '' }}' >
+<label class='control-label'>Cm Pro </label>
+<select class='form-control' name='cmProUid' value='{{ old('cmProUid') ? old('cmProUid') : '' }}' >
 <option value=''>-- Select --</option>
 <?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
 <?php foreach($dbOptions as $o): ?>
-<option <?= $o->uid === (old('allyProUid') ? old('allyProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<option <?= $o->uid === (old('cmProUid') ? old('cmProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Rme Pro </label>
+<select class='form-control' name='rmeProUid' value='{{ old('rmeProUid') ? old('rmeProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('rmeProUid') ? old('rmeProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Rmm Pro </label>
+<select class='form-control' name='rmmProUid' value='{{ old('rmmProUid') ? old('rmmProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('rmmProUid') ? old('rmmProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
 <?php endforeach; ?>
 </select>
 </div>

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

@@ -18,7 +18,9 @@
 <th>CM</th>
 <th>RM</th>
 <th>MCP</th>
-<th>Ally</th>
+<th>CM</th>
+<th>RME</th>
+<th>RMM</th>
             </tr>
             </thead>
             <tbody>
@@ -31,7 +33,11 @@
 <td><?= $record->is_client_enrolled_in_rm ?></td>
 <td><?php $_r = \Illuminate\Support\Facades\DB::select("SELECT name_display AS result FROM pro WHERE id = " . ($record->mcp_pro_id ? $record->mcp_pro_id : -1) . "");
 echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
-<td><?php $_r = \Illuminate\Support\Facades\DB::select("SELECT name_display AS result FROM pro WHERE id = " . ($record->ally_pro_id ? $record->ally_pro_id : -1) . "");
+<td><?php $_r = \Illuminate\Support\Facades\DB::select("SELECT name_display AS result FROM pro WHERE id = " . ($record->cm_pro_id ? $record->cm_pro_id : -1) . "");
+echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
+<td><?php $_r = \Illuminate\Support\Facades\DB::select("SELECT name_display AS result FROM pro WHERE id = " . ($record->rme_pro_id ? $record->rme_pro_id : -1) . "");
+echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
+<td><?php $_r = \Illuminate\Support\Facades\DB::select("SELECT name_display AS result FROM pro WHERE id = " . ($record->rmm_pro_id ? $record->rmm_pro_id : -1) . "");
 echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
                 </tr>
             @endforeach

resources/views/pro/my_clients_SINGLE/SUB_notes.blade.php

@@ -42,6 +42,10 @@
 <th>Hcp Pro Id</th>
 <th>Signed By Ally Session Id</th>
 <th>Signed By Hcp Session Id</th>
+<th>Content Html</th>
+<th>Free Text Html</th>
+<th>Title</th>
+<th>Note Template Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -75,6 +79,10 @@
 <td><?= $subRecord->hcp_pro_id ?></td>
 <td><?= $subRecord->signed_by_ally_session_id ?></td>
 <td><?= $subRecord->signed_by_hcp_session_id ?></td>
+<td><?= $subRecord->content_html ?></td>
+<td><?= $subRecord->free_text_html ?></td>
+<td><?= $subRecord->title ?></td>
+<td><?= $subRecord->note_template_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -4,23 +4,79 @@
     <div class="row mt-3">
     <div class="col-8">
 
-        <div class="table-responsive p-0 bg-white table-sm">
-            <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>
-                @foreach($record as $k => $v)
-                    <tr>
-                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
-                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
-                    </tr>
-                @endforeach
-                </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>
+        <tr>
+            <th colspan="2" class="px-2">Bill Details
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Created At</td><td class="w-75 px-2 font-weight-bold"><?= $record->created_at ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Type</td><td class="w-75 px-2 font-weight-bold"><?= $record->type ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Uid</td><td class="w-75 px-2 font-weight-bold"><?= $record->uid ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Bill Service Type</td><td class="w-75 px-2 font-weight-bold"><?= $record->bill_service_type ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Cm Expected Payment Amount</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_expected_payment_amount ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Cm Or Rm</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_or_rm ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Cm Payment Amount</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_payment_amount ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Code</td><td class="w-75 px-2 font-weight-bold"><?= $record->code ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Collected Amount</td><td class="w-75 px-2 font-weight-bold"><?= $record->collected_amount ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Effective Date</td><td class="w-75 px-2 font-weight-bold"><?= $record->effective_date ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Has Cm Been Paid</td><td class="w-75 px-2 font-weight-bold"><?= $record->has_cm_been_paid ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Has Hcp Been Paid</td><td class="w-75 px-2 font-weight-bold"><?= $record->has_hcp_been_paid ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Has Rme Been Paid</td><td class="w-75 px-2 font-weight-bold"><?= $record->has_rme_been_paid ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Has Rmm Been Paid</td><td class="w-75 px-2 font-weight-bold"><?= $record->has_rmm_been_paid ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Hcp Expected Payment Amount</td><td class="w-75 px-2 font-weight-bold"><?= $record->hcp_expected_payment_amount ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Hcp Payment Amount</td><td class="w-75 px-2 font-weight-bold"><?= $record->hcp_payment_amount ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Is Cancelled</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_cancelled ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Is Signed By Cm</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_signed_by_cm ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Is Signed By Hcp</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_signed_by_hcp ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Is Signed By Rme</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_signed_by_rme ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Is Signed By Rmm</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_signed_by_rmm ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Is Submitted</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_submitted ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Marked Cancelled At</td><td class="w-75 px-2 font-weight-bold"><?= $record->marked_cancelled_at ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Marked Submitted At</td><td class="w-75 px-2 font-weight-bold"><?= $record->marked_submitted_at ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Modifier</td><td class="w-75 px-2 font-weight-bold"><?= $record->modifier ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Number Of Units</td><td class="w-75 px-2 font-weight-bold"><?= $record->number_of_units ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Reason1</td><td class="w-75 px-2 font-weight-bold"><?= $record->reason1 ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Reason2</td><td class="w-75 px-2 font-weight-bold"><?= $record->reason2 ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Reason3</td><td class="w-75 px-2 font-weight-bold"><?= $record->reason3 ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Reason3plus</td><td class="w-75 px-2 font-weight-bold"><?= $record->reason3plus ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rme Expected Payment Amount</td><td class="w-75 px-2 font-weight-bold"><?= $record->rme_expected_payment_amount ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rme Payment Amount</td><td class="w-75 px-2 font-weight-bold"><?= $record->rme_payment_amount ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rmm Expected Payment Amount</td><td class="w-75 px-2 font-weight-bold"><?= $record->rmm_expected_payment_amount ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rmm Payment Amount</td><td class="w-75 px-2 font-weight-bold"><?= $record->rmm_payment_amount ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Service Location</td><td class="w-75 px-2 font-weight-bold"><?= $record->service_location ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Signed By Cm At</td><td class="w-75 px-2 font-weight-bold"><?= $record->signed_by_cm_at ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Signed By Hcp At</td><td class="w-75 px-2 font-weight-bold"><?= $record->signed_by_hcp_at ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Signed By Rme At</td><td class="w-75 px-2 font-weight-bold"><?= $record->signed_by_rme_at ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Signed By Rmm At</td><td class="w-75 px-2 font-weight-bold"><?= $record->signed_by_rmm_at ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Created By Session Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->created_by_session_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Care Month Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->care_month_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Client Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->client_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Cm Payment Pro Transaction Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_payment_pro_transaction_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Cm Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_pro_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Hcp Payment Pro Transaction Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->hcp_payment_pro_transaction_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Hcp Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->hcp_pro_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Marked Cancelled By Session Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->marked_cancelled_by_session_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Marked Submitted By Session Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->marked_submitted_by_session_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Note Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->note_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Note Ally Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->note_ally_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rme Payment Pro Transaction Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->rme_payment_pro_transaction_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rme Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->rme_pro_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rmm Payment Pro Transaction Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->rmm_payment_pro_transaction_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rmm Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->rmm_pro_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Signed By Cm Session Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->signed_by_cm_session_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Signed By Hcp Session Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->signed_by_hcp_session_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Signed By Rme Session Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->signed_by_rme_session_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Signed By Rmm Session Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->signed_by_rmm_session_id ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
 
     </div>
     <div class="col-4">

routes/generated.php

@@ -166,8 +166,12 @@ Route::get('/bills/view/{uid}', 'bills_Controller@view')->name('bills-view');
 // --- pro: bills_SINGLE --- //
 Route::get('/bills/view/{uid}/ACTION_payHcpAmount', 'bills_SINGLE_Controller@ACTION_payHcpAmount')->name('bills_SINGLE-ACTION_payHcpAmount');
 Route::get('/bills/view/{uid}/ACTION_payHcpDifferentAmount', 'bills_SINGLE_Controller@ACTION_payHcpDifferentAmount')->name('bills_SINGLE-ACTION_payHcpDifferentAmount');
+Route::get('/bills/view/{uid}/ACTION_payCmDifferentAmount', 'bills_SINGLE_Controller@ACTION_payCmDifferentAmount')->name('bills_SINGLE-ACTION_payCmDifferentAmount');
+Route::get('/bills/view/{uid}/ACTION_payRmeDifferentAmount', 'bills_SINGLE_Controller@ACTION_payRmeDifferentAmount')->name('bills_SINGLE-ACTION_payRmeDifferentAmount');
+Route::get('/bills/view/{uid}/ACTION_payRmmDifferentAmount', 'bills_SINGLE_Controller@ACTION_payRmmDifferentAmount')->name('bills_SINGLE-ACTION_payRmmDifferentAmount');
 Route::get('/bills/view/{uid}/ACTION_signAsHcp', 'bills_SINGLE_Controller@ACTION_signAsHcp')->name('bills_SINGLE-ACTION_signAsHcp');
 Route::get('/bills/view/{uid}/ACTION_markSubmitted', 'bills_SINGLE_Controller@ACTION_markSubmitted')->name('bills_SINGLE-ACTION_markSubmitted');
+Route::get('/bills/view/{uid}/ACTION_markCancelled', 'bills_SINGLE_Controller@ACTION_markCancelled')->name('bills_SINGLE-ACTION_markCancelled');
 Route::get('/bills/view/{uid}/ACTION_putCollectedAmount', 'bills_SINGLE_Controller@ACTION_putCollectedAmount')->name('bills_SINGLE-ACTION_putCollectedAmount');
 Route::get('/bills/view/{uid}/SUB_dashboard', 'bills_SINGLE_Controller@SUB_dashboard')->name('bills_SINGLE-SUB_dashboard');
 Route::get('/bills/view/{uid}/SUB_transactions', 'bills_SINGLE_Controller@SUB_transactions')->name('bills_SINGLE-SUB_transactions');
@@ -254,7 +258,7 @@ Route::get('/pros/view/{uid}/ACTION_setIsDriverLicenseCompleteToFalse', 'pros_SI
 Route::get('/pros/view/{uid}/ACTION_setIsSsnCompleteToTrue', 'pros_SINGLE_Controller@ACTION_setIsSsnCompleteToTrue')->name('pros_SINGLE-ACTION_setIsSsnCompleteToTrue');
 Route::get('/pros/view/{uid}/ACTION_setIsSsnCompleteToFalse', 'pros_SINGLE_Controller@ACTION_setIsSsnCompleteToFalse')->name('pros_SINGLE-ACTION_setIsSsnCompleteToFalse');
 Route::get('/pros/view/{uid}/SUB_dashboard', 'pros_SINGLE_Controller@SUB_dashboard')->name('pros_SINGLE-SUB_dashboard');
-Route::get('/pros/view/{uid}/SUB_payment_schedule', 'pros_SINGLE_Controller@SUB_payment_schedule')->name('pros_SINGLE-SUB_payment_schedule');
+Route::get('/pros/view/{uid}/SUB_my_payment_schedule', 'pros_SINGLE_Controller@SUB_my_payment_schedule')->name('pros_SINGLE-SUB_my_payment_schedule');
 Route::get('/pros/view/{uid}/SUB_clients', 'pros_SINGLE_Controller@SUB_clients')->name('pros_SINGLE-SUB_clients');
 Route::get('/pros/view/{uid}/SUB_pro_access', 'pros_SINGLE_Controller@SUB_pro_access')->name('pros_SINGLE-SUB_pro_access');
 Route::get('/pros/view/{uid}/SUB_mcp_updates', 'pros_SINGLE_Controller@SUB_mcp_updates')->name('pros_SINGLE-SUB_mcp_updates');
@@ -269,7 +273,7 @@ Route::get('/pros/view/{uid}/SUB_pro_transactions', 'pros_SINGLE_Controller@SUB_
 Route::get('/pros/view/{uid}/SUB_lobby_pros', 'pros_SINGLE_Controller@SUB_lobby_pros')->name('pros_SINGLE-SUB_lobby_pros');
 Route::get('/pros/view/{uid}/SUB_sessions', 'pros_SINGLE_Controller@SUB_sessions')->name('pros_SINGLE-SUB_sessions');
 Route::get('/pros/view/{uid}/SUB_audit_log', 'pros_SINGLE_Controller@SUB_audit_log')->name('pros_SINGLE-SUB_audit_log');
-Route::get('/pros/view/{uid}/ACTION_payment_scheduleAddNew', 'pros_SINGLE_Controller@ACTION_payment_scheduleAddNew')->name('pros_SINGLE-ACTION_payment_scheduleAddNew');
+Route::get('/pros/view/{uid}/ACTION_my_payment_scheduleAddNew', 'pros_SINGLE_Controller@ACTION_my_payment_scheduleAddNew')->name('pros_SINGLE-ACTION_my_payment_scheduleAddNew');
 Route::get('/pros/view/{uid}/ACTION_lobby_prosAddNew', 'pros_SINGLE_Controller@ACTION_lobby_prosAddNew')->name('pros_SINGLE-ACTION_lobby_prosAddNew');
 
 // --- admin: pro_rates --- //