Просмотр исходного кода

Specify load conditions in TL pages

Vijayakrishnan Krishnan 5 лет назад
Родитель
Сommit
3f7e7156b8
42 измененных файлов с 652 добавлено и 161 удалено
  1. 20 1
      app/Console/Commands/GenerateTreeCommand.php
  2. 1 0
      app/Http/Controllers/action_items_Controller.php
  3. 1 0
      app/Http/Controllers/action_items_SINGLE_Controller.php
  4. 1 0
      app/Http/Controllers/ally_updates_Controller.php
  5. 2 1
      app/Http/Controllers/bills_Controller.php
  6. 1 0
      app/Http/Controllers/bills_SINGLE_Controller.php
  7. 3 2
      app/Http/Controllers/care_month_entries_Controller.php
  8. 1 0
      app/Http/Controllers/care_month_entries_SINGLE_Controller.php
  9. 2 1
      app/Http/Controllers/care_months_Controller.php
  10. 1 0
      app/Http/Controllers/care_months_SINGLE_Controller.php
  11. 2 1
      app/Http/Controllers/facilities_Controller.php
  12. 1 0
      app/Http/Controllers/facilities_SINGLE_Controller.php
  13. 1 0
      app/Http/Controllers/mcp_updates_Controller.php
  14. 2 1
      app/Http/Controllers/my_clients_Controller.php
  15. 1 0
      app/Http/Controllers/my_clients_SINGLE_Controller.php
  16. 18 0
      app/Http/Controllers/my_payment_schedule_Controller.php
  17. 2 1
      app/Http/Controllers/my_teams_Controller.php
  18. 31 0
      app/Http/Controllers/my_teams_SINGLE_Controller.php
  19. 2 1
      app/Http/Controllers/notes_Controller.php
  20. 1 0
      app/Http/Controllers/notes_SINGLE_Controller.php
  21. 1 0
      app/Http/Controllers/pro_access_Controller.php
  22. 2 1
      app/Http/Controllers/pro_rates_Controller.php
  23. 1 0
      app/Http/Controllers/pro_rates_SINGLE_Controller.php
  24. 2 1
      app/Http/Controllers/pros_Controller.php
  25. 1 0
      app/Http/Controllers/pros_SINGLE_Controller.php
  26. 1 0
      app/Http/Controllers/transactions_Controller.php
  27. 1 0
      generatecv/tree-templates/controller.template.php
  28. 224 117
      generatecv/tree.txt
  29. 7 7
      resources/views/admin/pros/add_new.blade.php
  30. 7 7
      resources/views/admin/pros_SINGLE/ACTION_updateName.blade.php
  31. 1 0
      resources/views/layouts/generated-links.blade.php
  32. 6 10
      resources/views/pro/my_clients/add_new.blade.php
  33. 7 7
      resources/views/pro/my_clients_SINGLE/ACTION_putName.blade.php
  34. 58 0
      resources/views/pro/my_payment_schedule/index.blade.php
  35. 6 1
      resources/views/pro/my_teams/actions.blade.php
  36. 100 0
      resources/views/pro/my_teams_SINGLE/ACTION_clientsAddNew.blade.php
  37. 31 0
      resources/views/pro/my_teams_SINGLE/ACTION_deactivate.blade.php
  38. 31 0
      resources/views/pro/my_teams_SINGLE/ACTION_reactivate.blade.php
  39. 31 0
      resources/views/pro/my_teams_SINGLE/ACTION_updateDeactivationMemo.blade.php
  40. 31 0
      resources/views/pro/my_teams_SINGLE/ACTION_updateReactivationMemo.blade.php
  41. 1 1
      resources/views/pro/my_teams_SINGLE/SUB_clients.blade.php
  42. 8 0
      routes/generated.php

+ 20 - 1
app/Console/Commands/GenerateTreeCommand.php

@@ -69,8 +69,20 @@ class GenerateTreeCommand extends Command
                 $tokens = explode("|", $line);
                 $line = $tokens[0];
                 $dbTable = null;
+                $condition = null;
                 if(count($tokens) >= 2) {
                     $dbTable = $tokens[1];
+
+                    // check if table has loading conditions
+                    if(strpos($dbTable, ":")) {
+                        $parts = explode(":", $dbTable);
+                        $dbTable = $parts[0];
+                        $parts = explode("=", $parts[1]);
+                        $condition = [
+                            "field" => $parts[0],
+                            "value" => str_replace("OWN", "Auth::user()->id" , $parts[1])
+                        ];
+                    }
                 }
 
                 $hasAdd = in_array("add", $tokens);
@@ -116,6 +128,7 @@ class GenerateTreeCommand extends Command
                             }
                             $currentController = new GenController($currentRoot, $line);
                             $currentController->dbTable = $dbTable;
+                            $currentController->condition = $condition;
                             $currentController->hasAdd = $hasAdd;
                             $currentController->hasView = $hasView;
                             $currentController->hasRemove = $hasRemove;
@@ -218,6 +231,7 @@ class GenController {
     public $methods;
     public $parentRoute = "";
     public $dbTable = null;
+    public $condition = null;
     public $hasAdd = false;
     public $hasView = false;
     public $hasRemove = false;
@@ -300,7 +314,12 @@ class GenController {
                         "compact(" . implode(", ", $input) . "));";
                 }
                 else {
-                    $code[] = "\t\t\$records = DB::table('{$this->dbTable}')->get();";
+                    $loadingLine[] = "\t\t\$records = DB::table('{$this->dbTable}')";
+                    if($this->condition) {
+                        $loadingLine[] = "->where('{$this->condition['field']}', {$this->condition['value']})";
+                    }
+                    $loadingLine[] = "->get();";
+                    $code[] = implode("", $loadingLine);
                     $code[] = "\t\treturn view('{$this->root}/{$this->name}/{$method->name}', " .
                         "compact('records'));";
                 }

+ 1 - 0
app/Http/Controllers/action_items_Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class action_items_Controller extends Controller
 {

+ 1 - 0
app/Http/Controllers/action_items_SINGLE_Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class action_items_SINGLE_Controller extends Controller
 {

+ 1 - 0
app/Http/Controllers/ally_updates_Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class ally_updates_Controller extends Controller
 {

+ 2 - 1
app/Http/Controllers/bills_Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class bills_Controller extends Controller
 {
@@ -17,7 +18,7 @@ class bills_Controller extends Controller
 
 	// GET /bills/add_new_for_note
 	public function add_new_for_note(Request $request) {
-		$records = DB::table('bill')->get();
+		$records = DB::table('bill')->get();		$records = DB::table('bill')->get();
 		return view('pro/bills/add_new_for_note', compact('records'));
 	}
 

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

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class bills_SINGLE_Controller extends Controller
 {

+ 3 - 2
app/Http/Controllers/care_month_entries_Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class care_month_entries_Controller extends Controller
 {
@@ -17,13 +18,13 @@ class care_month_entries_Controller extends Controller
 
 	// GET /care_month_entries/add_new_for_cm
 	public function add_new_for_cm(Request $request) {
-		$records = DB::table('care_month_entry')->get();
+		$records = DB::table('care_month_entry')->get();		$records = DB::table('care_month_entry')->get();
 		return view('pro/care_month_entries/add_new_for_cm', compact('records'));
 	}
 
 	// GET /care_month_entries/add_new_for_rm
 	public function add_new_for_rm(Request $request) {
-		$records = DB::table('care_month_entry')->get();
+		$records = DB::table('care_month_entry')->get();		$records = DB::table('care_month_entry')->get();		$records = DB::table('care_month_entry')->get();
 		return view('pro/care_month_entries/add_new_for_rm', compact('records'));
 	}
 

+ 1 - 0
app/Http/Controllers/care_month_entries_SINGLE_Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class care_month_entries_SINGLE_Controller extends Controller
 {

+ 2 - 1
app/Http/Controllers/care_months_Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class care_months_Controller extends Controller
 {
@@ -17,7 +18,7 @@ class care_months_Controller extends Controller
 
 	// GET /care_months/add_new
 	public function add_new(Request $request) {
-		$records = DB::table('care_month')->get();
+		$records = DB::table('care_month')->get();		$records = DB::table('care_month')->get();
 		return view('pro/care_months/add_new', compact('records'));
 	}
 

+ 1 - 0
app/Http/Controllers/care_months_SINGLE_Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class care_months_SINGLE_Controller extends Controller
 {

+ 2 - 1
app/Http/Controllers/facilities_Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class facilities_Controller extends Controller
 {
@@ -17,7 +18,7 @@ class facilities_Controller extends Controller
 
 	// GET /facilities/add_new
 	public function add_new(Request $request) {
-		$records = DB::table('facility')->get();
+		$records = DB::table('facility')->get();		$records = DB::table('facility')->get();
 		return view('admin/facilities/add_new', compact('records'));
 	}
 

+ 1 - 0
app/Http/Controllers/facilities_SINGLE_Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class facilities_SINGLE_Controller extends Controller
 {

+ 1 - 0
app/Http/Controllers/mcp_updates_Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class mcp_updates_Controller extends Controller
 {

+ 2 - 1
app/Http/Controllers/my_clients_Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class my_clients_Controller extends Controller
 {
@@ -17,7 +18,7 @@ class my_clients_Controller extends Controller
 
 	// GET /my_clients/add_new
 	public function add_new(Request $request) {
-		$records = DB::table('client')->get();
+		$records = DB::table('client')->get();		$records = DB::table('client')->get();
 		return view('pro/my_clients/add_new', compact('records'));
 	}
 

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

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class my_clients_SINGLE_Controller extends Controller
 {

+ 18 - 0
app/Http/Controllers/my_payment_schedule_Controller.php

@@ -0,0 +1,18 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
+
+class my_payment_schedule_Controller extends Controller
+{
+    public $selfName = 'my_payment_schedule_Controller';
+
+	// GET /my_payment_schedule
+	public function index(Request $request) {
+	    $records = DB::table('pro_rate')->where('pro_id', Auth::id())->get();
+		return view('pro/my_payment_schedule/index', compact('records'));
+	}
+}

+ 2 - 1
app/Http/Controllers/my_teams_Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class my_teams_Controller extends Controller
 {
@@ -17,7 +18,7 @@ class my_teams_Controller extends Controller
 
 	// GET /my_teams/add_new
 	public function add_new(Request $request) {
-		$records = DB::table('team')->get();
+		$records = DB::table('team')->get();		$records = DB::table('team')->get();
 		return view('pro/my_teams/add_new', compact('records'));
 	}
 

+ 31 - 0
app/Http/Controllers/my_teams_SINGLE_Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class my_teams_SINGLE_Controller extends Controller
 {
@@ -15,6 +16,30 @@ class my_teams_SINGLE_Controller extends Controller
 		return view('pro/my_teams_SINGLE/ACTION_updateTeamNumber', compact('record'));
 	}
 
+	// GET /my_teams/view/{uid}/ACTION_deactivate
+	public function ACTION_deactivate(Request $request, $uid) {
+		$record = DB::table('team')->where('uid', $uid)->first();
+		return view('pro/my_teams_SINGLE/ACTION_deactivate', compact('record'));
+	}
+
+	// GET /my_teams/view/{uid}/ACTION_updateDeactivationMemo
+	public function ACTION_updateDeactivationMemo(Request $request, $uid) {
+		$record = DB::table('team')->where('uid', $uid)->first();
+		return view('pro/my_teams_SINGLE/ACTION_updateDeactivationMemo', compact('record'));
+	}
+
+	// GET /my_teams/view/{uid}/ACTION_reactivate
+	public function ACTION_reactivate(Request $request, $uid) {
+		$record = DB::table('team')->where('uid', $uid)->first();
+		return view('pro/my_teams_SINGLE/ACTION_reactivate', compact('record'));
+	}
+
+	// GET /my_teams/view/{uid}/ACTION_updateReactivationMemo
+	public function ACTION_updateReactivationMemo(Request $request, $uid) {
+		$record = DB::table('team')->where('uid', $uid)->first();
+		return view('pro/my_teams_SINGLE/ACTION_updateReactivationMemo', compact('record'));
+	}
+
 	// GET /my_teams/view/{uid}/SUB_dashboard
 	public function SUB_dashboard(Request $request, $uid) {
 		$record = DB::table('team')->where('uid', $uid)->first();
@@ -33,4 +58,10 @@ class my_teams_SINGLE_Controller extends Controller
 		$record = DB::table('team')->where('uid', $uid)->first();
 		return view('pro/my_teams_SINGLE/SUB_audit_log', compact('record'));
 	}
+
+	// GET /my_teams/view/{uid}/ACTION_clientsAddNew
+	public function ACTION_clientsAddNew(Request $request, $uid) {
+		$record = DB::table('team')->where('uid', $uid)->first();
+		return view('pro/my_teams_SINGLE/ACTION_clientsAddNew', compact('record'));
+	}
 }

+ 2 - 1
app/Http/Controllers/notes_Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class notes_Controller extends Controller
 {
@@ -17,7 +18,7 @@ class notes_Controller extends Controller
 
 	// GET /notes/add_new
 	public function add_new(Request $request) {
-		$records = DB::table('note')->get();
+		$records = DB::table('note')->get();		$records = DB::table('note')->get();
 		return view('pro/notes/add_new', compact('records'));
 	}
 

+ 1 - 0
app/Http/Controllers/notes_SINGLE_Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class notes_SINGLE_Controller extends Controller
 {

+ 1 - 0
app/Http/Controllers/pro_access_Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class pro_access_Controller extends Controller
 {

+ 2 - 1
app/Http/Controllers/pro_rates_Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class pro_rates_Controller extends Controller
 {
@@ -17,7 +18,7 @@ class pro_rates_Controller extends Controller
 
 	// GET /pro_rates/add_new
 	public function add_new(Request $request) {
-		$records = DB::table('pro_rate')->get();
+		$records = DB::table('pro_rate')->get();		$records = DB::table('pro_rate')->get();
 		return view('admin/pro_rates/add_new', compact('records'));
 	}
 

+ 1 - 0
app/Http/Controllers/pro_rates_SINGLE_Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class pro_rates_SINGLE_Controller extends Controller
 {

+ 2 - 1
app/Http/Controllers/pros_Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class pros_Controller extends Controller
 {
@@ -17,7 +18,7 @@ class pros_Controller extends Controller
 
 	// GET /pros/add_new
 	public function add_new(Request $request) {
-		$records = DB::table('pro')->get();
+		$records = DB::table('pro')->get();		$records = DB::table('pro')->get();
 		return view('admin/pros/add_new', compact('records'));
 	}
 

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

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class pros_SINGLE_Controller extends Controller
 {

+ 1 - 0
app/Http/Controllers/transactions_Controller.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class transactions_Controller extends Controller
 {

+ 1 - 0
generatecv/tree-templates/controller.template.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
 
 class _NAME_ extends Controller
 {

+ 224 - 117
generatecv/tree.txt

@@ -1,6 +1,6 @@
 PRO
 #    dashboard
-#    my_payment_schedule
+    my_payment_schedule|pro_rate:pro_id=OWN
     my_teams|team|add|view
     my_teams/add_new:create
         hcpProUid:record:pro:uid,name_display
@@ -10,10 +10,32 @@ PRO
         ACTIONS
             updateTeamNumber
                 teamNumber=team_number
+            deactivate
+                memo
+            updateDeactivationMemo
+                memo=deactivation_memo
+            reactivate
+                memo
+            updateReactivationMemo
+                memo=reactivation_memo
         SUB
             dashboard
             clients
                 id=client.team_id
+                add_new:client
+                    teamUid:hidden=uid
+                    nameDisplay
+                    namePrefix
+                    nameFirst
+                    nameMiddle
+                    nameLast
+                    nameSuffix
+                    nameCredential
+                    gender:select:M,F
+                    dateOfBirth:date
+                    cellNumber:tel
+                    emailAddress:email
+                    medicareNumber
             audit_log
     my_clients|client|add|view
     my_clients/add_new:create
@@ -21,13 +43,12 @@ PRO
         mcpProUid:record:pro:uid,name_display
         allyProUid:record:pro:uid,name_display
         nameDisplay
-        name.nameDisplay
-        name.namePrefix
-        name.nameFirst
-        name.nameMiddle
-        name.nameLast
-        name.nameSuffix
-        name.nameCredential
+        namePrefix
+        nameFirst
+        nameMiddle
+        nameLast
+        nameSuffix
+        nameCredential
         gender:select:M,F
         dateOfBirth:date
         cellNumber:tel
@@ -36,39 +57,35 @@ PRO
     my_clients/view/{uid}
         ACTIONS
             sendCellNumberConfirmationMessage
-            confirmCellNumberWithConfirmationToken
-                token
             putNewCellNumber
                 newCellNumber:tel=cell_number
             sendEmailAddressConfirmationMessage
-            confirmEmailAddressWithConfirmationToken
-                token
             putNewEmailAddress
                 newEmailAddress:email=email_address
             putTeam
                 teamUid:record:team:uid,team_number
-            removeTeam
+            removeTeam:if:teamUid
             putMcp
                 mcpProUid:record:pro:uid,name_display
-            removeMcp
+            removeMcp:if:mcpProUid
             putAlly
                 allyProUid:record:pro:uid,name_display
-            removeAlly
+            removeAlly:if:allyProUid
             putName
-                name.nameDisplay
-                name.namePrefix
-                name.nameFirst
-                name.nameMiddle
-                name.nameLast
-                name.nameSuffix
-                name.nameCredential
+                nameDisplay
+                namePrefix
+                nameFirst
+                nameMiddle
+                nameLast
+                nameSuffix
+                nameCredential
             putGender
                 gender:select:M,F=gender
             putDateOfBirth
                 dateOfBirth:date=date_of_birth
             putProfilePicture
                 profilePictureBase64
-            removeProfilePicture
+            removeProfilePicture:if:profilePictureBase64
             updatePhoneInfo
                 homePhoneNumber=home_phone_number
                 workPhoneNumber=work_phone_number
@@ -141,10 +158,16 @@ PRO
             med_profile
             med_profile_log
             pro_access
-                id=client_pro_access.client_id
+                id=client_pro_access.client_id :: also link to TL pro-access single
+                add_new:client_pro_access
+                    clientUid:hidden=uid
+                    proUid:record:pro:uid,name_display
+                    reasonCategory
+                    reasonMemo
+                    reasonDetail
             notes
                 id=note.client_id
-                add_new:note
+                add_new:note :: exit to notes/view/{uid} - 207
                     clientUid:hidden=uid
                     hcpProUid:record:pro:uid,name_display
                     allyProUid:record:pro:uid,name_display
@@ -162,8 +185,8 @@ PRO
                 id=care_month.client_id
                 add_new:care_month
                     clientUid:hidden=uid
-                    startDate:date
-#           care_months/add_new:create
+                    startMonth:number
+                    startYear:number
             care_month_entries
                 id=care_month_entry.client_id
             bills
@@ -172,85 +195,141 @@ PRO
                 id=pro_transaction.client_id
             action_items
                 id=action_item.client_id
-#           action_items/add_new:create
+                add_new:action_item
+                    clientUid:hidden=uid
+                    prescriberProUid:record:pro:uid,name_display
+                    toFacilityUid:record:facility:uid,name
+                    contentText
+                    contentDetail
             erx
-#           erx/add_new:create
+                id=action_item.client_id :: and category = RX
+                add_new:action_item
+                    clientUid:hidden=uid
+                    prescriberProUid:record:pro:uid,name_display
+                    toFacilityUid:record:facility:uid,name
+                    contentText
+                    contentDetail
             mcp_updates
                 id=client_mcp_update.client_id
             ally_updates
                 id=client_ally_update.client_id
             audit_log
-    notes|note|add|view
-    notes/add_new:create
-        clientUid:record:client:uid,name_display
-        hcpProUid:record:pro:uid,name_display
-        allyProUid:record:pro:uid,name_display
-        effectiveDateEST:date
-        effectiveTime:time
-        reason1
-        reason2
-        reason3
-        reason3Plus
-        serviceLocation
-        category
-        contentText
-        contentDetail
+    notes|note|view
     notes/view/{uid}
         ACTIONS
             signAsHcp
         SUB
             dashboard
+            bills
+                id=bill.note_id
+                add_new:bill :: api is createForNote
+                    noteUid:hidden=uid
+                    effectiveDate:date
+                    code
+                    reason1
+                    reason2
+                    reason3
+                    reason3Plus
+                    serviceLocation
+                    modifier
+                    numberOfUnits:number
             audit_log
-#   erx
-#   erx/view/{uid}
-#        ACTIONS
-#        SUB
-#            dashboard
-#            audit_log
+    erx|action_item|view :: where category = RX
+    erx/view/{uid}
+         ACTIONS
+            signAsPrescriber
+            updateToFacility
+                toFacilityUid:record:facility:uid,name
+            updateContent
+                contentText=content_text
+                contentDetail=content_detail
+            updateStatus
+                statusCategory:select:OPEN,CLOSED
+                statusMemo
+            efax
+                toFaxNumber:tel
+         SUB
+             dashboard
+             audit_log
     action_items|action_item|view
     action_items/view/{uid}
         ACTIONS
+         	signAsPrescriber
+         	updateToFacility
+         	    toFacilityUid:record:facility:uid,name
+         	updateContent
+         	    contentText=content_text
+                contentDetail=content_detail
+         	updateStatus
+         	    statusCategory:select:OPEN,CLOSED
+                statusMemo
+         	efax
+         	    toFaxNumber:tel
         SUB
-            dashboard
-            audit_log
-    care_months|care_month|add|view
-    care_months/add_new:create
-        clientUid:record:client:uid,name_display
-        startDate:date
+             dashboard
+             audit_log
+    care_months|care_month|view
     care_months/view/{uid}
         ACTIONS
+            putMcpPro
+                mcpProUid:record:pro:uid,name_display
+            putAllyPro
+                allyProUid:record:pro:uid,name_display
+            putReasons
+                reason1
+                reason2
+                reason3
+                reason3Plus
+            setIsClientEnrolledInCmToTrue
+            setIsClientEnrolledInCmToFalse
+            updateWhyNotEnrolledInCm
+                whyNotEnrolledInCmCategory
+                whyNotEnrolledInCmMemo
+            setIsClientEnrolledInRmToTrue
+            setIsClientEnrolledInRmToFalse
+            updateWhyNotEnrolledInRm
+                whyNotEnrolledInRmCategory
+                whyNotEnrolledInRmMemo
             generateBillForCm
                 numberOfMinutes:number
             generateBillForRm
                 numberOfMinutes:number
+            setIsCmCanceledThisMonthToTrue
+            updateWhyIsCmCanceledThisMonth
+            setIsCmCanceledThisMonthToFalse
+            setIsRmCanceledThisMonthToTrue
+            updateWhyIsRmCanceledThisMonth
+            setIsRmCanceledThisMonthToFalse
+            setIsTmThisMonthToTrue
+            setIsTmThisMonthToFalse
         SUB
             dashboard
-            time_entries
-                id=care_month_entry.care_month_id
+            cm_time_entries :: need remove
+                id=care_month_entry.care_month_id :: where cm_or_rm = cm
+                add_new:care_month_entry :: api is createForCm
+                    careMonthUid:hidden=uid
+                    proUid:record:pro:uid,name_display
+                    effectiveDate:date
+                    timeInSeconds:number
+                    isTimeSpecific
+                    startingTime:time
+                    endingTime:time
+                    contentText
+                    contentDetail
+            rm_time_entries :: need remove
+                id=care_month_entry.care_month_id :: where cm_or_rm = rm
+                add_new:care_month_entry :: api is createForRm
+                    careMonthUid:hidden=uid
+                    proUid:record:pro:uid,name_display
+                    effectiveDate:date
+                    timeInSeconds:number
+                    isTimeSpecific
+                    startingTime:time
+                    endingTime:time
+                    contentText
+                    contentDetail
             audit_log
-    care_month_entries|care_month_entry|add|view|remove
-    care_month_entries/add_new_for_cm:createForCm
-        careMonthUid:record:care_month:uid,start_date
-        proUid:record:pro:uid,name_display
-        effectiveDate:date
-        timeInSeconds:number
-        isTimeSpecific
-        startingTime:time
-        endingTime:time
-        contentText
-        contentDetail
-    care_month_entries/add_new_for_rm:createForRm
-        careMonthUid:record:care_month:uid,start_date
-        proUid:record:pro:uid,name_display
-        effectiveDate:date
-        timeInSeconds:number
-        isTimeSpecific
-        startingTime:time
-        endingTime:time
-        contentText
-        contentDetail
-    care_month_entries/remove/{uid}:remove
-        memo
+    care_month_entries|care_month_entry|view
     care_month_entries/view/{uid}
         ACTIONS
             updateContent
@@ -264,18 +343,7 @@ PRO
                 endingTime
         SUB
             dashboard
-    bills|bill|add|view
-    bills/add_new_for_note:createForNote
-        noteUid:record:note:uid,uid
-        effectiveDate:date
-        code
-        reason1
-        reason2
-        reason3
-        reason3Plus
-        serviceLocation
-        modifier
-        numberOfUnits:number
+    bills|bill|view
     bills/view/{uid}
         ACTIONS
             payHcpAmount
@@ -289,14 +357,30 @@ PRO
         SUB
             dashboard
             transactions
+                id=pro_transaction.bill_id
             audit_log
     transactions|pro_transaction
-#   med_profile_lines
-#   med_profile_line_updates
-    pro_access|client_pro_access
+    med_profile_lines|client_info_line
+    med_profile_line_updates|client_info_line_update
+    pro_access|client_pro_access|view
+    pro_access/view/{uid}
+        ACTIONS
+            updateReason
+                reasonCategory=reason_category
+                reasonDetail=reason_detail
+            deactivate
+                memo
+            updateDeactivationMemo
+                memo=deactivation_memo
+            reactivate
+                memo
+            updateReactivationMemo
+                memo=reactivation_memo
+        SUB
+            dashboard
     mcp_updates|client_mcp_update
     ally_updates|client_ally_update
-#   audit_log
+    audit_log :: coming soon
 
 ADMIN
 #   admin_dashboard
@@ -304,6 +388,28 @@ ADMIN
     facilities/add_new:create
     facilities/view/{uid}
         ACTIONS
+            updateBasic
+                name=name
+                addressFull=address_full
+                addressLine1=address_line1
+                addressLine2=address_line2
+                addressCity=address_city
+                addressState=address_state
+                addressZip=address_zip
+                addressCountry=address_country
+                addressGeoLat=address_geo_lat
+                addressGeoLong=address_geo_long
+                phone=phone
+                fax=fax
+                hours=hours
+            deactivate
+                memo
+            updateDeactivationMemo
+                memo=deactivation_memo
+            reactivate
+                memo
+            updateReactivationMemo
+                memo=reactivation_memo
         SUB
             dashboard
             erx
@@ -313,13 +419,13 @@ ADMIN
     pros/add_new:create
         cellNumber:tel
         emailAddress:email
-        name.nameDisplay
-        name.namePrefix
-        name.nameFirst
-        name.nameMiddle
-        name.nameLast
-        name.nameSuffix
-        name.nameCredential
+        nameDisplay
+        namePrefix
+        nameFirst
+        nameMiddle
+        nameLast
+        nameSuffix
+        nameCredential
         isHcp
         hcpNpi
         previousProfessionCategory
@@ -338,13 +444,13 @@ ADMIN
             putNewEmailAddress
                 newEmailAddress:email=email_address
             updateName
-                name.nameDisplay
-                name.namePrefix
-                name.nameFirst
-                name.nameMiddle
-                name.nameLast
-                name.nameSuffix
-                name.nameCredential
+                nameDisplay
+                namePrefix
+                nameFirst
+                nameMiddle
+                nameLast
+                nameSuffix
+                nameCredential
             updateProfession
                 isHcp
                 hcpNpi
@@ -394,6 +500,12 @@ ADMIN
         SUB
             dashboard
             payment_schedule
+                id=pro_rate.pro_id :: and link to pro_rates/view/{uid}
+                add_new:pro_rate
+                    proUid:hidden=uid
+                    asHcpOrAlly:select:HCP,ALLY
+                    code
+                    amount:number
             teams
             clients
             pro_access
@@ -408,12 +520,7 @@ ADMIN
             pro_transactions
             sessions
             audit_log
-    pro_rates|pro_rate|add|view
-    pro_rates/add_new:create
-        proUid:record:pro:uid,name_display
-        asHcpOrAlly:select:HCP,ALLY
-        code
-        amount:number
+    pro_rates|pro_rate|view
     pro_rates/view/{uid}
         ACTIONS
             updateAmount

+ 7 - 7
resources/views/admin/pros/add_new.blade.php

@@ -33,31 +33,31 @@
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name Display</label>
-<input class='form-control' type='text' name='name.nameDisplay' value='{{ old('name.nameDisplay') ? old('name.nameDisplay') : '' }}' >
+<input class='form-control' type='text' name='nameDisplay' value='{{ old('nameDisplay') ? old('nameDisplay') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name Prefix</label>
-<input class='form-control' type='text' name='name.namePrefix' value='{{ old('name.namePrefix') ? old('name.namePrefix') : '' }}' >
+<input class='form-control' type='text' name='namePrefix' value='{{ old('namePrefix') ? old('namePrefix') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name First</label>
-<input class='form-control' type='text' name='name.nameFirst' value='{{ old('name.nameFirst') ? old('name.nameFirst') : '' }}' >
+<input class='form-control' type='text' name='nameFirst' value='{{ old('nameFirst') ? old('nameFirst') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name Middle</label>
-<input class='form-control' type='text' name='name.nameMiddle' value='{{ old('name.nameMiddle') ? old('name.nameMiddle') : '' }}' >
+<input class='form-control' type='text' name='nameMiddle' value='{{ old('nameMiddle') ? old('nameMiddle') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name Last</label>
-<input class='form-control' type='text' name='name.nameLast' value='{{ old('name.nameLast') ? old('name.nameLast') : '' }}' >
+<input class='form-control' type='text' name='nameLast' value='{{ old('nameLast') ? old('nameLast') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name Suffix</label>
-<input class='form-control' type='text' name='name.nameSuffix' value='{{ old('name.nameSuffix') ? old('name.nameSuffix') : '' }}' >
+<input class='form-control' type='text' name='nameSuffix' value='{{ old('nameSuffix') ? old('nameSuffix') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name Credential</label>
-<input class='form-control' type='text' name='name.nameCredential' value='{{ old('name.nameCredential') ? old('name.nameCredential') : '' }}' >
+<input class='form-control' type='text' name='nameCredential' value='{{ old('nameCredential') ? old('nameCredential') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Is Hcp</label>

+ 7 - 7
resources/views/admin/pros_SINGLE/ACTION_updateName.blade.php

@@ -20,31 +20,31 @@
         <input type="hidden" name="_return" value="{{route('pros_SINGLE-ACTION_updateName', ['uid' => $record->uid])}}">
         <div class='form-group mb-3'>
 <label class='control-label'>Name Display</label>
-<input class='form-control' type='text' name='name.nameDisplay' value='{{ old('name.nameDisplay') ? old('name.nameDisplay') : '' }}' >
+<input class='form-control' type='text' name='nameDisplay' value='{{ old('nameDisplay') ? old('nameDisplay') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name Prefix</label>
-<input class='form-control' type='text' name='name.namePrefix' value='{{ old('name.namePrefix') ? old('name.namePrefix') : '' }}' >
+<input class='form-control' type='text' name='namePrefix' value='{{ old('namePrefix') ? old('namePrefix') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name First</label>
-<input class='form-control' type='text' name='name.nameFirst' value='{{ old('name.nameFirst') ? old('name.nameFirst') : '' }}' >
+<input class='form-control' type='text' name='nameFirst' value='{{ old('nameFirst') ? old('nameFirst') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name Middle</label>
-<input class='form-control' type='text' name='name.nameMiddle' value='{{ old('name.nameMiddle') ? old('name.nameMiddle') : '' }}' >
+<input class='form-control' type='text' name='nameMiddle' value='{{ old('nameMiddle') ? old('nameMiddle') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name Last</label>
-<input class='form-control' type='text' name='name.nameLast' value='{{ old('name.nameLast') ? old('name.nameLast') : '' }}' >
+<input class='form-control' type='text' name='nameLast' value='{{ old('nameLast') ? old('nameLast') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name Suffix</label>
-<input class='form-control' type='text' name='name.nameSuffix' value='{{ old('name.nameSuffix') ? old('name.nameSuffix') : '' }}' >
+<input class='form-control' type='text' name='nameSuffix' value='{{ old('nameSuffix') ? old('nameSuffix') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name Credential</label>
-<input class='form-control' type='text' name='name.nameCredential' value='{{ old('name.nameCredential') ? old('name.nameCredential') : '' }}' >
+<input class='form-control' type='text' name='nameCredential' value='{{ old('nameCredential') ? old('nameCredential') : '' }}' >
 </div>
         <div class="form-group mb-3">
             <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>

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

@@ -1,3 +1,4 @@
+<li class='nav-item'><a href='/my_payment_schedule' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'my_payment_schedule') === 0 ? 'active' : '') }} '><i class='nav-icon fa fa-user'></i><p>My Payment Schedule</p></a></li>
 <li class='nav-item'><a href='/my_teams' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'my_teams') === 0 ? 'active' : '') }} '><i class='nav-icon fa fa-user'></i><p>My Teams</p></a></li>
 <li class='nav-item'><a href='/my_clients' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'my_clients') === 0 ? 'active' : '') }} '><i class='nav-icon fa fa-user'></i><p>My Clients</p></a></li>
 <li class='nav-item'><a href='/notes' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'notes') === 0 ? 'active' : '') }} '><i class='nav-icon fa fa-user'></i><p>Notes</p></a></li>

+ 6 - 10
resources/views/pro/my_clients/add_new.blade.php

@@ -58,32 +58,28 @@
 <input class='form-control' type='text' name='nameDisplay' value='{{ old('nameDisplay') ? old('nameDisplay') : '' }}' >
 </div>
 <div class='form-group mb-3'>
-<label class='control-label'>Name Display</label>
-<input class='form-control' type='text' name='name.nameDisplay' value='{{ old('name.nameDisplay') ? old('name.nameDisplay') : '' }}' >
-</div>
-<div class='form-group mb-3'>
 <label class='control-label'>Name Prefix</label>
-<input class='form-control' type='text' name='name.namePrefix' value='{{ old('name.namePrefix') ? old('name.namePrefix') : '' }}' >
+<input class='form-control' type='text' name='namePrefix' value='{{ old('namePrefix') ? old('namePrefix') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name First</label>
-<input class='form-control' type='text' name='name.nameFirst' value='{{ old('name.nameFirst') ? old('name.nameFirst') : '' }}' >
+<input class='form-control' type='text' name='nameFirst' value='{{ old('nameFirst') ? old('nameFirst') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name Middle</label>
-<input class='form-control' type='text' name='name.nameMiddle' value='{{ old('name.nameMiddle') ? old('name.nameMiddle') : '' }}' >
+<input class='form-control' type='text' name='nameMiddle' value='{{ old('nameMiddle') ? old('nameMiddle') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name Last</label>
-<input class='form-control' type='text' name='name.nameLast' value='{{ old('name.nameLast') ? old('name.nameLast') : '' }}' >
+<input class='form-control' type='text' name='nameLast' value='{{ old('nameLast') ? old('nameLast') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name Suffix</label>
-<input class='form-control' type='text' name='name.nameSuffix' value='{{ old('name.nameSuffix') ? old('name.nameSuffix') : '' }}' >
+<input class='form-control' type='text' name='nameSuffix' value='{{ old('nameSuffix') ? old('nameSuffix') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name Credential</label>
-<input class='form-control' type='text' name='name.nameCredential' value='{{ old('name.nameCredential') ? old('name.nameCredential') : '' }}' >
+<input class='form-control' type='text' name='nameCredential' value='{{ old('nameCredential') ? old('nameCredential') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Gender</label>

+ 7 - 7
resources/views/pro/my_clients_SINGLE/ACTION_putName.blade.php

@@ -20,31 +20,31 @@
         <input type="hidden" name="_return" value="{{route('my_clients_SINGLE-ACTION_putName', ['uid' => $record->uid])}}">
         <div class='form-group mb-3'>
 <label class='control-label'>Name Display</label>
-<input class='form-control' type='text' name='name.nameDisplay' value='{{ old('name.nameDisplay') ? old('name.nameDisplay') : '' }}' >
+<input class='form-control' type='text' name='nameDisplay' value='{{ old('nameDisplay') ? old('nameDisplay') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name Prefix</label>
-<input class='form-control' type='text' name='name.namePrefix' value='{{ old('name.namePrefix') ? old('name.namePrefix') : '' }}' >
+<input class='form-control' type='text' name='namePrefix' value='{{ old('namePrefix') ? old('namePrefix') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name First</label>
-<input class='form-control' type='text' name='name.nameFirst' value='{{ old('name.nameFirst') ? old('name.nameFirst') : '' }}' >
+<input class='form-control' type='text' name='nameFirst' value='{{ old('nameFirst') ? old('nameFirst') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name Middle</label>
-<input class='form-control' type='text' name='name.nameMiddle' value='{{ old('name.nameMiddle') ? old('name.nameMiddle') : '' }}' >
+<input class='form-control' type='text' name='nameMiddle' value='{{ old('nameMiddle') ? old('nameMiddle') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name Last</label>
-<input class='form-control' type='text' name='name.nameLast' value='{{ old('name.nameLast') ? old('name.nameLast') : '' }}' >
+<input class='form-control' type='text' name='nameLast' value='{{ old('nameLast') ? old('nameLast') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name Suffix</label>
-<input class='form-control' type='text' name='name.nameSuffix' value='{{ old('name.nameSuffix') ? old('name.nameSuffix') : '' }}' >
+<input class='form-control' type='text' name='nameSuffix' value='{{ old('nameSuffix') ? old('nameSuffix') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Name Credential</label>
-<input class='form-control' type='text' name='name.nameCredential' value='{{ old('name.nameCredential') ? old('name.nameCredential') : '' }}' >
+<input class='form-control' type='text' name='nameCredential' value='{{ old('nameCredential') ? old('nameCredential') : '' }}' >
 </div>
         <div class="form-group mb-3">
             <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>

+ 58 - 0
resources/views/pro/my_payment_schedule/index.blade.php

@@ -0,0 +1,58 @@
+@extends('layouts.pro-logged-in')
+@section('content')
+
+    <h3 class="d-flex mb-3">
+        <div>My Payment Schedule: List</div>
+        <div class="ml-auto">
+            <!-- _ADD_NEW_LINK_ -->
+        </div>
+    </h3>
+
+    <div class="table-responsive p-0 bg-white border">
+        <table class="table table-hover text-nowrap">
+            <thead>
+            <tr>
+<th>Id</th>
+<th>Created At</th>
+<th>Type</th>
+<th>Uid</th>
+<th>Deactivated At</th>
+<th>Deactivation Memo</th>
+<th>Is Active</th>
+<th>Reactivated At</th>
+<th>Reactivation Memo</th>
+<th>Amount</th>
+<th>As Hcp Or Ally</th>
+<th>Code</th>
+<th>Created By Session Id</th>
+<th>Deactivated By Session Id</th>
+<th>Reactivated By Session Id</th>
+<th>Pro Id</th>
+            </tr>
+            </thead>
+            <tbody>
+            @foreach($records as $record)
+                <tr>
+<td><?= $record->id ?></td>
+<td><?= $record->created_at ?></td>
+<td><?= $record->type ?></td>
+<td><?= $record->uid ?></td>
+<td><?= $record->deactivated_at ?></td>
+<td><?= $record->deactivation_memo ?></td>
+<td><?= $record->is_active ?></td>
+<td><?= $record->reactivated_at ?></td>
+<td><?= $record->reactivation_memo ?></td>
+<td><?= $record->amount ?></td>
+<td><?= $record->as_hcp_or_ally ?></td>
+<td><?= $record->code ?></td>
+<td><?= $record->created_by_session_id ?></td>
+<td><?= $record->deactivated_by_session_id ?></td>
+<td><?= $record->reactivated_by_session_id ?></td>
+<td><?= $record->pro_id ?></td>
+                </tr>
+            @endforeach
+            </tbody>
+        </table>
+    </div>
+
+@endsection

+ 6 - 1
resources/views/pro/my_teams/actions.blade.php

@@ -1 +1,6 @@
-<a href='/my_teams/view/<?= $record->uid ?>/ACTION_updateTeamNumber' class='d-block btn btn-sm btn-default mb-3'>Update Team Number</a>
+<a href='/my_teams/view/<?= $record->uid ?>/ACTION_updateTeamNumber' class='d-block btn btn-sm btn-default mb-3'>Update Team Number</a>
+<a href='/my_teams/view/<?= $record->uid ?>/ACTION_deactivate' class='d-block btn btn-sm btn-default mb-3'>Deactivate</a>
+<a href='/my_teams/view/<?= $record->uid ?>/ACTION_updateDeactivationMemo' class='d-block btn btn-sm btn-default mb-3'>Update Deactivation Memo</a>
+<a href='/my_teams/view/<?= $record->uid ?>/ACTION_reactivate' class='d-block btn btn-sm btn-default mb-3'>Reactivate</a>
+<a href='/my_teams/view/<?= $record->uid ?>/ACTION_updateReactivationMemo' class='d-block btn btn-sm btn-default mb-3'>Update Reactivation Memo</a>
+<a href='/my_teams/view/<?= $record->uid ?>/ACTION_clientsAddNew' class='d-block btn btn-sm btn-default mb-3'>Clients Add New</a>

+ 100 - 0
resources/views/pro/my_teams_SINGLE/ACTION_clientsAddNew.blade.php

@@ -0,0 +1,100 @@
+@extends('pro.my_teams.view')
+@section('content-inner')
+
+    <h4 class='my-3'>
+        <div>Clients Add New</div>
+    </h4>
+
+    <form action="/post-to-api"
+          method="post" enctype="multipart/form-data"
+          class="bg-light rounded border px-3 pt-3 mr-3 mb-3">
+        @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/client/create">
+        <input type="hidden" name="_success" value="{{route('my_teams_SINGLE-SUB_clients', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('my_teams_SINGLE-ACTION_clientsAddNew', ['uid' => $record->uid])}}">
+        <input class='form-control' type='hidden' name='teamUid' value='{{ old('teamUid') ? old('teamUid') : $record->uid }}' >
+<div class='form-group mb-3'>
+<label class='control-label'>Mcp Pro</label>
+<select class='form-control' name='mcpProUid' value='{{ old('mcpProUid') ? old('mcpProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('mcpProUid') ? old('mcpProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Ally Pro</label>
+<select class='form-control' name='allyProUid' value='{{ old('allyProUid') ? old('allyProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('allyProUid') ? old('allyProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Name Display</label>
+<input class='form-control' type='text' name='nameDisplay' value='{{ old('nameDisplay') ? old('nameDisplay') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Name Prefix</label>
+<input class='form-control' type='text' name='namePrefix' value='{{ old('namePrefix') ? old('namePrefix') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Name First</label>
+<input class='form-control' type='text' name='nameFirst' value='{{ old('nameFirst') ? old('nameFirst') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Name Middle</label>
+<input class='form-control' type='text' name='nameMiddle' value='{{ old('nameMiddle') ? old('nameMiddle') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Name Last</label>
+<input class='form-control' type='text' name='nameLast' value='{{ old('nameLast') ? old('nameLast') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Name Suffix</label>
+<input class='form-control' type='text' name='nameSuffix' value='{{ old('nameSuffix') ? old('nameSuffix') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Name Credential</label>
+<input class='form-control' type='text' name='nameCredential' value='{{ old('nameCredential') ? old('nameCredential') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Gender</label>
+<select class='form-control' name='gender' value='{{ old('gender') ? old('gender') : '' }}' >
+<option value=''>-- Select --</option>
+<option <?= 'M' === (old('gender') ? old('gender') : '') ? 'selected' : '' ?> value='M'>M</option>
+<option <?= 'F' === (old('gender') ? old('gender') : '') ? 'selected' : '' ?> value='F'>F</option>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Date Of Birth</label>
+<input class='form-control' type='date' name='dateOfBirth' value='{{ old('dateOfBirth') ? old('dateOfBirth') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Cell Number</label>
+<input class='form-control' type='tel' name='cellNumber' value='{{ old('cellNumber') ? old('cellNumber') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Email Address</label>
+<input class='form-control' type='email' name='emailAddress' value='{{ old('emailAddress') ? old('emailAddress') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Medicare Number</label>
+<input class='form-control' type='text' name='medicareNumber' value='{{ old('medicareNumber') ? old('medicareNumber') : '' }}' >
+</div>
+        <div class="form-group mb-3">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('my_teams_SINGLE-SUB_clients', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5">Cancel</a>
+        </div>
+    </form>
+
+@endsection

+ 31 - 0
resources/views/pro/my_teams_SINGLE/ACTION_deactivate.blade.php

@@ -0,0 +1,31 @@
+@extends('pro.my_teams.view')
+@section('content-inner')
+
+    <h4 class='my-3'>
+        <div>Deactivate</div>
+    </h4>
+
+    <form action="/post-to-api"
+          method="post" enctype="multipart/form-data"
+          class="bg-light rounded border px-3 pt-3 mr-3 mb-3">
+        @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/team/deactivate">
+        <input type="hidden" name="_success" value="{{route('my_teams-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('my_teams_SINGLE-ACTION_deactivate', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Memo</label>
+<input class='form-control' type='text' name='memo' value='{{ old('memo') ? old('memo') : '' }}' >
+</div>
+        <div class="form-group mb-3">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('my_teams-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5">Cancel</a>
+        </div>
+    </form>
+
+@endsection

+ 31 - 0
resources/views/pro/my_teams_SINGLE/ACTION_reactivate.blade.php

@@ -0,0 +1,31 @@
+@extends('pro.my_teams.view')
+@section('content-inner')
+
+    <h4 class='my-3'>
+        <div>Reactivate</div>
+    </h4>
+
+    <form action="/post-to-api"
+          method="post" enctype="multipart/form-data"
+          class="bg-light rounded border px-3 pt-3 mr-3 mb-3">
+        @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/team/reactivate">
+        <input type="hidden" name="_success" value="{{route('my_teams-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('my_teams_SINGLE-ACTION_reactivate', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Memo</label>
+<input class='form-control' type='text' name='memo' value='{{ old('memo') ? old('memo') : '' }}' >
+</div>
+        <div class="form-group mb-3">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('my_teams-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5">Cancel</a>
+        </div>
+    </form>
+
+@endsection

+ 31 - 0
resources/views/pro/my_teams_SINGLE/ACTION_updateDeactivationMemo.blade.php

@@ -0,0 +1,31 @@
+@extends('pro.my_teams.view')
+@section('content-inner')
+
+    <h4 class='my-3'>
+        <div>Update Deactivation Memo</div>
+    </h4>
+
+    <form action="/post-to-api"
+          method="post" enctype="multipart/form-data"
+          class="bg-light rounded border px-3 pt-3 mr-3 mb-3">
+        @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/team/updateDeactivationMemo">
+        <input type="hidden" name="_success" value="{{route('my_teams-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('my_teams_SINGLE-ACTION_updateDeactivationMemo', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Memo</label>
+<input class='form-control' type='text' name='memo' value='{{ old('memo') ? old('memo') : $record->deactivation_memo }}' >
+</div>
+        <div class="form-group mb-3">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('my_teams-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5">Cancel</a>
+        </div>
+    </form>
+
+@endsection

+ 31 - 0
resources/views/pro/my_teams_SINGLE/ACTION_updateReactivationMemo.blade.php

@@ -0,0 +1,31 @@
+@extends('pro.my_teams.view')
+@section('content-inner')
+
+    <h4 class='my-3'>
+        <div>Update Reactivation Memo</div>
+    </h4>
+
+    <form action="/post-to-api"
+          method="post" enctype="multipart/form-data"
+          class="bg-light rounded border px-3 pt-3 mr-3 mb-3">
+        @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/team/updateReactivationMemo">
+        <input type="hidden" name="_success" value="{{route('my_teams-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('my_teams_SINGLE-ACTION_updateReactivationMemo', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Memo</label>
+<input class='form-control' type='text' name='memo' value='{{ old('memo') ? old('memo') : $record->reactivation_memo }}' >
+</div>
+        <div class="form-group mb-3">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('my_teams-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5">Cancel</a>
+        </div>
+    </form>
+
+@endsection

+ 1 - 1
resources/views/pro/my_teams_SINGLE/SUB_clients.blade.php

@@ -6,7 +6,7 @@
         <h4 class='my-3 d-flex'>
             <div>Clients</div>
             <div class="ml-auto">
-                <!-- _ADD_NEW_LINK_ -->
+                <a class="btn btn-primary btn-sm" href="{{route('my_teams_SINGLE-ACTION_clientsAddNew', ['uid' => $record->uid])}}"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
             </div>
         </h4>
 

+ 8 - 0
routes/generated.php

@@ -2,6 +2,9 @@
 
 use Illuminate\Support\Facades\Route;
 
+// --- pro: my_payment_schedule --- //
+Route::get('/my_payment_schedule', 'my_payment_schedule_Controller@index')->name('my_payment_schedule-index');
+
 // --- pro: my_teams --- //
 Route::get('/my_teams', 'my_teams_Controller@index')->name('my_teams-index');
 Route::get('/my_teams/add_new', 'my_teams_Controller@add_new')->name('my_teams-add_new');
@@ -9,9 +12,14 @@ Route::get('/my_teams/view/{uid}', 'my_teams_Controller@view')->name('my_teams-v
 
 // --- pro: my_teams_SINGLE --- //
 Route::get('/my_teams/view/{uid}/ACTION_updateTeamNumber', 'my_teams_SINGLE_Controller@ACTION_updateTeamNumber')->name('my_teams_SINGLE-ACTION_updateTeamNumber');
+Route::get('/my_teams/view/{uid}/ACTION_deactivate', 'my_teams_SINGLE_Controller@ACTION_deactivate')->name('my_teams_SINGLE-ACTION_deactivate');
+Route::get('/my_teams/view/{uid}/ACTION_updateDeactivationMemo', 'my_teams_SINGLE_Controller@ACTION_updateDeactivationMemo')->name('my_teams_SINGLE-ACTION_updateDeactivationMemo');
+Route::get('/my_teams/view/{uid}/ACTION_reactivate', 'my_teams_SINGLE_Controller@ACTION_reactivate')->name('my_teams_SINGLE-ACTION_reactivate');
+Route::get('/my_teams/view/{uid}/ACTION_updateReactivationMemo', 'my_teams_SINGLE_Controller@ACTION_updateReactivationMemo')->name('my_teams_SINGLE-ACTION_updateReactivationMemo');
 Route::get('/my_teams/view/{uid}/SUB_dashboard', 'my_teams_SINGLE_Controller@SUB_dashboard')->name('my_teams_SINGLE-SUB_dashboard');
 Route::get('/my_teams/view/{uid}/SUB_clients', 'my_teams_SINGLE_Controller@SUB_clients')->name('my_teams_SINGLE-SUB_clients');
 Route::get('/my_teams/view/{uid}/SUB_audit_log', 'my_teams_SINGLE_Controller@SUB_audit_log')->name('my_teams_SINGLE-SUB_audit_log');
+Route::get('/my_teams/view/{uid}/ACTION_clientsAddNew', 'my_teams_SINGLE_Controller@ACTION_clientsAddNew')->name('my_teams_SINGLE-ACTION_clientsAddNew');
 
 // --- pro: my_clients --- //
 Route::get('/my_clients', 'my_clients_Controller@index')->name('my_clients-index');