Status change

app/Models/Pro.php

@@ -777,9 +777,9 @@ WHERE
             ->count();
 
         $reimbursement = [];
-        $reimbursement["currentBalance"] =  $performer->pro->balance;
+        $reimbursement["currentBalance"] =  $this->performer->pro->balance;
         $reimbursement["nextPaymentDate"] = '--';
-        $lastPayment = ProTransaction::where('pro_id', $performerProID)->where('plus_or_minus', 'PLUS')->orderBy('created_at', 'DESC')->first();
+        $lastPayment = ProTransaction::where('pro_id', $this->performer->pro->id)->where('plus_or_minus', 'PLUS')->orderBy('created_at', 'DESC')->first();
         if ($lastPayment) {
             $reimbursement["lastPayment"] =  $lastPayment->amount;
             $reimbursement["lastPaymentDate"] = $lastPayment->created_at;
@@ -1492,7 +1492,7 @@ ORDER BY cm.created_at DESC
             return $clientQuery->where('default_na_pro_id', $myId);
         })
             ->where('is_status_acknowledgement_from_appointment_pro_pending', true)
-            ->where('raw_date', '>=', DB::raw('NOW()'))
+            // ->where('raw_date', '>=', DB::raw('NOW()'))
             ->orderBy('raw_date', 'asc')
             ->get();
     }
@@ -1503,7 +1503,7 @@ ORDER BY cm.created_at DESC
             return $clientQuery->where('rd_pro_id', $myId);
         })
             ->where('is_status_acknowledgement_from_appointment_pro_pending', true)
-            ->where('raw_date', '>=', DB::raw('NOW()'))
+            // ->where('raw_date', '>=', DB::raw('NOW()'))
             ->orderBy('raw_date', 'asc')
             ->get();
     }

resources/views/app/rd/dashboard.blade.php

@@ -222,7 +222,7 @@
                                         </strong>
                                     </div>
                                     <div class="card-body p-0">
-                                        @include('app.dna.dashboard.messages')
+                                        @include('app.rd.dashboard.messages')
                                     </div>
                                 </div>
 

resources/views/app/rd/dashboard/notifications.blade.php

@@ -19,51 +19,67 @@ $apptsPending = [
     </div>
 @endif
 @if (count($apptsPending['status']))
-    <b class="text-secondary my-2 d-block">Appointment Status Changes</b>
-    @foreach ($apptsPending['status'] as $appt)
-        <div class="d-flex mb-1">
-            <div>
-                <a href="/patients/view/{{ $appt->client->uid }}"><b>{{ $appt->client->displayName() }}</b></a>
-                <span class="ml-2">{{ friendlier_date_time($appt->start_time) }}</span>
-                <span class="ml-2">{{ $appt->status }}</span>
-                @if ($appt->status_memo)
-                    <div class="text-secondary text-sm">{{ $appt->status_memo }} This is a status memo</div>
-                @endif
-            </div>
-            @if ($appt->pro_id == $pro->id)
-                <div moe relative class="ml-auto">
-                    <form show url="/api/appointment/acknowledgeStatusAsAppointmentPro">
-                        <input type="hidden" name="uid" value="{{ $appt->uid }}">
-                        <input type="hidden" name="currentStatus" value="{{ $appt->status }}">
-                        @if ($appt->status_memo !== null)
-                            <input type="hidden" name="currentStatusMemo" value="{{ $appt->status_memo }}">
+    <div class="card mb-4">
+        <div class="card-header pl-2">
+            <strong>
+                Appointment Status Changes
+            </strong>
+        </div>
+        <div class="card-body">
+            @foreach ($apptsPending['status'] as $appt)
+                <div class="d-flex mb-1">
+                    <div>
+                        <a href="/patients/view/{{ $appt->client->uid }}"><b>{{ $appt->client->displayName() }}</b></a>
+                        <span class="ml-2">{{ friendlier_date_time($appt->start_time) }}</span>
+                        <span class="ml-2">{{ $appt->status }}</span>
+                        @if ($appt->status_memo)
+                            <div class="text-secondary text-sm">{{ $appt->status_memo }} This is a status memo</div>
                         @endif
-                        <input type="hidden" name="currentRawDate" value="{{ $appt->raw_date }}">
-                        <input type="hidden" name="currentRawStartTime" value="{{ $appt->raw_start_time }}">
-                        <input type="hidden" name="currentRawEndTime" value="{{ $appt->raw_end_time }}">
-                        <input type="hidden" name="currentTimezone" value="{{ $appt->timezone }}">
-                        <button submit class="bg-transparent border-0 p-0 text-primary">Acknowledge</button>
-                    </form>
+                    </div>
+                    @if ($appt->pro_id == $pro->id)
+                        <div moe relative class="ml-auto">
+                            <form show url="/api/appointment/acknowledgeStatusAsAppointmentPro">
+                                <input type="hidden" name="uid" value="{{ $appt->uid }}">
+                                <input type="hidden" name="currentStatus" value="{{ $appt->status }}">
+                                @if ($appt->status_memo !== null)
+                                    <input type="hidden" name="currentStatusMemo" value="{{ $appt->status_memo }}">
+                                @endif
+                                <input type="hidden" name="currentRawDate" value="{{ $appt->raw_date }}">
+                                <input type="hidden" name="currentRawStartTime" value="{{ $appt->raw_start_time }}">
+                                <input type="hidden" name="currentRawEndTime" value="{{ $appt->raw_end_time }}">
+                                <input type="hidden" name="currentTimezone" value="{{ $appt->timezone }}">
+                                <button submit class="bg-transparent border-0 p-0 text-primary">Acknowledge</button>
+                            </form>
+                        </div>
+                    @endif
                 </div>
-            @endif
+            @endforeach
         </div>
-    @endforeach
+    </div>
 @endif
 @if (count($apptsPending['decision']))
-    <b class="text-secondary my-2 d-block">Appointment Confirmation Changes</b>
-    @foreach ($apptsPending['decision'] as $appt)
-        <div class="d-flex mb-1">
-            <a href="/patients/view/{{ $appt->client->uid }}"><b>{{ $appt->client->displayName() }}</b></a>
-            <span class="ml-2">{{ friendlier_date_time($appt->start_time) }}</span>
-            <span class="ml-2">{{ $appt->latestConfirmationDecision->decision_enum }}</span>
-            @if ($appt->pro_id == $pro->id)
-                <div moe relative class="ml-auto">
-                    <form show url="/api/appointment/acknowledgeDecisionAsAppointmentPro">
-                        <input type="hidden" name="uid" value="{{ $appt->uid }}">
-                        <button submit class="bg-transparent border-0 p-0 text-primary">Acknowledge</button>
-                    </form>
+    <div class="card mb-4">
+        <div class="card-header pl-2">
+            <strong>
+                Appointment Confirmation Changes
+            </strong>
+        </div>
+        <div class="card-body">
+            @foreach ($apptsPending['decision'] as $appt)
+                <div class="d-flex mb-1">
+                    <a href="/patients/view/{{ $appt->client->uid }}"><b>{{ $appt->client->displayName() }}</b></a>
+                    <span class="ml-2">{{ friendlier_date_time($appt->start_time) }}</span>
+                    <span class="ml-2">{{ $appt->latestConfirmationDecision->decision_enum }}</span>
+                    @if ($appt->pro_id == $pro->id)
+                        <div moe relative class="ml-auto">
+                            <form show url="/api/appointment/acknowledgeDecisionAsAppointmentPro">
+                                <input type="hidden" name="uid" value="{{ $appt->uid }}">
+                                <button submit class="bg-transparent border-0 p-0 text-primary">Acknowledge</button>
+                            </form>
+                        </div>
+                    @endif
                 </div>
-            @endif
+            @endforeach
         </div>
-    @endforeach
+    </div>
 @endif