Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 20:00:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

updates for type casting

Browse Source
This commit is contained in:
David Bomba 2024-06-22 09:38:09 +10:00
parent ba7651cdae
commit 83e3147462
4 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Helpers/Invoice/InvoiceItemSum.php
View File

@ -332,7 +332,7 @@ class InvoiceItemSum
public function setLineTotal($total) public function setLineTotal($total)
{ {
$this->item->line_total = $total; $this->item->line_total = (float)$total;
return $this; return $this;
} }

3
app/Http/Requests/Task/StoreTaskRequest.php
View File

@ -55,7 +55,6 @@ class StoreTaskRequest extends Request
} }
$rules['hash'] = 'bail|sometimes|string|nullable'; $rules['hash'] = 'bail|sometimes|string|nullable';
$rules['rate'] = 'bail|numeric';
$rules['time_log'] = ['bail',function ($attribute, $values, $fail) { $rules['time_log'] = ['bail',function ($attribute, $values, $fail) {
@ -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'] == '{}') { if(!isset($input['time_log']) || empty($input['time_log']) || $input['time_log'] == '{}') {
$input['time_log'] = json_encode([]); $input['time_log'] = json_encode([]);
} }

5
app/Http/Requests/Task/UpdateTaskRequest.php
View File

@ -61,7 +61,7 @@ class UpdateTaskRequest extends Request
} }
$rules['hash'] = 'bail|sometimes|string|nullable'; $rules['hash'] = 'bail|sometimes|string|nullable';
$rules['rate'] = 'bail|numeric';
$rules['time_log'] = ['bail', function ($attribute, $values, $fail) { $rules['time_log'] = ['bail', function ($attribute, $values, $fail) {
if(is_string($values)) { if(is_string($values)) {
@ -137,9 +137,6 @@ class UpdateTaskRequest extends Request
$input['time_log'] = json_encode([]); $input['time_log'] = json_encode([]);
} }
$input['rate'] = isset($input['rate']) ? $input['rate'] : 0;
$this->replace($input); $this->replace($input);
} }

3
app/Repositories/TaskRepository.php
View File

@ -50,6 +50,9 @@ class TaskRepository extends BaseRepository
TaskAssigned::dispatch($task, $task->company->db)->delay(2); TaskAssigned::dispatch($task, $task->company->db)->delay(2);
} }
if(!$task->rate || !isset($data['rate']))
$data['rate'] = 0;
$task->fill($data); $task->fill($data);
$task->saveQuietly(); $task->saveQuietly();