Alex/freescout
1
0
Fork 0
mirror of https://github.com/freescout-helpdesk/freescout.git synced 2024-11-25 03:43:33 +01:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:freescout-helpdesk/freescout

Browse Source
This commit is contained in:
FreeScout 2018-11-09 22:07:43 -08:00
commit 4b87eb8db0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Controllers/SettingsController.php
View File

@ -167,6 +167,12 @@ class SettingsController extends Controller
$request = request();
$request->settings = array_merge($request->settings, [
'email_branding' => !empty($request->settings['email_branding']) ? $request->settings['email_branding'] : 0,
'open_tracking' => !empty($request->settings['open_tracking']) ? $request->settings['open_tracking'] : 0,
'enrich_customer_data' => !empty($request->settings['enrich_customer_data']) ? $request->settings['enrich_customer_data'] : 0,
]);
foreach ($settings as $i => $option_name) {
// By some reason isset() does not work for empty elements
if (array_key_exists($option_name, $request->settings)) {

2
app/Sendmail.php
View File

@ -19,7 +19,7 @@ class Sendmail extends Model
/**
* Customer.
*/
public function user()
public function customer()
{
return $this->belongsTo('App\Customer');
}