From 518863fbec184e181b0e70a8e71bcdb333d8ac71 Mon Sep 17 00:00:00 2001
From: denisdulici <denisdulici@gmail.com>
Date: Wed, 15 Nov 2017 21:33:12 +0300
Subject: [PATCH] added company name to emails

---
 app/Notifications/Auth/Reset.php                       | 3 ++-
 resources/views/vendor/mail/html/message.blade.php     | 4 ++--
 resources/views/vendor/mail/markdown/message.blade.php | 4 ++--
 resources/views/vendor/notifications/email.blade.php   | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/Notifications/Auth/Reset.php b/app/Notifications/Auth/Reset.php
index b7587c108..acb7adca2 100644
--- 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 @@ class Reset extends Notification
      */
     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
index 2ad23a66e..413dbaf1d 100644
--- 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
index b409c71cb..4792686d2 100644
--- 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
index efb0469d0..d91eb8bb4 100644
--- 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 -->