Explorar el Código

Merge branch 'dev-vj' into dev-vj-opentok

Vijayakrishnan hace 5 años
padre
commit
c2be34bddb
Se han modificado 28 ficheros con 961 adiciones y 522 borrados
  1. 36 0
      app/Http/Controllers/bills_SINGLE_Controller.php
  2. 12 4
      app/Http/Controllers/care_months_SINGLE_Controller.php
  3. 0 29
      app/Http/Controllers/lobbies_Controller.php
  4. 0 74
      app/Http/Controllers/lobbies_SINGLE_Controller.php
  5. 6 0
      app/Http/Controllers/my_clients_SINGLE_Controller.php
  6. 0 13
      app/Http/Controllers/pros_SINGLE_Controller.php
  7. 1 3
      app/HttpModels/ProModel.php
  8. 0 21
      app/Models/Lobby.php
  9. 0 17
      app/Models/LobbyPro.php
  10. 0 4
      app/Models/Pro.php
  11. 90 108
      generatecv/tree.txt
  12. 0 1
      resources/views/admin/pros/subs.blade.php
  13. 0 49
      resources/views/layouts/generated-links.blade.php
  14. 6 0
      resources/views/pro/bills/actions.blade.php
  15. 41 0
      resources/views/pro/bills_SINGLE/ACTION_payCmAmount.blade.php
  16. 41 0
      resources/views/pro/bills_SINGLE/ACTION_payRmeAmount.blade.php
  17. 41 0
      resources/views/pro/bills_SINGLE/ACTION_payRmmAmount.blade.php
  18. 38 0
      resources/views/pro/bills_SINGLE/ACTION_signAsCm.blade.php
  19. 38 0
      resources/views/pro/bills_SINGLE/ACTION_signAsRme.blade.php
  20. 38 0
      resources/views/pro/bills_SINGLE/ACTION_signAsRmm.blade.php
  21. 291 31
      resources/views/pro/bills_SINGLE/SUB_dashboard.blade.php
  22. 2 1
      resources/views/pro/care_months/actions.blade.php
  23. 45 0
      resources/views/pro/care_months_SINGLE/ACTION_updateCmReasons.blade.php
  24. 45 0
      resources/views/pro/care_months_SINGLE/ACTION_updateRmReasons.blade.php
  25. 180 35
      resources/views/pro/care_months_SINGLE/SUB_dashboard.blade.php
  26. 1 0
      resources/views/pro/my_clients/actions.blade.php
  27. 0 28
      resources/views/pro/my_clients_SINGLE/SUB_dashboard.blade.php
  28. 9 104
      routes/generated.php

+ 36 - 0
app/Http/Controllers/bills_SINGLE_Controller.php

@@ -22,18 +22,36 @@ class bills_SINGLE_Controller extends Controller
 		return response()->view('pro/bills_SINGLE/ACTION_payHcpDifferentAmount', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
+	// GET /bills/view/{uid}/ACTION_payCmAmount
+	public function ACTION_payCmAmount(Request $request, $uid) {
+		$record = DB::table('bill')->where('uid', $uid)->first();
+		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();
 		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();
+		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();
 		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();
+		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();
@@ -46,6 +64,24 @@ class bills_SINGLE_Controller extends Controller
 		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();
+		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();
+		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();
+		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();

+ 12 - 4
app/Http/Controllers/care_months_SINGLE_Controller.php

@@ -82,10 +82,16 @@ class care_months_SINGLE_Controller extends Controller
 		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_putReasons
-	public function ACTION_putReasons(Request $request, $uid) {
+	// GET /care_months/view/{uid}/ACTION_updateCmReasons
+	public function ACTION_updateCmReasons(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
-		return response()->view('pro/care_months_SINGLE/ACTION_putReasons', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		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();
+		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
@@ -187,7 +193,9 @@ class care_months_SINGLE_Controller extends Controller
 	// GET /care_months/view/{uid}/SUB_dashboard
 	public function SUB_dashboard(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
-		return response()->view('pro/care_months_SINGLE/SUB_dashboard', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		$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');
 	}
 
 	// GET /care_months/view/{uid}/SUB_cm_time_entries

+ 0 - 29
app/Http/Controllers/lobbies_Controller.php

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

+ 0 - 74
app/Http/Controllers/lobbies_SINGLE_Controller.php

@@ -1,74 +0,0 @@
-<?php
-
-namespace App\Http\Controllers;
-
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Auth;
-
-class lobbies_SINGLE_Controller extends Controller
-{
-    public $selfName = 'lobbies_SINGLE_Controller';
-
-	// GET /lobbies/view/{uid}/ACTION_putName
-	public function ACTION_putName(Request $request, $uid) {
-		$record = DB::table('lobby')->where('uid', $uid)->first();
-		return response()->view('admin/lobbies_SINGLE/ACTION_putName', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-
-	// GET /lobbies/view/{uid}/ACTION_putUrlSlug
-	public function ACTION_putUrlSlug(Request $request, $uid) {
-		$record = DB::table('lobby')->where('uid', $uid)->first();
-		return response()->view('admin/lobbies_SINGLE/ACTION_putUrlSlug', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-
-	// GET /lobbies/view/{uid}/ACTION_setIsStrangerAccessibleToTrue
-	public function ACTION_setIsStrangerAccessibleToTrue(Request $request, $uid) {
-		$record = DB::table('lobby')->where('uid', $uid)->first();
-		return response()->view('admin/lobbies_SINGLE/ACTION_setIsStrangerAccessibleToTrue', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-
-	// GET /lobbies/view/{uid}/ACTION_setIsStrangerAccessibleToFalse
-	public function ACTION_setIsStrangerAccessibleToFalse(Request $request, $uid) {
-		$record = DB::table('lobby')->where('uid', $uid)->first();
-		return response()->view('admin/lobbies_SINGLE/ACTION_setIsStrangerAccessibleToFalse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-
-	// GET /lobbies/view/{uid}/ACTION_setIsClientAccessibleToTrue
-	public function ACTION_setIsClientAccessibleToTrue(Request $request, $uid) {
-		$record = DB::table('lobby')->where('uid', $uid)->first();
-		return response()->view('admin/lobbies_SINGLE/ACTION_setIsClientAccessibleToTrue', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-
-	// GET /lobbies/view/{uid}/ACTION_setIsClientAccessibleToFalse
-	public function ACTION_setIsClientAccessibleToFalse(Request $request, $uid) {
-		$record = DB::table('lobby')->where('uid', $uid)->first();
-		return response()->view('admin/lobbies_SINGLE/ACTION_setIsClientAccessibleToFalse', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-
-	// GET /lobbies/view/{uid}/SUB_dashboard
-	public function SUB_dashboard(Request $request, $uid) {
-		$record = DB::table('lobby')->where('uid', $uid)->first();
-		return response()->view('admin/lobbies_SINGLE/SUB_dashboard', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-
-	// GET /lobbies/view/{uid}/SUB_lobby_pros
-	public function SUB_lobby_pros(Request $request, $uid) {
-		$record = DB::table('lobby')->where('uid', $uid)->first();
-		$subRecords = DB::table('lobby_pro')->where('lobby_id', $record->id)->get();
-		return response()->view('admin/lobbies_SINGLE/SUB_lobby_pros', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-
-	// GET /lobbies/view/{uid}/SUB_meetings
-	public function SUB_meetings(Request $request, $uid) {
-		$record = DB::table('lobby')->where('uid', $uid)->first();
-		$subRecords = DB::table('meeting')->where('lobby_id', $record->id)->get();
-		return response()->view('admin/lobbies_SINGLE/SUB_meetings', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-
-	// GET /lobbies/view/{uid}/ACTION_lobby_prosAddNew
-	public function ACTION_lobby_prosAddNew(Request $request, $uid) {
-		$record = DB::table('lobby')->where('uid', $uid)->first();
-		return response()->view('admin/lobbies_SINGLE/ACTION_lobby_prosAddNew', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-}

+ 6 - 0
app/Http/Controllers/my_clients_SINGLE_Controller.php

@@ -334,6 +334,12 @@ class my_clients_SINGLE_Controller extends Controller
 		return response()->view('pro/my_clients_SINGLE/ACTION_updateCmReasons', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
+	// GET /my_clients/view/{uid}/ACTION_updateRmReasons
+	public function ACTION_updateRmReasons(Request $request, $uid) {
+		$record = DB::table('client')->where('uid', $uid)->first();
+		return response()->view('pro/my_clients_SINGLE/ACTION_updateRmReasons', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
 	// GET /my_clients/view/{uid}/ACTION_updateCmEnrollmentConsentInfo
 	public function ACTION_updateCmEnrollmentConsentInfo(Request $request, $uid) {
 		$record = DB::table('client')->where('uid', $uid)->first();

+ 0 - 13
app/Http/Controllers/pros_SINGLE_Controller.php

@@ -275,13 +275,6 @@ class pros_SINGLE_Controller extends Controller
 		return response()->view('admin/pros_SINGLE/SUB_pro_transactions', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
-	// GET /pros/view/{uid}/SUB_lobby_pros
-	public function SUB_lobby_pros(Request $request, $uid) {
-		$record = DB::table('pro')->where('uid', $uid)->first();
-		$subRecords = DB::table('lobby_pro')->where('pro_id', $record->id)->get();
-		return response()->view('admin/pros_SINGLE/SUB_lobby_pros', compact('record', 'subRecords'), 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();
@@ -299,10 +292,4 @@ class pros_SINGLE_Controller extends Controller
 		$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');
 	}
-
-	// GET /pros/view/{uid}/ACTION_lobby_prosAddNew
-	public function ACTION_lobby_prosAddNew(Request $request, $uid) {
-		$record = DB::table('pro')->where('uid', $uid)->first();
-		return response()->view('admin/pros_SINGLE/ACTION_lobby_prosAddNew', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
 }

+ 1 - 3
app/HttpModels/ProModel.php

@@ -19,8 +19,6 @@ class ProModel {
         $this->type = $pro->pro_type;
         $this->avatarFile = $pro->profile_picture_base64;
         $this->is_active_and_visible = $pro->is_currently_clocked_in;
-        foreach ($pro->lobbies()->where('lobby.is_active',true)->get() as $lobby) {
-            $this->lobbies[] = new LobbyModel($lobby);
-        }
+       
     }
 }

+ 0 - 21
app/Models/Lobby.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Lobby extends Model
-{
-    
-    protected $table = "lobby";
-
-    public function meetings()
-    {
-        return $this->hasMany(Meeting::class);
-    }
-
-    public function pros()
-    {
-        return $this->belongsToMany(Pro::class, 'lobby_pro');
-    }
-}

+ 0 - 17
app/Models/LobbyPro.php

@@ -1,17 +0,0 @@
-<?php
-
-namespace App\Models;
-
-use Illuminate\Database\Eloquent\Model;
-
-class LobbyPro extends Model
-{
-    
-    protected $table = "lobby_pro";
-
-
-    public function pro()
-    {
-        return $this->belongsTo(Pro::class);
-    }
-}

+ 0 - 4
app/Models/Pro.php

@@ -9,8 +9,4 @@ class Pro extends Model
 
     protected $table = "pro";
 
-    public function lobbies()
-    {
-        return $this->belongsToMany(Lobby::class, 'lobby_pro', 'pro_id', 'lobby_id');
-    }
 }

+ 90 - 108
generatecv/tree.txt

@@ -246,6 +246,9 @@ PRO
             updateCmReasons
                 cmReason1*=cm_reason1
                 cmReason2=cm_reason2
+            updateRmReasons
+                rmReason1*=rm_reason1
+                rmReason2=rm_reason2
             updateCmEnrollmentConsentInfo
                 cmEnrollmentConsentMethod=cm_enrollment_consent_method
                 cmEnrollmentConsentMethodMemo=cm_enrollment_consent_method_memo
@@ -295,7 +298,7 @@ PRO
                 !grp:Deceased:is_deceased,date_and_time_of_death,cause_of_death
                 !grp:Pharmacy:pharmacy,pharmacy_facility_id:Edit pharmancy:circle=>/my_clients/view/$uid/ACTION_editPharmacy
                 !grp:SSN:ssn:Edit SSN:circle=>/my_clients/view/$uid/ACTION_editSsn
-                !grp:MCN:mcn,mcn_name_first,mcn_name_last,mcn_dob,mcn_ssn,mcn_address,is_partbprimary,is_hospice,mcn_response_detail,billing_address,reason_not_partb,reason_not_partbmemo,is_medicare_advantage,medicare_advantage_plan:Put MSN:circle=>/my_clients/view/$uid/ACTION_putMcn
+                #!grp:MCN:mcn,mcn_name_first,mcn_name_last,mcn_dob,mcn_ssn,mcn_address,is_partbprimary,is_hospice,mcn_response_detail,billing_address,reason_not_partb,reason_not_partbmemo,is_medicare_advantage,medicare_advantage_plan:Put MSN:circle=>/my_clients/view/$uid/ACTION_putMcn
                 !grp:Webcam:has_webcam_device,webcam_device:Update webcam info:circle=>/my_clients/view/$uid/ACTION_updateWebcamInfo
                 !grp:MCP:mcp_pro_id:Put MCP:circle=>/my_clients/view/$uid/ACTION_putMcp
                 !grp:MCP Visit:has_mcp_done_onboarding_visit,mcp_onboarding_visit_date,mcp_onboarding_visit_note_id,reason_onboarding_visit_note_outside_system,is_mcp_onboarding_active,why_is_mcp_onboarding_not_active_category,why_is_mcp_onboarding_not_active_memo:Update source:circle=>/my_clients/view/$uid/ACTION_updateMcpOnboardingVisitInfo
@@ -598,11 +601,12 @@ PRO
             changeRmmPro
                 rmmProUid:record:pro:uid,name_display
             removeRmmPro:if:rmm_pro_id
-            putReasons
-                reason1
-                reason2
-                reason3
-                reason3Plus
+            updateCmReasons
+                cmReason1*
+                cmReason2
+            updateRmReasons
+                rmReason1*
+                rmReason2
             setIsClientEnrolledInCmToTrue
             setIsClientEnrolledInCmToFalse
             updateWhyNotEnrolledInCm
@@ -627,7 +631,51 @@ PRO
             setIsTmThisMonthToFalse
         SUB
             dashboard
-                !grp:Care Month Details:id,created_at,type,uid,cm_reason1,cm_reason2,cm_total_time_in_seconds,cm_total_time_in_seconds_by_cm_pro,cm_total_time_in_seconds_by_mcp,has_mcp_done_em_visit,is_client_enrolled_in_cm,is_client_enrolled_in_rm,is_cm_canceled_this_month,is_rm_canceled_this_month,is_tm_this_month,rm_reason1,rm_reason2,rm_total_time_in_seconds,rm_total_time_in_seconds_by_mcp,rm_total_time_in_seconds_by_rme_pro,rm_total_time_in_seconds_by_rmm_pro,start_date,why_is_cm_canceled_this_month,why_is_rm_canceled_this_month,why_not_enrolled_in_cm_category,why_not_enrolled_in_cm_memo,why_not_enrolled_in_rm_category,why_not_enrolled_in_rm_memo,created_by_session_id,client_id,cm_bill_id,cm_pro_id,mcp_pro_id,rm_bill_id,rme_pro_id,rmm_pro_id
+                !qry:clients:select id, concat(name_first, ' ', name_last) as name_display from client
+                !qry:pros:SELECT id, name_display FROM pro
+                !grp:Info:client_id,start_date
+                !grp:Pros:mcp_pro_id,cm_pro_id,rme_pro_id,rmm_pro_id,has_mcp_done_em_visit
+                !grp:Reasons:cm_reason1,cm_reason2,rm_reason1,rm_reason2
+                !grp:CM Enrollment:is_client_enrolled_in_cm,why_not_enrolled_in_cm_category,why_not_enrolled_in_cm_memo:Update why not enrolled in CM:circle=>/care_months/view/$uid/ACTION_updateWhyNotEnrolledInCm
+                !grp:RM Enrollment:is_client_enrolled_in_rm,why_not_enrolled_in_rm_category,why_not_enrolled_in_rm_memo:Update why not enrolled in RM:circle=>/care_months/view/$uid/ACTION_updateWhyNotEnrolledInRm
+                !grp:CM Total Time:cm_total_time_in_seconds,cm_total_time_in_seconds_by_mcp,cm_total_time_in_seconds_by_cm_pro
+                !grp:RM Total Time:rm_total_time_in_seconds,rm_total_time_in_seconds_by_mcp,rm_total_time_in_seconds_by_rmm_pro,rm_total_time_in_seconds_by_rme_pro
+                !grp:Bills:cm_bill_id,rm_bill_id
+                !grp:CM Cancellation:is_cm_canceled_this_month,why_is_cm_canceled_this_month
+                !grp:RM Cancellation:is_rm_canceled_this_month,why_is_rm_canceled_this_month
+                !grp:TM:is_tm_this_month
+                !col:client_id:Client:~clients:name_display:id,=,$client_id:all
+                !col:mcp_pro_id:MCP:~pros:name_display:id,=,$mcp_pro_id:all
+                !col:cm_pro_id:CM:~pros:name_display:id,=,$cm_pro_id:all
+                !col:rmm_pro_id:RMM:~pros:name_display:id,=,$rmm_pro_id:all
+                !col:rme_pro_id:RME:~pros:name_display:id,=,$rme_pro_id:all
+                !act:mcp_pro_id:assignMcpPro:circle:if-not:mcp_pro_id=>/care_months/view/$uid/ACTION_assignMcpPro
+                !act:mcp_pro_id:changeMcpPro:circle:if:mcp_pro_id=>/care_months/view/$uid/ACTION_changeMcpPro
+                !act:mcp_pro_id:removeMcpPro:circle:if:mcp_pro_id=>/care_months/view/$uid/ACTION_removeMcpPro
+                !act:cm_pro_id:assignCmPro:circle:if-not:cm_pro_id=>/care_months/view/$uid/ACTION_assignCmPro
+                !act:cm_pro_id:changeCmPro:circle:if:cm_pro_id=>/care_months/view/$uid/ACTION_changeCmPro
+                !act:cm_pro_id:removeCmPro:circle:if:cm_pro_id=>/care_months/view/$uid/ACTION_removeCmPro
+                !act:rmm_pro_id:assignRmmPro:circle:if-not:rmm_pro_id=>/care_months/view/$uid/ACTION_assignRmmPro
+                !act:rmm_pro_id:changeRmmPro:circle:if:rmm_pro_id=>/care_months/view/$uid/ACTION_changeRmmPro
+                !act:rmm_pro_id:removeRmmPro:circle:if:rmm_pro_id=>/care_months/view/$uid/ACTION_removeRmmPro
+                !act:rme_pro_id:assignRmePro:circle:if-not:rmm_pro_id=>/care_months/view/$uid/ACTION_assignRmePro
+                !act:rme_pro_id:changeRmePro:circle:if:rmm_pro_id=>/care_months/view/$uid/ACTION_changeRmePro
+                !act:rme_pro_id:removeRmePro:circle:if:rmm_pro_id=>/care_months/view/$uid/ACTION_removeRmePro
+                !act:is_client_enrolled_in_cm:setIsClientEnrolledInCmToFalse:circle=>/care_months/view/$uid/ACTION_setIsClientEnrolledInCmToFalse
+                !act:is_client_enrolled_in_cm:setIsClientEnrolledInCmToTrue:circle=>/care_months/view/$uid/ACTION_setIsClientEnrolledInCmToTrue
+                !act:is_client_enrolled_in_rm:setIsClientEnrolledInRmToFalse:circle=>/care_months/view/$uid/ACTION_setIsClientEnrolledInRmToFalse
+                !act:is_client_enrolled_in_rm:setIsClientEnrolledInRmToTrue:circle=>/care_months/view/$uid/ACTION_setIsClientEnrolledInRmToTrue
+                !act:cm_bill_id:generateBillForCm:circle=>/care_months/view/$uid/ACTION_generateBillForCm
+                !act:rm_bill_id:generateBillForRm:circle=>/care_months/view/$uid/ACTION_generateBillForRm
+                !act:is_cm_canceled_this_month:setCmCancelledThisMonthToTrue:circle=>/care_months/view/$uid/ACTION_setIsCmCanceledThisMonthToTrue
+                !act:is_cm_canceled_this_month:setCmCancelledThisMonthToFalse:circle=>/care_months/view/$uid/ACTION_setIsCmCanceledThisMonthToFalse
+                !act:is_rm_canceled_this_month:setRmCancelledThisMonthToTrue:circle=>/care_months/view/$uid/ACTION_setIsRmCanceledThisMonthToTrue
+                !act:is_rm_canceled_this_month:setRmCancelledThisMonthToFalse:circle=>/care_months/view/$uid/ACTION_setIsRmCanceledThisMonthToFalse
+                !act:is_tm_this_month:setIsTmThisMonthToTrue:circle=>/care_months/view/$uid/ACTION_setIsTmThisMonthToTrue
+                !act:is_tm_this_month:setIsTmThisMonthToFalse:circle=>/care_months/view/$uid/ACTION_setIsTmThisMonthToFalse
+                !act:cm_reason1:updateCmReasons:circle=>/care_months/view/$uid/ACTION_updateCmReasons
+                !act:rm_reason1:updateRmReasons:circle=>/care_months/view/$uid/ACTION_updateRmReasons
+                !nal:
 # :: need remove
             cm_time_entries
                 id=care_month_entry.care_month_id,cm_or_rm='CM'
@@ -679,19 +727,54 @@ PRO
                 hcpPaymentAmount:number
             payHcpDifferentAmount
                 differentHcpPaymentAmount:number
+            payCmAmount
+                cmPaymentAmount:number
             payCmDifferentAmount
                 differentCmPaymentAmount:number
+            payRmeAmount
+                rmePaymentAmount:number
             payRmeDifferentAmount
                 differentRmePaymentAmount:number
+            payRmmAmount
+                rmmPaymentAmount:number
             payRmmDifferentAmount
                 differentRmmPaymentAmount:number
             signAsHcp
+            signAsCm
+            signAsRme
+            signAsRmm
             markSubmitted
             markCancelled
             putCollectedAmount
                 collectedAmount
         SUB
             dashboard
+                !grp:Info:bill_service_type,client_id,effective_date,code,modifier,number_of_units
+                !grp:Note:note_id,note_ally_id
+                !grp:Care Month:care_month_id
+                !grp:Pros:cm_or_rm,hcp_pro_id,cm_pro_id,rme_pro_id,rmm_pro_id
+                !grp:Service Location:service_location
+                !grp:Reasons:reason1,reason2,reason3
+                !grp:HCP Signature:is_signed_by_hcp,signed_by_hcp_at:Sign as HCP:circle=>/bills/view/$uid/ACTION_signAsHcp
+                !grp:CM Signature:is_signed_by_cm,signed_by_cm_at:Sign as CM:circle=>/bills/view/$uid/ACTION_signAsCm
+                !grp:RME Signature:is_signed_by_rme,signed_by_rme_at:Sign as RME:circle=>/bills/view/$uid/ACTION_signAsRme
+                !grp:RMM Signature:is_signed_by_rmm,signed_by_rmm_at:Sign as RMM:circle=>/bills/view/$uid/ACTION_signAsRmm
+                !grp:HCP Payment:hcp_expected_payment_amount,has_hcp_been_paid,hcp_payment_amount,hcp_payment_pro_transaction_id
+                !grp:CM Payment:cm_expected_payment_amount  ,has_cm_been_paid,cm_payment_amount,cm_payment_pro_transaction_id
+                !grp:RME Payment:rme_expected_payment_amount,has_rme_been_paid,rme_payment_amount,rme_payment_pro_transaction_id
+                !grp:RMM Payment:rmm_expected_payment_amount,has_rmm_been_paid,rmm_payment_amount,rmm_payment_pro_transaction_id
+                !grp:Cancelled?:is_cancelled,marked_cancelled_at:Cancel:circle=>/bills/view/$uid/ACTION_markCancelled
+                !grp:Submitted?:is_submitted,marked_submitted_at:Submit:circle=>/bills/view/$uid/ACTION_markSubmitted
+                !grp:Collected Amount:collected_amount:Put collected amount:circle=>/bills/view/$uid/ACTION_putCollectedAmount
+                !act:has_hcp_been_paid:Pay HCP Amount:circle=>/bills/view/$uid/ACTION_payHcpAmount
+                !act:has_hcp_been_paid:Pay HCP Different Amount:circle=>/bills/view/$uid/ACTION_payHcpDifferentAmount
+                !act:has_cm_been_paid:Pay CM Amount:circle=>/bills/view/$uid/ACTION_payCmAmount
+                !act:has_cm_been_paid:Pay CM Different Amount:circle=>/bills/view/$uid/ACTION_payCmDifferentAmount
+                !act:has_rmm_been_paid:Pay RMM Amount:circle=>/bills/view/$uid/ACTION_payRmmAmount
+                !act:has_rmm_been_paid:Pay RMM Different Amount:circle=>/bills/view/$uid/ACTION_payRmmDifferentAmount
+                !act:has_rme_been_paid:Pay RME Amount:circle=>/bills/view/$uid/ACTION_payRmeAmount
+                !act:has_rme_been_paid:Pay RME Different Amount:circle=>/bills/view/$uid/ACTION_payRmeDifferentAmount
+                !nal:
             transactions
                 id=pro_transaction.bill_id
             audit_log
@@ -933,11 +1016,6 @@ ADMIN
             notes
             bills
             pro_transactions
-            lobby_pros
-                id=lobby_pro.pro_id=>/lobby_pros/view/UID
-                add_new:lobby_pro
-                    proUid:hidden=uid
-                    lobbyUid:record:lobby:uid,name
             sessions
             audit_log
     pro_rates|pro_rate|view|icon:funnel-dollar
@@ -947,102 +1025,6 @@ ADMIN
                 newAmount:number=amount
         SUB
             dashboard
-    lobbies|lobby|add|view|icon:hospital
-    lobbies/add_new:create
-        name
-		urlSlug
-		isStrangerAccessible:boolean
-		isClientAccessible:boolean
-    lobbies/view/{uid}
-        ACTIONS
-            putName
-                name
-            putUrlSlug
-                urlSlug
-            setIsStrangerAccessibleToTrue
-            setIsStrangerAccessibleToFalse
-            setIsClientAccessibleToTrue
-            setIsClientAccessibleToFalse
-        SUB
-            dashboard
-            lobby_pros
-                id=lobby_pro.lobby_id=>/lobby_pros/view/UID
-                add_new:lobby_pro
-                    lobbyUid:hidden=uid
-                    proUid:record:pro:uid,name_display
-            meetings
-                id=meeting.lobby_id=>/meetings/view/UID
-    meetings|meeting|add|view|icon:handshake
-    meetings/add_new:meetings:createAsProPerformer
-        lobbyUid:record:lobby:uid,name
-		targetLobbyProUid:record:lobby_pro:uid,uid
-		title
-		name
-		pictureBase64
-    meetings/view/{uid}
-        ACTIONS
-            putLobby
-                lobbyUid:record:lobby:uid,name
-            putTargetLobbyPro
-                lobbyUid:record:lobby_pro:uid,name
-            putTitle
-                title
-            putStrangerInfo
-                strangerFirstName
-		        strangerLastName
-		        strangerDob:date
-		        strangerMcn
-		        isStrangerMcnPpb:boolean
-		        strangerMcnDetail
-		        strangerSsn
-		        strangerDetail
-            putMeetingNumber
-        SUB
-            dashboard
-            meeting_participants
-                id=meeting_participant.meeting_id=>/meeting_participants/view/UID
-                add_new:meeting_participant:createForPro
-                    meetingUid:hidden=uid
-                    proUid:record:pro:uid,name_display
-                    name
-                    pictureBase64
-            meeting_invitations
-                id=meeting_invitation.meeting_id=>/meeting_invitations/view/UID
-                add_new:meeting_invitation
-                    meetingUid:hidden=uid
-                    smsOrEmail:select:SMS,EMAIL
-                    toSms
-                    toEmail
-                    toName
-            meeting_rings
-                id=meeting_ring.meeting_id=>/meeting_rings/view/UID
-            meeting_knocks
-                id=meeting_knock.meeting_id=>/meeting_knocks/view/UID
-            meeting_messages
-                id=meeting_message.meeting_id=>/meeting_messages/view/UID
-    meeting_participants|meeting_participant|view|icon:user
-    meeting_participants/view/{uid}
-        SUB
-            dashboard
-    meeting_invitations|meeting_invitation|view|icon:envelope
-    meeting_invitations/view/{uid}
-        ACTIONS
-            cancel
-                memo
-        SUB
-            dashboard
-    meeting_rings|meeting_ring|view|icon:phone
-    meeting_rings/view/{uid}
-        SUB
-            dashboard
-    meeting_knocks|meeting_knock|view|icon:door-closed
-    meeting_knocks/view/{uid}
-        SUB
-            dashboard
-    meeting_messages|meeting_message|view|icon:comments
-    meeting_message/view/{uid}
-        SUB
-            dashboard
     section_templates|section_template|add|icon:user-md
         !inc:@title,internal_name
     section_templates/add_new:create

+ 0 - 1
resources/views/admin/pros/subs.blade.php

@@ -11,6 +11,5 @@
 <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_lobby_pros' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_lobby_pros' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Lobby Pros</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>

+ 0 - 49
resources/views/layouts/generated-links.blade.php

@@ -124,55 +124,6 @@
 	</a>
 </li>
 
-<li class='nav-item'>
-	<a href='/lobbies' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'lobbies') === 0 ? 'active' : '') }} '>
-		<i class='nav-icon fa fa-hospital'></i>
-		<p>Lobbies</p>
-	</a>
-</li>
-
-<li class='nav-item'>
-	<a href='/meetings' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'meetings') === 0 ? 'active' : '') }} '>
-		<i class='nav-icon fa fa-handshake'></i>
-		<p>Meetings</p>
-	</a>
-</li>
-
-<li class='nav-item'>
-	<a href='/meeting_participants' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'meeting_participants') === 0 ? 'active' : '') }} '>
-		<i class='nav-icon fa fa-user'></i>
-		<p>Meeting Participants</p>
-	</a>
-</li>
-
-<li class='nav-item'>
-	<a href='/meeting_invitations' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'meeting_invitations') === 0 ? 'active' : '') }} '>
-		<i class='nav-icon fa fa-envelope'></i>
-		<p>Meeting Invitations</p>
-	</a>
-</li>
-
-<li class='nav-item'>
-	<a href='/meeting_rings' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'meeting_rings') === 0 ? 'active' : '') }} '>
-		<i class='nav-icon fa fa-phone'></i>
-		<p>Meeting Rings</p>
-	</a>
-</li>
-
-<li class='nav-item'>
-	<a href='/meeting_knocks' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'meeting_knocks') === 0 ? 'active' : '') }} '>
-		<i class='nav-icon fa fa-door-closed'></i>
-		<p>Meeting Knocks</p>
-	</a>
-</li>
-
-<li class='nav-item'>
-	<a href='/meeting_messages' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'meeting_messages') === 0 ? 'active' : '') }} '>
-		<i class='nav-icon fa fa-comments'></i>
-		<p>Meeting Messages</p>
-	</a>
-</li>
-
 <li class='nav-item'>
 	<a href='/section_templates' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'section_templates') === 0 ? 'active' : '') }} '>
 		<i class='nav-icon fa fa-user-md'></i>

+ 6 - 0
resources/views/pro/bills/actions.blade.php

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

+ 41 - 0
resources/views/pro/bills_SINGLE/ACTION_payCmAmount.blade.php

@@ -0,0 +1,41 @@
+@extends('pro.bills.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Pay Cm Amount</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="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/payCmAmount">
+        <input type="hidden" name="_success" value="{{route('bills-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('bills_SINGLE-ACTION_payCmAmount', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Cm Payment Amount </label>
+<input class='form-control' type='number' name='cmPaymentAmount' value='{{ old('cmPaymentAmount') ? old('cmPaymentAmount') : '' }}' >
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('bills-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 41 - 0
resources/views/pro/bills_SINGLE/ACTION_payRmeAmount.blade.php

@@ -0,0 +1,41 @@
+@extends('pro.bills.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Pay Rme Amount</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="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/payRmeAmount">
+        <input type="hidden" name="_success" value="{{route('bills-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('bills_SINGLE-ACTION_payRmeAmount', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rme Payment Amount </label>
+<input class='form-control' type='number' name='rmePaymentAmount' value='{{ old('rmePaymentAmount') ? old('rmePaymentAmount') : '' }}' >
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('bills-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 41 - 0
resources/views/pro/bills_SINGLE/ACTION_payRmmAmount.blade.php

@@ -0,0 +1,41 @@
+@extends('pro.bills.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Pay Rmm Amount</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="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/payRmmAmount">
+        <input type="hidden" name="_success" value="{{route('bills-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('bills_SINGLE-ACTION_payRmmAmount', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rmm Payment Amount </label>
+<input class='form-control' type='number' name='rmmPaymentAmount' value='{{ old('rmmPaymentAmount') ? old('rmmPaymentAmount') : '' }}' >
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('bills-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 38 - 0
resources/views/pro/bills_SINGLE/ACTION_signAsCm.blade.php

@@ -0,0 +1,38 @@
+@extends('pro.bills.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Sign As Cm</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/signAsCm">
+        <input type="hidden" name="_success" value="{{route('bills-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('bills_SINGLE-ACTION_signAsCm', ['uid' => $record->uid])}}">
+        
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('bills-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 38 - 0
resources/views/pro/bills_SINGLE/ACTION_signAsRme.blade.php

@@ -0,0 +1,38 @@
+@extends('pro.bills.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Sign As Rme</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/signAsRme">
+        <input type="hidden" name="_success" value="{{route('bills-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('bills_SINGLE-ACTION_signAsRme', ['uid' => $record->uid])}}">
+        
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('bills-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 38 - 0
resources/views/pro/bills_SINGLE/ACTION_signAsRmm.blade.php

@@ -0,0 +1,38 @@
+@extends('pro.bills.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Sign As Rmm</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/signAsRmm">
+        <input type="hidden" name="_success" value="{{route('bills-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('bills_SINGLE-ACTION_signAsRmm', ['uid' => $record->uid])}}">
+        
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('bills-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 291 - 31
resources/views/pro/bills_SINGLE/SUB_dashboard.blade.php

@@ -2,38 +2,298 @@
 @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 class="col-12">
+
+        <div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">Info
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Bill Service Type</td><td class="w-75 px-2 font-weight-bold"><?= $record->bill_service_type ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Client Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->client_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Effective Date</td><td class="w-75 px-2 font-weight-bold"><?= $record->effective_date ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Code</td><td class="w-75 px-2 font-weight-bold"><?= $record->code ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Modifier</td><td class="w-75 px-2 font-weight-bold"><?= $record->modifier ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Number Of Units</td><td class="w-75 px-2 font-weight-bold"><?= $record->number_of_units ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">Note
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Note Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->note_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Note Ally Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->note_ally_id ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">Care Month
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Care Month Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->care_month_id ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">Pros
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Cm Or Rm</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_or_rm ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Hcp Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->hcp_pro_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Cm Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_pro_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rme Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->rme_pro_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rmm Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->rmm_pro_id ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">Service Location
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Service Location</td><td class="w-75 px-2 font-weight-bold"><?= $record->service_location ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">Reasons
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Reason1</td><td class="w-75 px-2 font-weight-bold"><?= $record->reason1 ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Reason2</td><td class="w-75 px-2 font-weight-bold"><?= $record->reason2 ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Reason3</td><td class="w-75 px-2 font-weight-bold"><?= $record->reason3 ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">HCP Signature
+                <span class="ml-auto"><a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_signAsHcp' title='Sign as HCP'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Sign As HCP</span></a></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Is Signed By Hcp</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_signed_by_hcp ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Signed By Hcp At</td><td class="w-75 px-2 font-weight-bold"><?= friendly_date_time($record->signed_by_hcp_at) ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">CM Signature
+                <span class="ml-auto"><a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_signAsCm' title='Sign as CM'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Sign As CM</span></a></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Is Signed By Cm</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_signed_by_cm ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Signed By Cm At</td><td class="w-75 px-2 font-weight-bold"><?= friendly_date_time($record->signed_by_cm_at) ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">RME Signature
+                <span class="ml-auto"><a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_signAsRme' title='Sign as RME'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Sign As RME</span></a></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Is Signed By Rme</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_signed_by_rme ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Signed By Rme At</td><td class="w-75 px-2 font-weight-bold"><?= friendly_date_time($record->signed_by_rme_at) ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">RMM Signature
+                <span class="ml-auto"><a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_signAsRmm' title='Sign as RMM'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Sign As RMM</span></a></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Is Signed By Rmm</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_signed_by_rmm ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Signed By Rmm At</td><td class="w-75 px-2 font-weight-bold"><?= friendly_date_time($record->signed_by_rmm_at) ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">HCP Payment
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Hcp Expected Payment Amount</td><td class="w-75 px-2 font-weight-bold"><?= $record->hcp_expected_payment_amount ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Has Hcp Been Paid</td><td class="w-75 px-2 font-weight-bold"><?= $record->has_hcp_been_paid ?><a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_payHcpAmount' title='Pay HCP Amount' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Pay HCP Amount</span></a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_payHcpDifferentAmount' title='Pay HCP Different Amount' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Pay HCP Different Amount</span></a></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Hcp Payment Amount</td><td class="w-75 px-2 font-weight-bold"><?= $record->hcp_payment_amount ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Hcp Payment Pro Transaction Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->hcp_payment_pro_transaction_id ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">CM Payment
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Cm Expected Payment Amount  </td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_expected_payment_amount   ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Has Cm Been Paid</td><td class="w-75 px-2 font-weight-bold"><?= $record->has_cm_been_paid ?><a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_payCmAmount' title='Pay CM Amount' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Pay CM Amount</span></a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_payCmDifferentAmount' title='Pay CM Different Amount' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Pay CM Different Amount</span></a></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Cm Payment Amount</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_payment_amount ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Cm Payment Pro Transaction Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_payment_pro_transaction_id ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">RME Payment
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Rme Expected Payment Amount</td><td class="w-75 px-2 font-weight-bold"><?= $record->rme_expected_payment_amount ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Has Rme Been Paid</td><td class="w-75 px-2 font-weight-bold"><?= $record->has_rme_been_paid ?><a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_payRmeAmount' title='Pay RME Amount' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Pay RME Amount</span></a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_payRmeDifferentAmount' title='Pay RME Different Amount' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Pay RME Different Amount</span></a></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rme Payment Amount</td><td class="w-75 px-2 font-weight-bold"><?= $record->rme_payment_amount ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rme Payment Pro Transaction Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->rme_payment_pro_transaction_id ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">RMM Payment
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Rmm Expected Payment Amount</td><td class="w-75 px-2 font-weight-bold"><?= $record->rmm_expected_payment_amount ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Has Rmm Been Paid</td><td class="w-75 px-2 font-weight-bold"><?= $record->has_rmm_been_paid ?><a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_payRmmAmount' title='Pay RMM Amount' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Pay RMM Amount</span></a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_payRmmDifferentAmount' title='Pay RMM Different Amount' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Pay RMM Different Amount</span></a></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rmm Payment Amount</td><td class="w-75 px-2 font-weight-bold"><?= $record->rmm_payment_amount ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rmm Payment Pro Transaction Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->rmm_payment_pro_transaction_id ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">Cancelled?
+                <span class="ml-auto"><a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_markCancelled' title='Cancel'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Cancel</span></a></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Is Cancelled</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_cancelled ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Marked Cancelled At</td><td class="w-75 px-2 font-weight-bold"><?= friendly_date_time($record->marked_cancelled_at) ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">Submitted?
+                <span class="ml-auto"><a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_markSubmitted' title='Submit'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Submit</span></a></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Is Submitted</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_submitted ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Marked Submitted At</td><td class="w-75 px-2 font-weight-bold"><?= friendly_date_time($record->marked_submitted_at) ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">Collected Amount
+                <span class="ml-auto"><a up-modal=".form-contents" up-width="800" up-history="false" href='/bills/view/<?= $record->uid ?>/ACTION_putCollectedAmount' title='Put collected amount'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Put Collected Amount</span></a></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Collected Amount</td><td class="w-75 px-2 font-weight-bold"><?= $record->collected_amount ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
 
-    </div>
-    <div class="col-4">
-        <div class="border-left h-100 pl-3">
-            @include('pro/bills/actions')
-        </div>
     </div>
 </div>
 

+ 2 - 1
resources/views/pro/care_months/actions.blade.php

@@ -10,7 +10,8 @@
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_assignRmmPro' class='d-block btn btn-sm btn-default mb-3'>Assign Rmm Pro</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_changeRmmPro' class='d-block btn btn-sm btn-default mb-3'>Change Rmm Pro</a>
 @if($record->rmm_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_removeRmmPro' class='d-block btn btn-sm btn-default mb-3'>Remove Rmm Pro</a> @endif
-<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_putReasons' class='d-block btn btn-sm btn-default mb-3'>Put Reasons</a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_updateCmReasons' class='d-block btn btn-sm btn-default mb-3'>Update Cm Reasons</a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_updateRmReasons' class='d-block btn btn-sm btn-default mb-3'>Update Rm Reasons</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_setIsClientEnrolledInCmToTrue' class='d-block btn btn-sm btn-default mb-3'>Set Is Client Enrolled In Cm To True</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_setIsClientEnrolledInCmToFalse' class='d-block btn btn-sm btn-default mb-3'>Set Is Client Enrolled In Cm To False</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_updateWhyNotEnrolledInCm' class='d-block btn btn-sm btn-default mb-3'>Update Why Not Enrolled In Cm</a>

+ 45 - 0
resources/views/pro/care_months_SINGLE/ACTION_updateCmReasons.blade.php

@@ -0,0 +1,45 @@
+@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>Update Cm Reasons</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/updateCmReasons">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_updateCmReasons', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Cm Reason 1 *</label>
+<input class='form-control' type='text' name='cmReason1' value='{{ old('cmReason1') ? old('cmReason1') : '' }}' required>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Cm Reason 2 </label>
+<input class='form-control' type='text' name='cmReason2' value='{{ old('cmReason2') ? old('cmReason2') : '' }}' >
+</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-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 45 - 0
resources/views/pro/care_months_SINGLE/ACTION_updateRmReasons.blade.php

@@ -0,0 +1,45 @@
+@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>Update Rm Reasons</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/updateRmReasons">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_updateRmReasons', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rm Reason 1 *</label>
+<input class='form-control' type='text' name='rmReason1' value='{{ old('rmReason1') ? old('rmReason1') : '' }}' required>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Rm Reason 2 </label>
+<input class='form-control' type='text' name='rmReason2' value='{{ old('rmReason2') ? old('rmReason2') : '' }}' >
+</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-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 180 - 35
resources/views/pro/care_months_SINGLE/SUB_dashboard.blade.php

@@ -2,62 +2,207 @@
 @section('content-inner')
 
     <div class="row mt-3">
-    <div class="col-8">
+    <div class="col-12">
 
         <div class="table-responsive p-0 bg-white table-sm mb-3">
     <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
         <thead>
         <tr>
-            <th colspan="2" class="px-2">Care Month Details
+            <th colspan="2" class="px-2">Info
                 <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
             </th>
         </tr>
         </thead>
         <tbody>
-            <tr><td class="w-25 px-2 text-secondary border-right">Created At</td><td class="w-75 px-2 font-weight-bold"><?= friendly_date_time($record->created_at) ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Type</td><td class="w-75 px-2 font-weight-bold"><?= $record->type ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Cm Reason1</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_reason1 ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Cm Reason2</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_reason2 ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Cm Total Time In Seconds</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_total_time_in_seconds ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Cm Total Time In Seconds By Cm Pro</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_total_time_in_seconds_by_cm_pro ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Cm Total Time In Seconds By Mcp</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_total_time_in_seconds_by_mcp ?></td></tr>
+            <tr><td class="w-25 px-2 text-secondary border-right">Client</td><td class="w-75 px-2 font-weight-bold"><?= value_from_rs($result_clients, 'name_display', [['id', '=', $record->client_id], ], 'all'); ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Start Date</td><td class="w-75 px-2 font-weight-bold"><?= $record->start_date ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">Pros
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">MCP</td><td class="w-75 px-2 font-weight-bold"><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->mcp_pro_id], ], 'all'); ?>@if(! $record->mcp_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_assignMcpPro' title='assignMcpPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Assign Mcp Pro</span></a> @endif
+@if( $record->mcp_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_changeMcpPro' title='changeMcpPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Change Mcp Pro</span></a> @endif
+@if( $record->mcp_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_removeMcpPro' title='removeMcpPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Remove Mcp Pro</span></a> @endif</td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">CM</td><td class="w-75 px-2 font-weight-bold"><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->cm_pro_id], ], 'all'); ?>@if(! $record->cm_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_assignCmPro' title='assignCmPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Assign Cm Pro</span></a> @endif
+@if( $record->cm_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_changeCmPro' title='changeCmPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Change Cm Pro</span></a> @endif
+@if( $record->cm_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_removeCmPro' title='removeCmPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Remove Cm Pro</span></a> @endif</td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">RME</td><td class="w-75 px-2 font-weight-bold"><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->rme_pro_id], ], 'all'); ?>@if(! $record->rmm_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_assignRmePro' title='assignRmePro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Assign Rme Pro</span></a> @endif
+@if( $record->rmm_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_changeRmePro' title='changeRmePro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Change Rme Pro</span></a> @endif
+@if( $record->rmm_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_removeRmePro' title='removeRmePro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Remove Rme Pro</span></a> @endif</td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">RMM</td><td class="w-75 px-2 font-weight-bold"><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->rmm_pro_id], ], 'all'); ?>@if(! $record->rmm_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_assignRmmPro' title='assignRmmPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Assign Rmm Pro</span></a> @endif
+@if( $record->rmm_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_changeRmmPro' title='changeRmmPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Change Rmm Pro</span></a> @endif
+@if( $record->rmm_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_removeRmmPro' title='removeRmmPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Remove Rmm Pro</span></a> @endif</td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Has Mcp Done Em Visit</td><td class="w-75 px-2 font-weight-bold"><?= $record->has_mcp_done_em_visit ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Is Client Enrolled In Cm</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_client_enrolled_in_cm ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Is Client Enrolled In Rm</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_client_enrolled_in_rm ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Is Cm Canceled This Month</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_cm_canceled_this_month ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Is Rm Canceled This Month</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_rm_canceled_this_month ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Is Tm This Month</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_tm_this_month ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Rm Reason1</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_reason1 ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">Reasons
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Cm Reason1</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_reason1 ?><a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_updateCmReasons' title='updateCmReasons' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Update Cm Reasons</span></a></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Cm Reason2</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_reason2 ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rm Reason1</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_reason1 ?><a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_updateRmReasons' title='updateRmReasons' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Update Rm Reasons</span></a></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Rm Reason2</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_reason2 ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Rm Total Time In Seconds</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_total_time_in_seconds ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Rm Total Time In Seconds By Mcp</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_total_time_in_seconds_by_mcp ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Rm Total Time In Seconds By Rme Pro</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_total_time_in_seconds_by_rme_pro ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Rm Total Time In Seconds By Rmm Pro</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_total_time_in_seconds_by_rmm_pro ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Start Date</td><td class="w-75 px-2 font-weight-bold"><?= $record->start_date ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Why Is Cm Canceled This Month</td><td class="w-75 px-2 font-weight-bold"><?= $record->why_is_cm_canceled_this_month ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Why Is Rm Canceled This Month</td><td class="w-75 px-2 font-weight-bold"><?= $record->why_is_rm_canceled_this_month ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">CM Enrollment
+                <span class="ml-auto"><a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_updateWhyNotEnrolledInCm' title='Update why not enrolled in CM'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Update Why Not Enrolled In CM</span></a></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Is Client Enrolled In Cm</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_client_enrolled_in_cm ?><a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_setIsClientEnrolledInCmToFalse' title='setIsClientEnrolledInCmToFalse' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Set Is Client Enrolled In Cm To False</span></a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_setIsClientEnrolledInCmToTrue' title='setIsClientEnrolledInCmToTrue' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Set Is Client Enrolled In Cm To True</span></a></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Why Not Enrolled In Cm Category</td><td class="w-75 px-2 font-weight-bold"><?= $record->why_not_enrolled_in_cm_category ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Why Not Enrolled In Cm Memo</td><td class="w-75 px-2 font-weight-bold"><?= $record->why_not_enrolled_in_cm_memo ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">RM Enrollment
+                <span class="ml-auto"><a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_updateWhyNotEnrolledInRm' title='Update why not enrolled in RM'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Update Why Not Enrolled In RM</span></a></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Is Client Enrolled In Rm</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_client_enrolled_in_rm ?><a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_setIsClientEnrolledInRmToFalse' title='setIsClientEnrolledInRmToFalse' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Set Is Client Enrolled In Rm To False</span></a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_setIsClientEnrolledInRmToTrue' title='setIsClientEnrolledInRmToTrue' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Set Is Client Enrolled In Rm To True</span></a></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Why Not Enrolled In Rm Category</td><td class="w-75 px-2 font-weight-bold"><?= $record->why_not_enrolled_in_rm_category ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Why Not Enrolled In Rm Memo</td><td class="w-75 px-2 font-weight-bold"><?= $record->why_not_enrolled_in_rm_memo ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Created By Session Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->created_by_session_id ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Client Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->client_id ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Cm Bill Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_bill_id ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Cm Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_pro_id ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Mcp Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->mcp_pro_id ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Rm Bill Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_bill_id ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Rme Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->rme_pro_id ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Rmm Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->rmm_pro_id ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">CM Total Time
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Cm Total Time In Seconds</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_total_time_in_seconds ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Cm Total Time In Seconds By Mcp</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_total_time_in_seconds_by_mcp ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Cm Total Time In Seconds By Cm Pro</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_total_time_in_seconds_by_cm_pro ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">RM Total Time
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Rm Total Time In Seconds</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_total_time_in_seconds ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rm Total Time In Seconds By Mcp</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_total_time_in_seconds_by_mcp ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rm Total Time In Seconds By Rmm Pro</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_total_time_in_seconds_by_rmm_pro ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rm Total Time In Seconds By Rme Pro</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_total_time_in_seconds_by_rme_pro ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">Bills
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Cm Bill Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_bill_id ?><a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_generateBillForCm' title='generateBillForCm' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Generate Bill For Cm</span></a></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rm Bill Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_bill_id ?><a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_generateBillForRm' title='generateBillForRm' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Generate Bill For Rm</span></a></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">CM Cancellation
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Is Cm Canceled This Month</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_cm_canceled_this_month ?><a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_setIsCmCanceledThisMonthToTrue' title='setCmCancelledThisMonthToTrue' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Set Cm Cancelled This Month To True</span></a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_setIsCmCanceledThisMonthToFalse' title='setCmCancelledThisMonthToFalse' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Set Cm Cancelled This Month To False</span></a></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Why Is Cm Canceled This Month</td><td class="w-75 px-2 font-weight-bold"><?= $record->why_is_cm_canceled_this_month ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">RM Cancellation
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Is Rm Canceled This Month</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_rm_canceled_this_month ?><a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_setIsRmCanceledThisMonthToTrue' title='setRmCancelledThisMonthToTrue' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Set Rm Cancelled This Month To True</span></a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_setIsRmCanceledThisMonthToFalse' title='setRmCancelledThisMonthToFalse' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Set Rm Cancelled This Month To False</span></a></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Why Is Rm Canceled This Month</td><td class="w-75 px-2 font-weight-bold"><?= $record->why_is_rm_canceled_this_month ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">TM
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Is Tm This Month</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_tm_this_month ?><a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_setIsTmThisMonthToTrue' title='setIsTmThisMonthToTrue' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Set Is Tm This Month To True</span></a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_setIsTmThisMonthToFalse' title='setIsTmThisMonthToFalse' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Set Is Tm This Month To False</span></a></td></tr>
         </tbody>
     </table>
 </div>
 
 
-    </div>
-    <div class="col-4">
-        <div class="border-left h-100 pl-3">
-            @include('pro/care_months/actions')
-        </div>
     </div>
 </div>
 

+ 1 - 0
resources/views/pro/my_clients/actions.blade.php

@@ -52,6 +52,7 @@
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_setIsEnrolledInCmToFalse' class='d-block btn btn-sm btn-default mb-3'>Set Is Enrolled In Cm To False</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_setIsEnrolledInCmToTrue' class='d-block btn btn-sm btn-default mb-3'>Set Is Enrolled In Cm To True</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_updateCmReasons' class='d-block btn btn-sm btn-default mb-3'>Update Cm Reasons</a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_updateRmReasons' class='d-block btn btn-sm btn-default mb-3'>Update Rm Reasons</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_updateCmEnrollmentConsentInfo' class='d-block btn btn-sm btn-default mb-3'>Update Cm Enrollment Consent Info</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_updateWhyNotEnrolledInCm' class='d-block btn btn-sm btn-default mb-3'>Update Why Not Enrolled In Cm</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_updateRmEligibility' class='d-block btn btn-sm btn-default mb-3'>Update Rm Eligibility</a>

+ 0 - 28
resources/views/pro/my_clients_SINGLE/SUB_dashboard.blade.php

@@ -379,34 +379,6 @@
     </table>
 </div>
 
-<div class="table-responsive p-0 bg-white table-sm mb-3">
-    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
-        <thead>
-        <tr>
-            <th colspan="2" class="px-2">MCN
-                <span class="ml-auto"><a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_putMcn' title='Put MSN'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Put MSN</span></a></span>
-            </th>
-        </tr>
-        </thead>
-        <tbody>
-            <tr><td class="w-25 px-2 text-secondary border-right">Mcn</td><td class="w-75 px-2 font-weight-bold"><?= $record->mcn ?><a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_removeMcn' title='removeMcn' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Remove Mcn</span></a></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Mcn Name First</td><td class="w-75 px-2 font-weight-bold"><?= $record->mcn_name_first ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Mcn Name Last</td><td class="w-75 px-2 font-weight-bold"><?= $record->mcn_name_last ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Mcn Dob</td><td class="w-75 px-2 font-weight-bold"><?= $record->mcn_dob ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Mcn Ssn</td><td class="w-75 px-2 font-weight-bold"><?= $record->mcn_ssn ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Mcn Address</td><td class="w-75 px-2 font-weight-bold"><?= $record->mcn_address ?></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 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>
-<tr><td class="w-25 px-2 text-secondary border-right">Reason Not Partb</td><td class="w-75 px-2 font-weight-bold"><?= $record->reason_not_partb ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Reason Not Partbmemo</td><td class="w-75 px-2 font-weight-bold"><?= $record->reason_not_partbmemo ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Is Medicare Advantage</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_medicare_advantage ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Medicare Advantage Plan</td><td class="w-75 px-2 font-weight-bold"><?= $record->medicare_advantage_plan ?></td></tr>
-        </tbody>
-    </table>
-</div>
-
 <div class="table-responsive p-0 bg-white table-sm mb-3">
     <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
         <thead>

+ 9 - 104
routes/generated.php

@@ -70,6 +70,7 @@ Route::prefix('/my_clients/view/{uid}')->group(function () {
 	Route::get('ACTION_setIsEnrolledInCmToFalse', 'my_clients_SINGLE_Controller@ACTION_setIsEnrolledInCmToFalse')->name('my_clients_SINGLE-ACTION_setIsEnrolledInCmToFalse');
 	Route::get('ACTION_setIsEnrolledInCmToTrue', 'my_clients_SINGLE_Controller@ACTION_setIsEnrolledInCmToTrue')->name('my_clients_SINGLE-ACTION_setIsEnrolledInCmToTrue');
 	Route::get('ACTION_updateCmReasons', 'my_clients_SINGLE_Controller@ACTION_updateCmReasons')->name('my_clients_SINGLE-ACTION_updateCmReasons');
+	Route::get('ACTION_updateRmReasons', 'my_clients_SINGLE_Controller@ACTION_updateRmReasons')->name('my_clients_SINGLE-ACTION_updateRmReasons');
 	Route::get('ACTION_updateCmEnrollmentConsentInfo', 'my_clients_SINGLE_Controller@ACTION_updateCmEnrollmentConsentInfo')->name('my_clients_SINGLE-ACTION_updateCmEnrollmentConsentInfo');
 	Route::get('ACTION_updateWhyNotEnrolledInCm', 'my_clients_SINGLE_Controller@ACTION_updateWhyNotEnrolledInCm')->name('my_clients_SINGLE-ACTION_updateWhyNotEnrolledInCm');
 	Route::get('ACTION_updateRmEligibility', 'my_clients_SINGLE_Controller@ACTION_updateRmEligibility')->name('my_clients_SINGLE-ACTION_updateRmEligibility');
@@ -183,7 +184,8 @@ Route::prefix('/care_months/view/{uid}')->group(function () {
 	Route::get('ACTION_assignRmmPro', 'care_months_SINGLE_Controller@ACTION_assignRmmPro')->name('care_months_SINGLE-ACTION_assignRmmPro');
 	Route::get('ACTION_changeRmmPro', 'care_months_SINGLE_Controller@ACTION_changeRmmPro')->name('care_months_SINGLE-ACTION_changeRmmPro');
 	Route::get('ACTION_removeRmmPro', 'care_months_SINGLE_Controller@ACTION_removeRmmPro')->name('care_months_SINGLE-ACTION_removeRmmPro');
-	Route::get('ACTION_putReasons', 'care_months_SINGLE_Controller@ACTION_putReasons')->name('care_months_SINGLE-ACTION_putReasons');
+	Route::get('ACTION_updateCmReasons', 'care_months_SINGLE_Controller@ACTION_updateCmReasons')->name('care_months_SINGLE-ACTION_updateCmReasons');
+	Route::get('ACTION_updateRmReasons', 'care_months_SINGLE_Controller@ACTION_updateRmReasons')->name('care_months_SINGLE-ACTION_updateRmReasons');
 	Route::get('ACTION_setIsClientEnrolledInCmToTrue', 'care_months_SINGLE_Controller@ACTION_setIsClientEnrolledInCmToTrue')->name('care_months_SINGLE-ACTION_setIsClientEnrolledInCmToTrue');
 	Route::get('ACTION_setIsClientEnrolledInCmToFalse', 'care_months_SINGLE_Controller@ACTION_setIsClientEnrolledInCmToFalse')->name('care_months_SINGLE-ACTION_setIsClientEnrolledInCmToFalse');
 	Route::get('ACTION_updateWhyNotEnrolledInCm', 'care_months_SINGLE_Controller@ACTION_updateWhyNotEnrolledInCm')->name('care_months_SINGLE-ACTION_updateWhyNotEnrolledInCm');
@@ -231,10 +233,16 @@ Route::prefix('/bills')->group(function () {
 Route::prefix('/bills/view/{uid}')->group(function () {
 	Route::get('ACTION_payHcpAmount', 'bills_SINGLE_Controller@ACTION_payHcpAmount')->name('bills_SINGLE-ACTION_payHcpAmount');
 	Route::get('ACTION_payHcpDifferentAmount', 'bills_SINGLE_Controller@ACTION_payHcpDifferentAmount')->name('bills_SINGLE-ACTION_payHcpDifferentAmount');
+	Route::get('ACTION_payCmAmount', 'bills_SINGLE_Controller@ACTION_payCmAmount')->name('bills_SINGLE-ACTION_payCmAmount');
 	Route::get('ACTION_payCmDifferentAmount', 'bills_SINGLE_Controller@ACTION_payCmDifferentAmount')->name('bills_SINGLE-ACTION_payCmDifferentAmount');
+	Route::get('ACTION_payRmeAmount', 'bills_SINGLE_Controller@ACTION_payRmeAmount')->name('bills_SINGLE-ACTION_payRmeAmount');
 	Route::get('ACTION_payRmeDifferentAmount', 'bills_SINGLE_Controller@ACTION_payRmeDifferentAmount')->name('bills_SINGLE-ACTION_payRmeDifferentAmount');
+	Route::get('ACTION_payRmmAmount', 'bills_SINGLE_Controller@ACTION_payRmmAmount')->name('bills_SINGLE-ACTION_payRmmAmount');
 	Route::get('ACTION_payRmmDifferentAmount', 'bills_SINGLE_Controller@ACTION_payRmmDifferentAmount')->name('bills_SINGLE-ACTION_payRmmDifferentAmount');
 	Route::get('ACTION_signAsHcp', 'bills_SINGLE_Controller@ACTION_signAsHcp')->name('bills_SINGLE-ACTION_signAsHcp');
+	Route::get('ACTION_signAsCm', 'bills_SINGLE_Controller@ACTION_signAsCm')->name('bills_SINGLE-ACTION_signAsCm');
+	Route::get('ACTION_signAsRme', 'bills_SINGLE_Controller@ACTION_signAsRme')->name('bills_SINGLE-ACTION_signAsRme');
+	Route::get('ACTION_signAsRmm', 'bills_SINGLE_Controller@ACTION_signAsRmm')->name('bills_SINGLE-ACTION_signAsRmm');
 	Route::get('ACTION_markSubmitted', 'bills_SINGLE_Controller@ACTION_markSubmitted')->name('bills_SINGLE-ACTION_markSubmitted');
 	Route::get('ACTION_markCancelled', 'bills_SINGLE_Controller@ACTION_markCancelled')->name('bills_SINGLE-ACTION_markCancelled');
 	Route::get('ACTION_putCollectedAmount', 'bills_SINGLE_Controller@ACTION_putCollectedAmount')->name('bills_SINGLE-ACTION_putCollectedAmount');
@@ -365,11 +373,9 @@ Route::prefix('/pros/view/{uid}')->group(function () {
 	Route::get('SUB_notes', 'pros_SINGLE_Controller@SUB_notes')->name('pros_SINGLE-SUB_notes');
 	Route::get('SUB_bills', 'pros_SINGLE_Controller@SUB_bills')->name('pros_SINGLE-SUB_bills');
 	Route::get('SUB_pro_transactions', 'pros_SINGLE_Controller@SUB_pro_transactions')->name('pros_SINGLE-SUB_pro_transactions');
-	Route::get('SUB_lobby_pros', 'pros_SINGLE_Controller@SUB_lobby_pros')->name('pros_SINGLE-SUB_lobby_pros');
 	Route::get('SUB_sessions', 'pros_SINGLE_Controller@SUB_sessions')->name('pros_SINGLE-SUB_sessions');
 	Route::get('SUB_audit_log', 'pros_SINGLE_Controller@SUB_audit_log')->name('pros_SINGLE-SUB_audit_log');
 	Route::get('ACTION_my_payment_scheduleAddNew', 'pros_SINGLE_Controller@ACTION_my_payment_scheduleAddNew')->name('pros_SINGLE-ACTION_my_payment_scheduleAddNew');
-	Route::get('ACTION_lobby_prosAddNew', 'pros_SINGLE_Controller@ACTION_lobby_prosAddNew')->name('pros_SINGLE-ACTION_lobby_prosAddNew');
 });
 
 // --- admin: pro_rates --- //
@@ -384,107 +390,6 @@ Route::prefix('/pro_rates/view/{uid}')->group(function () {
 	Route::get('SUB_dashboard', 'pro_rates_SINGLE_Controller@SUB_dashboard')->name('pro_rates_SINGLE-SUB_dashboard');
 });
 
-// --- admin: lobbies --- //
-Route::prefix('/lobbies')->group(function () {
-	Route::get('', 'lobbies_Controller@index')->name('lobbies-index');
-	Route::get('add_new', 'lobbies_Controller@add_new')->name('lobbies-add_new');
-	Route::get('view/{uid}', 'lobbies_Controller@view')->name('lobbies-view');
-});
-
-// --- admin: lobbies_SINGLE --- //
-Route::prefix('/lobbies/view/{uid}')->group(function () {
-	Route::get('ACTION_putName', 'lobbies_SINGLE_Controller@ACTION_putName')->name('lobbies_SINGLE-ACTION_putName');
-	Route::get('ACTION_putUrlSlug', 'lobbies_SINGLE_Controller@ACTION_putUrlSlug')->name('lobbies_SINGLE-ACTION_putUrlSlug');
-	Route::get('ACTION_setIsStrangerAccessibleToTrue', 'lobbies_SINGLE_Controller@ACTION_setIsStrangerAccessibleToTrue')->name('lobbies_SINGLE-ACTION_setIsStrangerAccessibleToTrue');
-	Route::get('ACTION_setIsStrangerAccessibleToFalse', 'lobbies_SINGLE_Controller@ACTION_setIsStrangerAccessibleToFalse')->name('lobbies_SINGLE-ACTION_setIsStrangerAccessibleToFalse');
-	Route::get('ACTION_setIsClientAccessibleToTrue', 'lobbies_SINGLE_Controller@ACTION_setIsClientAccessibleToTrue')->name('lobbies_SINGLE-ACTION_setIsClientAccessibleToTrue');
-	Route::get('ACTION_setIsClientAccessibleToFalse', 'lobbies_SINGLE_Controller@ACTION_setIsClientAccessibleToFalse')->name('lobbies_SINGLE-ACTION_setIsClientAccessibleToFalse');
-	Route::get('SUB_dashboard', 'lobbies_SINGLE_Controller@SUB_dashboard')->name('lobbies_SINGLE-SUB_dashboard');
-	Route::get('SUB_lobby_pros', 'lobbies_SINGLE_Controller@SUB_lobby_pros')->name('lobbies_SINGLE-SUB_lobby_pros');
-	Route::get('SUB_meetings', 'lobbies_SINGLE_Controller@SUB_meetings')->name('lobbies_SINGLE-SUB_meetings');
-	Route::get('ACTION_lobby_prosAddNew', 'lobbies_SINGLE_Controller@ACTION_lobby_prosAddNew')->name('lobbies_SINGLE-ACTION_lobby_prosAddNew');
-});
-
-// --- admin: meetings --- //
-Route::prefix('/meetings')->group(function () {
-	Route::get('', 'meetings_Controller@index')->name('meetings-index');
-	Route::get('add_new', 'meetings_Controller@add_new')->name('meetings-add_new');
-	Route::get('view/{uid}', 'meetings_Controller@view')->name('meetings-view');
-});
-
-// --- admin: meetings_SINGLE --- //
-Route::prefix('/meetings/view/{uid}')->group(function () {
-	Route::get('ACTION_putLobby', 'meetings_SINGLE_Controller@ACTION_putLobby')->name('meetings_SINGLE-ACTION_putLobby');
-	Route::get('ACTION_putTargetLobbyPro', 'meetings_SINGLE_Controller@ACTION_putTargetLobbyPro')->name('meetings_SINGLE-ACTION_putTargetLobbyPro');
-	Route::get('ACTION_putTitle', 'meetings_SINGLE_Controller@ACTION_putTitle')->name('meetings_SINGLE-ACTION_putTitle');
-	Route::get('ACTION_putStrangerInfo', 'meetings_SINGLE_Controller@ACTION_putStrangerInfo')->name('meetings_SINGLE-ACTION_putStrangerInfo');
-	Route::get('ACTION_putMeetingNumber', 'meetings_SINGLE_Controller@ACTION_putMeetingNumber')->name('meetings_SINGLE-ACTION_putMeetingNumber');
-	Route::get('SUB_dashboard', 'meetings_SINGLE_Controller@SUB_dashboard')->name('meetings_SINGLE-SUB_dashboard');
-	Route::get('SUB_meeting_participants', 'meetings_SINGLE_Controller@SUB_meeting_participants')->name('meetings_SINGLE-SUB_meeting_participants');
-	Route::get('SUB_meeting_invitations', 'meetings_SINGLE_Controller@SUB_meeting_invitations')->name('meetings_SINGLE-SUB_meeting_invitations');
-	Route::get('SUB_meeting_rings', 'meetings_SINGLE_Controller@SUB_meeting_rings')->name('meetings_SINGLE-SUB_meeting_rings');
-	Route::get('SUB_meeting_knocks', 'meetings_SINGLE_Controller@SUB_meeting_knocks')->name('meetings_SINGLE-SUB_meeting_knocks');
-	Route::get('SUB_meeting_messages', 'meetings_SINGLE_Controller@SUB_meeting_messages')->name('meetings_SINGLE-SUB_meeting_messages');
-	Route::get('ACTION_meeting_participantsAddNew', 'meetings_SINGLE_Controller@ACTION_meeting_participantsAddNew')->name('meetings_SINGLE-ACTION_meeting_participantsAddNew');
-	Route::get('ACTION_meeting_invitationsAddNew', 'meetings_SINGLE_Controller@ACTION_meeting_invitationsAddNew')->name('meetings_SINGLE-ACTION_meeting_invitationsAddNew');
-});
-
-// --- admin: meeting_participants --- //
-Route::prefix('/meeting_participants')->group(function () {
-	Route::get('', 'meeting_participants_Controller@index')->name('meeting_participants-index');
-	Route::get('view/{uid}', 'meeting_participants_Controller@view')->name('meeting_participants-view');
-});
-
-// --- admin: meeting_participants_SINGLE --- //
-Route::prefix('/meeting_participants/view/{uid}')->group(function () {
-	Route::get('SUB_dashboard', 'meeting_participants_SINGLE_Controller@SUB_dashboard')->name('meeting_participants_SINGLE-SUB_dashboard');
-});
-
-// --- admin: meeting_invitations --- //
-Route::prefix('/meeting_invitations')->group(function () {
-	Route::get('', 'meeting_invitations_Controller@index')->name('meeting_invitations-index');
-	Route::get('view/{uid}', 'meeting_invitations_Controller@view')->name('meeting_invitations-view');
-});
-
-// --- admin: meeting_invitations_SINGLE --- //
-Route::prefix('/meeting_invitations/view/{uid}')->group(function () {
-	Route::get('ACTION_cancel', 'meeting_invitations_SINGLE_Controller@ACTION_cancel')->name('meeting_invitations_SINGLE-ACTION_cancel');
-	Route::get('SUB_dashboard', 'meeting_invitations_SINGLE_Controller@SUB_dashboard')->name('meeting_invitations_SINGLE-SUB_dashboard');
-});
-
-// --- admin: meeting_rings --- //
-Route::prefix('/meeting_rings')->group(function () {
-	Route::get('', 'meeting_rings_Controller@index')->name('meeting_rings-index');
-	Route::get('view/{uid}', 'meeting_rings_Controller@view')->name('meeting_rings-view');
-});
-
-// --- admin: meeting_rings_SINGLE --- //
-Route::prefix('/meeting_rings/view/{uid}')->group(function () {
-	Route::get('SUB_dashboard', 'meeting_rings_SINGLE_Controller@SUB_dashboard')->name('meeting_rings_SINGLE-SUB_dashboard');
-});
-
-// --- admin: meeting_knocks --- //
-Route::prefix('/meeting_knocks')->group(function () {
-	Route::get('', 'meeting_knocks_Controller@index')->name('meeting_knocks-index');
-	Route::get('view/{uid}', 'meeting_knocks_Controller@view')->name('meeting_knocks-view');
-});
-
-// --- admin: meeting_knocks_SINGLE --- //
-Route::prefix('/meeting_knocks/view/{uid}')->group(function () {
-	Route::get('SUB_dashboard', 'meeting_knocks_SINGLE_Controller@SUB_dashboard')->name('meeting_knocks_SINGLE-SUB_dashboard');
-});
-
-// --- admin: meeting_messages --- //
-Route::prefix('/meeting_messages')->group(function () {
-	Route::get('', 'meeting_messages_Controller@index')->name('meeting_messages-index');
-	Route::get('view/{uid}', 'meeting_messages_Controller@view')->name('meeting_messages-view');
-});
-
-// --- admin: meeting_messages_SINGLE --- //
-Route::prefix('/meeting_message/view/{uid}')->group(function () {
-	Route::get('SUB_dashboard', 'meeting_messages_SINGLE_Controller@SUB_dashboard')->name('meeting_messages_SINGLE-SUB_dashboard');
-});
-
 // --- admin: section_templates --- //
 Route::prefix('/section_templates')->group(function () {
 	Route::get('', 'section_templates_Controller@index')->name('section_templates-index');