mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-06-03 04:44:33 -04:00
Fixes for group settings
This commit is contained in:
parent
822a53a530
commit
b1de2e6b3b
@ -139,7 +139,9 @@ class GroupSettingController extends BaseController
|
|||||||
*/
|
*/
|
||||||
public function update(UpdateGroupSettingRequest $request, GroupSetting $group_setting)
|
public function update(UpdateGroupSettingRequest $request, GroupSetting $group_setting)
|
||||||
{
|
{
|
||||||
$group_setting = $this->group_setting_repo->save($request->all(), $group_setting);
|
/** Need this to prevent settings from being overwritten */
|
||||||
|
if(!$request->file('company_logo'))
|
||||||
|
$group_setting = $this->group_setting_repo->save($request->all(), $group_setting);
|
||||||
|
|
||||||
$this->uploadLogo($request->file('company_logo'), $group_setting->company, $group_setting);
|
$this->uploadLogo($request->file('company_logo'), $group_setting->company, $group_setting);
|
||||||
|
|
||||||
|
@ -73,5 +73,6 @@ class ReportPreviewTest extends TestCase
|
|||||||
])->postJson('/api/v1/reports/credits?output=json', $data)
|
])->postJson('/api/v1/reports/credits?output=json', $data)
|
||||||
->assertStatus(200);
|
->assertStatus(200);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user