Updated claim status

app/Http/Controllers/PracticeManagementController.php

@@ -2891,10 +2891,7 @@ ORDER BY c.name_last, c.name_first
             if($claimingClosed === 'NO') $cmQuery = $cmQuery->where('is_claim_closed', false);
         }
 
-        $cmQuery = $cmQuery->orderBy('start_date', 'DESC');
-        $cmQuery = $cmQuery->with(['client' => function ($q) {
-            return $q->orderBy('name_first', 'DESC');
-        }]);
+        $cmQuery = $cmQuery->orderBy('start_date', 'DESC')->orderBy('client_id', 'ASC');
         $rows =$cmQuery->paginate(15);
 
         return view('app.practice-management.rm-action-report', compact('rows', 'filters', 'minRequiredMeasurements'));

resources/views/app/patient/care-month/update-claim-status.blade.php

@@ -1,19 +1,23 @@
 <span moe relative title="Submit Claim">
 	<a class="" href="" show start><i class="fa fa-pencil-alt"></i></a>
-	<form url="/api/mbClaim/updateStatus" right>
-		<input type="hidden" name="uid" value="{{$mbClaim->uid}}">
-		<div class="form-group">
+	<form url="/api/claim/updateStatus" right>
+		<input type="hidden" name="uid" value="{{$claim->uid}}">
+		<div class="mb-2">
 			<label for="" class="control-label">Status</label>
 			<select name="status" class="form-control form-control-sm" required>
 				<option value="">-- select --</option>
-				<option value="NEW" {{$mbClaim->status === 'NEW' ? 'selected' : ''}}>New</option>
-				<option value="PROCESSING" {{$mbClaim->status === 'PROCESSING' ? 'selected' : ''}}>Processing</option>
-				<option value="SUBMITTED" {{$mbClaim->status === 'SUBMITTED' ? 'selected' : ''}}>Submitted</option>
+				<option value="NEW" {{$claim->status === 'NEW' ? 'selected' : ''}}>New</option>
+				<option value="PICKED_UP" {{$claim->status === 'PICKED_UP' ? 'selected' : ''}}>Picked Up</option>
+				<option value="SUBMITTED" {{$claim->status === 'SUBMITTED' ? 'selected' : ''}}>Submitted</option>
+				<option value="IN_PROCESS" {{$claim->status === 'IN_PROCESS' ? 'selected' : ''}}>In Process</option>
+				<option value="ACCEPTED" {{$claim->status === 'ACCEPTED' ? 'selected' : ''}}>Accepted</option>
+				<option value="REJECTED" {{$claim->status === 'REJECTED' ? 'selected' : ''}}>Rejected</option>
+				<option value="ABANDONED" {{$claim->status === 'ABANDONED' ? 'selected' : ''}}>Abandoned</option>
 			</select>
 		</div>
-		<div class="form-group">
+		<div class="mb-2">
 			<label for="" class="control-label">Status Memo</label>
-			<textarea name="memo" class="form-control"><?= $mbClaim->status_memo ?></textarea>
+			<textarea name="memo" class="form-control"><?= $claim->status_memo ?></textarea>
 		</div>
 		<div class="mb-0">
 			<button class="btn btn-primary btn-sm" submit>Submit</button>

resources/views/app/practice-management/rm-action-report.blade.php

@@ -247,16 +247,15 @@
                                         </div>                                
                                     @endforeach
                                 </div>
-                                <div>
-                                @foreach($row->claims as $claim)
-                                        <div class="d-flex align-items-center">
-                                            @foreach($claim->mbClaims as $mbClaim)
-                                                <span class="mr-2">Status: <b>{{$mbClaim->status}}</b></span>
-                                                @include('app.patient.care-month.update-claim-status')
-                                            @endforeach
-                                        </div>                                
-                                    @endforeach
+                                <?php $rowFirstClaim = $row->claims->first(); ?>
+                                @if($rowFirstClaim)
+                                <div class="ml-4">
+                                    <div class="d-flex align-items-center">
+                                        <span class="mr-2">Status: <b>{{$rowFirstClaim->status}}</b></span>
+                                        @include('app.patient.care-month.update-claim-status', ['claim' => $rowFirstClaim])
+                                    </div>
                                 </div>
+                                @endif
                             </div>