From 83e3147462004951d8d66ce3b5bf99dae6847195 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Sat, 22 Jun 2024 09:38:09 +1000 Subject: [PATCH] updates for type casting --- app/Helpers/Invoice/InvoiceItemSum.php | 2 +- app/Http/Requests/Task/StoreTaskRequest.php | 5 +---- app/Http/Requests/Task/UpdateTaskRequest.php | 5 +---- app/Repositories/TaskRepository.php | 3 +++ 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/app/Helpers/Invoice/InvoiceItemSum.php b/app/Helpers/Invoice/InvoiceItemSum.php index ef2cddb0ef3b..69b09cabd820 100644 --- a/app/Helpers/Invoice/InvoiceItemSum.php +++ b/app/Helpers/Invoice/InvoiceItemSum.php @@ -332,7 +332,7 @@ class InvoiceItemSum public function setLineTotal($total) { - $this->item->line_total = $total; + $this->item->line_total = (float)$total; return $this; } diff --git a/app/Http/Requests/Task/StoreTaskRequest.php b/app/Http/Requests/Task/StoreTaskRequest.php index 3aaedf108a29..f61bc4267a23 100644 --- a/app/Http/Requests/Task/StoreTaskRequest.php +++ b/app/Http/Requests/Task/StoreTaskRequest.php @@ -55,8 +55,7 @@ class StoreTaskRequest extends Request } $rules['hash'] = 'bail|sometimes|string|nullable'; - $rules['rate'] = 'bail|numeric'; - + $rules['time_log'] = ['bail',function ($attribute, $values, $fail) { if(is_string($values)) { @@ -124,8 +123,6 @@ class StoreTaskRequest extends Request } } - $input['rate'] = isset($input['rate']) ? $input['rate'] : 0; - if(!isset($input['time_log']) || empty($input['time_log']) || $input['time_log'] == '{}') { $input['time_log'] = json_encode([]); } diff --git a/app/Http/Requests/Task/UpdateTaskRequest.php b/app/Http/Requests/Task/UpdateTaskRequest.php index bfe43b763b90..85b2c4de955b 100644 --- a/app/Http/Requests/Task/UpdateTaskRequest.php +++ b/app/Http/Requests/Task/UpdateTaskRequest.php @@ -61,7 +61,7 @@ class UpdateTaskRequest extends Request } $rules['hash'] = 'bail|sometimes|string|nullable'; - $rules['rate'] = 'bail|numeric'; + $rules['time_log'] = ['bail', function ($attribute, $values, $fail) { if(is_string($values)) { @@ -137,9 +137,6 @@ class UpdateTaskRequest extends Request $input['time_log'] = json_encode([]); } - - $input['rate'] = isset($input['rate']) ? $input['rate'] : 0; - $this->replace($input); } diff --git a/app/Repositories/TaskRepository.php b/app/Repositories/TaskRepository.php index 4017dd749479..3ae0aca75190 100644 --- a/app/Repositories/TaskRepository.php +++ b/app/Repositories/TaskRepository.php @@ -50,6 +50,9 @@ class TaskRepository extends BaseRepository TaskAssigned::dispatch($task, $task->company->db)->delay(2); } + if(!$task->rate || !isset($data['rate'])) + $data['rate'] = 0; + $task->fill($data); $task->saveQuietly();