Merge branch 'dev' into dev-vj

app/Http/Controllers/HomeController.php

@@ -335,7 +335,7 @@ class HomeController extends Controller
             default:
                 break;
         }
-        $patients = $query->orderBy('created_at', 'asc')->orderBy('name_last', 'asc')->orderBy('name_first', 'asc')->get();
+        $patients = $query->orderBy('created_at', 'asc')->orderBy('name_last', 'asc')->orderBy('name_first', 'asc')->paginate();
         return view('app/patients', compact('patients', 'filter'));
     }
 

app/Models/Client.php

@@ -108,7 +108,8 @@ class Client extends Model
 
     public function upcomingAppointments() {
         return $this->hasMany(Appointment::class, 'client_id', 'id')
-            ->where('start_time', '>', date('Y-m-d H:i:s'))
+           // ->where('raw_start_time', '>', date('Y-m-d H:i:s'))
+            ->whereIn('status', ['CREATED', 'CONFIRMED'])
             ->orderBy('start_time', 'desc');
     }
 

resources/views/app/patients.blade.php

@@ -105,7 +105,11 @@
                     </tr>
                 @endforeach
                 </tbody>
+            
             </table>
+            <div class="ml-2 mt-2">
+             {{$patients->links()}}
+            </div>
         </div>
     </div>
     </div>