UI updates

app/Helpers/helpers.php

@@ -138,7 +138,7 @@ if(!function_exists('inchesAfterFeetFromInches')) {
 }
 
 if(!function_exists('genericBills')) {
-    function genericBills(Pro $performerPro, $patient, $entityType, $entityUid) {
+    function genericBills(Pro $performerPro, $patient,$careMonth, $entityType, $entityUid) {
         $genericBills = Bill::where('bill_service_type', 'GENERIC');
         if($performerPro->pro_type !== 'ADMIN') {
             $genericBills = $genericBills->where('generic_pro_id', $performerPro->id);
@@ -146,15 +146,17 @@ if(!function_exists('genericBills')) {
         if($patient) {
             $genericBills = $genericBills->where('client_id', $patient->id);
         }
+
+        if($careMonth){
+            $genericBills = $genericBills->where('care_month_id', $careMonth->id);
+        }
+
         if($entityType && $entityUid) {
-            if($entityType == 'CareMonth'){
-                $genericBills = $genericBills
-                    ->where('care_month_id', $entityUid);
-            }else{
-                $genericBills = $genericBills
-                    ->where('generic_target_entity_type', $entityType)
-                    ->where('generic_target_entity_uid', $entityUid);
-            }
+          
+            $genericBills = $genericBills
+                ->where('generic_target_entity_type', $entityType)
+                ->where('generic_target_entity_uid', $entityUid);
+            
             
         }
         return $genericBills->orderBy('created_at', 'DESC')->get();

resources/views/app/dna/my-bills.blade.php

@@ -155,7 +155,7 @@
                                         <p>Update Cancellation Memo</p>
                                         <div class="mb-2">
                                             <textarea class="text form-control form-control-sm" name="cancellationMemo"
-                                                      placeholder="">{{$bill->cancellation_memo ? $bill->cancellation_memo : ($pro->pro_type === 'ADMIN' ? 'Please contact billing.' : '')}}</textarea>
+                                                    placeholder="">{{$bill->cancellation_memo ? $bill->cancellation_memo : ($pro->pro_type === 'ADMIN' ? 'Please contact billing.' : '')}}</textarea>
                                         </div>
                                         <div>
                                             <button class="btn btn-success btn-sm" submit>Submit</button>

resources/views/app/generic-bills/inline-for-cm.blade.php

@@ -11,7 +11,7 @@ use App\Models\Client;
 /** @var $entityType */
 /** @var $entityUid */
 
-$genericBills = genericBills($pro, @$patient, @$entityType, @$entityUid);
+$genericBills = genericBills($pro, @$patient,null, @$entityType, @$entityUid);
 ?>
 
 @if(!count($genericBills))

resources/views/app/generic-bills/inline.blade.php

@@ -11,7 +11,7 @@ use App\Models\Client;
 /** @var $entityType */
 /** @var $entityUid */
 
-$genericBills = genericBills($pro, @$patient, @$entityType, @$entityUid);
+$genericBills = genericBills($pro, @$patient, @$careMonth, @$entityType, @$entityUid);
 ?>
 
 @if(!count($genericBills))

resources/views/app/patient/care-month/dashboard.blade.php

@@ -284,6 +284,8 @@
                                     </b>
                                 </div>
 
+
+
                                 <div class="mt-2">
                                     <?php
                                     $minsBilled = 0;
@@ -321,6 +323,22 @@
                                     @include('app.practice-management.care_month_add_entry_form')
                                 </div>
 
+                                @if($performer->pro->pro_type == 'ADMIN')
+                                    <div>
+                                        <div class="my-1 font-weight-bold text-secondary">Has Anyone Interacted With Client About RM: {{$careMonth->has_anyone_interacted_with_client_about_rm? 'Yes': 'No'}}</div> 
+                                        <div class="my-1 font-weight-bold text-secondary">Has Mcp Interacted With Client About RM: {{$careMonth->has_mcp_interacted_with_client_about_rm? 'Yes': 'No'}}</div>	
+                                        <div class="my-1 font-weight-bold text-secondary">Has Admin Interacted With Client About RM: {{$careMonth->has_admin_interacted_with_client_about_rm? 'Yes': 'No'}}</div>
+                                        <div class="my-1 font-weight-bold text-secondary">Has Rmm Interacted With Client About RM: {{$careMonth->has_rmm_interacted_with_client_about_rm? 'Yes': 'No'}}</div>
+                                         
+                                        <div class="my-1 font-weight-bold text-secondary">Most Recent Mcp Note Date: {{$careMonth->most_recent_mcp_note_date}}</div>
+                                        <div class="my-1 font-weight-bold text-secondary">Days Between Most Recent Mcp Note Date And End Of Care Month: {{$careMonth->days_between_most_recent_mcp_note_date_and_end_of_care_month}}</div>
+                                        <div class="my-1 font-weight-bold text-secondary">Rm Total Time In Seconds: {{$careMonth->rm_total_time_in_seconds}}</div>
+                                        <div class="my-1 font-weight-bold text-secondary">Rm Total Time In Seconds By Mcp: {{$careMonth->rm_total_time_in_seconds_by_mcp}}</div>
+                                        <div class="my-1 font-weight-bold text-secondary">Rm Total Time In Seconds By Rmm Pro: {{$careMonth->rm_total_time_in_seconds_by_rmm_pro}}</div>
+                                        <div class="my-1 font-weight-bold text-secondary">Rm Total Time In Seconds By Rme Pro: {{$careMonth->rm_total_time_in_seconds_by_rme_pro}}</div>
+                                    </div>
+                                @endif
+
                                 <div class="mt-2 d-flex align-items-baseline">
                                     <span class="font-weight-bold text-secondary mr-1">Billing:</span>
                                     <div>
@@ -919,7 +937,7 @@
             @if($pro->pro_type === 'ADMIN')
 
                 <div class="screen-only m-neg-4 mb-3">
-                    @include('app.generic-bills.inline-for-cm', ['patient' => $patient, 'careMonth' => $careMonth, 'class' => 'p-3 border-bottom', 'label' => 'MCP', 'entityType' => 'CareMonth', 'entityUid' => $careMonth->id])
+                    @include('app.generic-bills.inline-for-cm', ['patient' => $patient, 'careMonth' => $careMonth, 'class' => 'p-3 border-bottom', 'label' => 'MCP'])
                 </div>
 
             @endif

resources/views/app/practice-management/processing-bill-matrix.blade.php

@@ -89,6 +89,7 @@
                             <th class="border-bottom-0 border-top-0">Code</th>
                             <th class="border-bottom-0 border-top-0">Units</th>
                             <th class="border-bottom-0 border-top-0">Verified?</th>
+                            <th class="border-bottom-0 border-top-0">Cancelled?</th>
                             @if(!request()->input('t') || request()->input('t') === 'hcp')
                             <th class="border-bottom-0 border-top-0">HCP Expected Amount</th>
                             @elseif(request()->input('t') === 'na')
@@ -261,6 +262,49 @@
                                     @endif
                                 @endif
                             </td>
+
+                            <td>
+                                @if($row->is_cancelled)
+                                    <div class="text-warning-mellow font-weight-bold">Cancelled</div>
+                                    @if($row->cancellation_memo)
+                                        <div class="text-dark text-sm font-italic my-1">{{$row->cancellation_memo}}</div>
+                                    @endif
+                                    @if($row->is_cancelled_by_administrator)
+                                        <div class="text-secondary text-sm text-nowrap">(by Administrator)</div>
+                                    @endif
+                                    <div moe class="mt-1">
+                                        <a class="text-nowrap" href="" show start>Update Memo</a>
+                                        <form url="/api/bill/updateCancellationMemo">
+                                            <input type="hidden" name="uid" value="{{$row->uid}}">
+                                            <p>Update Cancellation Memo</p>
+                                            <div class="mb-2">
+                                                <textarea class="text form-control form-control-sm" name="cancellationMemo"
+                                                        placeholder="">{{$row->cancellation_memo ? $row->cancellation_memo : ($pro->pro_type === 'ADMIN' ? 'Please contact billing.' : '')}}</textarea>
+                                            </div>
+                                            <div>
+                                                <button class="btn btn-success btn-sm" submit>Submit</button>
+                                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                @else
+                                    <div class="d-block" moe relative="">
+                                        <a class="text-danger" href="" show start>Cancel</a>
+                                        <form url="/api/bill/markCancelled" right="">
+                                            <input type="hidden" name="uid" value="{{$row->uid}}">
+                                            <p class="mb-2">Cancel this bill?</p>
+                                            <div class="mb-2">
+                                                <label class="mb-1 text-secondary">Cancellation Memo</label>
+                                                <textarea type="text" name="memo" placeholder="Memo" class="form-control form-control-sm">@if($pro->pro_type === 'ADMIN')Please contact billing.@endif</textarea>
+                                            </div>
+                                            <div class="mb-0">
+                                                <button class="btn btn-danger btn-sm" submit>Yes</button>
+                                                <button class="btn btn-default border btn-sm" cancel>No</button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                @endif
+                            </td>
                             
                             @if(!request()->input('t') || request()->input('t') === 'hcp')
                             <td>${{$row->hcp_expected_payment_amount}}</td>