Răsfoiți Sursa

fixes testes apresentacao

Gustavo Zanatta 1 lună în urmă
părinte
comite
7e1b1d8c17

+ 9 - 3
app/Jobs/FinishScheduleJob.php

@@ -2,9 +2,11 @@
 
 namespace App\Jobs;
 
+use App\Models\Address;
 use App\Models\Client;
 use App\Models\Provider;
 use App\Models\Schedule;
+use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
@@ -75,16 +77,20 @@ class FinishScheduleJob implements ShouldQueue
       ]);
       $emailService = new EmailService();
       $serviceAmount = (float) $schedule->total_amount;
-      $serviceFee = 7.00;
+      $serviceFee = $serviceAmount * 0.11;
       $finalAmount = $serviceAmount + $serviceFee;
+
+      $email_cliente = User::find($schedule->client->user_id)->email;
+      $address = Address::find($schedule->address_id);
+
       $emailService->sendEmailReceipt(
-        email: $schedule->client->user->email,
+        email: $email_cliente,
         schedule: $schedule,
         client_name: $schedule->client->user->name,
         service_date: $schedule->date,
         start_time: $schedule->start_time,
         end_time: $schedule->end_time,
-        address: $schedule->address->address,
+        address: $address->address . ', ' . $address->number . ($address->has_complement ? ', ' . $address->complement : '') . ' - ' . $address->district . ', ' . $address->city->name . '/' . $address->state->code,
         total_amount: $serviceAmount,
         service_fee: $serviceFee,
         final_amount: $finalAmount,

+ 0 - 1
app/Jobs/StartScheduleJob.php

@@ -42,7 +42,6 @@ class StartScheduleJob implements ShouldQueue
       
       if ($date_cleaned > now()->toDateString()) {
         return;
-      
       }
       Log::channel('schedule_start_jobs')->info('Verificando horário');
       Log::channel('schedule_start_jobs')->info('Horário do agendamento: ' . $schedule->start_time);

+ 1 - 1
app/Models/Address.php

@@ -41,7 +41,7 @@ class Address extends Model
 
     public function city()
     {
-        return $this->belongsTo(City::class)->select('id');
+        return $this->belongsTo(City::class)->select('id', 'name');
     }
 
     public function state()

+ 4 - 0
app/Services/DashboardService.php

@@ -167,6 +167,10 @@ class DashboardService
         'provider_user.name as provider_name',
         'schedules.date',
         'schedules.address_id',
+        'schedules.status',
+        'schedules.total_amount',
+        'schedules.start_time',
+        'schedules.end_time',
         DB::raw("CASE
           WHEN (now() - schedules.created_at) < INTERVAL '1 hour' THEN CONCAT(ROUND(EXTRACT(EPOCH FROM (now() - schedules.created_at)) / 60), 'min')
           WHEN (now() - schedules.created_at) < INTERVAL '1 day' THEN CONCAT(ROUND(EXTRACT(EPOCH FROM (now() - schedules.created_at)) / 3600), 'h')