shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed #594

Browse Source
This commit is contained in:
denisdulici 2018-11-06 14:00:30 +03:00
parent 99c735dba8
commit 270a44411d
7 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.example
View File

@ -26,3 +26,5 @@ MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
MAIL_FROM_NAME=null
MAIL_FROM_ADDRESS=null

16
app/Http/Controllers/Settings/Settings.php
View File

@ -181,17 +181,17 @@ class Settings extends Controller
protected function oneCompany($key, $value)
{
switch ($key) {
case 'company_name':
Installer::updateEnv(['MAIL_FROM_NAME' => '"' . $value . '"']);
break;
case 'company_email':
Installer::updateEnv(['MAIL_FROM_ADDRESS' => $value]);
break;
case 'default_locale':
// Change default locale
Installer::updateEnv([
'APP_LOCALE' => $value
]);
Installer::updateEnv(['APP_LOCALE' => $value]);
break;
case 'session_handler':
// Change session handler
Installer::updateEnv([
'SESSION_DRIVER' => $value
]);
Installer::updateEnv(['SESSION_DRIVER' => $value]);
break;
}
}

2
app/Notifications/Auth/Reset.php
View File

@ -43,8 +43,6 @@ class Reset extends Notification
*/
public function toMail($notifiable)
{
setting(['general.company_name' => config('app.name')]);
return (new MailMessage)
->line(trans('auth.notification.message_1'))
->action(trans('auth.notification.button'), url('auth/reset', $this->token))

8
app/Utilities/Installer.php
View File

@ -269,16 +269,24 @@ class Installer
$env = explode("\n", $env);
foreach ($data as $data_key => $data_value) {
$updated = false;
foreach ($env as $env_key => $env_value) {
$entry = explode('=', $env_value, 2);
// Check if new or old key
if ($entry[0] == $data_key) {
$env[$env_key] = $data_key . '=' . $data_value;
$updated = true;
} else {
$env[$env_key] = $env_value;
}
}
// Lets create if not available
if (!$updated) {
$env[] = $data_key . '=' . $data_value;
}
}
$env = implode("\n", $env);

4
resources/views/vendor/mail/html/message.blade.php vendored
View File

@ -2,7 +2,7 @@
{{-- Header --}}
@slot('header')
@component('mail::header', ['url' => config('app.url')])
{{ setting('general.company_name', config('app.name')) }}
{{ setting('general.company_name', config('mail.from.name', config('app.name'))) }}
@endcomponent
@endslot
@ -21,7 +21,7 @@
{{-- Footer --}}
@slot('footer')
@component('mail::footer')
© {{ date('Y') }} {{ setting('general.company_name', config('app.name')) }}. All rights reserved.
© {{ date('Y') }} {{ setting('general.company_name', config('mail.from.name', config('app.name'))) }}. All rights reserved.
@endcomponent
@endslot
@endcomponent

4
resources/views/vendor/mail/markdown/message.blade.php vendored
View File

@ -2,7 +2,7 @@
{{-- Header --}}
@slot('header')
@component('mail::header', ['url' => config('app.url')])
{{ setting('general.company_name', config('app.name')) }}
{{ setting('general.company_name', config('mail.from.name', config('app.name'))) }}
@endcomponent
@endslot
@ -21,7 +21,7 @@
{{-- Footer --}}
@slot('footer')
@component('mail::footer')
© {{ date('Y') }} {{ setting('general.company_name', config('app.name')) }}. All rights reserved.
© {{ date('Y') }} {{ setting('general.company_name', config('mail.from.name', config('app.name'))) }}. All rights reserved.
@endcomponent
@endslot
@endcomponent

2
resources/views/vendor/notifications/email.blade.php vendored
View File

@ -45,7 +45,7 @@
@if (! empty($salutation))
{{ $salutation }}
@else
{!! trans('notifications.salutation', ['company_name' => setting('general.company_name', config('app.name'))]) !!}
{!! trans('notifications.salutation', ['company_name' => setting('general.company_name', config('mail.from.name', config('app.name')))]) !!}
@endif
<!-- Subcopy -->