regenerated tree

app/Http/Controllers/action_items_SINGLE_Controller.php

@@ -14,42 +14,70 @@ class action_items_SINGLE_Controller extends Controller
 	// GET /action_items/view/{uid}/ACTION_signAsPrescriber
 	public function ACTION_signAsPrescriber(Request $request, $uid) {
 		$record = DB::table('action_item')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('action_item')->where('id', $uid)->first();
+			if($record) return redirect('/action_items/view/' . $record->uid . '/ACTION_signAsPrescriber');
+		}
 		return response()->view('pro/action_items_SINGLE/ACTION_signAsPrescriber', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /action_items/view/{uid}/ACTION_updateToFacility
 	public function ACTION_updateToFacility(Request $request, $uid) {
 		$record = DB::table('action_item')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('action_item')->where('id', $uid)->first();
+			if($record) return redirect('/action_items/view/' . $record->uid . '/ACTION_updateToFacility');
+		}
 		return response()->view('pro/action_items_SINGLE/ACTION_updateToFacility', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /action_items/view/{uid}/ACTION_updateContent
 	public function ACTION_updateContent(Request $request, $uid) {
 		$record = DB::table('action_item')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('action_item')->where('id', $uid)->first();
+			if($record) return redirect('/action_items/view/' . $record->uid . '/ACTION_updateContent');
+		}
 		return response()->view('pro/action_items_SINGLE/ACTION_updateContent', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /action_items/view/{uid}/ACTION_updateStatus
 	public function ACTION_updateStatus(Request $request, $uid) {
 		$record = DB::table('action_item')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('action_item')->where('id', $uid)->first();
+			if($record) return redirect('/action_items/view/' . $record->uid . '/ACTION_updateStatus');
+		}
 		return response()->view('pro/action_items_SINGLE/ACTION_updateStatus', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /action_items/view/{uid}/ACTION_efax
 	public function ACTION_efax(Request $request, $uid) {
 		$record = DB::table('action_item')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('action_item')->where('id', $uid)->first();
+			if($record) return redirect('/action_items/view/' . $record->uid . '/ACTION_efax');
+		}
 		return response()->view('pro/action_items_SINGLE/ACTION_efax', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /action_items/view/{uid}/SUB_dashboard
 	public function SUB_dashboard(Request $request, $uid) {
 		$record = DB::table('action_item')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('action_item')->where('id', $uid)->first();
+			if($record) return redirect('/action_items/view/' . $record->uid . '/SUB_dashboard');
+		}
 		return response()->view('pro/action_items_SINGLE/SUB_dashboard', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /action_items/view/{uid}/SUB_audit_log
 	public function SUB_audit_log(Request $request, $uid) {
 		$record = DB::table('action_item')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('action_item')->where('id', $uid)->first();
+			if($record) return redirect('/action_items/view/' . $record->uid . '/SUB_audit_log');
+		}
 		return response()->view('pro/action_items_SINGLE/SUB_audit_log', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 }

app/Http/Controllers/bills_SINGLE_Controller.php

@@ -14,102 +14,170 @@ class bills_SINGLE_Controller extends Controller
 	// GET /bills/view/{uid}/ACTION_payHcpAmount
 	public function ACTION_payHcpAmount(Request $request, $uid) {
 		$record = DB::table('bill')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('bill')->where('id', $uid)->first();
+			if($record) return redirect('/bills/view/' . $record->uid . '/ACTION_payHcpAmount');
+		}
 		return response()->view('pro/bills_SINGLE/ACTION_payHcpAmount', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /bills/view/{uid}/ACTION_payHcpDifferentAmount
 	public function ACTION_payHcpDifferentAmount(Request $request, $uid) {
 		$record = DB::table('bill')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('bill')->where('id', $uid)->first();
+			if($record) return redirect('/bills/view/' . $record->uid . '/ACTION_payHcpDifferentAmount');
+		}
 		return response()->view('pro/bills_SINGLE/ACTION_payHcpDifferentAmount', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /bills/view/{uid}/ACTION_payCmAmount
 	public function ACTION_payCmAmount(Request $request, $uid) {
 		$record = DB::table('bill')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('bill')->where('id', $uid)->first();
+			if($record) return redirect('/bills/view/' . $record->uid . '/ACTION_payCmAmount');
+		}
 		return response()->view('pro/bills_SINGLE/ACTION_payCmAmount', 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();
+		if(!$record) {
+			$record = DB::table('bill')->where('id', $uid)->first();
+			if($record) return redirect('/bills/view/' . $record->uid . '/ACTION_payCmDifferentAmount');
+		}
 		return response()->view('pro/bills_SINGLE/ACTION_payCmDifferentAmount', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /bills/view/{uid}/ACTION_payRmeAmount
 	public function ACTION_payRmeAmount(Request $request, $uid) {
 		$record = DB::table('bill')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('bill')->where('id', $uid)->first();
+			if($record) return redirect('/bills/view/' . $record->uid . '/ACTION_payRmeAmount');
+		}
 		return response()->view('pro/bills_SINGLE/ACTION_payRmeAmount', 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();
+		if(!$record) {
+			$record = DB::table('bill')->where('id', $uid)->first();
+			if($record) return redirect('/bills/view/' . $record->uid . '/ACTION_payRmeDifferentAmount');
+		}
 		return response()->view('pro/bills_SINGLE/ACTION_payRmeDifferentAmount', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /bills/view/{uid}/ACTION_payRmmAmount
 	public function ACTION_payRmmAmount(Request $request, $uid) {
 		$record = DB::table('bill')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('bill')->where('id', $uid)->first();
+			if($record) return redirect('/bills/view/' . $record->uid . '/ACTION_payRmmAmount');
+		}
 		return response()->view('pro/bills_SINGLE/ACTION_payRmmAmount', 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();
+		if(!$record) {
+			$record = DB::table('bill')->where('id', $uid)->first();
+			if($record) return redirect('/bills/view/' . $record->uid . '/ACTION_payRmmDifferentAmount');
+		}
 		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();
+		if(!$record) {
+			$record = DB::table('bill')->where('id', $uid)->first();
+			if($record) return redirect('/bills/view/' . $record->uid . '/ACTION_signAsHcp');
+		}
 		return response()->view('pro/bills_SINGLE/ACTION_signAsHcp', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /bills/view/{uid}/ACTION_signAsCm
 	public function ACTION_signAsCm(Request $request, $uid) {
 		$record = DB::table('bill')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('bill')->where('id', $uid)->first();
+			if($record) return redirect('/bills/view/' . $record->uid . '/ACTION_signAsCm');
+		}
 		return response()->view('pro/bills_SINGLE/ACTION_signAsCm', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /bills/view/{uid}/ACTION_signAsRme
 	public function ACTION_signAsRme(Request $request, $uid) {
 		$record = DB::table('bill')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('bill')->where('id', $uid)->first();
+			if($record) return redirect('/bills/view/' . $record->uid . '/ACTION_signAsRme');
+		}
 		return response()->view('pro/bills_SINGLE/ACTION_signAsRme', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /bills/view/{uid}/ACTION_signAsRmm
 	public function ACTION_signAsRmm(Request $request, $uid) {
 		$record = DB::table('bill')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('bill')->where('id', $uid)->first();
+			if($record) return redirect('/bills/view/' . $record->uid . '/ACTION_signAsRmm');
+		}
 		return response()->view('pro/bills_SINGLE/ACTION_signAsRmm', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /bills/view/{uid}/ACTION_markSubmitted
 	public function ACTION_markSubmitted(Request $request, $uid) {
 		$record = DB::table('bill')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('bill')->where('id', $uid)->first();
+			if($record) return redirect('/bills/view/' . $record->uid . '/ACTION_markSubmitted');
+		}
 		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();
+		if(!$record) {
+			$record = DB::table('bill')->where('id', $uid)->first();
+			if($record) return redirect('/bills/view/' . $record->uid . '/ACTION_markCancelled');
+		}
 		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();
+		if(!$record) {
+			$record = DB::table('bill')->where('id', $uid)->first();
+			if($record) return redirect('/bills/view/' . $record->uid . '/ACTION_putCollectedAmount');
+		}
 		return response()->view('pro/bills_SINGLE/ACTION_putCollectedAmount', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /bills/view/{uid}/SUB_dashboard
 	public function SUB_dashboard(Request $request, $uid) {
 		$record = DB::table('bill')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('bill')->where('id', $uid)->first();
+			if($record) return redirect('/bills/view/' . $record->uid . '/SUB_dashboard');
+		}
 		return response()->view('pro/bills_SINGLE/SUB_dashboard', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /bills/view/{uid}/SUB_transactions
 	public function SUB_transactions(Request $request, $uid) {
 		$record = DB::table('bill')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('bill')->where('id', $uid)->first();
+			if($record) return redirect('/bills/view/' . $record->uid . '/SUB_transactions');
+		}
 		$subRecords = DB::table('pro_transaction')->where('bill_id', $record->id)->get();
 		return response()->view('pro/bills_SINGLE/SUB_transactions', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
@@ -117,6 +185,10 @@ class bills_SINGLE_Controller extends Controller
 	// GET /bills/view/{uid}/SUB_audit_log
 	public function SUB_audit_log(Request $request, $uid) {
 		$record = DB::table('bill')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('bill')->where('id', $uid)->first();
+			if($record) return redirect('/bills/view/' . $record->uid . '/SUB_audit_log');
+		}
 		return response()->view('pro/bills_SINGLE/SUB_audit_log', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 }

app/Http/Controllers/care_month_entries_SINGLE_Controller.php

@@ -14,24 +14,40 @@ class care_month_entries_SINGLE_Controller extends Controller
 	// GET /care_month_entries/view/{uid}/ACTION_updateContent
 	public function ACTION_updateContent(Request $request, $uid) {
 		$record = DB::table('care_month_entry')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month_entry')->where('id', $uid)->first();
+			if($record) return redirect('/care_month_entries/view/' . $record->uid . '/ACTION_updateContent');
+		}
 		return response()->view('pro/care_month_entries_SINGLE/ACTION_updateContent', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_month_entries/view/{uid}/ACTION_updateTiming
 	public function ACTION_updateTiming(Request $request, $uid) {
 		$record = DB::table('care_month_entry')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month_entry')->where('id', $uid)->first();
+			if($record) return redirect('/care_month_entries/view/' . $record->uid . '/ACTION_updateTiming');
+		}
 		return response()->view('pro/care_month_entries_SINGLE/ACTION_updateTiming', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_month_entries/view/{uid}/ACTION_remove
 	public function ACTION_remove(Request $request, $uid) {
 		$record = DB::table('care_month_entry')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month_entry')->where('id', $uid)->first();
+			if($record) return redirect('/care_month_entries/view/' . $record->uid . '/ACTION_remove');
+		}
 		return response()->view('pro/care_month_entries_SINGLE/ACTION_remove', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_month_entries/view/{uid}/SUB_dashboard
 	public function SUB_dashboard(Request $request, $uid) {
 		$record = DB::table('care_month_entry')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month_entry')->where('id', $uid)->first();
+			if($record) return redirect('/care_month_entries/view/' . $record->uid . '/SUB_dashboard');
+		}
 		$result_clients = DB::select("select id, concat(name_first, ' ', name_last) as name_display from client");
 		$result_pros = DB::select("select id, name_display from pro");
 		return response()->view('pro/care_month_entries_SINGLE/SUB_dashboard', compact('record', 'result_clients', 'result_pros'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');

app/Http/Controllers/care_months_SINGLE_Controller.php

@@ -14,186 +14,310 @@ class care_months_SINGLE_Controller extends Controller
 	// GET /care_months/view/{uid}/ACTION_assignMcpPro
 	public function ACTION_assignMcpPro(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_assignMcpPro');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_assignMcpPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_changeMcpPro
 	public function ACTION_changeMcpPro(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_changeMcpPro');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_changeMcpPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_removeMcpPro
 	public function ACTION_removeMcpPro(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_removeMcpPro');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_removeMcpPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_assignCmPro
 	public function ACTION_assignCmPro(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_assignCmPro');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_assignCmPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_changeCmPro
 	public function ACTION_changeCmPro(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_changeCmPro');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_changeCmPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_removeCmPro
 	public function ACTION_removeCmPro(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_removeCmPro');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_removeCmPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_assignRmePro
 	public function ACTION_assignRmePro(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_assignRmePro');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_assignRmePro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_changeRmePro
 	public function ACTION_changeRmePro(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_changeRmePro');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_changeRmePro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_removeRmePro
 	public function ACTION_removeRmePro(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_removeRmePro');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_removeRmePro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_assignRmmPro
 	public function ACTION_assignRmmPro(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_assignRmmPro');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_assignRmmPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_changeRmmPro
 	public function ACTION_changeRmmPro(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_changeRmmPro');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_changeRmmPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_removeRmmPro
 	public function ACTION_removeRmmPro(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_removeRmmPro');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_removeRmmPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_updateCmReasons
 	public function ACTION_updateCmReasons(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_updateCmReasons');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_updateCmReasons', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_updateRmReasons
 	public function ACTION_updateRmReasons(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_updateRmReasons');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_updateRmReasons', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_setIsClientEnrolledInCmToTrue
 	public function ACTION_setIsClientEnrolledInCmToTrue(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_setIsClientEnrolledInCmToTrue');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_setIsClientEnrolledInCmToTrue', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_setIsClientEnrolledInCmToFalse
 	public function ACTION_setIsClientEnrolledInCmToFalse(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_setIsClientEnrolledInCmToFalse');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_setIsClientEnrolledInCmToFalse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_updateWhyNotEnrolledInCm
 	public function ACTION_updateWhyNotEnrolledInCm(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_updateWhyNotEnrolledInCm');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_updateWhyNotEnrolledInCm', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_setIsClientEnrolledInRmToTrue
 	public function ACTION_setIsClientEnrolledInRmToTrue(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_setIsClientEnrolledInRmToTrue');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_setIsClientEnrolledInRmToTrue', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_setIsClientEnrolledInRmToFalse
 	public function ACTION_setIsClientEnrolledInRmToFalse(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_setIsClientEnrolledInRmToFalse');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_setIsClientEnrolledInRmToFalse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_updateWhyNotEnrolledInRm
 	public function ACTION_updateWhyNotEnrolledInRm(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_updateWhyNotEnrolledInRm');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_updateWhyNotEnrolledInRm', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_generateBillForCm
 	public function ACTION_generateBillForCm(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_generateBillForCm');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_generateBillForCm', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_generateBillForRm
 	public function ACTION_generateBillForRm(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_generateBillForRm');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_generateBillForRm', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_setIsCmCanceledThisMonthToTrue
 	public function ACTION_setIsCmCanceledThisMonthToTrue(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_setIsCmCanceledThisMonthToTrue');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_setIsCmCanceledThisMonthToTrue', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_updateWhyIsCmCanceledThisMonth
 	public function ACTION_updateWhyIsCmCanceledThisMonth(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_updateWhyIsCmCanceledThisMonth');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_updateWhyIsCmCanceledThisMonth', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_setIsCmCanceledThisMonthToFalse
 	public function ACTION_setIsCmCanceledThisMonthToFalse(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_setIsCmCanceledThisMonthToFalse');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_setIsCmCanceledThisMonthToFalse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_setIsRmCanceledThisMonthToTrue
 	public function ACTION_setIsRmCanceledThisMonthToTrue(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_setIsRmCanceledThisMonthToTrue');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_setIsRmCanceledThisMonthToTrue', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_updateWhyIsRmCanceledThisMonth
 	public function ACTION_updateWhyIsRmCanceledThisMonth(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_updateWhyIsRmCanceledThisMonth');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_updateWhyIsRmCanceledThisMonth', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_setIsRmCanceledThisMonthToFalse
 	public function ACTION_setIsRmCanceledThisMonthToFalse(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_setIsRmCanceledThisMonthToFalse');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_setIsRmCanceledThisMonthToFalse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_setIsTmThisMonthToTrue
 	public function ACTION_setIsTmThisMonthToTrue(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_setIsTmThisMonthToTrue');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_setIsTmThisMonthToTrue', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_setIsTmThisMonthToFalse
 	public function ACTION_setIsTmThisMonthToFalse(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_setIsTmThisMonthToFalse');
+		}
 		return response()->view('pro/care_months_SINGLE/ACTION_setIsTmThisMonthToFalse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/SUB_dashboard
 	public function SUB_dashboard(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/SUB_dashboard');
+		}
 		$result_clients = DB::select("select id, concat(name_first, ' ', name_last) as name_display from client");
 		$result_pros = DB::select("SELECT id, name_display FROM pro");
 		return response()->view('pro/care_months_SINGLE/SUB_dashboard', compact('record', 'result_clients', 'result_pros'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
@@ -202,6 +326,10 @@ class care_months_SINGLE_Controller extends Controller
 	// GET /care_months/view/{uid}/SUB_cm_time_entries
 	public function SUB_cm_time_entries(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/SUB_cm_time_entries');
+		}
 		$subRecords = DB::table('care_month_entry')->where('care_month_id', $record->id)->where('cm_or_rm', 'CM')->get();
 		return response()->view('pro/care_months_SINGLE/SUB_cm_time_entries', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
@@ -209,6 +337,10 @@ class care_months_SINGLE_Controller extends Controller
 	// GET /care_months/view/{uid}/SUB_rm_time_entries
 	public function SUB_rm_time_entries(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/SUB_rm_time_entries');
+		}
 		$subRecords = DB::table('care_month_entry')->where('care_month_id', $record->id)->where('cm_or_rm', 'RM')->get();
 		return response()->view('pro/care_months_SINGLE/SUB_rm_time_entries', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
@@ -216,6 +348,10 @@ class care_months_SINGLE_Controller extends Controller
 	// GET /care_months/view/{uid}/SUB_bills
 	public function SUB_bills(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/SUB_bills');
+		}
 		$subRecords = DB::table('bill')->where('care_month_id', $record->id)->get();
 		return response()->view('pro/care_months_SINGLE/SUB_bills', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
@@ -223,18 +359,30 @@ class care_months_SINGLE_Controller extends Controller
 	// GET /care_months/view/{uid}/SUB_audit_log
 	public function SUB_audit_log(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/SUB_audit_log');
+		}
 		return response()->view('pro/care_months_SINGLE/SUB_audit_log', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
-	// GET /care_months/view/{uid}/ACTION_cm_time_entriesAddNew
-	public function ACTION_cm_time_entriesAddNew(Request $request, $uid) {
+	// GET /care_months/view/{uid}/ACTION_add_new_care_month_entry
+	public function ACTION_add_new_care_month_entry(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
-		return response()->view('pro/care_months_SINGLE/ACTION_cm_time_entriesAddNew', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_add_new_care_month_entry');
+		}
+		return response()->view('pro/care_months_SINGLE/ACTION_add_new_care_month_entry', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
-	// GET /care_months/view/{uid}/ACTION_rm_time_entriesAddNew
-	public function ACTION_rm_time_entriesAddNew(Request $request, $uid) {
+	// GET /care_months/view/{uid}/ACTION_add_new_care_month_entry
+	public function ACTION_add_new_care_month_entry(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
-		return response()->view('pro/care_months_SINGLE/ACTION_rm_time_entriesAddNew', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_add_new_care_month_entry');
+		}
+		return response()->view('pro/care_months_SINGLE/ACTION_add_new_care_month_entry', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 }

app/Http/Controllers/client_pro_access_SINGLE_Controller.php

@@ -14,36 +14,60 @@ class client_pro_access_SINGLE_Controller extends Controller
 	// GET /client_pro_access/view/{uid}/ACTION_updateReason
 	public function ACTION_updateReason(Request $request, $uid) {
 		$record = DB::table('client_pro_access')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('client_pro_access')->where('id', $uid)->first();
+			if($record) return redirect('/client_pro_access/view/' . $record->uid . '/ACTION_updateReason');
+		}
 		return response()->view('admin/client_pro_access_SINGLE/ACTION_updateReason', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /client_pro_access/view/{uid}/ACTION_deactivate
 	public function ACTION_deactivate(Request $request, $uid) {
 		$record = DB::table('client_pro_access')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('client_pro_access')->where('id', $uid)->first();
+			if($record) return redirect('/client_pro_access/view/' . $record->uid . '/ACTION_deactivate');
+		}
 		return response()->view('admin/client_pro_access_SINGLE/ACTION_deactivate', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /client_pro_access/view/{uid}/ACTION_updateDeactivationMemo
 	public function ACTION_updateDeactivationMemo(Request $request, $uid) {
 		$record = DB::table('client_pro_access')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('client_pro_access')->where('id', $uid)->first();
+			if($record) return redirect('/client_pro_access/view/' . $record->uid . '/ACTION_updateDeactivationMemo');
+		}
 		return response()->view('admin/client_pro_access_SINGLE/ACTION_updateDeactivationMemo', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /client_pro_access/view/{uid}/ACTION_reactivate
 	public function ACTION_reactivate(Request $request, $uid) {
 		$record = DB::table('client_pro_access')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('client_pro_access')->where('id', $uid)->first();
+			if($record) return redirect('/client_pro_access/view/' . $record->uid . '/ACTION_reactivate');
+		}
 		return response()->view('admin/client_pro_access_SINGLE/ACTION_reactivate', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /client_pro_access/view/{uid}/ACTION_updateReactivationMemo
 	public function ACTION_updateReactivationMemo(Request $request, $uid) {
 		$record = DB::table('client_pro_access')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('client_pro_access')->where('id', $uid)->first();
+			if($record) return redirect('/client_pro_access/view/' . $record->uid . '/ACTION_updateReactivationMemo');
+		}
 		return response()->view('admin/client_pro_access_SINGLE/ACTION_updateReactivationMemo', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /client_pro_access/view/{uid}/SUB_dashboard
 	public function SUB_dashboard(Request $request, $uid) {
 		$record = DB::table('client_pro_access')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('client_pro_access')->where('id', $uid)->first();
+			if($record) return redirect('/client_pro_access/view/' . $record->uid . '/SUB_dashboard');
+		}
 		return response()->view('admin/client_pro_access_SINGLE/SUB_dashboard', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 }

app/Http/Controllers/clients_Controller.php

@@ -14,7 +14,7 @@ class clients_Controller extends Controller
 	// GET /clients
 	public function index(Request $request) {
 		$records = DB::table('client')->get();
-		$result_pros = DB::select("SELECT id, name_display FROM pro");
+		$result_pros = DB::select("SELECT id, concat(name_last, ', ', name_first) as name_display FROM pro");
 		return response()->view('pro/clients/index', compact('records', 'result_pros'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 

app/Http/Controllers/clients_SINGLE_Controller.php

@@ -2,11 +2,9 @@
 
 namespace App\Http\Controllers;
 
-use App\Models\Pro;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Auth;
-use App\Models\Client;
 
 class clients_SINGLE_Controller extends Controller
 {
@@ -15,395 +13,651 @@ class clients_SINGLE_Controller extends Controller
 
 	// GET /clients/view/{uid}/ACTION_sendCellNumberConfirmationMessage
 	public function ACTION_sendCellNumberConfirmationMessage(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_sendCellNumberConfirmationMessage');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_sendCellNumberConfirmationMessage', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_confirmCellNumberWithConfirmationToken
 	public function ACTION_confirmCellNumberWithConfirmationToken(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_confirmCellNumberWithConfirmationToken');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_confirmCellNumberWithConfirmationToken', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_putNewCellNumber
 	public function ACTION_putNewCellNumber(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_putNewCellNumber');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_putNewCellNumber', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_putNewEmailAddress
 	public function ACTION_putNewEmailAddress(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_putNewEmailAddress');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_putNewEmailAddress', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_sendEmailAddressConfirmationMessage
 	public function ACTION_sendEmailAddressConfirmationMessage(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_sendEmailAddressConfirmationMessage');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_sendEmailAddressConfirmationMessage', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_confirmEmailAddressWithConfirmationToken
 	public function ACTION_confirmEmailAddressWithConfirmationToken(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_confirmEmailAddressWithConfirmationToken');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_confirmEmailAddressWithConfirmationToken', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_deactivate
 	public function ACTION_deactivate(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_deactivate');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_deactivate', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_updateDeactivationMemo
 	public function ACTION_updateDeactivationMemo(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_updateDeactivationMemo');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_updateDeactivationMemo', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_reactivate
 	public function ACTION_reactivate(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_reactivate');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_reactivate', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_updateReactivationMemo
 	public function ACTION_updateReactivationMemo(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_updateReactivationMemo');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_updateReactivationMemo', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_editSource
 	public function ACTION_editSource(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_editSource');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_editSource', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_setIsDuplicateToTrue
 	public function ACTION_setIsDuplicateToTrue(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_setIsDuplicateToTrue');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_setIsDuplicateToTrue', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_setIsDuplicateToFalse
 	public function ACTION_setIsDuplicateToFalse(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_setIsDuplicateToFalse');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_setIsDuplicateToFalse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_editName
 	public function ACTION_editName(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_editName');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_editName', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_editDob
 	public function ACTION_editDob(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_editDob');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_editDob', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_editDemographics
 	public function ACTION_editDemographics(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_editDemographics');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_editDemographics', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_editSpouse
 	public function ACTION_editSpouse(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_editSpouse');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_editSpouse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_editIntakeDetails
 	public function ACTION_editIntakeDetails(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_editIntakeDetails');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_editIntakeDetails', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_editResponsibleParty
 	public function ACTION_editResponsibleParty(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_editResponsibleParty');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_editResponsibleParty', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_editEmergencyRelationship
 	public function ACTION_editEmergencyRelationship(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_editEmergencyRelationship');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_editEmergencyRelationship', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_editFamilyInfo
 	public function ACTION_editFamilyInfo(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_editFamilyInfo');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_editFamilyInfo', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_editContactDetails
 	public function ACTION_editContactDetails(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_editContactDetails');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_editContactDetails', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_editAddress
 	public function ACTION_editAddress(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_editAddress');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_editAddress', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_editMiscDemographics
 	public function ACTION_editMiscDemographics(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_editMiscDemographics');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_editMiscDemographics', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_setIsDeceasedToTrue
 	public function ACTION_setIsDeceasedToTrue(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_setIsDeceasedToTrue');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_setIsDeceasedToTrue', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_setIsDeceasedToFalse
 	public function ACTION_setIsDeceasedToFalse(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_setIsDeceasedToFalse');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_setIsDeceasedToFalse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_editPharmacy
 	public function ACTION_editPharmacy(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_editPharmacy');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_editPharmacy', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_editSsn
 	public function ACTION_editSsn(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_editSsn');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_editSsn', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_putMedicareInfo
 	public function ACTION_putMedicareInfo(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_putMedicareInfo');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_putMedicareInfo', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_removeMcn
 	public function ACTION_removeMcn(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_removeMcn');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_removeMcn', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_updateWebcamInfo
 	public function ACTION_updateWebcamInfo(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_updateWebcamInfo');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_updateWebcamInfo', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_putMcp
 	public function ACTION_putMcp(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_putMcp');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_putMcp', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_removeMcp
 	public function ACTION_removeMcp(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_removeMcp');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_removeMcp', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_updateMcpOnboardingVisitInfo
 	public function ACTION_updateMcpOnboardingVisitInfo(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_updateMcpOnboardingVisitInfo');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_updateMcpOnboardingVisitInfo', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_updateMcpOnboardingActiveInfo
 	public function ACTION_updateMcpOnboardingActiveInfo(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_updateMcpOnboardingActiveInfo');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_updateMcpOnboardingActiveInfo', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_putMcpOnboardingPro
 	public function ACTION_putMcpOnboardingPro(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_putMcpOnboardingPro');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_putMcpOnboardingPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_removeMcpOnboardingPro
 	public function ACTION_removeMcpOnboardingPro(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_removeMcpOnboardingPro');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_removeMcpOnboardingPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_acceptAssignmentAsMcpOnboardingPro
 	public function ACTION_acceptAssignmentAsMcpOnboardingPro(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_acceptAssignmentAsMcpOnboardingPro');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_acceptAssignmentAsMcpOnboardingPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_rejectAssignmentAsMcpOnboardingPro
 	public function ACTION_rejectAssignmentAsMcpOnboardingPro(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_rejectAssignmentAsMcpOnboardingPro');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_rejectAssignmentAsMcpOnboardingPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_updateMcpOnboardingProDecisionMemo
 	public function ACTION_updateMcpOnboardingProDecisionMemo(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_updateMcpOnboardingProDecisionMemo');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_updateMcpOnboardingProDecisionMemo', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_updateMcpOnboardingStrategy
 	public function ACTION_updateMcpOnboardingStrategy(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_updateMcpOnboardingStrategy');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_updateMcpOnboardingStrategy', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_updateNextMcpOnboardingAttempt
 	public function ACTION_updateNextMcpOnboardingAttempt(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_updateNextMcpOnboardingAttempt');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_updateNextMcpOnboardingAttempt', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_putCmPro
 	public function ACTION_putCmPro(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_putCmPro');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_putCmPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_removeCmPro
 	public function ACTION_removeCmPro(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_removeCmPro');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_removeCmPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_putRmePro
 	public function ACTION_putRmePro(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_putRmePro');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_putRmePro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_removeRmePro
 	public function ACTION_removeRmePro(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_removeRmePro');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_removeRmePro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_putRmmPro
 	public function ACTION_putRmmPro(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_putRmmPro');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_putRmmPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_removeRmmPro
 	public function ACTION_removeRmmPro(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_removeRmmPro');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_removeRmmPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_putRdPro
 	public function ACTION_putRdPro(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_putRdPro');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_putRdPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_removeRdPro
 	public function ACTION_removeRdPro(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_removeRdPro');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_removeRdPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_updateMntEligibility
 	public function ACTION_updateMntEligibility(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_updateMntEligibility');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_updateMntEligibility', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_updateCmEligibility
 	public function ACTION_updateCmEligibility(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_updateCmEligibility');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_updateCmEligibility', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_setIsEnrolledInCmToFalse
 	public function ACTION_setIsEnrolledInCmToFalse(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_setIsEnrolledInCmToFalse');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_setIsEnrolledInCmToFalse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_setIsEnrolledInCmToTrue
 	public function ACTION_setIsEnrolledInCmToTrue(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_setIsEnrolledInCmToTrue');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_setIsEnrolledInCmToTrue', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_updateCmReasons
 	public function ACTION_updateCmReasons(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_updateCmReasons');
+		}
 		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 = Client::where('uid', $uid)->first();
+		$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 = Client::where('uid', $uid)->first();
+		$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_updateCmEnrollmentConsentInfo');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_updateCmEnrollmentConsentInfo', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_updateWhyNotEnrolledInCm
 	public function ACTION_updateWhyNotEnrolledInCm(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_updateWhyNotEnrolledInCm');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_updateWhyNotEnrolledInCm', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_updateRmEligibility
 	public function ACTION_updateRmEligibility(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_updateRmEligibility');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_updateRmEligibility', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_setIsEnrolledInRmToFalse
 	public function ACTION_setIsEnrolledInRmToFalse(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_setIsEnrolledInRmToFalse');
+		}
 		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 = Client::where('uid', $uid)->first();
+		$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 = Client::where('uid', $uid)->first();
+		$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_updateWhyNotEnrolledInRm');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_updateWhyNotEnrolledInRm', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/ACTION_updateEquipmentInfo
 	public function ACTION_updateEquipmentInfo(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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_updateEquipmentInfo');
+		}
 		return response()->view('pro/clients_SINGLE/ACTION_updateEquipmentInfo', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/SUB_dashboard
 	public function SUB_dashboard(Request $request, $uid) {
-		$record = Client::where("uid", $uid)->first();
-		$careMonth = $record->careMonth;//TODO: get caremonth selected from the UI
-        $inCallWithPros = Pro::where('in_meeting_with_client_id', $record->id)->get();
-		return response()->view('pro/clients_SINGLE/SUB_dashboard',
-            compact('record', 'careMonth', 'inCallWithPros'),
-            session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		$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 . '/SUB_dashboard');
+		}
+		return response()->view('pro/clients_SINGLE/SUB_dashboard', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/SUB_detail
 	public function SUB_detail(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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 . '/SUB_detail');
+		}
 		$result_clients = DB::select("select id, concat(name_first, ' ', name_last) as name_display from client");
 		$result_pros = DB::select("select id, name_display from pro");
 		$result_facilities = DB::select("select id, name from facility");
@@ -413,56 +667,88 @@ class clients_SINGLE_Controller extends Controller
 
 	// GET /clients/view/{uid}/SUB_measurements
 	public function SUB_measurements(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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 . '/SUB_measurements');
+		}
 		$subRecords = DB::table('measurement')->where('client_id', $record->id)->get();
 		return response()->view('pro/clients_SINGLE/SUB_measurements', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/SUB_med_profile
 	public function SUB_med_profile(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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 . '/SUB_med_profile');
+		}
 		$subRecords = DB::table('client_info_line')->where('client_id', $record->id)->get();
 		return response()->view('pro/clients_SINGLE/SUB_med_profile', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/SUB_med_profile_log
 	public function SUB_med_profile_log(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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 . '/SUB_med_profile_log');
+		}
 		$subRecords = DB::table('client_info_line_update')->where('client_id', $record->id)->get();
 		return response()->view('pro/clients_SINGLE/SUB_med_profile_log', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/SUB_pro_access
 	public function SUB_pro_access(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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 . '/SUB_pro_access');
+		}
 		$subRecords = DB::table('client_pro_access')->where('client_id', $record->id)->get();
 		return response()->view('pro/clients_SINGLE/SUB_pro_access', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/SUB_notes
 	public function SUB_notes(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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 . '/SUB_notes');
+		}
 		$subRecords = DB::table('note')->where('client_id', $record->id)->get();
 		return response()->view('pro/clients_SINGLE/SUB_notes', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/SUB_relationships
 	public function SUB_relationships(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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 . '/SUB_relationships');
+		}
 		$subRecords = DB::table('relationship')->where('client_id', $record->id)->get();
 		return response()->view('pro/clients_SINGLE/SUB_relationships', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/SUB_care_months
 	public function SUB_care_months(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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 . '/SUB_care_months');
+		}
 		$subRecords = DB::table('care_month')->where('client_id', $record->id)->get();
 		return response()->view('pro/clients_SINGLE/SUB_care_months', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/SUB_care_month_entries
 	public function SUB_care_month_entries(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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 . '/SUB_care_month_entries');
+		}
 		$subRecords = DB::table('care_month_entry')->where('client_id', $record->id)->get();
 		$result_pros = DB::select("SELECT id, name_display FROM pro");
 		return response()->view('pro/clients_SINGLE/SUB_care_month_entries', compact('record', 'subRecords', 'result_pros'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
@@ -470,97 +756,146 @@ class clients_SINGLE_Controller extends Controller
 
 	// GET /clients/view/{uid}/SUB_bills
 	public function SUB_bills(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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 . '/SUB_bills');
+		}
 		$subRecords = DB::table('bill')->where('client_id', $record->id)->get();
 		return response()->view('pro/clients_SINGLE/SUB_bills', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/SUB_related_transactions
 	public function SUB_related_transactions(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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 . '/SUB_related_transactions');
+		}
 		$subRecords = DB::table('pro_transaction')->where('client_id', $record->id)->get();
 		return response()->view('pro/clients_SINGLE/SUB_related_transactions', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/SUB_action_items
 	public function SUB_action_items(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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 . '/SUB_action_items');
+		}
 		$subRecords = DB::table('action_item')->where('client_id', $record->id)->get();
 		return response()->view('pro/clients_SINGLE/SUB_action_items', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/SUB_erx
 	public function SUB_erx(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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 . '/SUB_erx');
+		}
 		$subRecords = DB::table('action_item')->where('client_id', $record->id)->where('action_item_category', 'RX')->get();
 		return response()->view('pro/clients_SINGLE/SUB_erx', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /clients/view/{uid}/SUB_mcp_updates
 	public function SUB_mcp_updates(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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 . '/SUB_mcp_updates');
+		}
 		$subRecords = DB::table('client_mcp_update')->where('client_id', $record->id)->get();
 		return response()->view('pro/clients_SINGLE/SUB_mcp_updates', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
-	// GET /clients/view/{uid}/SUB_ally_updates
-	public function SUB_ally_updates(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
-		$subRecords = DB::table('client_ally_update')->where('client_id', $record->id)->get();
-		return response()->view('pro/clients_SINGLE/SUB_ally_updates', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-
 	// GET /clients/view/{uid}/SUB_audit_log
 	public function SUB_audit_log(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
+		$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 . '/SUB_audit_log');
+		}
 		return response()->view('pro/clients_SINGLE/SUB_audit_log', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
-	// GET /clients/view/{uid}/ACTION_measurementsAddNew
-	public function ACTION_measurementsAddNew(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
-		return response()->view('pro/clients_SINGLE/ACTION_measurementsAddNew', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-
-	// GET /clients/view/{uid}/ACTION_med_profileAddNew
-	public function ACTION_med_profileAddNew(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
-		return response()->view('pro/clients_SINGLE/ACTION_med_profileAddNew', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-
-	// GET /clients/view/{uid}/ACTION_pro_accessAddNew
-	public function ACTION_pro_accessAddNew(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
-		return response()->view('pro/clients_SINGLE/ACTION_pro_accessAddNew', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-
-	// GET /clients/view/{uid}/ACTION_notesAddNew
-	public function ACTION_notesAddNew(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
-		return response()->view('pro/clients_SINGLE/ACTION_notesAddNew', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-
-	// GET /clients/view/{uid}/ACTION_relationshipsAddNew
-	public function ACTION_relationshipsAddNew(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
-		return response()->view('pro/clients_SINGLE/ACTION_relationshipsAddNew', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-
-	// GET /clients/view/{uid}/ACTION_care_monthsAddNew
-	public function ACTION_care_monthsAddNew(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
-		return response()->view('pro/clients_SINGLE/ACTION_care_monthsAddNew', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-
-	// GET /clients/view/{uid}/ACTION_action_itemsAddNew
-	public function ACTION_action_itemsAddNew(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
-		return response()->view('pro/clients_SINGLE/ACTION_action_itemsAddNew', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-
-	// GET /clients/view/{uid}/ACTION_erxAddNew
-	public function ACTION_erxAddNew(Request $request, $uid) {
-		$record = Client::where('uid', $uid)->first();
-		return response()->view('pro/clients_SINGLE/ACTION_erxAddNew', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	// GET /clients/view/{uid}/ACTION_add_new_measurement
+	public function ACTION_add_new_measurement(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_add_new_measurement');
+		}
+		return response()->view('pro/clients_SINGLE/ACTION_add_new_measurement', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /clients/view/{uid}/ACTION_add_new_client_info_line
+	public function ACTION_add_new_client_info_line(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_add_new_client_info_line');
+		}
+		return response()->view('pro/clients_SINGLE/ACTION_add_new_client_info_line', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /clients/view/{uid}/ACTION_add_new_client_pro_access
+	public function ACTION_add_new_client_pro_access(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_add_new_client_pro_access');
+		}
+		return response()->view('pro/clients_SINGLE/ACTION_add_new_client_pro_access', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /clients/view/{uid}/ACTION_add_new_note
+	public function ACTION_add_new_note(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_add_new_note');
+		}
+		return response()->view('pro/clients_SINGLE/ACTION_add_new_note', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /clients/view/{uid}/ACTION_add_new_relationship
+	public function ACTION_add_new_relationship(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_add_new_relationship');
+		}
+		return response()->view('pro/clients_SINGLE/ACTION_add_new_relationship', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /clients/view/{uid}/ACTION_add_new_care_month
+	public function ACTION_add_new_care_month(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_add_new_care_month');
+		}
+		return response()->view('pro/clients_SINGLE/ACTION_add_new_care_month', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /clients/view/{uid}/ACTION_add_new_action_item
+	public function ACTION_add_new_action_item(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_add_new_action_item');
+		}
+		return response()->view('pro/clients_SINGLE/ACTION_add_new_action_item', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /clients/view/{uid}/ACTION_add_new_erx_action_item
+	public function ACTION_add_new_erx_action_item(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_add_new_erx_action_item');
+		}
+		return response()->view('pro/clients_SINGLE/ACTION_add_new_erx_action_item', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 }

app/Http/Controllers/erx_SINGLE_Controller.php

@@ -14,42 +14,70 @@ class erx_SINGLE_Controller extends Controller
 	// GET /erx/view/{uid}/ACTION_signAsPrescriber
 	public function ACTION_signAsPrescriber(Request $request, $uid) {
 		$record = DB::table('action_item')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('action_item')->where('id', $uid)->first();
+			if($record) return redirect('/erx/view/' . $record->uid . '/ACTION_signAsPrescriber');
+		}
 		return response()->view('pro/erx_SINGLE/ACTION_signAsPrescriber', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /erx/view/{uid}/ACTION_updateToFacility
 	public function ACTION_updateToFacility(Request $request, $uid) {
 		$record = DB::table('action_item')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('action_item')->where('id', $uid)->first();
+			if($record) return redirect('/erx/view/' . $record->uid . '/ACTION_updateToFacility');
+		}
 		return response()->view('pro/erx_SINGLE/ACTION_updateToFacility', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /erx/view/{uid}/ACTION_updateContent
 	public function ACTION_updateContent(Request $request, $uid) {
 		$record = DB::table('action_item')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('action_item')->where('id', $uid)->first();
+			if($record) return redirect('/erx/view/' . $record->uid . '/ACTION_updateContent');
+		}
 		return response()->view('pro/erx_SINGLE/ACTION_updateContent', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /erx/view/{uid}/ACTION_updateStatus
 	public function ACTION_updateStatus(Request $request, $uid) {
 		$record = DB::table('action_item')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('action_item')->where('id', $uid)->first();
+			if($record) return redirect('/erx/view/' . $record->uid . '/ACTION_updateStatus');
+		}
 		return response()->view('pro/erx_SINGLE/ACTION_updateStatus', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /erx/view/{uid}/ACTION_efax
 	public function ACTION_efax(Request $request, $uid) {
 		$record = DB::table('action_item')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('action_item')->where('id', $uid)->first();
+			if($record) return redirect('/erx/view/' . $record->uid . '/ACTION_efax');
+		}
 		return response()->view('pro/erx_SINGLE/ACTION_efax', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /erx/view/{uid}/SUB_dashboard
 	public function SUB_dashboard(Request $request, $uid) {
 		$record = DB::table('action_item')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('action_item')->where('id', $uid)->first();
+			if($record) return redirect('/erx/view/' . $record->uid . '/SUB_dashboard');
+		}
 		return response()->view('pro/erx_SINGLE/SUB_dashboard', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /erx/view/{uid}/SUB_audit_log
 	public function SUB_audit_log(Request $request, $uid) {
 		$record = DB::table('action_item')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('action_item')->where('id', $uid)->first();
+			if($record) return redirect('/erx/view/' . $record->uid . '/SUB_audit_log');
+		}
 		return response()->view('pro/erx_SINGLE/SUB_audit_log', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 }

app/Http/Controllers/facilities_SINGLE_Controller.php

@@ -14,54 +14,90 @@ class facilities_SINGLE_Controller extends Controller
 	// GET /facilities/view/{uid}/ACTION_updateBasic
 	public function ACTION_updateBasic(Request $request, $uid) {
 		$record = DB::table('facility')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('facility')->where('id', $uid)->first();
+			if($record) return redirect('/facilities/view/' . $record->uid . '/ACTION_updateBasic');
+		}
 		return response()->view('admin/facilities_SINGLE/ACTION_updateBasic', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /facilities/view/{uid}/ACTION_deactivate
 	public function ACTION_deactivate(Request $request, $uid) {
 		$record = DB::table('facility')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('facility')->where('id', $uid)->first();
+			if($record) return redirect('/facilities/view/' . $record->uid . '/ACTION_deactivate');
+		}
 		return response()->view('admin/facilities_SINGLE/ACTION_deactivate', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /facilities/view/{uid}/ACTION_updateDeactivationMemo
 	public function ACTION_updateDeactivationMemo(Request $request, $uid) {
 		$record = DB::table('facility')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('facility')->where('id', $uid)->first();
+			if($record) return redirect('/facilities/view/' . $record->uid . '/ACTION_updateDeactivationMemo');
+		}
 		return response()->view('admin/facilities_SINGLE/ACTION_updateDeactivationMemo', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /facilities/view/{uid}/ACTION_reactivate
 	public function ACTION_reactivate(Request $request, $uid) {
 		$record = DB::table('facility')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('facility')->where('id', $uid)->first();
+			if($record) return redirect('/facilities/view/' . $record->uid . '/ACTION_reactivate');
+		}
 		return response()->view('admin/facilities_SINGLE/ACTION_reactivate', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /facilities/view/{uid}/ACTION_updateReactivationMemo
 	public function ACTION_updateReactivationMemo(Request $request, $uid) {
 		$record = DB::table('facility')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('facility')->where('id', $uid)->first();
+			if($record) return redirect('/facilities/view/' . $record->uid . '/ACTION_updateReactivationMemo');
+		}
 		return response()->view('admin/facilities_SINGLE/ACTION_updateReactivationMemo', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /facilities/view/{uid}/SUB_dashboard
 	public function SUB_dashboard(Request $request, $uid) {
 		$record = DB::table('facility')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('facility')->where('id', $uid)->first();
+			if($record) return redirect('/facilities/view/' . $record->uid . '/SUB_dashboard');
+		}
 		return response()->view('admin/facilities_SINGLE/SUB_dashboard', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /facilities/view/{uid}/SUB_erx
 	public function SUB_erx(Request $request, $uid) {
 		$record = DB::table('facility')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('facility')->where('id', $uid)->first();
+			if($record) return redirect('/facilities/view/' . $record->uid . '/SUB_erx');
+		}
 		return response()->view('admin/facilities_SINGLE/SUB_erx', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /facilities/view/{uid}/SUB_action_items
 	public function SUB_action_items(Request $request, $uid) {
 		$record = DB::table('facility')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('facility')->where('id', $uid)->first();
+			if($record) return redirect('/facilities/view/' . $record->uid . '/SUB_action_items');
+		}
 		return response()->view('admin/facilities_SINGLE/SUB_action_items', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /facilities/view/{uid}/SUB_audit_log
 	public function SUB_audit_log(Request $request, $uid) {
 		$record = DB::table('facility')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('facility')->where('id', $uid)->first();
+			if($record) return redirect('/facilities/view/' . $record->uid . '/SUB_audit_log');
+		}
 		return response()->view('admin/facilities_SINGLE/SUB_audit_log', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 }

app/Http/Controllers/measurements_SINGLE_Controller.php

@@ -14,18 +14,30 @@ class measurements_SINGLE_Controller extends Controller
 	// GET /measurements/view/{uid}/ACTION_updateBasic
 	public function ACTION_updateBasic(Request $request, $uid) {
 		$record = DB::table('measurement')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('measurement')->where('id', $uid)->first();
+			if($record) return redirect('/measurements/view/' . $record->uid . '/ACTION_updateBasic');
+		}
 		return response()->view('pro/measurements_SINGLE/ACTION_updateBasic', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /measurements/view/{uid}/ACTION_remove
 	public function ACTION_remove(Request $request, $uid) {
 		$record = DB::table('measurement')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('measurement')->where('id', $uid)->first();
+			if($record) return redirect('/measurements/view/' . $record->uid . '/ACTION_remove');
+		}
 		return response()->view('pro/measurements_SINGLE/ACTION_remove', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /measurements/view/{uid}/SUB_dashboard
 	public function SUB_dashboard(Request $request, $uid) {
 		$record = DB::table('measurement')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('measurement')->where('id', $uid)->first();
+			if($record) return redirect('/measurements/view/' . $record->uid . '/SUB_dashboard');
+		}
 		$result_clients = DB::select("select id, concat(name_first, ' ', name_last) as name_display from client");
 		return response()->view('pro/measurements_SINGLE/SUB_dashboard', compact('record', 'result_clients'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}

app/Http/Controllers/med_profile_lines_SINGLE_Controller.php

@@ -14,18 +14,30 @@ class med_profile_lines_SINGLE_Controller extends Controller
 	// GET /med_profile_lines/view/{uid}/ACTION_remove
 	public function ACTION_remove(Request $request, $uid) {
 		$record = DB::table('client_info_line')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('client_info_line')->where('id', $uid)->first();
+			if($record) return redirect('/med_profile_lines/view/' . $record->uid . '/ACTION_remove');
+		}
 		return response()->view('pro/med_profile_lines_SINGLE/ACTION_remove', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /med_profile_lines/view/{uid}/ACTION_updateContent
 	public function ACTION_updateContent(Request $request, $uid) {
 		$record = DB::table('client_info_line')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('client_info_line')->where('id', $uid)->first();
+			if($record) return redirect('/med_profile_lines/view/' . $record->uid . '/ACTION_updateContent');
+		}
 		return response()->view('pro/med_profile_lines_SINGLE/ACTION_updateContent', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /med_profile_lines/view/{uid}/SUB_dashboard
 	public function SUB_dashboard(Request $request, $uid) {
 		$record = DB::table('client_info_line')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('client_info_line')->where('id', $uid)->first();
+			if($record) return redirect('/med_profile_lines/view/' . $record->uid . '/SUB_dashboard');
+		}
 		return response()->view('pro/med_profile_lines_SINGLE/SUB_dashboard', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 }

app/Http/Controllers/notes_Controller.php

@@ -14,9 +14,9 @@ class notes_Controller extends Controller
 	// GET /notes
 	public function index(Request $request) {
 		$records = DB::table('note')->get();
-		$result_pros = DB::select("SELECT id, name_display FROM pro");
-		$result_clients = DB::select("SELECT id, concat(name_first,name_last) as name_display FROM client");
-		$result_reasons = DB::select("SELECT id, concat(reason1,reason2) as result FROM note");
+		$result_pros = DB::select("SELECT id, concat(name_last, ', ', name_first) as name_display FROM pro");
+		$result_clients = DB::select("SELECT id, concat(name_last, ', ', name_first) as name_display FROM client");
+		$result_reasons = DB::select("SELECT id, concat(reason1, reason2) as result FROM note");
 		return response()->view('pro/notes/index', compact('records', 'result_pros', 'result_clients', 'result_reasons'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 

app/Http/Controllers/notes_SINGLE_Controller.php

@@ -14,18 +14,30 @@ class notes_SINGLE_Controller extends Controller
 	// GET /notes/view/{uid}/ACTION_signAsHcp
 	public function ACTION_signAsHcp(Request $request, $uid) {
 		$record = DB::table('note')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('note')->where('id', $uid)->first();
+			if($record) return redirect('/notes/view/' . $record->uid . '/ACTION_signAsHcp');
+		}
 		return response()->view('pro/notes_SINGLE/ACTION_signAsHcp', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /notes/view/{uid}/SUB_dashboard
 	public function SUB_dashboard(Request $request, $uid) {
 		$record = DB::table('note')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('note')->where('id', $uid)->first();
+			if($record) return redirect('/notes/view/' . $record->uid . '/SUB_dashboard');
+		}
 		return response()->view('pro/notes_SINGLE/SUB_dashboard', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /notes/view/{uid}/SUB_bills
 	public function SUB_bills(Request $request, $uid) {
 		$record = DB::table('note')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('note')->where('id', $uid)->first();
+			if($record) return redirect('/notes/view/' . $record->uid . '/SUB_bills');
+		}
 		$subRecords = DB::table('bill')->where('note_id', $record->id)->get();
 		return response()->view('pro/notes_SINGLE/SUB_bills', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
@@ -33,13 +45,21 @@ class notes_SINGLE_Controller extends Controller
 	// GET /notes/view/{uid}/SUB_sections
 	public function SUB_sections(Request $request, $uid) {
 		$record = DB::table('note')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('note')->where('id', $uid)->first();
+			if($record) return redirect('/notes/view/' . $record->uid . '/SUB_sections');
+		}
 		$subRecords = DB::table('section')->where('note_id', $record->id)->get();
 		return response()->view('pro/notes_SINGLE/SUB_sections', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
-	// GET /notes/view/{uid}/ACTION_billsAddNew
-	public function ACTION_billsAddNew(Request $request, $uid) {
+	// GET /notes/view/{uid}/ACTION_add_new_bill
+	public function ACTION_add_new_bill(Request $request, $uid) {
 		$record = DB::table('note')->where('uid', $uid)->first();
-		return response()->view('pro/notes_SINGLE/ACTION_billsAddNew', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		if(!$record) {
+			$record = DB::table('note')->where('id', $uid)->first();
+			if($record) return redirect('/notes/view/' . $record->uid . '/ACTION_add_new_bill');
+		}
+		return response()->view('pro/notes_SINGLE/ACTION_add_new_bill', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 }

app/Http/Controllers/pro_rates_Controller.php

@@ -14,7 +14,8 @@ class pro_rates_Controller extends Controller
 	// GET /pro_rates
 	public function index(Request $request) {
 		$records = DB::table('pro_rate')->get();
-		return response()->view('admin/pro_rates/index', compact('records'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		$result_pros = DB::select("SELECT id, concat(name_last, ', ', name_first) as name_display FROM pro");
+		return response()->view('admin/pro_rates/index', compact('records', 'result_pros'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pro_rates/view/{uid}

app/Http/Controllers/pro_rates_SINGLE_Controller.php

@@ -14,24 +14,40 @@ class pro_rates_SINGLE_Controller extends Controller
 	// GET /pro_rates/view/{uid}/ACTION_updateAmount
 	public function ACTION_updateAmount(Request $request, $uid) {
 		$record = DB::table('pro_rate')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro_rate')->where('id', $uid)->first();
+			if($record) return redirect('/pro_rates/view/' . $record->uid . '/ACTION_updateAmount');
+		}
 		return response()->view('admin/pro_rates_SINGLE/ACTION_updateAmount', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pro_rates/view/{uid}/ACTION_reactivate
 	public function ACTION_reactivate(Request $request, $uid) {
 		$record = DB::table('pro_rate')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro_rate')->where('id', $uid)->first();
+			if($record) return redirect('/pro_rates/view/' . $record->uid . '/ACTION_reactivate');
+		}
 		return response()->view('admin/pro_rates_SINGLE/ACTION_reactivate', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pro_rates/view/{uid}/ACTION_deactivate
 	public function ACTION_deactivate(Request $request, $uid) {
 		$record = DB::table('pro_rate')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro_rate')->where('id', $uid)->first();
+			if($record) return redirect('/pro_rates/view/' . $record->uid . '/ACTION_deactivate');
+		}
 		return response()->view('admin/pro_rates_SINGLE/ACTION_deactivate', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pro_rates/view/{uid}/SUB_dashboard
 	public function SUB_dashboard(Request $request, $uid) {
 		$record = DB::table('pro_rate')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro_rate')->where('id', $uid)->first();
+			if($record) return redirect('/pro_rates/view/' . $record->uid . '/SUB_dashboard');
+		}
 		return response()->view('admin/pro_rates_SINGLE/SUB_dashboard', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 }

app/Http/Controllers/pros_SINGLE_Controller.php

@@ -14,235 +14,401 @@ class pros_SINGLE_Controller extends Controller
 	// GET /pros/view/{uid}/ACTION_sendCellNumberConfirmationMessage
 	public function ACTION_sendCellNumberConfirmationMessage(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_sendCellNumberConfirmationMessage');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_sendCellNumberConfirmationMessage', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
+	// GET /pros/view/{uid}/ACTION_adminResetPassword
+	public function ACTION_adminResetPassword(Request $request, $uid) {
+		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_adminResetPassword');
+		}
+		return response()->view('admin/pros_SINGLE/ACTION_adminResetPassword', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
 	// GET /pros/view/{uid}/ACTION_confirmCellNumberWithConfirmationToken
 	public function ACTION_confirmCellNumberWithConfirmationToken(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_confirmCellNumberWithConfirmationToken');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_confirmCellNumberWithConfirmationToken', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_putNewCellNumber
 	public function ACTION_putNewCellNumber(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_putNewCellNumber');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_putNewCellNumber', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_confirmEmailAddressWithConfirmationToken
 	public function ACTION_confirmEmailAddressWithConfirmationToken(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_confirmEmailAddressWithConfirmationToken');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_confirmEmailAddressWithConfirmationToken', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_putNewEmailAddress
 	public function ACTION_putNewEmailAddress(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_putNewEmailAddress');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_putNewEmailAddress', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_updateName
 	public function ACTION_updateName(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_updateName');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_updateName', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_updateProfession
 	public function ACTION_updateProfession(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_updateProfession');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_updateProfession', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_updateEnrolledHcpInfo
 	public function ACTION_updateEnrolledHcpInfo(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_updateEnrolledHcpInfo');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_updateEnrolledHcpInfo', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_putProfilePicture
 	public function ACTION_putProfilePicture(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_putProfilePicture');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_putProfilePicture', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_updatePhoneInfo
 	public function ACTION_updatePhoneInfo(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_updatePhoneInfo');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_updatePhoneInfo', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_updateAddress
 	public function ACTION_updateAddress(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_updateAddress');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_updateAddress', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_updatePaymentProcessingDetail
 	public function ACTION_updatePaymentProcessingDetail(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_updatePaymentProcessingDetail');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_updatePaymentProcessingDetail', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_uploadDriverLicense
 	public function ACTION_uploadDriverLicense(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_uploadDriverLicense');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_uploadDriverLicense', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_updateDriverLicenseInfo
 	public function ACTION_updateDriverLicenseInfo(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_updateDriverLicenseInfo');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_updateDriverLicenseInfo', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_updateSsn
 	public function ACTION_updateSsn(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_updateSsn');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_updateSsn', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_sendEmailAddressConfirmationMessage
 	public function ACTION_sendEmailAddressConfirmationMessage(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_sendEmailAddressConfirmationMessage');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_sendEmailAddressConfirmationMessage', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_setIsHcpToTrue
 	public function ACTION_setIsHcpToTrue(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_setIsHcpToTrue');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_setIsHcpToTrue', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_setIsHcpToFalse
 	public function ACTION_setIsHcpToFalse(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_setIsHcpToFalse');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_setIsHcpToFalse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_setIsEnrolledAsHcpToTrue
 	public function ACTION_setIsEnrolledAsHcpToTrue(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_setIsEnrolledAsHcpToTrue');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_setIsEnrolledAsHcpToTrue', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_setIsEnrolledAsHcpToFalse
 	public function ACTION_setIsEnrolledAsHcpToFalse(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_setIsEnrolledAsHcpToFalse');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_setIsEnrolledAsHcpToFalse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_setIsEnrolledAsMcpToTrue
 	public function ACTION_setIsEnrolledAsMcpToTrue(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_setIsEnrolledAsMcpToTrue');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_setIsEnrolledAsMcpToTrue', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_setIsEnrolledAsMcpToFalse
 	public function ACTION_setIsEnrolledAsMcpToFalse(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_setIsEnrolledAsMcpToFalse');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_setIsEnrolledAsMcpToFalse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_setHasAccessToNextPatientButtonToTrue
 	public function ACTION_setHasAccessToNextPatientButtonToTrue(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_setHasAccessToNextPatientButtonToTrue');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_setHasAccessToNextPatientButtonToTrue', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_setHasAccessToNextPatientButtonToFalse
 	public function ACTION_setHasAccessToNextPatientButtonToFalse(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_setHasAccessToNextPatientButtonToFalse');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_setHasAccessToNextPatientButtonToFalse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_setIsVideoVisitAssistantToTrue
 	public function ACTION_setIsVideoVisitAssistantToTrue(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_setIsVideoVisitAssistantToTrue');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_setIsVideoVisitAssistantToTrue', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_setIsVideoVisitAssistantToFalse
 	public function ACTION_setIsVideoVisitAssistantToFalse(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_setIsVideoVisitAssistantToFalse');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_setIsVideoVisitAssistantToFalse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_removeProfilePicture
 	public function ACTION_removeProfilePicture(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_removeProfilePicture');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_removeProfilePicture', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_updateW9Detail
 	public function ACTION_updateW9Detail(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_updateW9Detail');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_updateW9Detail', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_updateSignedContractPdf
 	public function ACTION_updateSignedContractPdf(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_updateSignedContractPdf');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_updateSignedContractPdf', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_setIsPaymentProcessingDetailCompleteToTrue
 	public function ACTION_setIsPaymentProcessingDetailCompleteToTrue(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_setIsPaymentProcessingDetailCompleteToTrue');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_setIsPaymentProcessingDetailCompleteToTrue', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_setIsPaymentProcessingDetailCompleteToFalse
 	public function ACTION_setIsPaymentProcessingDetailCompleteToFalse(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_setIsPaymentProcessingDetailCompleteToFalse');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_setIsPaymentProcessingDetailCompleteToFalse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_setIsDriverLicenseCompleteToTrue
 	public function ACTION_setIsDriverLicenseCompleteToTrue(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_setIsDriverLicenseCompleteToTrue');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_setIsDriverLicenseCompleteToTrue', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_setIsDriverLicenseCompleteToFalse
 	public function ACTION_setIsDriverLicenseCompleteToFalse(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_setIsDriverLicenseCompleteToFalse');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_setIsDriverLicenseCompleteToFalse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_setIsSsnCompleteToTrue
 	public function ACTION_setIsSsnCompleteToTrue(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_setIsSsnCompleteToTrue');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_setIsSsnCompleteToTrue', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/ACTION_setIsSsnCompleteToFalse
 	public function ACTION_setIsSsnCompleteToFalse(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_setIsSsnCompleteToFalse');
+		}
 		return response()->view('admin/pros_SINGLE/ACTION_setIsSsnCompleteToFalse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/SUB_dashboard
 	public function SUB_dashboard(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/SUB_dashboard');
+		}
 		return response()->view('admin/pros_SINGLE/SUB_dashboard', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
-	// GET /pros/view/{uid}/SUB_my_payment_schedule
-	public function SUB_my_payment_schedule(Request $request, $uid) {
+	// GET /pros/view/{uid}/SUB_pro_rates
+	public function SUB_pro_rates(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/SUB_pro_rates');
+		}
 		$subRecords = DB::table('pro_rate')->where('pro_id', $record->id)->get();
-		return response()->view('admin/pros_SINGLE/SUB_my_payment_schedule', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		return response()->view('admin/pros_SINGLE/SUB_pro_rates', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/SUB_clients
 	public function SUB_clients(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/SUB_clients');
+		}
 		return response()->view('admin/pros_SINGLE/SUB_clients', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/SUB_pro_access
 	public function SUB_pro_access(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/SUB_pro_access');
+		}
 		$subRecords = DB::table('client_pro_access')->where('pro_id', $record->id)->get();
 		return response()->view('admin/pros_SINGLE/SUB_pro_access', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
@@ -250,78 +416,143 @@ class pros_SINGLE_Controller extends Controller
 	// GET /pros/view/{uid}/SUB_mcp_updates
 	public function SUB_mcp_updates(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/SUB_mcp_updates');
+		}
 		return response()->view('admin/pros_SINGLE/SUB_mcp_updates', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
-	// GET /pros/view/{uid}/SUB_ally_updates
-	public function SUB_ally_updates(Request $request, $uid) {
-		$record = DB::table('pro')->where('uid', $uid)->first();
-		return response()->view('admin/pros_SINGLE/SUB_ally_updates', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-
 	// GET /pros/view/{uid}/SUB_erx
 	public function SUB_erx(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/SUB_erx');
+		}
 		return response()->view('admin/pros_SINGLE/SUB_erx', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/SUB_action_items
 	public function SUB_action_items(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/SUB_action_items');
+		}
 		return response()->view('admin/pros_SINGLE/SUB_action_items', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/SUB_care_months
 	public function SUB_care_months(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/SUB_care_months');
+		}
 		return response()->view('admin/pros_SINGLE/SUB_care_months', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/SUB_care_month_entries
 	public function SUB_care_month_entries(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/SUB_care_month_entries');
+		}
 		return response()->view('admin/pros_SINGLE/SUB_care_month_entries', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/SUB_notes
 	public function SUB_notes(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/SUB_notes');
+		}
 		return response()->view('admin/pros_SINGLE/SUB_notes', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/SUB_bills
 	public function SUB_bills(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/SUB_bills');
+		}
 		return response()->view('admin/pros_SINGLE/SUB_bills', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
-	// GET /pros/view/{uid}/SUB_pro_transactions
-	public function SUB_pro_transactions(Request $request, $uid) {
+	// GET /pros/view/{uid}/SUB_transactions
+	public function SUB_transactions(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
-		return response()->view('admin/pros_SINGLE/SUB_pro_transactions', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/SUB_transactions');
+		}
+		$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");
+		$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');
 	}
 
 	// GET /pros/view/{uid}/SUB_sessions
 	public function SUB_sessions(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/SUB_sessions');
+		}
 		return response()->view('admin/pros_SINGLE/SUB_sessions', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /pros/view/{uid}/SUB_audit_log
 	public function SUB_audit_log(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/SUB_audit_log');
+		}
 		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_my_payment_scheduleAddNew
-	public function ACTION_my_payment_scheduleAddNew(Request $request, $uid) {
+	// GET /pros/view/{uid}/ACTION_add_new_pro_rate
+	public function ACTION_add_new_pro_rate(Request $request, $uid) {
+		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_add_new_pro_rate');
+		}
+		return response()->view('admin/pros_SINGLE/ACTION_add_new_pro_rate', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /pros/view/{uid}/ACTION_add_new_client_pro_access
+	public function ACTION_add_new_client_pro_access(Request $request, $uid) {
+		$record = DB::table('pro')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('pro')->where('id', $uid)->first();
+			if($record) return redirect('/pros/view/' . $record->uid . '/ACTION_add_new_client_pro_access');
+		}
+		return response()->view('admin/pros_SINGLE/ACTION_add_new_client_pro_access', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /pros/view/{uid}/ACTION_add_new_credit_pro_transaction
+	public function ACTION_add_new_credit_pro_transaction(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
-		return response()->view('admin/pros_SINGLE/ACTION_my_payment_scheduleAddNew', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		if(!$record) {
+			$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');
 	}
 
-	// GET /pros/view/{uid}/ACTION_pro_accessAddNew
-	public function ACTION_pro_accessAddNew(Request $request, $uid) {
+	// GET /pros/view/{uid}/ACTION_add_new_debit_pro_transaction
+	public function ACTION_add_new_debit_pro_transaction(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();
-		return response()->view('admin/pros_SINGLE/ACTION_pro_accessAddNew', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		if(!$record) {
+			$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');
 	}
 }

app/Http/Controllers/relationships_SINGLE_Controller.php

@@ -14,12 +14,20 @@ class relationships_SINGLE_Controller extends Controller
 	// GET /relationships/view/{uid}/ACTION_updateBasic
 	public function ACTION_updateBasic(Request $request, $uid) {
 		$record = DB::table('relationship')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('relationship')->where('id', $uid)->first();
+			if($record) return redirect('/relationships/view/' . $record->uid . '/ACTION_updateBasic');
+		}
 		return response()->view('pro/relationships_SINGLE/ACTION_updateBasic', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /relationships/view/{uid}/SUB_dashboard
 	public function SUB_dashboard(Request $request, $uid) {
 		$record = DB::table('relationship')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('relationship')->where('id', $uid)->first();
+			if($record) return redirect('/relationships/view/' . $record->uid . '/SUB_dashboard');
+		}
 		return response()->view('pro/relationships_SINGLE/SUB_dashboard', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 }

app/Http/Controllers/transactions_Controller.php

@@ -16,4 +16,9 @@ class transactions_Controller extends Controller
 		$records = DB::table('pro_transaction')->get();
 		return response()->view('pro/transactions/index', compact('records'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
+
+	// GET /transactions/view/{uid}
+	public function view(Request $request, $uid) {
+		return redirect("/transactions/view/$uid/SUB_dashboard");
+	}
 }

app/Http/Controllers/transactions_SINGLE_Controller.php

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

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

@@ -14,39 +14,23 @@
             <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>Amount</th>
-<th>Code</th>
+<th>Pro</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>
+<th>Code</th>
+<th>Amount</th>
             </tr>
             </thead>
             <tbody>
             @foreach($records as $record)
                 <tr>
 <td><a href="/pro_rates/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><a href="/pro_rates/view/<?= $record->uid ?>"><?= friendly_date_time($record->created_at) ?></a></td>
 <td><?= $record->is_active ?></td>
-<td><?= friendly_date_time($record->reactivated_at) ?></td>
-<td><?= $record->reactivation_memo ?></td>
-<td><?= $record->amount ?></td>
-<td><?= $record->code ?></td>
+<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->pro_id], ], 'all'); ?></td>
 <td><?= $record->responsibility ?></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->code ?></td>
+<td><?= $record->amount ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -1,4 +1,5 @@
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_sendCellNumberConfirmationMessage?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Send Cell Number Confirmation Message</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_adminResetPassword?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Admin Reset Password</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_confirmCellNumberWithConfirmationToken?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Confirm Cell Number With Confirmation Token</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_putNewCellNumber?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Put New Cell Number</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_confirmEmailAddressWithConfirmationToken?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Confirm Email Address With Confirmation Token</a>

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

@@ -30,6 +30,10 @@
 <input class='form-control' type='tel' name='cellNumber' value='{{ old('cellNumber') ? old('cellNumber') : '' }}' required>
 </div>
 <div class='form-group mb-3'>
+<label class='control-label'>Temporary Password *</label>
+<input class='form-control' type='text' name='temporaryPassword' value='{{ old('temporaryPassword') ? old('temporaryPassword') : '' }}' required>
+</div>
+<div class='form-group mb-3'>
 <label class='control-label'>Email Address </label>
 <input class='form-control' type='email' name='emailAddress' value='{{ old('emailAddress') ? old('emailAddress') : '' }}' >
 </div>

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

@@ -1,15 +1,14 @@
 <a href='/pros/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>
-<a href='/pros/view/<?= $record->uid ?>/SUB_my_payment_schedule' class='d-block px-3 py-2 border-bottom stag-sublink {{ 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_pro_rates' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_pro_rates' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Pro Rates</a>
 <a href='/pros/view/<?= $record->uid ?>/SUB_clients' class='d-block px-3 py-2 border-bottom stag-sublink {{ 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 stag-sublink {{ 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 stag-sublink {{ request()->route()->getActionMethod() === 'SUB_mcp_updates' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Mcp Updates</a>
-<a href='/pros/view/<?= $record->uid ?>/SUB_ally_updates' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_ally_updates' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Ally Updates</a>
 <a href='/pros/view/<?= $record->uid ?>/SUB_erx' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_erx' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Erx</a>
 <a href='/pros/view/<?= $record->uid ?>/SUB_action_items' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_action_items' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Action Items</a>
 <a href='/pros/view/<?= $record->uid ?>/SUB_care_months' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_care_months' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Care Months</a>
 <a href='/pros/view/<?= $record->uid ?>/SUB_care_month_entries' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_care_month_entries' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Care Month Entries</a>
 <a href='/pros/view/<?= $record->uid ?>/SUB_notes' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_notes' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Notes</a>
 <a href='/pros/view/<?= $record->uid ?>/SUB_bills' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_bills' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Bills</a>
-<a href='/pros/view/<?= $record->uid ?>/SUB_pro_transactions' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_pro_transactions' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Pro Transactions</a>
+<a href='/pros/view/<?= $record->uid ?>/SUB_transactions' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_transactions' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Transactions</a>
 <a href='/pros/view/<?= $record->uid ?>/SUB_sessions' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_sessions' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Sessions</a>
 <a href='/pros/view/<?= $record->uid ?>/SUB_audit_log' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_audit_log' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Audit Log</a>

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

@@ -0,0 +1,60 @@
+@extends('admin.pros.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>Add New Client Pro Access</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/clientProAccess/create">
+        <input type="hidden" name="_success" value="{{route('pros_SINGLE-SUB_pro_access', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('pros_SINGLE-ACTION_add_new_client_pro_access', ['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'>Client </label>
+<select class='form-control' name='clientUid' value='{{ old('clientUid') ? old('clientUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('client')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('clientUid') ? old('clientUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_first ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Reason Category </label>
+<input class='form-control' type='text' name='reasonCategory' value='{{ old('reasonCategory') ? old('reasonCategory') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Reason Memo </label>
+<input class='form-control' type='text' name='reasonMemo' value='{{ old('reasonMemo') ? old('reasonMemo') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Reason Detail </label>
+<input class='form-control' type='text' name='reasonDetail' value='{{ old('reasonDetail') ? old('reasonDetail') : '' }}' >
+</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_pro_access', ['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_add_new_credit_pro_transaction.blade.php

@@ -0,0 +1,50 @@
+@extends('admin.pros.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>Add New Credit Pro Transaction</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/proTransaction/createManualPlusForPro">
+        <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='number' 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='number' 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>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

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

@@ -0,0 +1,50 @@
+@extends('admin.pros.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>Add New Debit Pro Transaction</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/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='number' 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='number' 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>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

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

@@ -0,0 +1,74 @@
+@extends('admin.pros.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>Add New Pro Rate</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/proRate/create">
+        <input type="hidden" name="_success" value="{{route('pros_SINGLE-SUB_pro_rates', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('pros_SINGLE-ACTION_add_new_pro_rate', ['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>
+<option <?= 'VIDEO-INTAKE' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='VIDEO-INTAKE'>VIDEO-INTAKE</option>
+<option <?= 'FOLLOW-UP-VIDEO-VISIT-BASIC' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='FOLLOW-UP-VIDEO-VISIT-BASIC'>FOLLOW-UP-VIDEO-VISIT-BASIC</option>
+<option <?= 'FOLLOW-UP-VISIT-INTERMEDIATE' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='FOLLOW-UP-VISIT-INTERMEDIATE'>FOLLOW-UP-VISIT-INTERMEDIATE</option>
+<option <?= 'FOLLOW-UP-VISIT-COMPLEX' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='FOLLOW-UP-VISIT-COMPLEX'>FOLLOW-UP-VISIT-COMPLEX</option>
+<option <?= 'FOLLOW-UP-PHONE-VISIT-BASIC' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='FOLLOW-UP-PHONE-VISIT-BASIC'>FOLLOW-UP-PHONE-VISIT-BASIC</option>
+<option <?= 'FOLLOW-UP-PHONE-VISIT-INTERMEDIATE' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='FOLLOW-UP-PHONE-VISIT-INTERMEDIATE'>FOLLOW-UP-PHONE-VISIT-INTERMEDIATE</option>
+<option <?= 'FOLLOW-UP-PHONE-VISIT-COMPLEX' === (old('code') ? old('code') : '') ? 'selected' : '' ?> value='FOLLOW-UP-PHONE-VISIT-COMPLEX'>FOLLOW-UP-PHONE-VISIT-COMPLEX</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_pro_rates', ['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_adminResetPassword.blade.php

@@ -0,0 +1,41 @@
+@extends('admin.pros.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>Admin Reset Password</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/pro/adminResetPassword">
+        <input type="hidden" name="_success" value="{{route('pros-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('pros_SINGLE-ACTION_adminResetPassword', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Temporary Password *</label>
+<input class='form-control' type='password' name='temporaryPassword' value='{{ old('temporaryPassword') ? old('temporaryPassword') : '' }}' required>
+</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-view', ['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/SUB_dashboard.blade.php

@@ -14,7 +14,8 @@
         </tr>
         </thead>
         <tbody>
-            <tr><td class="w-25 px-2 text-secondary border-right">Cell Number</td><td class="w-75 px-2 font-weight-bold"><?= $record->cell_number ?><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_sendCellNumberConfirmationMessage?optimised=1' title='sendCellNumberConfirmationMessage' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Send Cell Number Confirmation Message</span></a></td></tr>
+            <tr><td class="w-25 px-2 text-secondary border-right">Cell Number</td><td class="w-75 px-2 font-weight-bold"><?= $record->cell_number ?><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_sendCellNumberConfirmationMessage?optimised=1' title='sendConfirmationMessage' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Send Confirmation Message</span></a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_adminResetPassword?optimised=1' title='resetPassword' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Reset Password</span></a></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Is Cell Number Confirmation Pending</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_cell_number_confirmation_pending ?><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_confirmCellNumberWithConfirmationToken?optimised=1' title='confirmCellNumberWithConfirmationToken' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Confirm Cell Number With Confirmation Token</span></a></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Cell Number Confirmation Token</td><td class="w-75 px-2 font-weight-bold"><?= $record->cell_number_confirmation_token ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Is Cell Number Confirmed</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_cell_number_confirmed ?></td></tr>

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

@@ -6,7 +6,7 @@
         <h5 class='my-3 d-flex stag-heading stag-heading-sub'>
             <div>Pro Access</div>
             <div class="ml-auto">
-                <a class="btn btn-primary btn-sm" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('pros_SINGLE-ACTION_pro_accessAddNew', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+                <a class="btn btn-primary btn-sm ml-2" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('pros_SINGLE-ACTION_add_new_client_pro_access', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
             </div>
         </h5>
 

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

@@ -0,0 +1,38 @@
+@extends('admin.pros.view')
+@section('content-inner')
+
+    <div class="pb-3">
+
+        <h5 class='my-3 d-flex stag-heading stag-heading-sub'>
+            <div>Pro Rates</div>
+            <div class="ml-auto">
+                <a class="btn btn-primary btn-sm ml-2" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('pros_SINGLE-ACTION_add_new_pro_rate', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+            </div>
+        </h5>
+
+        <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>Responsibility</th>
+<th>Code</th>
+<th>Amount</th>
+                </tr>
+                </thead>
+                <tbody>
+                @foreach($subRecords as $subRecord)
+                    <tr>
+                        <td><a href="/pro_rates/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
+<td><?= $subRecord->responsibility ?></td>
+<td><?= $subRecord->code ?></td>
+<td><?= $subRecord->amount ?></td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+
+@endsection

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

@@ -0,0 +1,46 @@
+@extends('admin.pros.view')
+@section('content-inner')
+
+    <div class="pb-3">
+
+        <h5 class='my-3 d-flex stag-heading stag-heading-sub'>
+            <div>Transactions</div>
+            <div class="ml-auto">
+                <a class="btn btn-primary btn-sm ml-2" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('pros_SINGLE-ACTION_add_new_credit_pro_transaction', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New Credit</a><a class="btn btn-primary btn-sm ml-2" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('pros_SINGLE-ACTION_add_new_debit_pro_transaction', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New Debit</a>
+            </div>
+        </h5>
+
+        <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>
+                </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>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+
+@endsection

resources/views/layouts/generated-links.blade.php

@@ -1,10 +1,3 @@
-<li class='nav-item'>
-	<a href='/my_payment_schedule' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'my_payment_schedule') === 0 ? 'active' : '') }} '>
-		<i class='nav-icon fa fa-dollar-sign'></i>
-		<p>My Payment Schedule</p>
-	</a>
-</li>
-
 <li class='nav-item'>
 	<a href='/clients' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'clients') === 0 ? 'active' : '') }} '>
 		<i class='nav-icon fa fa-user-injured'></i>
@@ -96,13 +89,6 @@
 	</a>
 </li>
 
-<li class='nav-item'>
-	<a href='/ally_updates' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'ally_updates') === 0 ? 'active' : '') }} '>
-		<i class='nav-icon fa fa-user-edit'></i>
-		<p>Ally Updates</p>
-	</a>
-</li>
-
 <li class='nav-item'>
 	<a href='/facilities' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'facilities') === 0 ? 'active' : '') }} '>
 		<i class='nav-icon fa fa-temperature-low'></i>

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

@@ -0,0 +1,77 @@
+@extends('pro.care_months.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>Add New Care Month Entry</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/careMonthEntry/createForRm">
+        <input type="hidden" name="_success" value="{{route('care_months_SINGLE-SUB_rm_time_entries', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_add_new_care_month_entry', ['uid' => $record->uid])}}">
+        <input class='form-control' type='hidden' name='careMonthUid' value='{{ old('careMonthUid') ? old('careMonthUid') : $record->uid }}' >
+<div class='form-group mb-3'>
+<label class='control-label'>Pro </label>
+<select class='form-control' name='proUid' value='{{ old('proUid') ? old('proUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('proUid') ? old('proUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Effective Date </label>
+<input class='form-control' type='date' name='effectiveDate' value='{{ old('effectiveDate') ? old('effectiveDate') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Time In Seconds </label>
+<input class='form-control' type='number' name='timeInSeconds' value='{{ old('timeInSeconds') ? old('timeInSeconds') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Is Time Specific 
+<input class='ml-2' type='checkbox' name='isTimeSpecific' >
+</label>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Starting Time </label>
+<input class='form-control' type='time' name='startingTime' value='{{ old('startingTime') ? old('startingTime') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Ending Time </label>
+<input class='form-control' type='time' name='endingTime' value='{{ old('endingTime') ? old('endingTime') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Content Text </label>
+<input class='form-control' type='text' name='contentText' value='{{ old('contentText') ? old('contentText') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Content Detail </label>
+<input class='form-control' type='text' name='contentDetail' value='{{ old('contentDetail') ? old('contentDetail') : '' }}' >
+</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('care_months_SINGLE-SUB_rm_time_entries', ['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/SUB_cm_time_entries.blade.php

@@ -6,7 +6,7 @@
         <h5 class='my-3 d-flex stag-heading stag-heading-sub'>
             <div>Cm Time Entries</div>
             <div class="ml-auto">
-                <a class="btn btn-primary btn-sm" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('care_months_SINGLE-ACTION_cm_time_entriesAddNew', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+                <a class="btn btn-primary btn-sm ml-2" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('care_months_SINGLE-ACTION_add_new_care_month_entry', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
             </div>
         </h5>
 

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

@@ -6,7 +6,7 @@
         <h5 class='my-3 d-flex stag-heading stag-heading-sub'>
             <div>Rm Time Entries</div>
             <div class="ml-auto">
-                <a class="btn btn-primary btn-sm" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('care_months_SINGLE-ACTION_rm_time_entriesAddNew', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+                <a class="btn btn-primary btn-sm ml-2" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('care_months_SINGLE-ACTION_add_new_care_month_entry', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
             </div>
         </h5>
 

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

@@ -14,12 +14,12 @@
             <tr>
 <th>&nbsp;</th>
 <th>First Name</th>
-<th>Gender</th>
+<th>Last Name</th>
+<th>Sex</th>
 <th>MCP</th>
 <th>CM Pro</th>
 <th>RME Pro</th>
 <th>RMM Pro</th>
-<th>RD Pro</th>
             </tr>
             </thead>
             <tbody>
@@ -27,12 +27,12 @@
                 <tr>
 <td><a href="/clients/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
 <td><a href="/clients/view/<?= $record->uid ?>/SUB_dashboard"><?= $record->name_first ?></a></td>
-<td><?= $record->gender_identity ?></td>
-<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->mcp_pro_id], ], 'all'); ?></td>
-<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->cm_pro_id], ], 'all'); ?></td>
-<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->rme_pro_id], ], 'all'); ?></td>
-<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->rmm_pro_id], ], 'all'); ?></td>
-<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->rd_pro_id], ], 'all'); ?></td>
+<td><?= $record->name_last ?></td>
+<td><?= $record->sex ?></td>
+<td><a href="/pros/view/<?= $record->mcp_pro_id ?>"><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->mcp_pro_id], ], 'all'); ?></a></td>
+<td><a href="/pros/view/<?= $record->cm_pro_id ?>"><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->cm_pro_id], ], 'all'); ?></a></td>
+<td><a href="/pros/view/<?= $record->rme_pro_id ?>"><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->rme_pro_id], ], 'all'); ?></a></td>
+<td><a href="/pros/view/<?= $record->rmm_pro_id ?>"><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->rmm_pro_id], ], 'all'); ?></a></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -13,5 +13,4 @@
 <a href='/clients/view/<?= $record->uid ?>/SUB_action_items' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_action_items' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Action Items</a>
 <a href='/clients/view/<?= $record->uid ?>/SUB_erx' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_erx' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Erx</a>
 <a href='/clients/view/<?= $record->uid ?>/SUB_mcp_updates' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_mcp_updates' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Mcp Updates</a>
-<a href='/clients/view/<?= $record->uid ?>/SUB_ally_updates' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_ally_updates' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Ally Updates</a>
 <a href='/clients/view/<?= $record->uid ?>/SUB_audit_log' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_audit_log' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Audit Log</a>

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

@@ -0,0 +1,66 @@
+@extends('pro.clients.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>Add New Action Item</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/actionItem/create">
+        <input type="hidden" name="_success" value="{{route('clients_SINGLE-SUB_action_items', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('clients_SINGLE-ACTION_add_new_action_item', ['uid' => $record->uid])}}">
+        <input class='form-control' type='hidden' name='clientUid' value='{{ old('clientUid') ? old('clientUid') : $record->uid }}' >
+<div class='form-group mb-3'>
+<label class='control-label'>Prescriber Pro </label>
+<select class='form-control' name='prescriberProUid' value='{{ old('prescriberProUid') ? old('prescriberProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('prescriberProUid') ? old('prescriberProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>To Facility </label>
+<select class='form-control' name='toFacilityUid' value='{{ old('toFacilityUid') ? old('toFacilityUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('facility')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('toFacilityUid') ? old('toFacilityUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Content Text </label>
+<input class='form-control' type='text' name='contentText' value='{{ old('contentText') ? old('contentText') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Content Detail </label>
+<input class='form-control' type='text' name='contentDetail' value='{{ old('contentDetail') ? old('contentDetail') : '' }}' >
+</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('clients_SINGLE-SUB_action_items', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

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

@@ -0,0 +1,46 @@
+@extends('pro.clients.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>Add New Care Month</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/careMonth/create">
+        <input type="hidden" name="_success" value="{{route('clients_SINGLE-SUB_care_months', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('clients_SINGLE-ACTION_add_new_care_month', ['uid' => $record->uid])}}">
+        <input class='form-control' type='hidden' name='clientUid' value='{{ old('clientUid') ? old('clientUid') : $record->uid }}' >
+<div class='form-group mb-3'>
+<label class='control-label'>Start Month </label>
+<input class='form-control' type='number' name='startMonth' value='{{ old('startMonth') ? old('startMonth') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Start Year </label>
+<input class='form-control' type='number' name='startYear' value='{{ old('startYear') ? old('startYear') : '' }}' >
+</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('clients_SINGLE-SUB_care_months', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

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

@@ -0,0 +1,50 @@
+@extends('pro.clients.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>Add New Client Info Line</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/clientInfoLine/create">
+        <input type="hidden" name="_success" value="{{route('clients_SINGLE-SUB_med_profile', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('clients_SINGLE-ACTION_add_new_client_info_line', ['uid' => $record->uid])}}">
+        <input class='form-control' type='hidden' name='clientUid' value='{{ old('clientUid') ? old('clientUid') : $record->uid }}' >
+<div class='form-group mb-3'>
+<label class='control-label'>Category </label>
+<input class='form-control' type='text' name='category' value='{{ old('category') ? old('category') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Content Text </label>
+<input class='form-control' type='text' name='contentText' value='{{ old('contentText') ? old('contentText') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Content Detail </label>
+<input class='form-control' type='text' name='contentDetail' value='{{ old('contentDetail') ? old('contentDetail') : '' }}' >
+</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('clients_SINGLE-SUB_med_profile', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

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

@@ -0,0 +1,60 @@
+@extends('pro.clients.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>Add New Client Pro Access</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/clientProAccess/create">
+        <input type="hidden" name="_success" value="{{route('clients_SINGLE-SUB_pro_access', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('clients_SINGLE-ACTION_add_new_client_pro_access', ['uid' => $record->uid])}}">
+        <input class='form-control' type='hidden' name='clientUid' value='{{ old('clientUid') ? old('clientUid') : $record->uid }}' >
+<div class='form-group mb-3'>
+<label class='control-label'>Pro </label>
+<select class='form-control' name='proUid' value='{{ old('proUid') ? old('proUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('proUid') ? old('proUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Reason Category </label>
+<input class='form-control' type='text' name='reasonCategory' value='{{ old('reasonCategory') ? old('reasonCategory') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Reason Memo </label>
+<input class='form-control' type='text' name='reasonMemo' value='{{ old('reasonMemo') ? old('reasonMemo') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Reason Detail </label>
+<input class='form-control' type='text' name='reasonDetail' value='{{ old('reasonDetail') ? old('reasonDetail') : '' }}' >
+</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('clients_SINGLE-SUB_pro_access', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

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

@@ -0,0 +1,66 @@
+@extends('pro.clients.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>Add New Erx Action Item</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/actionItem/create">
+        <input type="hidden" name="_success" value="{{route('clients_SINGLE-SUB_erx', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('clients_SINGLE-ACTION_add_new_erx_action_item', ['uid' => $record->uid])}}">
+        <input class='form-control' type='hidden' name='clientUid' value='{{ old('clientUid') ? old('clientUid') : $record->uid }}' >
+<div class='form-group mb-3'>
+<label class='control-label'>Prescriber Pro </label>
+<select class='form-control' name='prescriberProUid' value='{{ old('prescriberProUid') ? old('prescriberProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('prescriberProUid') ? old('prescriberProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>To Facility </label>
+<select class='form-control' name='toFacilityUid' value='{{ old('toFacilityUid') ? old('toFacilityUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('facility')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('toFacilityUid') ? old('toFacilityUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Content Text </label>
+<input class='form-control' type='text' name='contentText' value='{{ old('contentText') ? old('contentText') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Content Detail </label>
+<input class='form-control' type='text' name='contentDetail' value='{{ old('contentDetail') ? old('contentDetail') : '' }}' >
+</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('clients_SINGLE-SUB_erx', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

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

@@ -0,0 +1,50 @@
+@extends('pro.clients.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>Add New Measurement</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/measurement/create">
+        <input type="hidden" name="_success" value="{{route('clients_SINGLE-SUB_measurements', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('clients_SINGLE-ACTION_add_new_measurement', ['uid' => $record->uid])}}">
+        <input class='form-control' type='hidden' name='clientUid' value='{{ old('clientUid') ? old('clientUid') : $record->uid }}' >
+<div class='form-group mb-3'>
+<label class='control-label'>Label </label>
+<input class='form-control' type='text' name='label' value='{{ old('label') ? old('label') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Value </label>
+<input class='form-control' type='number' name='value' value='{{ old('value') ? old('value') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Effective Date </label>
+<input class='form-control' type='date' name='effectiveDate' value='{{ old('effectiveDate') ? old('effectiveDate') : '' }}' >
+</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('clients_SINGLE-SUB_measurements', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

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

@@ -0,0 +1,92 @@
+@extends('pro.clients.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>Add New Note</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/note/create">
+        <input type="hidden" name="_success" value="{{route('clients_SINGLE-SUB_notes', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('clients_SINGLE-ACTION_add_new_note', ['uid' => $record->uid])}}">
+        <input class='form-control' type='hidden' name='clientUid' value='{{ old('clientUid') ? old('clientUid') : $record->uid }}' >
+<div class='form-group mb-3'>
+<label class='control-label'>Hcp Pro </label>
+<select class='form-control' name='hcpProUid' value='{{ old('hcpProUid') ? old('hcpProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('hcpProUid') ? old('hcpProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Title </label>
+<input class='form-control' type='text' name='title' value='{{ old('title') ? old('title') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Effective Date EST </label>
+<input class='form-control' type='date' name='effectiveDateEST' value='{{ old('effectiveDateEST') ? old('effectiveDateEST') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Effective Time </label>
+<input class='form-control' type='time' name='effectiveTime' value='{{ old('effectiveTime') ? old('effectiveTime') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Reason 1 </label>
+<input class='form-control' type='text' name='reason1' value='{{ old('reason1') ? old('reason1') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Reason 2 </label>
+<input class='form-control' type='text' name='reason2' value='{{ old('reason2') ? old('reason2') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Reason 3 </label>
+<input class='form-control' type='text' name='reason3' value='{{ old('reason3') ? old('reason3') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Reason 3Plus </label>
+<input class='form-control' type='text' name='reason3Plus' value='{{ old('reason3Plus') ? old('reason3Plus') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Service Location </label>
+<input class='form-control' type='text' name='serviceLocation' value='{{ old('serviceLocation') ? old('serviceLocation') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Category </label>
+<input class='form-control' type='text' name='category' value='{{ old('category') ? old('category') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Content Text </label>
+<input class='form-control' type='text' name='contentText' value='{{ old('contentText') ? old('contentText') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Content Detail </label>
+<input class='form-control' type='text' name='contentDetail' value='{{ old('contentDetail') ? old('contentDetail') : '' }}' >
+</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('clients_SINGLE-SUB_notes', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

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

@@ -0,0 +1,158 @@
+@extends('pro.clients.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>Add New Relationship</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/relationship/create">
+        <input type="hidden" name="_success" value="{{route('clients_SINGLE-SUB_relationships', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('clients_SINGLE-ACTION_add_new_relationship', ['uid' => $record->uid])}}">
+        <input class='form-control' type='hidden' name='clientUid' value='{{ old('clientUid') ? old('clientUid') : $record->uid }}' >
+<div class='form-group mb-3'>
+<label class='control-label'>Relationship To Client </label>
+<input class='form-control' type='text' name='relationshipToClient' value='{{ old('relationshipToClient') ? old('relationshipToClient') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Relationship Memo </label>
+<input class='form-control' type='text' name='relationshipMemo' value='{{ old('relationshipMemo') ? old('relationshipMemo') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Name Prefix </label>
+<input class='form-control' type='text' name='namePrefix' value='{{ old('namePrefix') ? old('namePrefix') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Name First </label>
+<input class='form-control' type='text' name='nameFirst' value='{{ old('nameFirst') ? old('nameFirst') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Name Middle </label>
+<input class='form-control' type='text' name='nameMiddle' value='{{ old('nameMiddle') ? old('nameMiddle') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Name Last </label>
+<input class='form-control' type='text' name='nameLast' value='{{ old('nameLast') ? old('nameLast') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Name Suffix </label>
+<input class='form-control' type='text' name='nameSuffix' value='{{ old('nameSuffix') ? old('nameSuffix') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Name Maiden </label>
+<input class='form-control' type='text' name='nameMaiden' value='{{ old('nameMaiden') ? old('nameMaiden') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Name Previous </label>
+<input class='form-control' type='text' name='namePrevious' value='{{ old('namePrevious') ? old('namePrevious') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Organization Name </label>
+<input class='form-control' type='text' name='organizationName' value='{{ old('organizationName') ? old('organizationName') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Phone Home </label>
+<input class='form-control' type='text' name='phoneHome' value='{{ old('phoneHome') ? old('phoneHome') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Phone Mobile </label>
+<input class='form-control' type='text' name='phoneMobile' value='{{ old('phoneMobile') ? old('phoneMobile') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Phone Work </label>
+<input class='form-control' type='text' name='phoneWork' value='{{ old('phoneWork') ? old('phoneWork') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Phone Memo </label>
+<input class='form-control' type='text' name='phoneMemo' value='{{ old('phoneMemo') ? old('phoneMemo') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Home Address </label>
+<input class='form-control' type='text' name='homeAddress' value='{{ old('homeAddress') ? old('homeAddress') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Mailing Address </label>
+<input class='form-control' type='text' name='mailingAddress' value='{{ old('mailingAddress') ? old('mailingAddress') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Email Address </label>
+<input class='form-control' type='text' name='emailAddress' value='{{ old('emailAddress') ? old('emailAddress') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Is Hispanic </label>
+<select class='form-control' name='isHispanic' value='{{ old('isHispanic') ? old('isHispanic') : '' }}' >
+<option value=''>-- Select --</option>
+<option <?= 'YES' === (old('isHispanic') ? old('isHispanic') : '') ? 'selected' : '' ?> value='YES'>YES</option>
+<option <?= 'NO' === (old('isHispanic') ? old('isHispanic') : '') ? 'selected' : '' ?> value='NO'>NO</option>
+<option <?= 'UNKNOWN' === (old('isHispanic') ? old('isHispanic') : '') ? 'selected' : '' ?> value='UNKNOWN'>UNKNOWN</option>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Is Black Or AA </label>
+<select class='form-control' name='isBlackOrAA' value='{{ old('isBlackOrAA') ? old('isBlackOrAA') : '' }}' >
+<option value=''>-- Select --</option>
+<option <?= 'YES' === (old('isBlackOrAA') ? old('isBlackOrAA') : '') ? 'selected' : '' ?> value='YES'>YES</option>
+<option <?= 'NO' === (old('isBlackOrAA') ? old('isBlackOrAA') : '') ? 'selected' : '' ?> value='NO'>NO</option>
+<option <?= 'UNKNOWN' === (old('isBlackOrAA') ? old('isBlackOrAA') : '') ? 'selected' : '' ?> value='UNKNOWN'>UNKNOWN</option>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Ethnicities </label>
+<input class='form-control' type='text' name='ethnicities' value='{{ old('ethnicities') ? old('ethnicities') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Race </label>
+<input class='form-control' type='text' name='race' value='{{ old('race') ? old('race') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Specific Races </label>
+<input class='form-control' type='text' name='specificRaces' value='{{ old('specificRaces') ? old('specificRaces') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Preferred Language </label>
+<input class='form-control' type='text' name='preferredLanguage' value='{{ old('preferredLanguage') ? old('preferredLanguage') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Other Languages </label>
+<input class='form-control' type='text' name='otherLanguages' value='{{ old('otherLanguages') ? old('otherLanguages') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>English Level </label>
+<input class='form-control' type='text' name='englishLevel' value='{{ old('englishLevel') ? old('englishLevel') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Contact Client </label>
+<select class='form-control' name='contactClientUid' value='{{ old('contactClientUid') ? old('contactClientUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('client')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('contactClientUid') ? old('contactClientUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_first ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</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>
+            <a href="{{route('clients_SINGLE-SUB_relationships', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

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

@@ -6,7 +6,7 @@
         <h5 class='my-3 d-flex stag-heading stag-heading-sub'>
             <div>Action Items</div>
             <div class="ml-auto">
-                <a class="btn btn-primary btn-sm" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('clients_SINGLE-ACTION_action_itemsAddNew', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+                <a class="btn btn-primary btn-sm ml-2" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('clients_SINGLE-ACTION_add_new_action_item', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
             </div>
         </h5>
 

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

@@ -66,7 +66,7 @@
 <td><?= $subRecord->removed_by_session_id ?></td>
 <td><?= $subRecord->care_month_id ?></td>
 <td><?= $subRecord->client_id ?></td>
-<td><?= $subRecord->pro_id ?></td>
+<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->pro_id], ], 'all'); ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -6,7 +6,7 @@
         <h5 class='my-3 d-flex stag-heading stag-heading-sub'>
             <div>Care Months</div>
             <div class="ml-auto">
-                <a class="btn btn-primary btn-sm" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('clients_SINGLE-ACTION_care_monthsAddNew', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+                <a class="btn btn-primary btn-sm ml-2" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('clients_SINGLE-ACTION_add_new_care_month', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
             </div>
         </h5>
 

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

@@ -410,7 +410,7 @@
 <tr><td class="w-25 px-2 text-secondary border-right">Mcn Address City</td><td class="w-75 px-2 font-weight-bold"><?= $record->mcn_address_city ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Mcn Address State</td><td class="w-75 px-2 font-weight-bold"><?= $record->mcn_address_state ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Mcn Address Zip</td><td class="w-75 px-2 font-weight-bold"><?= $record->mcn_address_zip ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Is Partbprimary</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_partbprimary ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Is Part B Primary</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_part_b_primary ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Is Hospice</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_hospice ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Mcn Response Detail</td><td class="w-75 px-2 font-weight-bold"><?= $record->mcn_response_detail ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Billing Address</td><td class="w-75 px-2 font-weight-bold"><?= $record->billing_address ?></td></tr>

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

@@ -6,7 +6,7 @@
         <h5 class='my-3 d-flex stag-heading stag-heading-sub'>
             <div>Erx</div>
             <div class="ml-auto">
-                <a class="btn btn-primary btn-sm" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('clients_SINGLE-ACTION_erxAddNew', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+                <a class="btn btn-primary btn-sm ml-2" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('clients_SINGLE-ACTION_add_new_erx_action_item', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New Erx</a>
             </div>
         </h5>
 

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

@@ -6,7 +6,7 @@
         <h5 class='my-3 d-flex stag-heading stag-heading-sub'>
             <div>Measurements</div>
             <div class="ml-auto">
-                <a class="btn btn-primary btn-sm" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('clients_SINGLE-ACTION_measurementsAddNew', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+                <a class="btn btn-primary btn-sm ml-2" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('clients_SINGLE-ACTION_add_new_measurement', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
             </div>
         </h5>
 

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

@@ -6,7 +6,7 @@
         <h5 class='my-3 d-flex stag-heading stag-heading-sub'>
             <div>Med Profile</div>
             <div class="ml-auto">
-                <a class="btn btn-primary btn-sm" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('clients_SINGLE-ACTION_med_profileAddNew', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+                <a class="btn btn-primary btn-sm ml-2" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('clients_SINGLE-ACTION_add_new_client_info_line', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
             </div>
         </h5>
 
@@ -23,7 +23,7 @@
                 <tbody>
                 @foreach($subRecords as $subRecord)
                     <tr>
-                        <td><a href="/med_profile_lines/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
+                        <td><a href="/med_profiles/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
 <td><?= $subRecord->category ?></td>
 <td><?= $subRecord->content_text ?></td>
 <td><?= $subRecord->content_detail ?></td>

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

@@ -6,7 +6,7 @@
         <h5 class='my-3 d-flex stag-heading stag-heading-sub'>
             <div>Notes</div>
             <div class="ml-auto">
-                <a class="btn btn-primary btn-sm" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('clients_SINGLE-ACTION_notesAddNew', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+                <a class="btn btn-primary btn-sm ml-2" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('clients_SINGLE-ACTION_add_new_note', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
             </div>
         </h5>
 

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

@@ -6,7 +6,7 @@
         <h5 class='my-3 d-flex stag-heading stag-heading-sub'>
             <div>Pro Access</div>
             <div class="ml-auto">
-                <a class="btn btn-primary btn-sm" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('clients_SINGLE-ACTION_pro_accessAddNew', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+                <a class="btn btn-primary btn-sm ml-2" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('clients_SINGLE-ACTION_add_new_client_pro_access', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
             </div>
         </h5>
 

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

@@ -6,7 +6,7 @@
         <h5 class='my-3 d-flex stag-heading stag-heading-sub'>
             <div>Relationships</div>
             <div class="ml-auto">
-                <a class="btn btn-primary btn-sm" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('clients_SINGLE-ACTION_relationshipsAddNew', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+                <a class="btn btn-primary btn-sm ml-2" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('clients_SINGLE-ACTION_add_new_relationship', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
             </div>
         </h5>
 

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

@@ -16,9 +16,7 @@
 <th>Date</th>
 <th>Client</th>
 <th>HCP</th>
-<th>Ally</th>
 <th>Reason(s)</th>
-<th>Ally Signed?</th>
 <th>HCP Signed?</th>
 <th>Billed?</th>
             </tr>
@@ -30,9 +28,7 @@
 <td><?= $record->effective_dateest ?></td>
 <td><?= value_from_rs($result_clients, 'name_display', [['id', '=', $record->client_id], ], 'all'); ?></td>
 <td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->hcp_pro_id], ], 'all'); ?></td>
-<td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->ally_pro_id], ], 'all'); ?></td>
 <td><?= value_from_rs($result_reasons, 'result', [['id', '=', $record->id], ], 'all'); ?></td>
-<td><?= $record->is_signed_by_ally ?></td>
 <td><?= $record->is_signed_by_hcp ?></td>
 <td><?php $_r = \Illuminate\Support\Facades\DB::select("SELECT '-- TODO --' as result");
 echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>

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

@@ -0,0 +1,74 @@
+@extends('pro.notes.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>Add New Bill</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/bill/createForNote">
+        <input type="hidden" name="_success" value="{{route('notes_SINGLE-SUB_bills', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('notes_SINGLE-ACTION_add_new_bill', ['uid' => $record->uid])}}">
+        <input class='form-control' type='hidden' name='noteUid' value='{{ old('noteUid') ? old('noteUid') : $record->uid }}' >
+<div class='form-group mb-3'>
+<label class='control-label'>Effective Date </label>
+<input class='form-control' type='date' name='effectiveDate' value='{{ old('effectiveDate') ? old('effectiveDate') : '' }}' >
+</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') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Reason 1 </label>
+<input class='form-control' type='text' name='reason1' value='{{ old('reason1') ? old('reason1') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Reason 2 </label>
+<input class='form-control' type='text' name='reason2' value='{{ old('reason2') ? old('reason2') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Reason 3 </label>
+<input class='form-control' type='text' name='reason3' value='{{ old('reason3') ? old('reason3') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Reason 3Plus </label>
+<input class='form-control' type='text' name='reason3Plus' value='{{ old('reason3Plus') ? old('reason3Plus') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Service Location </label>
+<input class='form-control' type='text' name='serviceLocation' value='{{ old('serviceLocation') ? old('serviceLocation') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Modifier </label>
+<input class='form-control' type='text' name='modifier' value='{{ old('modifier') ? old('modifier') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Number Of Units </label>
+<input class='form-control' type='number' name='numberOfUnits' value='{{ old('numberOfUnits') ? old('numberOfUnits') : '' }}' >
+</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('notes_SINGLE-SUB_bills', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

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

@@ -6,7 +6,7 @@
         <h5 class='my-3 d-flex stag-heading stag-heading-sub'>
             <div>Bills</div>
             <div class="ml-auto">
-                <a class="btn btn-primary btn-sm" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('notes_SINGLE-ACTION_billsAddNew', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+                <a class="btn btn-primary btn-sm ml-2" up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href="{{route('notes_SINGLE-ACTION_add_new_bill', ['uid' => $record->uid])}}?optimised=1"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
             </div>
         </h5>
 

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

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

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

@@ -0,0 +1 @@
+<a href='/transactions/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/pro/transactions/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('pro/transactions/info')</div>
+        <div class="d-flex align-items-stretch">
+            <div class="inner-side-nav">
+                <div class="border-right h-100">
+                    @include('pro/transactions/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/pro/transactions_SINGLE/SUB_dashboard.blade.php

@@ -0,0 +1,41 @@
+@extends('pro.transactions.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('pro/transactions/actions')
+        </div>
+    </div>
+</div>
+
+
+@endsection

routes/generated.php

@@ -327,6 +327,7 @@ Route::prefix('/pros')->group(function () {
 // --- admin: pros_SINGLE --- //
 Route::prefix('/pros/view/{uid}')->group(function () {
 	Route::get('ACTION_sendCellNumberConfirmationMessage', 'pros_SINGLE_Controller@ACTION_sendCellNumberConfirmationMessage')->name('pros_SINGLE-ACTION_sendCellNumberConfirmationMessage');
+	Route::get('ACTION_adminResetPassword', 'pros_SINGLE_Controller@ACTION_adminResetPassword')->name('pros_SINGLE-ACTION_adminResetPassword');
 	Route::get('ACTION_confirmCellNumberWithConfirmationToken', 'pros_SINGLE_Controller@ACTION_confirmCellNumberWithConfirmationToken')->name('pros_SINGLE-ACTION_confirmCellNumberWithConfirmationToken');
 	Route::get('ACTION_putNewCellNumber', 'pros_SINGLE_Controller@ACTION_putNewCellNumber')->name('pros_SINGLE-ACTION_putNewCellNumber');
 	Route::get('ACTION_confirmEmailAddressWithConfirmationToken', 'pros_SINGLE_Controller@ACTION_confirmEmailAddressWithConfirmationToken')->name('pros_SINGLE-ACTION_confirmEmailAddressWithConfirmationToken');