Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-03 14:24:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

FIxes for approve with no conversion from AP

Browse Source
This commit is contained in:
David Bomba 2022-04-26 08:51:14 +10:00
parent 290775040e
commit bc76424fd7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Requests/Client/UpdateClientRequest.php
View File

@ -158,7 +158,11 @@ class UpdateClientRequest extends Request
unset($settings->{$key}); unset($settings->{$key});
} }
if($key == 'default_task_rate'){ //26-04-2022 - In case settings are returned as array instead of object
if($key == 'default_task_rate' && is_array($settings)){
$settings['default_task_rate'] = floatval($value);
}
elseif($key == 'default_task_rate' && is_object($settings)) {
$settings->default_task_rate = floatval($value); $settings->default_task_rate = floatval($value);
} }
} }

2
app/Services/Quote/TriggeredActions.php
View File

@ -51,7 +51,7 @@ class TriggeredActions extends AbstractService
} }
if ($this->request->has('approve') && $this->request->input('approve') == 'true' && in_array($this->quote->status_id, [Quote::STATUS_SENT, Quote::STATUS_DRAFT])) { if ($this->request->has('approve') && $this->request->input('approve') == 'true' && in_array($this->quote->status_id, [Quote::STATUS_SENT, Quote::STATUS_DRAFT])) {
$this->quote = $this->quote->service()->convert()->save(); $this->quote = $this->quote->service()->approveWithNoCoversion()->save();
} }