added company name to emails

akaunting · Nov 15, 2017 · 518863f · 518863f
1 parent 07583fc
commit 518863f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/app/Notifications/Auth/Reset.php b/app/Notifications/Auth/Reset.php
@@ -18,7 +18,6 @@ class Reset extends Notification
      * Create a notification instance.
      *
      * @param  string  $token
-     * @return void
      */
     public function __construct($token)
     {
@@ -44,6 +43,8 @@ public function via($notifiable)
      */
     public function toMail($notifiable)
     {
+        setting(['general.company_name' => config('app.name')]);
+
         return (new MailMessage)
             ->line('You are receiving this email because we received a password reset request for your account.')
             ->action('Reset Password', url('auth/reset', $this->token, true))

diff --git a/resources/views/vendor/mail/html/message.blade.php b/resources/views/vendor/mail/html/message.blade.php
@@ -2,7 +2,7 @@
     {{-- Header --}}
     @slot('header')
         @component('mail::header', ['url' => config('app.url')])
-            {{ config('app.name') }}
+            {{ setting('general.company_name', config('app.name')) }}
         @endcomponent
     @endslot
 
@@ -21,7 +21,7 @@
     {{-- Footer --}}
     @slot('footer')
         @component('mail::footer')
-            &copy; {{ date('Y') }} {{ config('app.name') }}. All rights reserved.
+            &copy; {{ date('Y') }} {{ setting('general.company_name', config('app.name')) }}. All rights reserved.
         @endcomponent
     @endslot
 @endcomponent
diff --git a/resources/views/vendor/mail/markdown/message.blade.php b/resources/views/vendor/mail/markdown/message.blade.php
@@ -2,7 +2,7 @@
     {{-- Header --}}
     @slot('header')
         @component('mail::header', ['url' => config('app.url')])
-            {{ config('app.name') }}
+            {{ setting('general.company_name', config('app.name')) }}
         @endcomponent
     @endslot
 
@@ -21,7 +21,7 @@
     {{-- Footer --}}
     @slot('footer')
         @component('mail::footer')
-            © {{ date('Y') }} {{ config('app.name') }}. All rights reserved.
+            © {{ date('Y') }} {{ setting('general.company_name', config('app.name')) }}. All rights reserved.
         @endcomponent
     @endslot
 @endcomponent
diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php
@@ -45,7 +45,7 @@
 @if (! empty($salutation))
 {{ $salutation }}
 @else
-Regards,<br>{{ config('app.name') }}
+Regards,<br>{{ setting('general.company_name', config('app.name')) }}
 @endif
 
 <!-- Subcopy -->