Merge branch 'feature/diariaapp-kay-agendamentos-sob-medida-apps' of Softpar/sfp_api_laravel_diarista into development

app/Services/CustomScheduleService.php

@@ -234,6 +234,7 @@ class CustomScheduleService
       ->where('schedules.schedule_type', 'custom')
       ->where('schedules.status', 'pending')
       ->whereNull('schedules.provider_id')
+      ->whereDate('schedules.date', '>=', now()->toDateString())
       ->select('schedules.*')
       ->get();
 
@@ -310,10 +311,14 @@ class CustomScheduleService
       $proposal = ScheduleProposal::findOrFail($proposalId);
       $schedule = $proposal->schedule;
 
+      Log::info($schedule);
       if ($schedule->provider_id) {
         throw new \Exception(__('validation.custom.opportunity.already_assigned'));
       }
 
+      Log::info('vrauu2');
+
+
       $provider = Provider::find($proposal->provider_id);
       switch ($schedule->period_type) {
         case '8':

app/Services/DashboardService.php

@@ -183,18 +183,22 @@ class DashboardService
       ->orderBy('schedules.date', 'asc')
       ->get();
 
-      $schedulesProposals = ScheduleProposal::query()
-    ->leftJoin('schedules', 'schedule_proposals.schedule_id', '=', 'schedules.id')
-    ->leftJoin('providers', 'schedule_proposals.provider_id', '=', 'providers.id')
-    ->leftJoin('users', 'providers.user_id', '=', 'users.id')
+    $schedulesProposals = ScheduleProposal::query()
 
-    ->where('schedules.client_id', $cliente->id)
-    ->where('schedules.schedule_type', 'custom')
-    ->where('schedules.status', 'pending')
+      ->leftJoin('schedules', 'schedule_proposals.schedule_id', '=', 'schedules.id')
+      ->leftJoin('providers', 'schedule_proposals.provider_id', '=', 'providers.id')
+      ->leftJoin('users', 'providers.user_id', '=', 'users.id')
+
+      ->where('schedules.client_id', $cliente->id)
+      ->where('schedules.schedule_type', 'custom')
+      ->where('schedules.status', 'pending')
+      ->whereNull('schedules.deleted_at')
+      ->whereDate('schedules.date', '>=', now()->toDateString())
 
-    ->orderBy('schedule_proposals.created_at', 'desc')
 
-    ->select([
+      ->orderBy('schedule_proposals.created_at', 'desc')
+
+      ->select([
         'schedule_proposals.id',
 
 
@@ -209,11 +213,12 @@ class DashboardService
         'providers.daily_price_8h',
         'providers.average_rating',
         'providers.total_services',
-
+        
+        
         'users.name as provider_name'
-    ])
+      ])
 
-    ->get();
+      ->get();
 
     $todaySchedules = Schedule::with('address:district,address,number,source_id,source,id,address_type')
       ->where('schedules.client_id', $cliente->id)