Pārlūkot izejas kodu

regenerated tree

= 4 gadi atpakaļ
vecāks
revīzija
c295e57f74
66 mainītis faili ar 2050 papildinājumiem un 9 dzēšanām
  1. 24 0
      app/Http/Controllers/account_clients_Controller.php
  2. 43 0
      app/Http/Controllers/account_clients_SINGLE_Controller.php
  3. 24 0
      app/Http/Controllers/accounts_Controller.php
  4. 54 0
      app/Http/Controllers/accounts_SINGLE_Controller.php
  5. 60 0
      app/Http/Controllers/care_months_SINGLE_Controller.php
  6. 40 0
      app/Http/Controllers/clients_SINGLE_Controller.php
  7. 30 0
      app/Http/Controllers/products_Controller.php
  8. 84 0
      app/Http/Controllers/products_SINGLE_Controller.php
  9. 2 0
      resources/views/admin/account_clients/actions.blade.php
  10. 50 0
      resources/views/admin/account_clients/index.blade.php
  11. 3 0
      resources/views/admin/account_clients/info.blade.php
  12. 1 0
      resources/views/admin/account_clients/subs.blade.php
  13. 20 0
      resources/views/admin/account_clients/view.blade.php
  14. 38 0
      resources/views/admin/account_clients_SINGLE/ACTION_proAllowAccess.blade.php
  15. 38 0
      resources/views/admin/account_clients_SINGLE/ACTION_proDenyAccess.blade.php
  16. 41 0
      resources/views/admin/account_clients_SINGLE/SUB_dashboard.blade.php
  17. 2 0
      resources/views/admin/accounts/actions.blade.php
  18. 72 0
      resources/views/admin/accounts/index.blade.php
  19. 3 0
      resources/views/admin/accounts/info.blade.php
  20. 2 0
      resources/views/admin/accounts/subs.blade.php
  21. 20 0
      resources/views/admin/accounts/view.blade.php
  22. 41 0
      resources/views/admin/accounts_SINGLE/ACTION_deactivate.blade.php
  23. 41 0
      resources/views/admin/accounts_SINGLE/ACTION_reactivate.blade.php
  24. 54 0
      resources/views/admin/accounts_SINGLE/SUB_clients.blade.php
  25. 41 0
      resources/views/admin/accounts_SINGLE/SUB_dashboard.blade.php
  26. 4 0
      resources/views/admin/bdt_measurements/index.blade.php
  27. 5 0
      resources/views/admin/products/actions.blade.php
  28. 80 0
      resources/views/admin/products/add_new.blade.php
  29. 68 0
      resources/views/admin/products/index.blade.php
  30. 3 0
      resources/views/admin/products/info.blade.php
  31. 2 0
      resources/views/admin/products/subs.blade.php
  32. 20 0
      resources/views/admin/products/view.blade.php
  33. 41 0
      resources/views/admin/products_SINGLE/ACTION_deactivate.blade.php
  34. 41 0
      resources/views/admin/products_SINGLE/ACTION_reactivate.blade.php
  35. 81 0
      resources/views/admin/products_SINGLE/ACTION_update.blade.php
  36. 41 0
      resources/views/admin/products_SINGLE/ACTION_updateDeactivationMemo.blade.php
  37. 41 0
      resources/views/admin/products_SINGLE/ACTION_updateReactivationMemo.blade.php
  38. 41 0
      resources/views/admin/products_SINGLE/SUB_dashboard.blade.php
  39. 72 0
      resources/views/admin/products_SINGLE/SUB_versions.blade.php
  40. 2 1
      resources/views/admin/pros/actions.blade.php
  41. 2 2
      resources/views/admin/pros_SINGLE/ACTION_setInitiative.blade.php
  42. 16 1
      resources/views/admin/pros_SINGLE/SUB_dashboard.blade.php
  43. 21 0
      resources/views/layouts/generated-links.blade.php
  44. 4 0
      resources/views/pro/care_month_entries/index.blade.php
  45. 6 0
      resources/views/pro/care_months/actions.blade.php
  46. 8 0
      resources/views/pro/care_months/index.blade.php
  47. 47 0
      resources/views/pro/care_months_SINGLE/ACTION_assignRmgPro.blade.php
  48. 47 0
      resources/views/pro/care_months_SINGLE/ACTION_assignRmsPro.blade.php
  49. 47 0
      resources/views/pro/care_months_SINGLE/ACTION_changeRmgPro.blade.php
  50. 47 0
      resources/views/pro/care_months_SINGLE/ACTION_changeRmsPro.blade.php
  51. 38 0
      resources/views/pro/care_months_SINGLE/ACTION_removeRmgPro.blade.php
  52. 38 0
      resources/views/pro/care_months_SINGLE/ACTION_removeRmsPro.blade.php
  53. 32 0
      resources/views/pro/care_months_SINGLE/SUB_bills.blade.php
  54. 4 0
      resources/views/pro/care_months_SINGLE/SUB_rm_time_entries.blade.php
  55. 4 0
      resources/views/pro/clients/actions.blade.php
  56. 47 0
      resources/views/pro/clients_SINGLE/ACTION_putRmgPro.blade.php
  57. 47 0
      resources/views/pro/clients_SINGLE/ACTION_putRmsPro.blade.php
  58. 38 0
      resources/views/pro/clients_SINGLE/ACTION_removeRmgPro.blade.php
  59. 38 0
      resources/views/pro/clients_SINGLE/ACTION_removeRmsPro.blade.php
  60. 32 0
      resources/views/pro/clients_SINGLE/SUB_bills.blade.php
  61. 4 0
      resources/views/pro/clients_SINGLE/SUB_care_month_entries.blade.php
  62. 8 0
      resources/views/pro/clients_SINGLE/SUB_care_months.blade.php
  63. 4 0
      resources/views/pro/clients_SINGLE/SUB_detail.blade.php
  64. 32 0
      resources/views/pro/notes_SINGLE/SUB_bills.blade.php
  65. 8 0
      resources/views/pro/tickets/index.blade.php
  66. 61 5
      routes/generated.php

+ 24 - 0
app/Http/Controllers/account_clients_Controller.php

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

+ 43 - 0
app/Http/Controllers/account_clients_SINGLE_Controller.php

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

+ 24 - 0
app/Http/Controllers/accounts_Controller.php

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

+ 54 - 0
app/Http/Controllers/accounts_SINGLE_Controller.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
+
+class accounts_SINGLE_Controller extends Controller
+{
+    public $selfName = 'accounts_SINGLE_Controller';
+    public $dashboardName = 'dashboard';
+
+	// GET /accounts/view/{uid}/ACTION_deactivate
+	public function ACTION_deactivate(Request $request, $uid) {
+		$record = DB::table('account')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('account')->where('id', $uid)->first();
+			if($record) return redirect('/accounts/view/' . $record->uid . '/ACTION_deactivate');
+		}
+		return response()->view('admin/accounts_SINGLE/ACTION_deactivate', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /accounts/view/{uid}/ACTION_reactivate
+	public function ACTION_reactivate(Request $request, $uid) {
+		$record = DB::table('account')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('account')->where('id', $uid)->first();
+			if($record) return redirect('/accounts/view/' . $record->uid . '/ACTION_reactivate');
+		}
+		return response()->view('admin/accounts_SINGLE/ACTION_reactivate', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /accounts/view/{uid}/SUB_dashboard
+	public function SUB_dashboard(Request $request, $uid) {
+		$record = DB::table('account')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('account')->where('id', $uid)->first();
+			if($record) return redirect('/accounts/view/' . $record->uid . '/SUB_dashboard');
+		}
+		return response()->view('admin/accounts_SINGLE/SUB_dashboard', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /accounts/view/{uid}/SUB_clients
+	public function SUB_clients(Request $request, $uid) {
+		$record = DB::table('account')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('account')->where('id', $uid)->first();
+			if($record) return redirect('/accounts/view/' . $record->uid . '/SUB_clients');
+		}
+		$subRecords = DB::table('account_client')->where('account_id', $record->id)->get();
+		return response()->view('admin/accounts_SINGLE/SUB_clients', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+}

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

@@ -131,6 +131,66 @@ 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_assignRmsPro
+	public function ACTION_assignRmsPro(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_assignRmsPro');
+		}
+		return response()->view('pro/care_months_SINGLE/ACTION_assignRmsPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /care_months/view/{uid}/ACTION_changeRmsPro
+	public function ACTION_changeRmsPro(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_changeRmsPro');
+		}
+		return response()->view('pro/care_months_SINGLE/ACTION_changeRmsPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /care_months/view/{uid}/ACTION_removeRmsPro
+	public function ACTION_removeRmsPro(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_removeRmsPro');
+		}
+		return response()->view('pro/care_months_SINGLE/ACTION_removeRmsPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /care_months/view/{uid}/ACTION_assignRmgPro
+	public function ACTION_assignRmgPro(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_assignRmgPro');
+		}
+		return response()->view('pro/care_months_SINGLE/ACTION_assignRmgPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /care_months/view/{uid}/ACTION_changeRmgPro
+	public function ACTION_changeRmgPro(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_changeRmgPro');
+		}
+		return response()->view('pro/care_months_SINGLE/ACTION_changeRmgPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /care_months/view/{uid}/ACTION_removeRmgPro
+	public function ACTION_removeRmgPro(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_removeRmgPro');
+		}
+		return response()->view('pro/care_months_SINGLE/ACTION_removeRmgPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
 	// GET /care_months/view/{uid}/ACTION_updateCmReasons
 	public function ACTION_updateCmReasons(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();

+ 40 - 0
app/Http/Controllers/clients_SINGLE_Controller.php

@@ -511,6 +511,46 @@ class clients_SINGLE_Controller extends Controller
 		return response()->view('pro/clients_SINGLE/ACTION_removeRmmPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
+	// GET /clients/view/{uid}/ACTION_putRmsPro
+	public function ACTION_putRmsPro(Request $request, $uid) {
+		$record = DB::table('client')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('client')->where('id', $uid)->first();
+			if($record) return redirect('/clients/view/' . $record->uid . '/ACTION_putRmsPro');
+		}
+		return response()->view('pro/clients_SINGLE/ACTION_putRmsPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /clients/view/{uid}/ACTION_removeRmsPro
+	public function ACTION_removeRmsPro(Request $request, $uid) {
+		$record = DB::table('client')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('client')->where('id', $uid)->first();
+			if($record) return redirect('/clients/view/' . $record->uid . '/ACTION_removeRmsPro');
+		}
+		return response()->view('pro/clients_SINGLE/ACTION_removeRmsPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /clients/view/{uid}/ACTION_putRmgPro
+	public function ACTION_putRmgPro(Request $request, $uid) {
+		$record = DB::table('client')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('client')->where('id', $uid)->first();
+			if($record) return redirect('/clients/view/' . $record->uid . '/ACTION_putRmgPro');
+		}
+		return response()->view('pro/clients_SINGLE/ACTION_putRmgPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /clients/view/{uid}/ACTION_removeRmgPro
+	public function ACTION_removeRmgPro(Request $request, $uid) {
+		$record = DB::table('client')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('client')->where('id', $uid)->first();
+			if($record) return redirect('/clients/view/' . $record->uid . '/ACTION_removeRmgPro');
+		}
+		return response()->view('pro/clients_SINGLE/ACTION_removeRmgPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
 	// GET /clients/view/{uid}/ACTION_putRdPro
 	public function ACTION_putRdPro(Request $request, $uid) {
 		$record = DB::table('client')->where('uid', $uid)->first();

+ 30 - 0
app/Http/Controllers/products_Controller.php

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

+ 84 - 0
app/Http/Controllers/products_SINGLE_Controller.php

@@ -0,0 +1,84 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
+
+class products_SINGLE_Controller extends Controller
+{
+    public $selfName = 'products_SINGLE_Controller';
+    public $dashboardName = 'dashboard';
+
+	// GET /products/view/{uid}/ACTION_update
+	public function ACTION_update(Request $request, $uid) {
+		$record = DB::table('product')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('product')->where('id', $uid)->first();
+			if($record) return redirect('/products/view/' . $record->uid . '/ACTION_update');
+		}
+		return response()->view('admin/products_SINGLE/ACTION_update', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /products/view/{uid}/ACTION_deactivate
+	public function ACTION_deactivate(Request $request, $uid) {
+		$record = DB::table('product')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('product')->where('id', $uid)->first();
+			if($record) return redirect('/products/view/' . $record->uid . '/ACTION_deactivate');
+		}
+		return response()->view('admin/products_SINGLE/ACTION_deactivate', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /products/view/{uid}/ACTION_updateDeactivationMemo
+	public function ACTION_updateDeactivationMemo(Request $request, $uid) {
+		$record = DB::table('product')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('product')->where('id', $uid)->first();
+			if($record) return redirect('/products/view/' . $record->uid . '/ACTION_updateDeactivationMemo');
+		}
+		return response()->view('admin/products_SINGLE/ACTION_updateDeactivationMemo', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /products/view/{uid}/ACTION_reactivate
+	public function ACTION_reactivate(Request $request, $uid) {
+		$record = DB::table('product')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('product')->where('id', $uid)->first();
+			if($record) return redirect('/products/view/' . $record->uid . '/ACTION_reactivate');
+		}
+		return response()->view('admin/products_SINGLE/ACTION_reactivate', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /products/view/{uid}/ACTION_updateReactivationMemo
+	public function ACTION_updateReactivationMemo(Request $request, $uid) {
+		$record = DB::table('product')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('product')->where('id', $uid)->first();
+			if($record) return redirect('/products/view/' . $record->uid . '/ACTION_updateReactivationMemo');
+		}
+		return response()->view('admin/products_SINGLE/ACTION_updateReactivationMemo', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /products/view/{uid}/SUB_dashboard
+	public function SUB_dashboard(Request $request, $uid) {
+		$record = DB::table('product')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('product')->where('id', $uid)->first();
+			if($record) return redirect('/products/view/' . $record->uid . '/SUB_dashboard');
+		}
+		return response()->view('admin/products_SINGLE/SUB_dashboard', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /products/view/{uid}/SUB_versions
+	public function SUB_versions(Request $request, $uid) {
+		$record = DB::table('product')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('product')->where('id', $uid)->first();
+			if($record) return redirect('/products/view/' . $record->uid . '/SUB_versions');
+		}
+		$subRecords = DB::table('product_version')->where('product_id', $record->id)->get();
+		return response()->view('admin/products_SINGLE/SUB_versions', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+}

+ 2 - 0
resources/views/admin/account_clients/actions.blade.php

@@ -0,0 +1,2 @@
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/account_clients/view/<?= $record->uid ?>/ACTION_proAllowAccess?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Pro Allow Access</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/account_clients/view/<?= $record->uid ?>/ACTION_proDenyAccess?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Pro Deny Access</a>

+ 50 - 0
resources/views/admin/account_clients/index.blade.php

@@ -0,0 +1,50 @@
+@extends('layouts.pro-logged-in')
+@section('content')
+
+    <h3 class="d-flex my-3 px-3 stag-heading stag-heading-index">
+        <div>Account Clients: List</div>
+        <div class="ml-auto">
+            <!-- _ADD_NEW_LINK_ -->
+        </div>
+    </h3>
+
+    <div class="table-responsive p-0 bg-white border stag-table stag-table-index">
+        <table class="table table-hover text-nowrap table-striped">
+            <thead>
+            <tr>
+<th>&nbsp;</th>
+<th>Created At</th>
+<th>Type</th>
+<th>Is Removed</th>
+<th>Removal Memo</th>
+<th>Removed At</th>
+<th>Access Code</th>
+<th>Is Access Allowed</th>
+<th>Created By Session Id</th>
+<th>Removed By Session Id</th>
+<th>Account Id</th>
+<th>Client Id</th>
+            </tr>
+            </thead>
+            <tbody>
+            @foreach($records as $record)
+                <tr>
+<td><a href="/account_clients/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
+<td><?= friendly_date_time($record->created_at) ?></td>
+<td><?= $record->type ?></td>
+<td><?= $record->is_removed ?></td>
+<td><?= $record->removal_memo ?></td>
+<td><?= friendly_date_time($record->removed_at) ?></td>
+<td><?= $record->access_code ?></td>
+<td><?= $record->is_access_allowed ?></td>
+<td><?= $record->created_by_session_id ?></td>
+<td><?= $record->removed_by_session_id ?></td>
+<td><?= $record->account_id ?></td>
+<td><?= $record->client_id ?></td>
+                </tr>
+            @endforeach
+            </tbody>
+        </table>
+    </div>
+
+@endsection

+ 3 - 0
resources/views/admin/account_clients/info.blade.php

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

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

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

+ 20 - 0
resources/views/admin/account_clients/view.blade.php

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

+ 38 - 0
resources/views/admin/account_clients_SINGLE/ACTION_proAllowAccess.blade.php

@@ -0,0 +1,38 @@
+@extends('admin.account_clients.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Pro Allow Access</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="false"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/accountClient/proAllowAccess">
+        <input type="hidden" name="_success" value="{{route('account_clients-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('account_clients_SINGLE-ACTION_proAllowAccess', ['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('account_clients-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/admin/account_clients_SINGLE/ACTION_proDenyAccess.blade.php

@@ -0,0 +1,38 @@
+@extends('admin.account_clients.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Pro Deny Access</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="false"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/accountClient/proDenyAccess">
+        <input type="hidden" name="_success" value="{{route('account_clients-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('account_clients_SINGLE-ACTION_proDenyAccess', ['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('account_clients-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/admin/account_clients_SINGLE/SUB_dashboard.blade.php

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

+ 2 - 0
resources/views/admin/accounts/actions.blade.php

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

+ 72 - 0
resources/views/admin/accounts/index.blade.php

@@ -0,0 +1,72 @@
+@extends('layouts.pro-logged-in')
+@section('content')
+
+    <h3 class="d-flex my-3 px-3 stag-heading stag-heading-index">
+        <div>Accounts: List</div>
+        <div class="ml-auto">
+            <!-- _ADD_NEW_LINK_ -->
+        </div>
+    </h3>
+
+    <div class="table-responsive p-0 bg-white border stag-table stag-table-index">
+        <table class="table table-hover text-nowrap table-striped">
+            <thead>
+            <tr>
+<th>&nbsp;</th>
+<th>Created At</th>
+<th>Type</th>
+<th>Deactivated At</th>
+<th>Deactivation Memo</th>
+<th>Is Active</th>
+<th>Reactivated At</th>
+<th>Reactivation Memo</th>
+<th>Dob</th>
+<th>Email</th>
+<th>Gender</th>
+<th>Name First</th>
+<th>Name Last</th>
+<th>Password</th>
+<th>Password Reset Requested At</th>
+<th>Password Reset Token</th>
+<th>Phone Number</th>
+<th>Created By Session Id</th>
+<th>Deactivated By Session Id</th>
+<th>Reactivated By Session Id</th>
+<th>Email Confirmation Token</th>
+<th>Was Email Confirmed</th>
+<th>Email Confirmed At</th>
+            </tr>
+            </thead>
+            <tbody>
+            @foreach($records as $record)
+                <tr>
+<td><a href="/accounts/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
+<td><?= friendly_date_time($record->created_at) ?></td>
+<td><?= $record->type ?></td>
+<td><?= friendly_date_time($record->deactivated_at) ?></td>
+<td><?= $record->deactivation_memo ?></td>
+<td><?= $record->is_active ?></td>
+<td><?= friendly_date_time($record->reactivated_at) ?></td>
+<td><?= $record->reactivation_memo ?></td>
+<td><?= $record->dob ?></td>
+<td><?= $record->email ?></td>
+<td><?= $record->gender ?></td>
+<td><?= $record->name_first ?></td>
+<td><?= $record->name_last ?></td>
+<td><?= $record->password ?></td>
+<td><?= friendly_date_time($record->password_reset_requested_at) ?></td>
+<td><?= $record->password_reset_token ?></td>
+<td><?= $record->phone_number ?></td>
+<td><?= $record->created_by_session_id ?></td>
+<td><?= $record->deactivated_by_session_id ?></td>
+<td><?= $record->reactivated_by_session_id ?></td>
+<td><?= $record->email_confirmation_token ?></td>
+<td><?= $record->was_email_confirmed ?></td>
+<td><?= friendly_date_time($record->email_confirmed_at) ?></td>
+                </tr>
+            @endforeach
+            </tbody>
+        </table>
+    </div>
+
+@endsection

+ 3 - 0
resources/views/admin/accounts/info.blade.php

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

+ 2 - 0
resources/views/admin/accounts/subs.blade.php

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

+ 20 - 0
resources/views/admin/accounts/view.blade.php

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

+ 41 - 0
resources/views/admin/accounts_SINGLE/ACTION_deactivate.blade.php

@@ -0,0 +1,41 @@
+@extends('admin.accounts.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>Deactivate</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/account/deactivate">
+        <input type="hidden" name="_success" value="{{route('accounts-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('accounts_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 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('accounts-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/admin/accounts_SINGLE/ACTION_reactivate.blade.php

@@ -0,0 +1,41 @@
+@extends('admin.accounts.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>Reactivate</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/account/reactivate">
+        <input type="hidden" name="_success" value="{{route('accounts-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('accounts_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 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('accounts-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 54 - 0
resources/views/admin/accounts_SINGLE/SUB_clients.blade.php

@@ -0,0 +1,54 @@
+@extends('admin.accounts.view')
+@section('content-inner')
+
+    <div class="pb-3">
+
+        <h5 class='my-3 d-flex stag-heading stag-heading-sub'>
+            <div>Clients</div>
+            <div class="ml-auto">
+                <!-- _ADD_NEW_LINK_ -->
+            </div>
+        </h5>
+
+        <div class="table-responsive p-0 bg-white border stag-table stag-table-sub">
+            <table class="table table-hover text-nowrap">
+                <thead>
+                <tr>
+                    <th>&nbsp;</th>
+<th>Created At</th>
+<th>Type</th>
+<th>Is Removed</th>
+<th>Removal Memo</th>
+<th>Removed At</th>
+<th>Access Code</th>
+<th>Is Access Allowed</th>
+<th>Created By Session Id</th>
+<th>Removed By Session Id</th>
+<th>Account Id</th>
+<th>Client Id</th>
+                </tr>
+                </thead>
+                <tbody>
+                @foreach($subRecords as $subRecord)
+                    <tr>
+                        <td><a href="/account_clients/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
+<td><?= friendly_date_time($subRecord->created_at) ?></td>
+<td><?= $subRecord->type ?></td>
+<td><?= $subRecord->is_removed ?></td>
+<td><?= $subRecord->removal_memo ?></td>
+<td><?= friendly_date_time($subRecord->removed_at) ?></td>
+<td><?= $subRecord->access_code ?></td>
+<td><?= $subRecord->is_access_allowed ?></td>
+<td><?= $subRecord->created_by_session_id ?></td>
+<td><?= $subRecord->removed_by_session_id ?></td>
+<td><?= $subRecord->account_id ?></td>
+<td><?= $subRecord->client_id ?></td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+
+@endsection

+ 41 - 0
resources/views/admin/accounts_SINGLE/SUB_dashboard.blade.php

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

+ 4 - 0
resources/views/admin/bdt_measurements/index.blade.php

@@ -33,6 +33,8 @@
 <th>Value Weight</th>
 <th>Weight In Pounds</th>
 <th>Created By Session Id</th>
+<th>Client Bdt Measurement Id</th>
+<th>Is Cellular Zero</th>
             </tr>
             </thead>
             <tbody>
@@ -59,6 +61,8 @@
 <td><?= $record->value_weight ?></td>
 <td><?= $record->weight_in_pounds ?></td>
 <td><?= $record->created_by_session_id ?></td>
+<td><?= $record->client_bdt_measurement_id ?></td>
+<td><?= $record->is_cellular_zero ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 5 - 0
resources/views/admin/products/actions.blade.php

@@ -0,0 +1,5 @@
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/products/view/<?= $record->uid ?>/ACTION_update?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Update</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/products/view/<?= $record->uid ?>/ACTION_deactivate?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Deactivate</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/products/view/<?= $record->uid ?>/ACTION_updateDeactivationMemo?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Update Deactivation Memo</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/products/view/<?= $record->uid ?>/ACTION_reactivate?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Reactivate</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/products/view/<?= $record->uid ?>/ACTION_updateReactivationMemo?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Update Reactivation Memo</a>

+ 80 - 0
resources/views/admin/products/add_new.blade.php

@@ -0,0 +1,80 @@
+@extends('layouts.pro-logged-in')
+@section('content')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Products: Add New</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="{{route('products-index')}}" 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="_api" value="/api/product/create">
+        <input type="hidden" name="_success" value="{{route('products-index')}}">
+        <input type="hidden" name="_return" value="{{route('products-add_new')}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Title *</label>
+<input class='form-control' type='text' name='title' value='{{ old('title') ? old('title') : '' }}' required>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Description </label>
+<input class='form-control' type='text' name='description' value='{{ old('description') ? old('description') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Image File </label>
+<input class='form-control' type='text' name='imageFile' value='{{ old('imageFile') ? old('imageFile') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Is Bdt Device 
+<input class='ml-2' type='checkbox' name='isBdtDevice' >
+</label>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Bdt Device Category </label>
+<select class='form-control' name='bdtDeviceCategory' value='{{ old('bdtDeviceCategory') ? old('bdtDeviceCategory') : '' }}' >
+<option value=''>-- Select --</option>
+<option <?= 'BP' === (old('bdtDeviceCategory') ? old('bdtDeviceCategory') : '') ? 'selected' : '' ?> value='BP'>BP</option>
+<option <?= 'WEIGHT' === (old('bdtDeviceCategory') ? old('bdtDeviceCategory') : '') ? 'selected' : '' ?> value='WEIGHT'>WEIGHT</option>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Client Understanding Memo Suggestion </label>
+<input class='form-control' type='text' name='clientUnderstandingMemoSuggestion' value='{{ old('clientUnderstandingMemoSuggestion') ? old('clientUnderstandingMemoSuggestion') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Has Imei Number 
+<input class='ml-2' type='checkbox' name='hasImeiNumber' >
+</label>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Has Lot 
+<input class='ml-2' type='checkbox' name='hasLot' >
+</label>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Requires Client Signature 
+<input class='ml-2' type='checkbox' name='requiresClientSignature' >
+</label>
+</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('products-index')}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 68 - 0
resources/views/admin/products/index.blade.php

@@ -0,0 +1,68 @@
+@extends('layouts.pro-logged-in')
+@section('content')
+
+    <h3 class="d-flex my-3 px-3 stag-heading stag-heading-index">
+        <div>Products: List</div>
+        <div class="ml-auto">
+            <a class='btn btn-primary btn-sm ml-2' up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/products/add_new?optimised=1'><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+        </div>
+    </h3>
+
+    <div class="table-responsive p-0 bg-white border stag-table stag-table-index">
+        <table class="table table-hover text-nowrap table-striped">
+            <thead>
+            <tr>
+<th>&nbsp;</th>
+<th>Title</th>
+<th>Description</th>
+<th>Image System File Id</th>
+<th>Is Bdt Device</th>
+<th>Bdt Device Category</th>
+<th>Client Understanding Memo Suggestion</th>
+<th>Has Imei Number</th>
+<th>Has Lot</th>
+<th>Requires Client Signature</th>
+<th>Product Version Id</th>
+<th>Created At</th>
+<th>Created By Session Id</th>
+<th>Type</th>
+<th>Is Active</th>
+<th>Deactivated At</th>
+<th>Deactivated By Session Id</th>
+<th>Deactivation Memo</th>
+<th>Reactivated At</th>
+<th>Reactivated By Session Id</th>
+<th>Reactivation Memo</th>
+            </tr>
+            </thead>
+            <tbody>
+            @foreach($records as $record)
+                <tr>
+<td><a href="/products/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
+<td><?= $record->title ?></td>
+<td><?= $record->description ?></td>
+<td><?= $record->image_system_file_id ?></td>
+<td><?= $record->is_bdt_device ?></td>
+<td><?= $record->bdt_device_category ?></td>
+<td><?= $record->client_understanding_memo_suggestion ?></td>
+<td><?= $record->has_imei_number ?></td>
+<td><?= $record->has_lot ?></td>
+<td><?= $record->requires_client_signature ?></td>
+<td><?= $record->product_version_id ?></td>
+<td><?= friendly_date_time($record->created_at) ?></td>
+<td><?= $record->created_by_session_id ?></td>
+<td><?= $record->type ?></td>
+<td><?= $record->is_active ?></td>
+<td><?= friendly_date_time($record->deactivated_at) ?></td>
+<td><?= $record->deactivated_by_session_id ?></td>
+<td><?= $record->deactivation_memo ?></td>
+<td><?= friendly_date_time($record->reactivated_at) ?></td>
+<td><?= $record->reactivated_by_session_id ?></td>
+<td><?= $record->reactivation_memo ?></td>
+                </tr>
+            @endforeach
+            </tbody>
+        </table>
+    </div>
+
+@endsection

+ 3 - 0
resources/views/admin/products/info.blade.php

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

+ 2 - 0
resources/views/admin/products/subs.blade.php

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

+ 20 - 0
resources/views/admin/products/view.blade.php

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

+ 41 - 0
resources/views/admin/products_SINGLE/ACTION_deactivate.blade.php

@@ -0,0 +1,41 @@
+@extends('admin.products.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>Deactivate</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/product/deactivate">
+        <input type="hidden" name="_success" value="{{route('products-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('products_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 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('products-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/admin/products_SINGLE/ACTION_reactivate.blade.php

@@ -0,0 +1,41 @@
+@extends('admin.products.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>Reactivate</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/product/reactivate">
+        <input type="hidden" name="_success" value="{{route('products-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('products_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 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('products-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 81 - 0
resources/views/admin/products_SINGLE/ACTION_update.blade.php

@@ -0,0 +1,81 @@
+@extends('admin.products.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</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/product/update">
+        <input type="hidden" name="_success" value="{{route('products-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('products_SINGLE-ACTION_update', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Title </label>
+<input class='form-control' type='text' name='title' value='{{ old('title') ? old('title') : $record->title }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Description </label>
+<input class='form-control' type='text' name='description' value='{{ old('description') ? old('description') : $record->description }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Image File </label>
+<input class='form-control' type='text' name='imageFile' value='{{ old('imageFile') ? old('imageFile') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Is Bdt Device 
+<input class='ml-2' type='checkbox' name='isBdtDevice' >
+</label>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Bdt Device Category </label>
+<select class='form-control' name='bdtDeviceCategory' value='{{ old('bdtDeviceCategory') ? old('bdtDeviceCategory') : $record->bdt_device_category }}' >
+<option value=''>-- Select --</option>
+<option <?= 'BP' === (old('bdtDeviceCategory') ? old('bdtDeviceCategory') : $record->bdt_device_category) ? 'selected' : '' ?> value='BP'>BP</option>
+<option <?= 'WEIGHT' === (old('bdtDeviceCategory') ? old('bdtDeviceCategory') : $record->bdt_device_category) ? 'selected' : '' ?> value='WEIGHT'>WEIGHT</option>
+</select>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Client Understanding Memo Suggestion </label>
+<input class='form-control' type='text' name='clientUnderstandingMemoSuggestion' value='{{ old('clientUnderstandingMemoSuggestion') ? old('clientUnderstandingMemoSuggestion') : $record->client_understanding_memo_suggestion }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Has Imei Number 
+<input class='ml-2' type='checkbox' name='hasImeiNumber' >
+</label>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Has Lot 
+<input class='ml-2' type='checkbox' name='hasLot' >
+</label>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Requires Client Signature 
+<input class='ml-2' type='checkbox' name='requiresClientSignature' >
+</label>
+</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('products-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/admin/products_SINGLE/ACTION_updateDeactivationMemo.blade.php

@@ -0,0 +1,41 @@
+@extends('admin.products.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 Deactivation Memo</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/product/updateDeactivationMemo">
+        <input type="hidden" name="_success" value="{{route('products-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('products_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 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('products-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/admin/products_SINGLE/ACTION_updateReactivationMemo.blade.php

@@ -0,0 +1,41 @@
+@extends('admin.products.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 Reactivation Memo</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/product/updateReactivationMemo">
+        <input type="hidden" name="_success" value="{{route('products-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('products_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 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('products-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/admin/products_SINGLE/SUB_dashboard.blade.php

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

+ 72 - 0
resources/views/admin/products_SINGLE/SUB_versions.blade.php

@@ -0,0 +1,72 @@
+@extends('admin.products.view')
+@section('content-inner')
+
+    <div class="pb-3">
+
+        <h5 class='my-3 d-flex stag-heading stag-heading-sub'>
+            <div>Versions</div>
+            <div class="ml-auto">
+                <!-- _ADD_NEW_LINK_ -->
+            </div>
+        </h5>
+
+        <div class="table-responsive p-0 bg-white border stag-table stag-table-sub">
+            <table class="table table-hover text-nowrap">
+                <thead>
+                <tr>
+                    <th>&nbsp;</th>
+<th>Product Id</th>
+<th>Title</th>
+<th>Description</th>
+<th>Image System File Id</th>
+<th>Is Bdt Device</th>
+<th>Bdt Device Category</th>
+<th>Client Understanding Memo Suggestion</th>
+<th>Has Imei Number</th>
+<th>Has Lot</th>
+<th>Requires Client Signature</th>
+<th>Created At</th>
+<th>Created By Session Id</th>
+<th>Type</th>
+<th>Is Active</th>
+<th>Deactivated At</th>
+<th>Deactivated By Session Id</th>
+<th>Deactivation Memo</th>
+<th>Reactivated At</th>
+<th>Reactivated By Session Id</th>
+<th>Reactivation Memo</th>
+                </tr>
+                </thead>
+                <tbody>
+                @foreach($subRecords as $subRecord)
+                    <tr>
+                        <td><a href="/products/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
+<td><?= $subRecord->product_id ?></td>
+<td><?= $subRecord->title ?></td>
+<td><?= $subRecord->description ?></td>
+<td><?= $subRecord->image_system_file_id ?></td>
+<td><?= $subRecord->is_bdt_device ?></td>
+<td><?= $subRecord->bdt_device_category ?></td>
+<td><?= $subRecord->client_understanding_memo_suggestion ?></td>
+<td><?= $subRecord->has_imei_number ?></td>
+<td><?= $subRecord->has_lot ?></td>
+<td><?= $subRecord->requires_client_signature ?></td>
+<td><?= friendly_date_time($subRecord->created_at) ?></td>
+<td><?= $subRecord->created_by_session_id ?></td>
+<td><?= $subRecord->type ?></td>
+<td><?= $subRecord->is_active ?></td>
+<td><?= friendly_date_time($subRecord->deactivated_at) ?></td>
+<td><?= $subRecord->deactivated_by_session_id ?></td>
+<td><?= $subRecord->deactivation_memo ?></td>
+<td><?= friendly_date_time($subRecord->reactivated_at) ?></td>
+<td><?= $subRecord->reactivated_by_session_id ?></td>
+<td><?= $subRecord->reactivation_memo ?></td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+
+@endsection

+ 2 - 1
resources/views/admin/pros/actions.blade.php

@@ -43,4 +43,5 @@
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_putSlug?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Put Slug</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_updateProfileImage?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Update Profile Image</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_updateProfileData?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Update Profile Data</a>
-<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_putProMemo?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Put Pro Memo</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_putProMemo?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Put Pro Memo</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_putCompany?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Put Company</a>

+ 2 - 2
resources/views/admin/pros_SINGLE/ACTION_setInitiative.blade.php

@@ -27,8 +27,8 @@
         <input type="hidden" name="_success" value="{{route('pros-view', ['uid' => $record->uid])}}">
         <input type="hidden" name="_return" value="{{route('pros_SINGLE-ACTION_setInitiative', ['uid' => $record->uid])}}">
         <div class='form-group mb-3'>
-<label class='control-label'>Initiative </label>
-<input class='form-control' type='text' name='initiative' value='{{ old('initiative') ? old('initiative') : '' }}' >
+<label class='control-label'>Initiatives </label>
+<input class='form-control' type='text' name='initiatives' value='{{ old('initiatives') ? old('initiatives') : $record->initiatives }}' >
 </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>

+ 16 - 1
resources/views/admin/pros_SINGLE/SUB_dashboard.blade.php

@@ -19,6 +19,21 @@
     </table>
 </div>
 
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">Company
+                <span class="ml-auto"><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/pros/view/<?= $record->uid ?>/ACTION_putCompany' title='Change?optimised=1'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Change</span></a></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Company Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->company_id ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
 <div class="table-responsive p-0 bg-white table-sm mb-3">
     <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
         <thead>
@@ -29,7 +44,7 @@
         </tr>
         </thead>
         <tbody>
-            <tr><td class="w-25 px-2 text-secondary border-right">Initiative</td><td class="w-75 px-2 font-weight-bold"><?= $record->initiative ?></td></tr>
+            <tr><td class="w-25 px-2 text-secondary border-right">Initiatives</td><td class="w-75 px-2 font-weight-bold"><?= $record->initiatives ?></td></tr>
         </tbody>
     </table>
 </div>

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

@@ -256,3 +256,24 @@
 		<p>Companies</p>
 	</a>
 </li>
+
+<li class='nav-item'>
+	<a href='/accounts' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'accounts') === 0 ? 'active' : '') }} '>
+		<i class='nav-icon fa fa-tablet-alt'></i>
+		<p>Accounts</p>
+	</a>
+</li>
+
+<li class='nav-item'>
+	<a href='/account_clients' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'account_clients') === 0 ? 'active' : '') }} '>
+		<i class='nav-icon fa fa-tablet-alt'></i>
+		<p>Account Clients</p>
+	</a>
+</li>
+
+<li class='nav-item'>
+	<a href='/products' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'products') === 0 ? 'active' : '') }} '>
+		<i class='nav-icon fa fa-tablet-alt'></i>
+		<p>Products</p>
+	</a>
+</li>

+ 4 - 0
resources/views/pro/care_month_entries/index.blade.php

@@ -36,6 +36,8 @@
 <th>Care Month Id</th>
 <th>Client Id</th>
 <th>Pro</th>
+<th>Achieved Rms Pro Time In Seconds</th>
+<th>Achieved Rmg Pro Time In Seconds</th>
             </tr>
             </thead>
             <tbody>
@@ -65,6 +67,8 @@
 <td><?= $record->care_month_id ?></td>
 <td><?= $record->client_id ?></td>
 <td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->pro_id], ], 'all'); ?></td>
+<td><?= $record->achieved_rms_pro_time_in_seconds ?></td>
+<td><?= $record->achieved_rmg_pro_time_in_seconds ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -10,6 +10,12 @@
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_assignRmmPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Assign Rmm Pro</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_changeRmmPro?optimised=1' 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-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_removeRmmPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Remove Rmm Pro</a> @endif
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_assignRmsPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Assign Rms Pro</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_changeRmsPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Change Rms Pro</a>
+@if($record->rms_pro_id) <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_removeRmsPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Remove Rms Pro</a> @endif
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_assignRmgPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Assign Rmg Pro</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_changeRmgPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Change Rmg Pro</a>
+@if($record->rms_pro_id) <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_removeRmgPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Remove Rmg Pro</a> @endif
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_updateCmReasons?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Update Cm Reasons</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_updateRmReasons?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Update Rm Reasons</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_setIsClientEnrolledInCmToTrue?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Set Is Client Enrolled In Cm To True</a>

+ 8 - 0
resources/views/pro/care_months/index.blade.php

@@ -47,6 +47,10 @@
 <th>Rm Bill Id</th>
 <th>Rme Pro Id</th>
 <th>Rmm Pro Id</th>
+<th>Rms Pro Id</th>
+<th>Rmg Pro Id</th>
+<th>Rm Total Time In Seconds By Rms Pro</th>
+<th>Rm Total Time In Seconds By Rmg Pro</th>
             </tr>
             </thead>
             <tbody>
@@ -87,6 +91,10 @@
 <td><?= $record->rm_bill_id ?></td>
 <td><?= $record->rme_pro_id ?></td>
 <td><?= $record->rmm_pro_id ?></td>
+<td><?= $record->rms_pro_id ?></td>
+<td><?= $record->rmg_pro_id ?></td>
+<td><?= $record->rm_total_time_in_seconds_by_rms_pro ?></td>
+<td><?= $record->rm_total_time_in_seconds_by_rmg_pro ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 47 - 0
resources/views/pro/care_months_SINGLE/ACTION_assignRmgPro.blade.php

@@ -0,0 +1,47 @@
+@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>Assign Rmg Pro</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/assignRmgPro">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_assignRmgPro', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rmg Pro </label>
+<select class='form-control' name='rmgProUid' value='{{ old('rmgProUid') ? old('rmgProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('rmgProUid') ? old('rmgProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('care_months-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 47 - 0
resources/views/pro/care_months_SINGLE/ACTION_assignRmsPro.blade.php

@@ -0,0 +1,47 @@
+@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>Assign Rms Pro</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/assignRmsPro">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_assignRmsPro', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rms Pro </label>
+<select class='form-control' name='rmsProUid' value='{{ old('rmsProUid') ? old('rmsProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('rmsProUid') ? old('rmsProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('care_months-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 47 - 0
resources/views/pro/care_months_SINGLE/ACTION_changeRmgPro.blade.php

@@ -0,0 +1,47 @@
+@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>Change Rmg Pro</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/changeRmgPro">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_changeRmgPro', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rmg Pro </label>
+<select class='form-control' name='rmgProUid' value='{{ old('rmgProUid') ? old('rmgProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('rmgProUid') ? old('rmgProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('care_months-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 47 - 0
resources/views/pro/care_months_SINGLE/ACTION_changeRmsPro.blade.php

@@ -0,0 +1,47 @@
+@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>Change Rms Pro</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/changeRmsPro">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_changeRmsPro', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rms Pro </label>
+<select class='form-control' name='rmsProUid' value='{{ old('rmsProUid') ? old('rmsProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('rmsProUid') ? old('rmsProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('care_months-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/care_months_SINGLE/ACTION_removeRmgPro.blade.php

@@ -0,0 +1,38 @@
+@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>Remove Rmg Pro</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/removeRmgPro">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_removeRmgPro', ['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('care_months-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/care_months_SINGLE/ACTION_removeRmsPro.blade.php

@@ -0,0 +1,38 @@
+@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>Remove Rms Pro</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/removeRmsPro">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_removeRmsPro', ['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('care_months-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 32 - 0
resources/views/pro/care_months_SINGLE/SUB_bills.blade.php

@@ -79,6 +79,22 @@
 <th>Signed By Rme Session Id</th>
 <th>Signed By Rmm Session Id</th>
 <th>Claim Id</th>
+<th>Rms Pro Id</th>
+<th>Rmg Pro Id</th>
+<th>Is Signed By Rms</th>
+<th>Signed By Rms At</th>
+<th>Signed By Rms Session Id</th>
+<th>Is Signed By Rmg</th>
+<th>Signed By Rmg At</th>
+<th>Signed By Rmg Session Id</th>
+<th>Rms Expected Payment Amount</th>
+<th>Has Rms Been Paid</th>
+<th>Rms Payment Amount</th>
+<th>Rmg Expected Payment Amount</th>
+<th>Has Rmg Been Paid</th>
+<th>Rmg Payment Amount</th>
+<th>Rms Payment Pro Transaction Id</th>
+<th>Rmg Payment Pro Transaction Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -149,6 +165,22 @@
 <td><?= $subRecord->signed_by_rme_session_id ?></td>
 <td><?= $subRecord->signed_by_rmm_session_id ?></td>
 <td><?= $subRecord->claim_id ?></td>
+<td><?= $subRecord->rms_pro_id ?></td>
+<td><?= $subRecord->rmg_pro_id ?></td>
+<td><?= $subRecord->is_signed_by_rms ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_rms_at) ?></td>
+<td><?= $subRecord->signed_by_rms_session_id ?></td>
+<td><?= $subRecord->is_signed_by_rmg ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_rmg_at) ?></td>
+<td><?= $subRecord->signed_by_rmg_session_id ?></td>
+<td><?= $subRecord->rms_expected_payment_amount ?></td>
+<td><?= $subRecord->has_rms_been_paid ?></td>
+<td><?= $subRecord->rms_payment_amount ?></td>
+<td><?= $subRecord->rmg_expected_payment_amount ?></td>
+<td><?= $subRecord->has_rmg_been_paid ?></td>
+<td><?= $subRecord->rmg_payment_amount ?></td>
+<td><?= $subRecord->rms_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->rmg_payment_pro_transaction_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 4 - 0
resources/views/pro/care_months_SINGLE/SUB_rm_time_entries.blade.php

@@ -38,6 +38,8 @@
 <th>Care Month Id</th>
 <th>Client Id</th>
 <th>Pro Id</th>
+<th>Achieved Rms Pro Time In Seconds</th>
+<th>Achieved Rmg Pro Time In Seconds</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -67,6 +69,8 @@
 <td><?= $subRecord->care_month_id ?></td>
 <td><?= $subRecord->client_id ?></td>
 <td><?= $subRecord->pro_id ?></td>
+<td><?= $subRecord->achieved_rms_pro_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_rmg_pro_time_in_seconds ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 4 - 0
resources/views/pro/clients/actions.blade.php

@@ -48,6 +48,10 @@
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_removeRmePro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Remove Rme Pro</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_putRmmPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Put Rmm Pro</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_removeRmmPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Remove Rmm Pro</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_putRmsPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Put Rms Pro</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_removeRmsPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Remove Rms Pro</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_putRmgPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Put Rmg Pro</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_removeRmgPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Remove Rmg Pro</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_putRdPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Put Rd Pro</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_removeRdPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Remove Rd Pro</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_updateMntEligibility?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Update Mnt Eligibility</a>

+ 47 - 0
resources/views/pro/clients_SINGLE/ACTION_putRmgPro.blade.php

@@ -0,0 +1,47 @@
+@extends('pro.clients.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Put Rmg Pro</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/client/putRmgPro">
+        <input type="hidden" name="_success" value="{{route('clients-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('clients_SINGLE-ACTION_putRmgPro', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rmg Pro *</label>
+<select class='form-control' name='rmgProUid' value='{{ old('rmgProUid') ? old('rmgProUid') : '' }}' required>
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('rmgProUid') ? old('rmgProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('clients-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 47 - 0
resources/views/pro/clients_SINGLE/ACTION_putRmsPro.blade.php

@@ -0,0 +1,47 @@
+@extends('pro.clients.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Put Rms Pro</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/client/putRmsPro">
+        <input type="hidden" name="_success" value="{{route('clients-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('clients_SINGLE-ACTION_putRmsPro', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rms Pro *</label>
+<select class='form-control' name='rmsProUid' value='{{ old('rmsProUid') ? old('rmsProUid') : '' }}' required>
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('rmsProUid') ? old('rmsProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('clients-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/clients_SINGLE/ACTION_removeRmgPro.blade.php

@@ -0,0 +1,38 @@
+@extends('pro.clients.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Remove Rmg Pro</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/client/removeRmgPro">
+        <input type="hidden" name="_success" value="{{route('clients-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('clients_SINGLE-ACTION_removeRmgPro', ['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('clients-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/clients_SINGLE/ACTION_removeRmsPro.blade.php

@@ -0,0 +1,38 @@
+@extends('pro.clients.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Remove Rms Pro</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/client/removeRmsPro">
+        <input type="hidden" name="_success" value="{{route('clients-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('clients_SINGLE-ACTION_removeRmsPro', ['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('clients-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 32 - 0
resources/views/pro/clients_SINGLE/SUB_bills.blade.php

@@ -79,6 +79,22 @@
 <th>Signed By Rme Session Id</th>
 <th>Signed By Rmm Session Id</th>
 <th>Claim Id</th>
+<th>Rms Pro Id</th>
+<th>Rmg Pro Id</th>
+<th>Is Signed By Rms</th>
+<th>Signed By Rms At</th>
+<th>Signed By Rms Session Id</th>
+<th>Is Signed By Rmg</th>
+<th>Signed By Rmg At</th>
+<th>Signed By Rmg Session Id</th>
+<th>Rms Expected Payment Amount</th>
+<th>Has Rms Been Paid</th>
+<th>Rms Payment Amount</th>
+<th>Rmg Expected Payment Amount</th>
+<th>Has Rmg Been Paid</th>
+<th>Rmg Payment Amount</th>
+<th>Rms Payment Pro Transaction Id</th>
+<th>Rmg Payment Pro Transaction Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -149,6 +165,22 @@
 <td><?= $subRecord->signed_by_rme_session_id ?></td>
 <td><?= $subRecord->signed_by_rmm_session_id ?></td>
 <td><?= $subRecord->claim_id ?></td>
+<td><?= $subRecord->rms_pro_id ?></td>
+<td><?= $subRecord->rmg_pro_id ?></td>
+<td><?= $subRecord->is_signed_by_rms ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_rms_at) ?></td>
+<td><?= $subRecord->signed_by_rms_session_id ?></td>
+<td><?= $subRecord->is_signed_by_rmg ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_rmg_at) ?></td>
+<td><?= $subRecord->signed_by_rmg_session_id ?></td>
+<td><?= $subRecord->rms_expected_payment_amount ?></td>
+<td><?= $subRecord->has_rms_been_paid ?></td>
+<td><?= $subRecord->rms_payment_amount ?></td>
+<td><?= $subRecord->rmg_expected_payment_amount ?></td>
+<td><?= $subRecord->has_rmg_been_paid ?></td>
+<td><?= $subRecord->rmg_payment_amount ?></td>
+<td><?= $subRecord->rms_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->rmg_payment_pro_transaction_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 4 - 0
resources/views/pro/clients_SINGLE/SUB_care_month_entries.blade.php

@@ -38,6 +38,8 @@
 <th>Care Month Id</th>
 <th>Client Id</th>
 <th>Pro</th>
+<th>Achieved Rms Pro Time In Seconds</th>
+<th>Achieved Rmg Pro Time In Seconds</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -67,6 +69,8 @@
 <td><?= $subRecord->care_month_id ?></td>
 <td><?= $subRecord->client_id ?></td>
 <td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->pro_id], ], 'all'); ?></td>
+<td><?= $subRecord->achieved_rms_pro_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_rmg_pro_time_in_seconds ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 8 - 0
resources/views/pro/clients_SINGLE/SUB_care_months.blade.php

@@ -49,6 +49,10 @@
 <th>Rm Bill Id</th>
 <th>Rme Pro Id</th>
 <th>Rmm Pro Id</th>
+<th>Rms Pro Id</th>
+<th>Rmg Pro Id</th>
+<th>Rm Total Time In Seconds By Rms Pro</th>
+<th>Rm Total Time In Seconds By Rmg Pro</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -89,6 +93,10 @@
 <td><?= $subRecord->rm_bill_id ?></td>
 <td><?= $subRecord->rme_pro_id ?></td>
 <td><?= $subRecord->rmm_pro_id ?></td>
+<td><?= $subRecord->rms_pro_id ?></td>
+<td><?= $subRecord->rmg_pro_id ?></td>
+<td><?= $subRecord->rm_total_time_in_seconds_by_rms_pro ?></td>
+<td><?= $subRecord->rm_total_time_in_seconds_by_rmg_pro ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 4 - 0
resources/views/pro/clients_SINGLE/SUB_detail.blade.php

@@ -530,6 +530,10 @@
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_removeRmePro?optimised=1' 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></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">RMM Pro</td><td class="w-75 px-2 font-weight-bold"><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->rmm_pro_id], ], 'all'); ?><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_putRmmPro?optimised=1' title='putRmmPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Put Rmm Pro</span></a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_removeRmmPro?optimised=1' 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></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">RMS Pro</td><td class="w-75 px-2 font-weight-bold"><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->rms_pro_id], ], 'all'); ?><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_putRmsPro?optimised=1' title='putRmsPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Put Rms Pro</span></a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_removeRmsPro?optimised=1' title='removeRmsPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Remove Rms Pro</span></a></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">RMG Pro</td><td class="w-75 px-2 font-weight-bold"><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->rmg_pro_id], ], 'all'); ?><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_putRmgPro?optimised=1' title='putRmgPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Put Rmg Pro</span></a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_removeRmgPro?optimised=1' title='removeRmgPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Remove Rmg Pro</span></a></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">RD Pro</td><td class="w-75 px-2 font-weight-bold"><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->rd_pro_id], ], 'all'); ?><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_putRdPro?optimised=1' title='putRdPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Put Rd Pro</span></a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_removeRdPro?optimised=1' title='removeRdPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Remove Rd Pro</span></a></td></tr>
         </tbody>

+ 32 - 0
resources/views/pro/notes_SINGLE/SUB_bills.blade.php

@@ -79,6 +79,22 @@
 <th>Signed By Rme Session Id</th>
 <th>Signed By Rmm Session Id</th>
 <th>Claim Id</th>
+<th>Rms Pro Id</th>
+<th>Rmg Pro Id</th>
+<th>Is Signed By Rms</th>
+<th>Signed By Rms At</th>
+<th>Signed By Rms Session Id</th>
+<th>Is Signed By Rmg</th>
+<th>Signed By Rmg At</th>
+<th>Signed By Rmg Session Id</th>
+<th>Rms Expected Payment Amount</th>
+<th>Has Rms Been Paid</th>
+<th>Rms Payment Amount</th>
+<th>Rmg Expected Payment Amount</th>
+<th>Has Rmg Been Paid</th>
+<th>Rmg Payment Amount</th>
+<th>Rms Payment Pro Transaction Id</th>
+<th>Rmg Payment Pro Transaction Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -149,6 +165,22 @@
 <td><?= $subRecord->signed_by_rme_session_id ?></td>
 <td><?= $subRecord->signed_by_rmm_session_id ?></td>
 <td><?= $subRecord->claim_id ?></td>
+<td><?= $subRecord->rms_pro_id ?></td>
+<td><?= $subRecord->rmg_pro_id ?></td>
+<td><?= $subRecord->is_signed_by_rms ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_rms_at) ?></td>
+<td><?= $subRecord->signed_by_rms_session_id ?></td>
+<td><?= $subRecord->is_signed_by_rmg ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_rmg_at) ?></td>
+<td><?= $subRecord->signed_by_rmg_session_id ?></td>
+<td><?= $subRecord->rms_expected_payment_amount ?></td>
+<td><?= $subRecord->has_rms_been_paid ?></td>
+<td><?= $subRecord->rms_payment_amount ?></td>
+<td><?= $subRecord->rmg_expected_payment_amount ?></td>
+<td><?= $subRecord->has_rmg_been_paid ?></td>
+<td><?= $subRecord->rmg_payment_amount ?></td>
+<td><?= $subRecord->rms_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->rmg_payment_pro_transaction_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 8 - 0
resources/views/pro/tickets/index.blade.php

@@ -43,6 +43,10 @@
 <th>Previous Ticket Update Id</th>
 <th>Ticket Entry Error Change Id</th>
 <th>Ticket Open Change Id</th>
+<th>Order File Path</th>
+<th>Order Pdf Path</th>
+<th>Current Ticket Fax Id</th>
+<th>Current Ticket Email Id</th>
             </tr>
             </thead>
             <tbody>
@@ -79,6 +83,10 @@
 <td><?= $record->previous_ticket_update_id ?></td>
 <td><?= $record->ticket_entry_error_change_id ?></td>
 <td><?= $record->ticket_open_change_id ?></td>
+<td><?= $record->order_file_path ?></td>
+<td><?= $record->order_pdf_path ?></td>
+<td><?= $record->current_ticket_fax_id ?></td>
+<td><?= $record->current_ticket_email_id ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 61 - 5
routes/generated.php

@@ -66,6 +66,10 @@ Route::prefix('/clients/view/{uid}')->group(function () {
 	Route::get('ACTION_removeRmePro', 'clients_SINGLE_Controller@ACTION_removeRmePro')->name('clients_SINGLE-ACTION_removeRmePro');
 	Route::get('ACTION_putRmmPro', 'clients_SINGLE_Controller@ACTION_putRmmPro')->name('clients_SINGLE-ACTION_putRmmPro');
 	Route::get('ACTION_removeRmmPro', 'clients_SINGLE_Controller@ACTION_removeRmmPro')->name('clients_SINGLE-ACTION_removeRmmPro');
+	Route::get('ACTION_putRmsPro', 'clients_SINGLE_Controller@ACTION_putRmsPro')->name('clients_SINGLE-ACTION_putRmsPro');
+	Route::get('ACTION_removeRmsPro', 'clients_SINGLE_Controller@ACTION_removeRmsPro')->name('clients_SINGLE-ACTION_removeRmsPro');
+	Route::get('ACTION_putRmgPro', 'clients_SINGLE_Controller@ACTION_putRmgPro')->name('clients_SINGLE-ACTION_putRmgPro');
+	Route::get('ACTION_removeRmgPro', 'clients_SINGLE_Controller@ACTION_removeRmgPro')->name('clients_SINGLE-ACTION_removeRmgPro');
 	Route::get('ACTION_putRdPro', 'clients_SINGLE_Controller@ACTION_putRdPro')->name('clients_SINGLE-ACTION_putRdPro');
 	Route::get('ACTION_removeRdPro', 'clients_SINGLE_Controller@ACTION_removeRdPro')->name('clients_SINGLE-ACTION_removeRdPro');
 	Route::get('ACTION_updateMntEligibility', 'clients_SINGLE_Controller@ACTION_updateMntEligibility')->name('clients_SINGLE-ACTION_updateMntEligibility');
@@ -220,6 +224,12 @@ 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_assignRmsPro', 'care_months_SINGLE_Controller@ACTION_assignRmsPro')->name('care_months_SINGLE-ACTION_assignRmsPro');
+	Route::get('ACTION_changeRmsPro', 'care_months_SINGLE_Controller@ACTION_changeRmsPro')->name('care_months_SINGLE-ACTION_changeRmsPro');
+	Route::get('ACTION_removeRmsPro', 'care_months_SINGLE_Controller@ACTION_removeRmsPro')->name('care_months_SINGLE-ACTION_removeRmsPro');
+	Route::get('ACTION_assignRmgPro', 'care_months_SINGLE_Controller@ACTION_assignRmgPro')->name('care_months_SINGLE-ACTION_assignRmgPro');
+	Route::get('ACTION_changeRmgPro', 'care_months_SINGLE_Controller@ACTION_changeRmgPro')->name('care_months_SINGLE-ACTION_changeRmgPro');
+	Route::get('ACTION_removeRmgPro', 'care_months_SINGLE_Controller@ACTION_removeRmgPro')->name('care_months_SINGLE-ACTION_removeRmgPro');
 	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');
@@ -398,6 +408,7 @@ Route::prefix('/pros/view/{uid}')->group(function () {
 	Route::get('ACTION_updateProfileImage', 'pros_SINGLE_Controller@ACTION_updateProfileImage')->name('pros_SINGLE-ACTION_updateProfileImage');
 	Route::get('ACTION_updateProfileData', 'pros_SINGLE_Controller@ACTION_updateProfileData')->name('pros_SINGLE-ACTION_updateProfileData');
 	Route::get('ACTION_putProMemo', 'pros_SINGLE_Controller@ACTION_putProMemo')->name('pros_SINGLE-ACTION_putProMemo');
+	Route::get('ACTION_putCompany', 'pros_SINGLE_Controller@ACTION_putCompany')->name('pros_SINGLE-ACTION_putCompany');
 	Route::get('SUB_dashboard', 'pros_SINGLE_Controller@SUB_dashboard')->name('pros_SINGLE-SUB_dashboard');
 	Route::get('SUB_pro_rates', 'pros_SINGLE_Controller@SUB_pro_rates')->name('pros_SINGLE-SUB_pro_rates');
 	Route::get('SUB_note_templates', 'pros_SINGLE_Controller@SUB_note_templates')->name('pros_SINGLE-SUB_note_templates');
@@ -654,6 +665,13 @@ Route::prefix('/mb_claim')->group(function () {
 	Route::get('view/{uid}', 'mb_claim_Controller@view')->name('mb_claim-view');
 });
 
+// --- admin: companies --- //
+Route::prefix('/companies')->group(function () {
+	Route::get('', 'companies_Controller@index')->name('companies-index');
+	Route::get('add_new', 'companies_Controller@add_new')->name('companies-add_new');
+	Route::get('view/{uid}', 'companies_Controller@view')->name('companies-view');
+});
+
 // --- admin: companies_SINGLE --- //
 Route::prefix('/companies/view/{uid}')->group(function () {
 	Route::get('ACTION_deactivate', 'companies_SINGLE_Controller@ACTION_deactivate')->name('companies_SINGLE-ACTION_deactivate');
@@ -662,9 +680,47 @@ Route::prefix('/companies/view/{uid}')->group(function () {
 	Route::get('SUB_dashboard', 'companies_SINGLE_Controller@SUB_dashboard')->name('companies_SINGLE-SUB_dashboard');
 });
 
-// --- admin: companies --- //
-Route::prefix('/companies')->group(function () {
-	Route::get('', 'companies_Controller@index')->name('companies-index');
-	Route::get('add_new', 'companies_Controller@add_new')->name('companies-add_new');
-	Route::get('view/{uid}', 'companies_Controller@view')->name('companies-view');
+// --- admin: accounts --- //
+Route::prefix('/accounts')->group(function () {
+	Route::get('', 'accounts_Controller@index')->name('accounts-index');
+	Route::get('view/{uid}', 'accounts_Controller@view')->name('accounts-view');
+});
+
+// --- admin: accounts_SINGLE --- //
+Route::prefix('/accounts/view/{uid}')->group(function () {
+	Route::get('ACTION_deactivate', 'accounts_SINGLE_Controller@ACTION_deactivate')->name('accounts_SINGLE-ACTION_deactivate');
+	Route::get('ACTION_reactivate', 'accounts_SINGLE_Controller@ACTION_reactivate')->name('accounts_SINGLE-ACTION_reactivate');
+	Route::get('SUB_dashboard', 'accounts_SINGLE_Controller@SUB_dashboard')->name('accounts_SINGLE-SUB_dashboard');
+	Route::get('SUB_clients', 'accounts_SINGLE_Controller@SUB_clients')->name('accounts_SINGLE-SUB_clients');
+});
+
+// --- admin: account_clients --- //
+Route::prefix('/account_clients')->group(function () {
+	Route::get('', 'account_clients_Controller@index')->name('account_clients-index');
+	Route::get('view/{uid}', 'account_clients_Controller@view')->name('account_clients-view');
+});
+
+// --- admin: account_clients_SINGLE --- //
+Route::prefix('/account_clients/view/{uid}')->group(function () {
+	Route::get('ACTION_proAllowAccess', 'account_clients_SINGLE_Controller@ACTION_proAllowAccess')->name('account_clients_SINGLE-ACTION_proAllowAccess');
+	Route::get('ACTION_proDenyAccess', 'account_clients_SINGLE_Controller@ACTION_proDenyAccess')->name('account_clients_SINGLE-ACTION_proDenyAccess');
+	Route::get('SUB_dashboard', 'account_clients_SINGLE_Controller@SUB_dashboard')->name('account_clients_SINGLE-SUB_dashboard');
+});
+
+// --- admin: products_SINGLE --- //
+Route::prefix('/products/view/{uid}')->group(function () {
+	Route::get('ACTION_update', 'products_SINGLE_Controller@ACTION_update')->name('products_SINGLE-ACTION_update');
+	Route::get('ACTION_deactivate', 'products_SINGLE_Controller@ACTION_deactivate')->name('products_SINGLE-ACTION_deactivate');
+	Route::get('ACTION_updateDeactivationMemo', 'products_SINGLE_Controller@ACTION_updateDeactivationMemo')->name('products_SINGLE-ACTION_updateDeactivationMemo');
+	Route::get('ACTION_reactivate', 'products_SINGLE_Controller@ACTION_reactivate')->name('products_SINGLE-ACTION_reactivate');
+	Route::get('ACTION_updateReactivationMemo', 'products_SINGLE_Controller@ACTION_updateReactivationMemo')->name('products_SINGLE-ACTION_updateReactivationMemo');
+	Route::get('SUB_dashboard', 'products_SINGLE_Controller@SUB_dashboard')->name('products_SINGLE-SUB_dashboard');
+	Route::get('SUB_versions', 'products_SINGLE_Controller@SUB_versions')->name('products_SINGLE-SUB_versions');
+});
+
+// --- admin: products --- //
+Route::prefix('/products')->group(function () {
+	Route::get('', 'products_Controller@index')->name('products-index');
+	Route::get('add_new', 'products_Controller@add_new')->name('products-add_new');
+	Route::get('view/{uid}', 'products_Controller@view')->name('products-view');
 });