updated by Sal

public/css/theme.css

@@ -113,7 +113,8 @@ aside.main-sidebar {
     font-family: Verdana,sans-serif;
 }
 .stag-heading.stag-heading-index {
-    font-size: 22px;
+    font-size: 18px;
+    font-weight: bold;
     margin: 0.5rem 0 !important;
 }
 .stag-heading.stag-heading-info {
@@ -121,13 +122,14 @@ aside.main-sidebar {
     margin: 0.5rem 0 !important;
 }
 .stag-heading.stag-heading-modal {
-    font-size: 20px;
+    font-size: 16px;
+    font-weight: bold;
     margin: 0;
     padding: 0.5rem 1rem !important;
     background: #fffcfc; /* Old browsers */
     background: -moz-linear-gradient(top,  #fffcfc 0%, #b0cee7 100%); /* FF3.6-15 */
     background: -webkit-linear-gradient(top,  #fffcfc 0%,#b0cee7 100%); /* Chrome10-25,Safari5.1-6 */
-    background: linear-gradient(to bottom,  #fffcfc 0%,#b0cee7 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
+    background: linear-gradient(to bottom,  #d1e3f3 0%,#b0cee7 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
     filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fffcfc', endColorstr='#b0cee7',GradientType=0 ); /* IE6-9 */
 }
 body .btn {
@@ -219,3 +221,11 @@ a {
     margin-left: 50px !important;
 }
 
+/*
+Sal
+*/
+
+.brand-text {
+    font-weight: bold;
+    font-size: 18px;
+}

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

@@ -21,8 +21,8 @@
 <th>Reactivated At</th>
 <th>Reactivation Memo</th>
 <th>Amount</th>
+<th>As Hcp Or Ally</th>
 <th>Code</th>
-<th>Responsibility</th>
 <th>Created By Session Id</th>
 <th>Deactivated By Session Id</th>
 <th>Reactivated By Session Id</th>
@@ -41,8 +41,8 @@
 <td><?= friendly_date_time($record->reactivated_at) ?></td>
 <td><?= $record->reactivation_memo ?></td>
 <td><?= $record->amount ?></td>
+<td><?= $record->as_hcp_or_ally ?></td>
 <td><?= $record->code ?></td>
-<td><?= $record->responsibility ?></td>
 <td><?= $record->created_by_session_id ?></td>
 <td><?= $record->deactivated_by_session_id ?></td>
 <td><?= $record->reactivated_by_session_id ?></td>

resources/views/layouts/pro-logged-in.blade.php

@@ -73,7 +73,7 @@
         <a href="/AdminLTE-3.0.5/index3.html" class="brand-link">
             <img src="/AdminLTE-3.0.5/dist/img/AdminLTELogo.png" alt="AdminLTE Logo" class="brand-image img-circle elevation-3"
                  style="opacity: .8">
-            <span class="brand-text font-weight-light">Stag | Pro</span>
+            <span class="brand-text font-weight-light">Scholar</span>
         </a>
 
         <!-- Sidebar -->

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

@@ -15,24 +15,20 @@
 <th>&nbsp;</th>
 <th>Created At</th>
 <th>Type</th>
+<th>Ally Expected Payment Amount</th>
+<th>Ally Payment Amount</th>
 <th>Bill Service Type</th>
-<th>Cm Expected Payment Amount</th>
 <th>Cm Or Rm</th>
-<th>Cm Payment Amount</th>
 <th>Code</th>
 <th>Collected Amount</th>
 <th>Effective Date</th>
-<th>Has Cm Been Paid</th>
+<th>Has Ally Been Paid</th>
 <th>Has Hcp Been Paid</th>
-<th>Has Rme Been Paid</th>
-<th>Has Rmm Been Paid</th>
 <th>Hcp Expected Payment Amount</th>
 <th>Hcp Payment Amount</th>
 <th>Is Cancelled</th>
-<th>Is Signed By Cm</th>
+<th>Is Signed By Ally</th>
 <th>Is Signed By Hcp</th>
-<th>Is Signed By Rme</th>
-<th>Is Signed By Rmm</th>
 <th>Is Submitted</th>
 <th>Marked Cancelled At</th>
 <th>Marked Submitted At</th>
@@ -42,34 +38,21 @@
 <th>Reason2</th>
 <th>Reason3</th>
 <th>Reason3plus</th>
-<th>Rme Expected Payment Amount</th>
-<th>Rme Payment Amount</th>
-<th>Rmm Expected Payment Amount</th>
-<th>Rmm Payment Amount</th>
 <th>Service Location</th>
-<th>Signed By Cm At</th>
+<th>Signed By Ally At</th>
 <th>Signed By Hcp At</th>
-<th>Signed By Rme At</th>
-<th>Signed By Rmm At</th>
 <th>Created By Session Id</th>
+<th>Ally Payment Pro Transaction Id</th>
+<th>Ally Pro Id</th>
 <th>Care Month Id</th>
 <th>Client Id</th>
-<th>Cm Payment Pro Transaction Id</th>
-<th>Cm Pro Id</th>
 <th>Hcp Payment Pro Transaction Id</th>
 <th>Hcp Pro Id</th>
 <th>Marked Cancelled By Session Id</th>
 <th>Marked Submitted By Session Id</th>
 <th>Note Id</th>
-<th>Note Ally Id</th>
-<th>Rme Payment Pro Transaction Id</th>
-<th>Rme Pro Id</th>
-<th>Rmm Payment Pro Transaction Id</th>
-<th>Rmm Pro Id</th>
-<th>Signed By Cm Session Id</th>
+<th>Signed By Ally Session Id</th>
 <th>Signed By Hcp Session Id</th>
-<th>Signed By Rme Session Id</th>
-<th>Signed By Rmm Session Id</th>
             </tr>
             </thead>
             <tbody>
@@ -78,24 +61,20 @@
 <td><a href="/bills/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->ally_expected_payment_amount ?></td>
+<td><?= $record->ally_payment_amount ?></td>
 <td><?= $record->bill_service_type ?></td>
-<td><?= $record->cm_expected_payment_amount ?></td>
 <td><?= $record->cm_or_rm ?></td>
-<td><?= $record->cm_payment_amount ?></td>
 <td><?= $record->code ?></td>
 <td><?= $record->collected_amount ?></td>
 <td><?= $record->effective_date ?></td>
-<td><?= $record->has_cm_been_paid ?></td>
+<td><?= $record->has_ally_been_paid ?></td>
 <td><?= $record->has_hcp_been_paid ?></td>
-<td><?= $record->has_rme_been_paid ?></td>
-<td><?= $record->has_rmm_been_paid ?></td>
 <td><?= $record->hcp_expected_payment_amount ?></td>
 <td><?= $record->hcp_payment_amount ?></td>
 <td><?= $record->is_cancelled ?></td>
-<td><?= $record->is_signed_by_cm ?></td>
+<td><?= $record->is_signed_by_ally ?></td>
 <td><?= $record->is_signed_by_hcp ?></td>
-<td><?= $record->is_signed_by_rme ?></td>
-<td><?= $record->is_signed_by_rmm ?></td>
 <td><?= $record->is_submitted ?></td>
 <td><?= friendly_date_time($record->marked_cancelled_at) ?></td>
 <td><?= friendly_date_time($record->marked_submitted_at) ?></td>
@@ -105,34 +84,21 @@
 <td><?= $record->reason2 ?></td>
 <td><?= $record->reason3 ?></td>
 <td><?= $record->reason3plus ?></td>
-<td><?= $record->rme_expected_payment_amount ?></td>
-<td><?= $record->rme_payment_amount ?></td>
-<td><?= $record->rmm_expected_payment_amount ?></td>
-<td><?= $record->rmm_payment_amount ?></td>
 <td><?= $record->service_location ?></td>
-<td><?= friendly_date_time($record->signed_by_cm_at) ?></td>
+<td><?= friendly_date_time($record->signed_by_ally_at) ?></td>
 <td><?= friendly_date_time($record->signed_by_hcp_at) ?></td>
-<td><?= friendly_date_time($record->signed_by_rme_at) ?></td>
-<td><?= friendly_date_time($record->signed_by_rmm_at) ?></td>
 <td><?= $record->created_by_session_id ?></td>
+<td><?= $record->ally_payment_pro_transaction_id ?></td>
+<td><?= $record->ally_pro_id ?></td>
 <td><?= $record->care_month_id ?></td>
 <td><?= $record->client_id ?></td>
-<td><?= $record->cm_payment_pro_transaction_id ?></td>
-<td><?= $record->cm_pro_id ?></td>
 <td><?= $record->hcp_payment_pro_transaction_id ?></td>
 <td><?= $record->hcp_pro_id ?></td>
 <td><?= $record->marked_cancelled_by_session_id ?></td>
 <td><?= $record->marked_submitted_by_session_id ?></td>
 <td><?= $record->note_id ?></td>
-<td><?= $record->note_ally_id ?></td>
-<td><?= $record->rme_payment_pro_transaction_id ?></td>
-<td><?= $record->rme_pro_id ?></td>
-<td><?= $record->rmm_payment_pro_transaction_id ?></td>
-<td><?= $record->rmm_pro_id ?></td>
-<td><?= $record->signed_by_cm_session_id ?></td>
+<td><?= $record->signed_by_ally_session_id ?></td>
 <td><?= $record->signed_by_hcp_session_id ?></td>
-<td><?= $record->signed_by_rme_session_id ?></td>
-<td><?= $record->signed_by_rmm_session_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -18,10 +18,8 @@
 <th>Is Removed</th>
 <th>Removal Memo</th>
 <th>Removed At</th>
-<th>Achieved Cm Pro Time In Seconds</th>
+<th>Achieved Ally Time In Seconds</th>
 <th>Achieved Mcp Time In Seconds</th>
-<th>Achieved Rme Pro Time In Seconds</th>
-<th>Achieved Rmm Pro Time In Seconds</th>
 <th>Achieved Total Time In Seconds</th>
 <th>Cm Or Rm</th>
 <th>Content Detail</th>
@@ -47,10 +45,8 @@
 <td><?= $record->is_removed ?></td>
 <td><?= $record->removal_memo ?></td>
 <td><?= friendly_date_time($record->removed_at) ?></td>
-<td><?= $record->achieved_cm_pro_time_in_seconds ?></td>
+<td><?= $record->achieved_ally_time_in_seconds ?></td>
 <td><?= $record->achieved_mcp_time_in_seconds ?></td>
-<td><?= $record->achieved_rme_pro_time_in_seconds ?></td>
-<td><?= $record->achieved_rmm_pro_time_in_seconds ?></td>
 <td><?= $record->achieved_total_time_in_seconds ?></td>
 <td><?= $record->cm_or_rm ?></td>
 <td><?= $record->content_detail ?></td>

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

@@ -18,7 +18,7 @@
 <th>Cm Reason1</th>
 <th>Cm Reason2</th>
 <th>Cm Total Time In Seconds</th>
-<th>Cm Total Time In Seconds By Cm Pro</th>
+<th>Cm Total Time In Seconds By Ally</th>
 <th>Cm Total Time In Seconds By Mcp</th>
 <th>Has Mcp Done Em Visit</th>
 <th>Is Client Enrolled In Cm</th>
@@ -29,9 +29,8 @@
 <th>Rm Reason1</th>
 <th>Rm Reason2</th>
 <th>Rm Total Time In Seconds</th>
+<th>Rm Total Time In Seconds By Ally</th>
 <th>Rm Total Time In Seconds By Mcp</th>
-<th>Rm Total Time In Seconds By Rme Pro</th>
-<th>Rm Total Time In Seconds By Rmm Pro</th>
 <th>Start Date</th>
 <th>Why Is Cm Canceled This Month</th>
 <th>Why Is Rm Canceled This Month</th>
@@ -40,13 +39,12 @@
 <th>Why Not Enrolled In Rm Category</th>
 <th>Why Not Enrolled In Rm Memo</th>
 <th>Created By Session Id</th>
+<th>Ally Pro Id</th>
 <th>Client Id</th>
 <th>Cm Bill Id</th>
-<th>Cm Pro Id</th>
 <th>Mcp Pro Id</th>
 <th>Rm Bill Id</th>
-<th>Rme Pro Id</th>
-<th>Rmm Pro Id</th>
+<th>Team Id</th>
             </tr>
             </thead>
             <tbody>
@@ -58,7 +56,7 @@
 <td><?= $record->cm_reason1 ?></td>
 <td><?= $record->cm_reason2 ?></td>
 <td><?= $record->cm_total_time_in_seconds ?></td>
-<td><?= $record->cm_total_time_in_seconds_by_cm_pro ?></td>
+<td><?= $record->cm_total_time_in_seconds_by_ally ?></td>
 <td><?= $record->cm_total_time_in_seconds_by_mcp ?></td>
 <td><?= $record->has_mcp_done_em_visit ?></td>
 <td><?= $record->is_client_enrolled_in_cm ?></td>
@@ -69,9 +67,8 @@
 <td><?= $record->rm_reason1 ?></td>
 <td><?= $record->rm_reason2 ?></td>
 <td><?= $record->rm_total_time_in_seconds ?></td>
+<td><?= $record->rm_total_time_in_seconds_by_ally ?></td>
 <td><?= $record->rm_total_time_in_seconds_by_mcp ?></td>
-<td><?= $record->rm_total_time_in_seconds_by_rme_pro ?></td>
-<td><?= $record->rm_total_time_in_seconds_by_rmm_pro ?></td>
 <td><?= $record->start_date ?></td>
 <td><?= $record->why_is_cm_canceled_this_month ?></td>
 <td><?= $record->why_is_rm_canceled_this_month ?></td>
@@ -80,13 +77,12 @@
 <td><?= $record->why_not_enrolled_in_rm_category ?></td>
 <td><?= $record->why_not_enrolled_in_rm_memo ?></td>
 <td><?= $record->created_by_session_id ?></td>
+<td><?= $record->ally_pro_id ?></td>
 <td><?= $record->client_id ?></td>
 <td><?= $record->cm_bill_id ?></td>
-<td><?= $record->cm_pro_id ?></td>
 <td><?= $record->mcp_pro_id ?></td>
 <td><?= $record->rm_bill_id ?></td>
-<td><?= $record->rme_pro_id ?></td>
-<td><?= $record->rmm_pro_id ?></td>
+<td><?= $record->team_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -20,10 +20,8 @@
 <th>Is Removed</th>
 <th>Removal Memo</th>
 <th>Removed At</th>
-<th>Achieved Cm Pro Time In Seconds</th>
+<th>Achieved Ally Time In Seconds</th>
 <th>Achieved Mcp Time In Seconds</th>
-<th>Achieved Rme Pro Time In Seconds</th>
-<th>Achieved Rmm Pro Time In Seconds</th>
 <th>Achieved Total Time In Seconds</th>
 <th>Cm Or Rm</th>
 <th>Content Detail</th>
@@ -49,10 +47,8 @@
 <td><?= $subRecord->is_removed ?></td>
 <td><?= $subRecord->removal_memo ?></td>
 <td><?= friendly_date_time($record->removed_at) ?></td>
-<td><?= $subRecord->achieved_cm_pro_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_ally_time_in_seconds ?></td>
 <td><?= $subRecord->achieved_mcp_time_in_seconds ?></td>
-<td><?= $subRecord->achieved_rme_pro_time_in_seconds ?></td>
-<td><?= $subRecord->achieved_rmm_pro_time_in_seconds ?></td>
 <td><?= $subRecord->achieved_total_time_in_seconds ?></td>
 <td><?= $subRecord->cm_or_rm ?></td>
 <td><?= $subRecord->content_detail ?></td>

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

@@ -20,10 +20,8 @@
 <th>Is Removed</th>
 <th>Removal Memo</th>
 <th>Removed At</th>
-<th>Achieved Cm Pro Time In Seconds</th>
+<th>Achieved Ally Time In Seconds</th>
 <th>Achieved Mcp Time In Seconds</th>
-<th>Achieved Rme Pro Time In Seconds</th>
-<th>Achieved Rmm Pro Time In Seconds</th>
 <th>Achieved Total Time In Seconds</th>
 <th>Cm Or Rm</th>
 <th>Content Detail</th>
@@ -49,10 +47,8 @@
 <td><?= $subRecord->is_removed ?></td>
 <td><?= $subRecord->removal_memo ?></td>
 <td><?= friendly_date_time($record->removed_at) ?></td>
-<td><?= $subRecord->achieved_cm_pro_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_ally_time_in_seconds ?></td>
 <td><?= $subRecord->achieved_mcp_time_in_seconds ?></td>
-<td><?= $subRecord->achieved_rme_pro_time_in_seconds ?></td>
-<td><?= $subRecord->achieved_rmm_pro_time_in_seconds ?></td>
 <td><?= $subRecord->achieved_total_time_in_seconds ?></td>
 <td><?= $subRecord->cm_or_rm ?></td>
 <td><?= $subRecord->content_detail ?></td>

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

@@ -17,24 +17,20 @@
                     <th>&nbsp;</th>
 <th>Created At</th>
 <th>Type</th>
+<th>Ally Expected Payment Amount</th>
+<th>Ally Payment Amount</th>
 <th>Bill Service Type</th>
-<th>Cm Expected Payment Amount</th>
 <th>Cm Or Rm</th>
-<th>Cm Payment Amount</th>
 <th>Code</th>
 <th>Collected Amount</th>
 <th>Effective Date</th>
-<th>Has Cm Been Paid</th>
+<th>Has Ally Been Paid</th>
 <th>Has Hcp Been Paid</th>
-<th>Has Rme Been Paid</th>
-<th>Has Rmm Been Paid</th>
 <th>Hcp Expected Payment Amount</th>
 <th>Hcp Payment Amount</th>
 <th>Is Cancelled</th>
-<th>Is Signed By Cm</th>
+<th>Is Signed By Ally</th>
 <th>Is Signed By Hcp</th>
-<th>Is Signed By Rme</th>
-<th>Is Signed By Rmm</th>
 <th>Is Submitted</th>
 <th>Marked Cancelled At</th>
 <th>Marked Submitted At</th>
@@ -44,34 +40,21 @@
 <th>Reason2</th>
 <th>Reason3</th>
 <th>Reason3plus</th>
-<th>Rme Expected Payment Amount</th>
-<th>Rme Payment Amount</th>
-<th>Rmm Expected Payment Amount</th>
-<th>Rmm Payment Amount</th>
 <th>Service Location</th>
-<th>Signed By Cm At</th>
+<th>Signed By Ally At</th>
 <th>Signed By Hcp At</th>
-<th>Signed By Rme At</th>
-<th>Signed By Rmm At</th>
 <th>Created By Session Id</th>
+<th>Ally Payment Pro Transaction Id</th>
+<th>Ally Pro Id</th>
 <th>Care Month Id</th>
 <th>Client Id</th>
-<th>Cm Payment Pro Transaction Id</th>
-<th>Cm Pro Id</th>
 <th>Hcp Payment Pro Transaction Id</th>
 <th>Hcp Pro Id</th>
 <th>Marked Cancelled By Session Id</th>
 <th>Marked Submitted By Session Id</th>
 <th>Note Id</th>
-<th>Note Ally Id</th>
-<th>Rme Payment Pro Transaction Id</th>
-<th>Rme Pro Id</th>
-<th>Rmm Payment Pro Transaction Id</th>
-<th>Rmm Pro Id</th>
-<th>Signed By Cm Session Id</th>
+<th>Signed By Ally Session Id</th>
 <th>Signed By Hcp Session Id</th>
-<th>Signed By Rme Session Id</th>
-<th>Signed By Rmm Session Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -80,24 +63,20 @@
                         <td><a href="/bills/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
 <td><?= friendly_date_time($record->created_at) ?></td>
 <td><?= $subRecord->type ?></td>
+<td><?= $subRecord->ally_expected_payment_amount ?></td>
+<td><?= $subRecord->ally_payment_amount ?></td>
 <td><?= $subRecord->bill_service_type ?></td>
-<td><?= $subRecord->cm_expected_payment_amount ?></td>
 <td><?= $subRecord->cm_or_rm ?></td>
-<td><?= $subRecord->cm_payment_amount ?></td>
 <td><?= $subRecord->code ?></td>
 <td><?= $subRecord->collected_amount ?></td>
 <td><?= $subRecord->effective_date ?></td>
-<td><?= $subRecord->has_cm_been_paid ?></td>
+<td><?= $subRecord->has_ally_been_paid ?></td>
 <td><?= $subRecord->has_hcp_been_paid ?></td>
-<td><?= $subRecord->has_rme_been_paid ?></td>
-<td><?= $subRecord->has_rmm_been_paid ?></td>
 <td><?= $subRecord->hcp_expected_payment_amount ?></td>
 <td><?= $subRecord->hcp_payment_amount ?></td>
 <td><?= $subRecord->is_cancelled ?></td>
-<td><?= $subRecord->is_signed_by_cm ?></td>
+<td><?= $subRecord->is_signed_by_ally ?></td>
 <td><?= $subRecord->is_signed_by_hcp ?></td>
-<td><?= $subRecord->is_signed_by_rme ?></td>
-<td><?= $subRecord->is_signed_by_rmm ?></td>
 <td><?= $subRecord->is_submitted ?></td>
 <td><?= friendly_date_time($record->marked_cancelled_at) ?></td>
 <td><?= friendly_date_time($record->marked_submitted_at) ?></td>
@@ -107,34 +86,21 @@
 <td><?= $subRecord->reason2 ?></td>
 <td><?= $subRecord->reason3 ?></td>
 <td><?= $subRecord->reason3plus ?></td>
-<td><?= $subRecord->rme_expected_payment_amount ?></td>
-<td><?= $subRecord->rme_payment_amount ?></td>
-<td><?= $subRecord->rmm_expected_payment_amount ?></td>
-<td><?= $subRecord->rmm_payment_amount ?></td>
 <td><?= $subRecord->service_location ?></td>
-<td><?= friendly_date_time($record->signed_by_cm_at) ?></td>
+<td><?= friendly_date_time($record->signed_by_ally_at) ?></td>
 <td><?= friendly_date_time($record->signed_by_hcp_at) ?></td>
-<td><?= friendly_date_time($record->signed_by_rme_at) ?></td>
-<td><?= friendly_date_time($record->signed_by_rmm_at) ?></td>
 <td><?= $subRecord->created_by_session_id ?></td>
+<td><?= $subRecord->ally_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->ally_pro_id ?></td>
 <td><?= $subRecord->care_month_id ?></td>
 <td><?= $subRecord->client_id ?></td>
-<td><?= $subRecord->cm_payment_pro_transaction_id ?></td>
-<td><?= $subRecord->cm_pro_id ?></td>
 <td><?= $subRecord->hcp_payment_pro_transaction_id ?></td>
 <td><?= $subRecord->hcp_pro_id ?></td>
 <td><?= $subRecord->marked_cancelled_by_session_id ?></td>
 <td><?= $subRecord->marked_submitted_by_session_id ?></td>
 <td><?= $subRecord->note_id ?></td>
-<td><?= $subRecord->note_ally_id ?></td>
-<td><?= $subRecord->rme_payment_pro_transaction_id ?></td>
-<td><?= $subRecord->rme_pro_id ?></td>
-<td><?= $subRecord->rmm_payment_pro_transaction_id ?></td>
-<td><?= $subRecord->rmm_pro_id ?></td>
-<td><?= $subRecord->signed_by_cm_session_id ?></td>
+<td><?= $subRecord->signed_by_ally_session_id ?></td>
 <td><?= $subRecord->signed_by_hcp_session_id ?></td>
-<td><?= $subRecord->signed_by_rme_session_id ?></td>
-<td><?= $subRecord->signed_by_rmm_session_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -20,10 +20,8 @@
 <th>Is Removed</th>
 <th>Removal Memo</th>
 <th>Removed At</th>
-<th>Achieved Cm Pro Time In Seconds</th>
+<th>Achieved Ally Time In Seconds</th>
 <th>Achieved Mcp Time In Seconds</th>
-<th>Achieved Rme Pro Time In Seconds</th>
-<th>Achieved Rmm Pro Time In Seconds</th>
 <th>Achieved Total Time In Seconds</th>
 <th>Cm Or Rm</th>
 <th>Content Detail</th>
@@ -49,10 +47,8 @@
 <td><?= $subRecord->is_removed ?></td>
 <td><?= $subRecord->removal_memo ?></td>
 <td><?= friendly_date_time($record->removed_at) ?></td>
-<td><?= $subRecord->achieved_cm_pro_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_ally_time_in_seconds ?></td>
 <td><?= $subRecord->achieved_mcp_time_in_seconds ?></td>
-<td><?= $subRecord->achieved_rme_pro_time_in_seconds ?></td>
-<td><?= $subRecord->achieved_rmm_pro_time_in_seconds ?></td>
 <td><?= $subRecord->achieved_total_time_in_seconds ?></td>
 <td><?= $subRecord->cm_or_rm ?></td>
 <td><?= $subRecord->content_detail ?></td>

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

@@ -20,7 +20,7 @@
 <th>Cm Reason1</th>
 <th>Cm Reason2</th>
 <th>Cm Total Time In Seconds</th>
-<th>Cm Total Time In Seconds By Cm Pro</th>
+<th>Cm Total Time In Seconds By Ally</th>
 <th>Cm Total Time In Seconds By Mcp</th>
 <th>Has Mcp Done Em Visit</th>
 <th>Is Client Enrolled In Cm</th>
@@ -31,9 +31,8 @@
 <th>Rm Reason1</th>
 <th>Rm Reason2</th>
 <th>Rm Total Time In Seconds</th>
+<th>Rm Total Time In Seconds By Ally</th>
 <th>Rm Total Time In Seconds By Mcp</th>
-<th>Rm Total Time In Seconds By Rme Pro</th>
-<th>Rm Total Time In Seconds By Rmm Pro</th>
 <th>Start Date</th>
 <th>Why Is Cm Canceled This Month</th>
 <th>Why Is Rm Canceled This Month</th>
@@ -42,13 +41,12 @@
 <th>Why Not Enrolled In Rm Category</th>
 <th>Why Not Enrolled In Rm Memo</th>
 <th>Created By Session Id</th>
+<th>Ally Pro Id</th>
 <th>Client Id</th>
 <th>Cm Bill Id</th>
-<th>Cm Pro Id</th>
 <th>Mcp Pro Id</th>
 <th>Rm Bill Id</th>
-<th>Rme Pro Id</th>
-<th>Rmm Pro Id</th>
+<th>Team Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -60,7 +58,7 @@
 <td><?= $subRecord->cm_reason1 ?></td>
 <td><?= $subRecord->cm_reason2 ?></td>
 <td><?= $subRecord->cm_total_time_in_seconds ?></td>
-<td><?= $subRecord->cm_total_time_in_seconds_by_cm_pro ?></td>
+<td><?= $subRecord->cm_total_time_in_seconds_by_ally ?></td>
 <td><?= $subRecord->cm_total_time_in_seconds_by_mcp ?></td>
 <td><?= $subRecord->has_mcp_done_em_visit ?></td>
 <td><?= $subRecord->is_client_enrolled_in_cm ?></td>
@@ -71,9 +69,8 @@
 <td><?= $subRecord->rm_reason1 ?></td>
 <td><?= $subRecord->rm_reason2 ?></td>
 <td><?= $subRecord->rm_total_time_in_seconds ?></td>
+<td><?= $subRecord->rm_total_time_in_seconds_by_ally ?></td>
 <td><?= $subRecord->rm_total_time_in_seconds_by_mcp ?></td>
-<td><?= $subRecord->rm_total_time_in_seconds_by_rme_pro ?></td>
-<td><?= $subRecord->rm_total_time_in_seconds_by_rmm_pro ?></td>
 <td><?= $subRecord->start_date ?></td>
 <td><?= $subRecord->why_is_cm_canceled_this_month ?></td>
 <td><?= $subRecord->why_is_rm_canceled_this_month ?></td>
@@ -82,13 +79,12 @@
 <td><?= $subRecord->why_not_enrolled_in_rm_category ?></td>
 <td><?= $subRecord->why_not_enrolled_in_rm_memo ?></td>
 <td><?= $subRecord->created_by_session_id ?></td>
+<td><?= $subRecord->ally_pro_id ?></td>
 <td><?= $subRecord->client_id ?></td>
 <td><?= $subRecord->cm_bill_id ?></td>
-<td><?= $subRecord->cm_pro_id ?></td>
 <td><?= $subRecord->mcp_pro_id ?></td>
 <td><?= $subRecord->rm_bill_id ?></td>
-<td><?= $subRecord->rme_pro_id ?></td>
-<td><?= $subRecord->rmm_pro_id ?></td>
+<td><?= $subRecord->team_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -20,10 +20,11 @@
 <th>Cancellation Memo</th>
 <th>Cancelled At</th>
 <th>Is Cancelled</th>
-<th>Content Html</th>
+<th>Category</th>
+<th>Content Detail</th>
+<th>Content Text</th>
 <th>Effective Dateest</th>
 <th>Effective Time</th>
-<th>Free Text Html</th>
 <th>Is Signed By Ally</th>
 <th>Is Signed By Hcp</th>
 <th>Reason1</th>
@@ -33,13 +34,11 @@
 <th>Service Location</th>
 <th>Signed By Ally At</th>
 <th>Signed By Hcp At</th>
-<th>Title</th>
 <th>Created By Session Id</th>
 <th>Cancelled By Session Id</th>
 <th>Ally Pro Id</th>
 <th>Client Id</th>
 <th>Hcp Pro Id</th>
-<th>Note Template Id</th>
 <th>Signed By Ally Session Id</th>
 <th>Signed By Hcp Session Id</th>
                 </tr>
@@ -53,10 +52,11 @@
 <td><?= $subRecord->cancellation_memo ?></td>
 <td><?= friendly_date_time($record->cancelled_at) ?></td>
 <td><?= $subRecord->is_cancelled ?></td>
-<td><?= $subRecord->content_html ?></td>
+<td><?= $subRecord->category ?></td>
+<td><?= $subRecord->content_detail ?></td>
+<td><?= $subRecord->content_text ?></td>
 <td><?= $subRecord->effective_dateest ?></td>
 <td><?= $subRecord->effective_time ?></td>
-<td><?= $subRecord->free_text_html ?></td>
 <td><?= $subRecord->is_signed_by_ally ?></td>
 <td><?= $subRecord->is_signed_by_hcp ?></td>
 <td><?= $subRecord->reason1 ?></td>
@@ -66,13 +66,11 @@
 <td><?= $subRecord->service_location ?></td>
 <td><?= friendly_date_time($record->signed_by_ally_at) ?></td>
 <td><?= friendly_date_time($record->signed_by_hcp_at) ?></td>
-<td><?= $subRecord->title ?></td>
 <td><?= $subRecord->created_by_session_id ?></td>
 <td><?= $subRecord->cancelled_by_session_id ?></td>
 <td><?= $subRecord->ally_pro_id ?></td>
 <td><?= $subRecord->client_id ?></td>
 <td><?= $subRecord->hcp_pro_id ?></td>
-<td><?= $subRecord->note_template_id ?></td>
 <td><?= $subRecord->signed_by_ally_session_id ?></td>
 <td><?= $subRecord->signed_by_hcp_session_id ?></td>
                     </tr>

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

@@ -17,24 +17,20 @@
                     <th>&nbsp;</th>
 <th>Created At</th>
 <th>Type</th>
+<th>Ally Expected Payment Amount</th>
+<th>Ally Payment Amount</th>
 <th>Bill Service Type</th>
-<th>Cm Expected Payment Amount</th>
 <th>Cm Or Rm</th>
-<th>Cm Payment Amount</th>
 <th>Code</th>
 <th>Collected Amount</th>
 <th>Effective Date</th>
-<th>Has Cm Been Paid</th>
+<th>Has Ally Been Paid</th>
 <th>Has Hcp Been Paid</th>
-<th>Has Rme Been Paid</th>
-<th>Has Rmm Been Paid</th>
 <th>Hcp Expected Payment Amount</th>
 <th>Hcp Payment Amount</th>
 <th>Is Cancelled</th>
-<th>Is Signed By Cm</th>
+<th>Is Signed By Ally</th>
 <th>Is Signed By Hcp</th>
-<th>Is Signed By Rme</th>
-<th>Is Signed By Rmm</th>
 <th>Is Submitted</th>
 <th>Marked Cancelled At</th>
 <th>Marked Submitted At</th>
@@ -44,34 +40,21 @@
 <th>Reason2</th>
 <th>Reason3</th>
 <th>Reason3plus</th>
-<th>Rme Expected Payment Amount</th>
-<th>Rme Payment Amount</th>
-<th>Rmm Expected Payment Amount</th>
-<th>Rmm Payment Amount</th>
 <th>Service Location</th>
-<th>Signed By Cm At</th>
+<th>Signed By Ally At</th>
 <th>Signed By Hcp At</th>
-<th>Signed By Rme At</th>
-<th>Signed By Rmm At</th>
 <th>Created By Session Id</th>
+<th>Ally Payment Pro Transaction Id</th>
+<th>Ally Pro Id</th>
 <th>Care Month Id</th>
 <th>Client Id</th>
-<th>Cm Payment Pro Transaction Id</th>
-<th>Cm Pro Id</th>
 <th>Hcp Payment Pro Transaction Id</th>
 <th>Hcp Pro Id</th>
 <th>Marked Cancelled By Session Id</th>
 <th>Marked Submitted By Session Id</th>
 <th>Note Id</th>
-<th>Note Ally Id</th>
-<th>Rme Payment Pro Transaction Id</th>
-<th>Rme Pro Id</th>
-<th>Rmm Payment Pro Transaction Id</th>
-<th>Rmm Pro Id</th>
-<th>Signed By Cm Session Id</th>
+<th>Signed By Ally Session Id</th>
 <th>Signed By Hcp Session Id</th>
-<th>Signed By Rme Session Id</th>
-<th>Signed By Rmm Session Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -80,24 +63,20 @@
                         <td><a href="/bills/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
 <td><?= friendly_date_time($record->created_at) ?></td>
 <td><?= $subRecord->type ?></td>
+<td><?= $subRecord->ally_expected_payment_amount ?></td>
+<td><?= $subRecord->ally_payment_amount ?></td>
 <td><?= $subRecord->bill_service_type ?></td>
-<td><?= $subRecord->cm_expected_payment_amount ?></td>
 <td><?= $subRecord->cm_or_rm ?></td>
-<td><?= $subRecord->cm_payment_amount ?></td>
 <td><?= $subRecord->code ?></td>
 <td><?= $subRecord->collected_amount ?></td>
 <td><?= $subRecord->effective_date ?></td>
-<td><?= $subRecord->has_cm_been_paid ?></td>
+<td><?= $subRecord->has_ally_been_paid ?></td>
 <td><?= $subRecord->has_hcp_been_paid ?></td>
-<td><?= $subRecord->has_rme_been_paid ?></td>
-<td><?= $subRecord->has_rmm_been_paid ?></td>
 <td><?= $subRecord->hcp_expected_payment_amount ?></td>
 <td><?= $subRecord->hcp_payment_amount ?></td>
 <td><?= $subRecord->is_cancelled ?></td>
-<td><?= $subRecord->is_signed_by_cm ?></td>
+<td><?= $subRecord->is_signed_by_ally ?></td>
 <td><?= $subRecord->is_signed_by_hcp ?></td>
-<td><?= $subRecord->is_signed_by_rme ?></td>
-<td><?= $subRecord->is_signed_by_rmm ?></td>
 <td><?= $subRecord->is_submitted ?></td>
 <td><?= friendly_date_time($record->marked_cancelled_at) ?></td>
 <td><?= friendly_date_time($record->marked_submitted_at) ?></td>
@@ -107,34 +86,21 @@
 <td><?= $subRecord->reason2 ?></td>
 <td><?= $subRecord->reason3 ?></td>
 <td><?= $subRecord->reason3plus ?></td>
-<td><?= $subRecord->rme_expected_payment_amount ?></td>
-<td><?= $subRecord->rme_payment_amount ?></td>
-<td><?= $subRecord->rmm_expected_payment_amount ?></td>
-<td><?= $subRecord->rmm_payment_amount ?></td>
 <td><?= $subRecord->service_location ?></td>
-<td><?= friendly_date_time($record->signed_by_cm_at) ?></td>
+<td><?= friendly_date_time($record->signed_by_ally_at) ?></td>
 <td><?= friendly_date_time($record->signed_by_hcp_at) ?></td>
-<td><?= friendly_date_time($record->signed_by_rme_at) ?></td>
-<td><?= friendly_date_time($record->signed_by_rmm_at) ?></td>
 <td><?= $subRecord->created_by_session_id ?></td>
+<td><?= $subRecord->ally_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->ally_pro_id ?></td>
 <td><?= $subRecord->care_month_id ?></td>
 <td><?= $subRecord->client_id ?></td>
-<td><?= $subRecord->cm_payment_pro_transaction_id ?></td>
-<td><?= $subRecord->cm_pro_id ?></td>
 <td><?= $subRecord->hcp_payment_pro_transaction_id ?></td>
 <td><?= $subRecord->hcp_pro_id ?></td>
 <td><?= $subRecord->marked_cancelled_by_session_id ?></td>
 <td><?= $subRecord->marked_submitted_by_session_id ?></td>
 <td><?= $subRecord->note_id ?></td>
-<td><?= $subRecord->note_ally_id ?></td>
-<td><?= $subRecord->rme_payment_pro_transaction_id ?></td>
-<td><?= $subRecord->rme_pro_id ?></td>
-<td><?= $subRecord->rmm_payment_pro_transaction_id ?></td>
-<td><?= $subRecord->rmm_pro_id ?></td>
-<td><?= $subRecord->signed_by_cm_session_id ?></td>
+<td><?= $subRecord->signed_by_ally_session_id ?></td>
 <td><?= $subRecord->signed_by_hcp_session_id ?></td>
-<td><?= $subRecord->signed_by_rme_session_id ?></td>
-<td><?= $subRecord->signed_by_rmm_session_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>