Merge branch 'master' of https://rav.triplestart.com/tigerphp/lemon-admin

resources/views/emails/layout.blade.php

@@ -348,7 +348,7 @@
                                                 }
                                             ?>
                                                 @if($entity)
-                                                <p style="color: #000; line-height: 1.625; margin: 0; font-size: 14px;padding: 15px;">Don’t want to receive any more e-mails? <a href="{{ route('unsubscribe-from-emails', $entity->uid) }}" style="color:#1C3D80">unsubscribe</a></p>
+                                                <p style="color: #000; line-height: 1.625; margin: 0; font-size: 14px;padding: 15px;">Don’t want to receive any more e-mails? <a href="{{ route('unsubscribe-from-emails', $entity->uid) }}" style="color:#1C3D80">Unsubscribe</a></p>
                                                 @endif
                                             </td>
                                         </tr>

resources/views/emails/templates/attachment.blade.php

@@ -5,7 +5,7 @@
 
 @extends('emails.layout')
 @section('salutation')
-    Hi, {{$params['toName']}}!
+    Hi, {{$params['toName']}},
 @endsection
 
 @section('content')

resources/views/emails/templates/results-report.blade.php

@@ -4,7 +4,7 @@
 
 @extends('emails.layout')
 @section('salutation')
-    Hi, {{$user->displayName()}}!
+    Hi, {{$user->displayName()}},
 @endsection
 
 @section('content')

resources/views/emails/templates/user-custom-email.blade.php

@@ -1,6 +1,6 @@
 @extends('emails.layout')
 @section('salutation')
-    Hi, {{$user->displayName()}}!
+    Hi, {{$user->displayName()}},
 @endsection
 
 @section('content')

resources/views/emails/templates/user-failed-order-charge.blade.php

@@ -1,6 +1,6 @@
 @extends('emails.layout')
 @section('salutation')
-    Hi, {{$user->displayName()}}!
+    Hi, {{$user->displayName()}},
 @endsection
 
 @section('content')

resources/views/emails/templates/user-order-shipped.blade.php

@@ -1,6 +1,6 @@
 @extends('emails.layout')
 @section('salutation')
-    Hi, {{$user->displayName()}}!
+    Hi, {{$user->displayName()}},
 @endsection
 
 @section('content')

resources/views/emails/templates/user-payment-successful.blade.php

@@ -1,6 +1,6 @@
 @extends('emails.layout')
 @section('salutation')
-    Hello, {{$user->displayName()}}
+    Hello {{$user->displayName()}},
 @endsection
 
 @section('content')

resources/views/emails/templates/user-reset-password.blade.php

@@ -1,6 +1,6 @@
 @extends('emails.layout')
 @section('salutation')
-    Hi, {{$user->displayName()}}!
+    Hi {{$user->displayName()}},
 @endsection
 
 @section('content')

resources/views/emails/templates/user-welcome.blade.php

@@ -1,6 +1,6 @@
 @extends('emails.layout')
 @section('salutation')
-    Welcome, {{$user->displayName()}}!
+    Welcome {{$user->displayName()}},
 @endsection
 
 @section('content')