From fd5d28e60db0ef70d6c10220dafe570b8e6d7393 Mon Sep 17 00:00:00 2001
From: Fenrikur <3359222+Fenrikur@users.noreply.github.com>
Date: Thu, 1 Feb 2024 21:14:18 +0100
Subject: [PATCH] fix(mail): missing data in plain-text mails

---
 .../AlternateTableOfferedNotification.php     |  4 ++--
 ...AlternateTableOfferedShareNotification.php |  4 ++--
 .../CanceledByDealershipNotification.php      |  4 ++--
 .../CanceledBySelfNotification.php            |  4 ++--
 app/Notifications/JoinNotification.php        |  2 +-
 .../TableAcceptanceReminderNotification.php   |  6 ++---
 .../TableAcceptedNotification.php             | 10 ++++----
 .../TableAcceptedShareNotification.php        |  4 ++--
 .../TableOfferedNotification.php              | 10 ++++----
 .../TableOfferedShareNotification.php         |  4 ++--
 app/Notifications/WaitingListNotification.php |  4 ++--
 .../WelcomeAssistantNotification.php          |  4 ++--
 app/Notifications/WelcomeNotification.php     |  4 ++--
 .../WelcomeShareNotification.php              |  2 +-
 .../views/application/invitees.blade.php      | 23 +++++++++++++++++++
 .../views/vendor/mail/text/header.blade.php   |  2 +-
 .../views/vendor/mail/text/layout.blade.php   |  4 ----
 .../views/vendor/mail/text/message.blade.php  | 22 ++++++++----------
 .../vendor/notifications/email.blade.php      | 10 ++++----
 19 files changed, 72 insertions(+), 55 deletions(-)

diff --git a/app/Notifications/AlternateTableOfferedNotification.php b/app/Notifications/AlternateTableOfferedNotification.php
index 9505625..6c39e05 100644
--- a/app/Notifications/AlternateTableOfferedNotification.php
+++ b/app/Notifications/AlternateTableOfferedNotification.php
@@ -29,8 +29,8 @@ public function via(object $notifiable): array
     public function toMail(object $notifiable): MailMessage
     {
         return (new MailMessage)
-            ->greeting("Dear " . $notifiable->name . ",")
             ->subject(config('con.con_name') . ' Dealers\' Den - Alternate Table Size')
+            ->greeting('Dear ' . $notifiable->name . ',')
             ->line('Thank you for your interest in a Dealership at Eurofurence. We appreciate your application and are excited to have you as a potential dealer at the convention.')
             ->line('Unfortunately, we regret to inform you that the table size you have applied for is no longer available. However, we have some alternative table sizes we would like to offer that may be suitable for your needs.')
             ->line('Currently, the following table size is available:')
@@ -38,7 +38,7 @@ public function toMail(object $notifiable): MailMessage
             ->action('Review Dealership Package', url('/table/confirm'))
             ->line('We understand that this alternative option may not be what you had in mind when applying, but we hope that it will still meet your needs and enable you to participate in the  Eurofurence Dealers\' Den. As we have limited space, we will be offering any available table sizes to other applications on the waiting list if we do not receive a response from you within the next seven days. So please let us know within this time frame whether you would like to accept one of the alternative options or decline the offer and be put on the waiting list. To do so, simply reply to this email.')
             ->line('We apologize for any inconvenience this may have caused you, and we hope to hear back from you soon. Thank you for your understanding and cooperation.')
-            ->salutation(new HtmlString('Best regards,<br />the Eurofurence Dealers\' Den Team'));
+            ->salutation(new HtmlString("Best regards,<br />\nthe Eurofurence Dealers' Den Team"));
     }
 
     public function toArray(object $notifiable): array
diff --git a/app/Notifications/AlternateTableOfferedShareNotification.php b/app/Notifications/AlternateTableOfferedShareNotification.php
index aac8d54..c83369e 100644
--- a/app/Notifications/AlternateTableOfferedShareNotification.php
+++ b/app/Notifications/AlternateTableOfferedShareNotification.php
@@ -29,14 +29,14 @@ public function via(object $notifiable): array
     public function toMail(object $notifiable): MailMessage
     {
         return (new MailMessage)
-            ->greeting("Dear " . $notifiable->name . ",")
             ->subject(config('con.con_name') . ' Dealers\' Den - Alternate Table Size')
+            ->greeting('Dear ' . $notifiable->name . ',')
             ->line('Thank you for your interest as share in a Dealership at Eurofurence. We appreciate your application and are excited to have you as a potential dealer at the convention.')
             ->line('Unfortunately, we regret to inform you that the table size your Dealership has applied for is no longer available. However, we have offered your Dealership an alternative table size that may be suitable for your needs.')
             ->line('Currently, the following table size is available:')
             ->line($this->tableAssigned . ' - ' . $this->price / 100 . ' EUR')
             ->line('We understand that this alternative option may not be what you had in mind when applying, but we hope that it will still meet your needs and enable you to participate in the  Eurofurence Dealers\' Den. Please consult with your Dealership about how you would like to proceed, as they are the ones who will have to accept or decline the offer and pay the abovementioned fee.')
-            ->salutation(new HtmlString('Best regards,<br />the Eurofurence Dealers\' Den Team'));
+            ->salutation(new HtmlString("Best regards,<br />\nthe Eurofurence Dealers' Den Team"));
     }
 
     public function toArray(object $notifiable): array
diff --git a/app/Notifications/CanceledByDealershipNotification.php b/app/Notifications/CanceledByDealershipNotification.php
index 7d3a114..2030c29 100644
--- a/app/Notifications/CanceledByDealershipNotification.php
+++ b/app/Notifications/CanceledByDealershipNotification.php
@@ -25,13 +25,13 @@ public function toMail($notifiable): MailMessage
     {
         return (new MailMessage)
             ->subject(config('con.con_name') . ' Dealers\' Den - Application Canceled by Dealership')
-            ->greeting("Dear ".$notifiable->name.",")
+            ->greeting('Dear ' . $notifiable->name . ',')
             ->line('The dealership you had joined has chosen to remove you from their application, thereby canceling your own application. But don\'t worry, all data you had entered remains in our system, allowing you pick one of the following options without having to reenter everything:')
             ->line('- Ask the dealership you were part of to allow you to rejoin if you think this happened in error,')
             ->line('- Get in touch with other dealers and join a different dealership or')
             ->line('- Apply for a full dealership yourself.')
             ->line('Thank you for your understanding.')
-            ->salutation(new HtmlString('Best regards,<br />the Eurofurence Dealers\' Den Team'));
+            ->salutation(new HtmlString("Best regards,<br />\nthe Eurofurence Dealers' Den Team"));
     }
 
     public function toArray($notifiable): array
diff --git a/app/Notifications/CanceledBySelfNotification.php b/app/Notifications/CanceledBySelfNotification.php
index 12f9d52..9da75d0 100644
--- a/app/Notifications/CanceledBySelfNotification.php
+++ b/app/Notifications/CanceledBySelfNotification.php
@@ -25,10 +25,10 @@ public function toMail($notifiable): MailMessage
     {
         return (new MailMessage)
             ->subject(config('con.con_name') . ' Dealers\' Den - Application Canceled')
-            ->greeting("Dear ".$notifiable->name.",")
+            ->greeting('Dear ' . $notifiable->name . ',')
             ->line('This mail confirms that you have successfully canceled your registration for the Dealers\' Den at this year\'s Eurofurence. We are sorry to see you go and would love to see you back next year.')
             ->line('Should you change your mind, you can resubmit your application or join another dealership until the end of the application phase.')
-            ->salutation(new HtmlString('Best regards,<br />the Eurofurence Dealers\' Den Team'));
+            ->salutation(new HtmlString("Best regards,<br />\nthe Eurofurence Dealers' Den Team"));
     }
 
     public function toArray($notifiable): array
diff --git a/app/Notifications/JoinNotification.php b/app/Notifications/JoinNotification.php
index 4fcc60a..d5bd695 100644
--- a/app/Notifications/JoinNotification.php
+++ b/app/Notifications/JoinNotification.php
@@ -34,7 +34,7 @@ public function toMail($notifiable): MailMessage
             ->line('We wish to inform you that ' . $this->joinName . ' has successfully joined your dealership as ' . $this->joinType . ' via your invite code.')
             ->line('If you did not invite them, please go to "Shares & Assistants" in the Dealers\' Den Registration system to generate a new invite code or disable invitations and remove them from your dealership:')
             ->action('Manage Shares and Assistants', url('/applications/invitees'))
-            ->salutation(new HtmlString('Best regards,<br />the Eurofurence Dealers\' Den Team'));
+            ->salutation(new HtmlString("Best regards,<br />\nthe Eurofurence Dealers' Den Team"));
     }
 
     public function toArray($notifiable): array
diff --git a/app/Notifications/TableAcceptanceReminderNotification.php b/app/Notifications/TableAcceptanceReminderNotification.php
index 4413ef3..9eca5e9 100644
--- a/app/Notifications/TableAcceptanceReminderNotification.php
+++ b/app/Notifications/TableAcceptanceReminderNotification.php
@@ -24,15 +24,15 @@ public function via(object $notifiable): array
     public function toMail(object $notifiable): MailMessage
     {
         return (new MailMessage)
-            ->greeting("Dear " . $notifiable->name . ",")
             ->subject(config('con.con_name') . ' Dealers\' Den - Reminder')
+            ->greeting('Dear ' . $notifiable->name . ',')
             ->line('We recently sent you an email notifying you of your successful application for a dealership at ' . config('con.con_name') . '. Congratulations again!')
             ->line('However, we noticed that you have yet to confirm your placement as a dealer. This confirmation is crucial to secure your spot in the Dealer\'s Den.')
             ->line('To confirm your dealership, please click on the following button. By doing so, you are agreeing to the Dealers\' Den\'s terms and conditions, and your Eurofurence event registration will be updated to include the fee for the assigned dealership.')
             ->action('Review Dealership Package', url('/table/confirm'))
-            ->line(new HtmlString('If you have any questions or concerns regarding the payment or subsequent processes, please contact Dealers\' Den management via <a href="mailto:'. config('con.dealers_email') .'">' . config('con.dealers_email') . '</a>.'))
+            ->line(new HtmlString('If you have any questions or concerns regarding the payment or subsequent processes, please contact Dealers\' Den management via <a href="mailto:' . config('con.dealers_email') . '">' . config('con.dealers_email') . '</a>.'))
             ->line('Thank you for your prompt attention to this matter. We are excited about your participation in  ' . config('con.con_name') . ' Dealers\' Den and look forward to seeing your unique pieces on display at the convention.')
-            ->salutation(new HtmlString('Best regards,<br />the Eurofurence Dealers\' Den Team'));
+            ->salutation(new HtmlString("Best regards,<br />\nthe Eurofurence Dealers' Den Team"));
     }
 
     public function toArray(object $notifiable): array
diff --git a/app/Notifications/TableAcceptedNotification.php b/app/Notifications/TableAcceptedNotification.php
index aad16b7..d6bbac5 100644
--- a/app/Notifications/TableAcceptedNotification.php
+++ b/app/Notifications/TableAcceptedNotification.php
@@ -31,18 +31,18 @@ public function via($notifiable): array
     public function toMail($notifiable): MailMessage
     {
         return (new MailMessage)
-            ->greeting("Dear " . $notifiable->name . ",")
             ->subject(config('con.con_name') . ' Dealers\' Den - Package Confirmed and Next Steps')
+            ->greeting('Dear ' . $notifiable->name . ',')
             ->line('We have received your confirmation for your dealer package at the ' . config('con.con_name') . ' Dealers\' Den. Thank you for taking the time to review and confirm your table assignment and dealer package details. We are excited to have you join us as a dealer at the convention!')
             ->line('Your confirmed table assignment details are as follows:')
             ->line('Table Number: ' . $this->tableNumber)
             ->line('Assigned Table Size: ' . $this->tableAssigned)
-            ->line('Final Dealer Package Price: ' . $this->price / 100 . ' EUR' )
-            ->line(new HtmlString('As you have confirmed your dealer package, the final price has been added to your Eurofurence registration fee. To complete the payment, please log in to the Eurofurence registration system at <a href="'. config('con.idp_url') .'">' . config('con.idp_url') . '</a> and follow the payment instructions.'))
+            ->line('Final Dealer Package Price: ' . $this->price / 100 . ' EUR')
+            ->line(new HtmlString('As you have confirmed your dealer package, the final price has been added to your Eurofurence registration fee. To complete the payment, please log in to the Eurofurence registration system at <a href="' . config('con.idp_url') . '">' . config('con.idp_url') . '</a> and follow the payment instructions.'))
             ->line('In the coming weeks, we will be sending you more information about the Dealers\' Den setup, event schedules, and other important details to help you prepare for the convention. Please keep an eye on your email for these updates.')
-            ->line(new HtmlString('If you have any questions or concerns, feel free to reach out to us at <a href="mailto:'. config('con.dealers_email') .'">' . config('con.dealers_email') . '</a>. We are here to help ensure a smooth and enjoyable experience for all our dealers.'))
+            ->line(new HtmlString('If you have any questions or concerns, feel free to reach out to us at <a href="mailto:' . config('con.dealers_email') . '">' . config('con.dealers_email') . '</a>. We are here to help ensure a smooth and enjoyable experience for all our dealers.'))
             ->line('Once again, thank you for your participation in ' . config('con.con_name') . ' Dealers\' Den. We are looking forward to seeing your amazing art and items showcased at the event!')
-            ->salutation(new HtmlString('Best regards,<br />the Eurofurence Dealers\' Den Team'));
+            ->salutation(new HtmlString("Best regards,<br />\nthe Eurofurence Dealers' Den Team"));
     }
 
     public function toArray($notifiable): array
diff --git a/app/Notifications/TableAcceptedShareNotification.php b/app/Notifications/TableAcceptedShareNotification.php
index fc62e81..6ced79f 100644
--- a/app/Notifications/TableAcceptedShareNotification.php
+++ b/app/Notifications/TableAcceptedShareNotification.php
@@ -31,8 +31,8 @@ public function via($notifiable): array
     public function toMail($notifiable): MailMessage
     {
         return (new MailMessage)
-            ->greeting("Dear " . $notifiable->name . ",")
             ->subject(config('con.con_name') . ' Dealers\' Den - Package Confirmed and Next Steps')
+            ->greeting('Dear ' . $notifiable->name . ',')
             ->line('Your Dealership has successfully confirmed its package at the ' . config('con.con_name') . ' Dealers\' Den. We are excited to have you join us as a dealer at the convention!')
             ->line('The table assignment details are as follows:')
             ->line('Table Number: ' . $this->tableNumber)
@@ -42,7 +42,7 @@ public function toMail($notifiable): MailMessage
             ->line('In the coming weeks, we will be sending you more information about the Dealers\' Den setup, event schedules, and other important details to help you prepare for the convention. Please keep an eye on your email for these updates.')
             ->line(new HtmlString('If you have any questions or concerns, feel free to reach out to us at <a href="mailto:' . config('con.dealers_email') . '">' . config('con.dealers_email') . '</a>. We are here to help ensure a smooth and enjoyable experience for all our dealers.'))
             ->line('Once again, thank you for your participation in ' . config('con.con_name') . ' Dealers\' Den. We are looking forward to seeing your amazing art and items showcased at the event!')
-            ->salutation(new HtmlString('Best regards,<br />the Eurofurence Dealers\' Den Team'));
+            ->salutation(new HtmlString("Best regards,<br />\nthe Eurofurence Dealers' Den Team"));
     }
 
     public function toArray($notifiable): array
diff --git a/app/Notifications/TableOfferedNotification.php b/app/Notifications/TableOfferedNotification.php
index 762d69d..9753196 100644
--- a/app/Notifications/TableOfferedNotification.php
+++ b/app/Notifications/TableOfferedNotification.php
@@ -24,16 +24,16 @@ public function via(object $notifiable): array
     public function toMail(object $notifiable): MailMessage
     {
         return (new MailMessage)
-            ->greeting("Dear " . $notifiable->name . ",")
             ->subject(config('con.con_name') . ' Dealers\' Den - Application Accepted')
+            ->greeting('Dear ' . $notifiable->name . ',')
             ->line('We are thrilled to inform you that your application for a dealership at ' . config('con.con_name') . ' has been accepted! Congratulations!')
-            ->line(new HtmlString('To review and confirm your placement as a dealer at ' . config('con.con_name') . ', please click on the button below. By accepting the offered table, you are agreeing to the <a href="'. config('con.dealers_tos_url') .'">Dealers\' Den\'s terms and conditions</a>, and the payment process will be initiated.'))
+            ->line(new HtmlString('To review and confirm your placement as a dealer at ' . config('con.con_name') . ', please click on the button below. By accepting the offered table, you are agreeing to the <a href="' . config('con.dealers_tos_url') . '">Dealers\' Den\'s terms and conditions</a>, and the payment process will be initiated.'))
             ->action('Review Dealership Package', url('/table/confirm'))
-            ->line(new HtmlString('Once you have confirmed the package, your Eurofurence event registration will be updated to include the fee for the assigned dealership. All payments must be handled through the Eurofurence registration system, available at <a href="'. config('con.idp_url') .'">' . config('con.idp_url') . '</a>. Please note that you are required to pay all fees, including the Eurofurence event registration fee, within ' . config('con.payment_timeframe') . ' of receiving this email to secure your placement as a dealer. If payment is overdue, Dealers\' Den management may void your placement and offer the space to the next dealer on the waiting list.'))
+            ->line(new HtmlString('Once you have confirmed the package, your Eurofurence event registration will be updated to include the fee for the assigned dealership. All payments must be handled through the Eurofurence registration system, available at <a href="' . config('con.idp_url') . '">' . config('con.idp_url') . '</a>. Please note that you are required to pay all fees, including the Eurofurence event registration fee, within ' . config('con.payment_timeframe') . ' of receiving this email to secure your placement as a dealer. If payment is overdue, Dealers\' Den management may void your placement and offer the space to the next dealer on the waiting list.'))
             ->line('Although all placements may be subject to change until the start of the convention, you will be sent an email containing the preliminary dealership table assignment for information.')
-            ->line(new HtmlString('If you have any questions or concerns regarding the payment or subsequent processes, please contact Dealers\' Den management via <a href="mailto:'. config('con.dealers_email') .'">' . config('con.dealers_email') . '</a>.'))
+            ->line(new HtmlString('If you have any questions or concerns regarding the payment or subsequent processes, please contact Dealers\' Den management via <a href="mailto:' . config('con.dealers_email') . '">' . config('con.dealers_email') . '</a>.'))
             ->line('Thank you again for your interest and participation in ' . config('con.con_name') . ' Dealers\' Den! We are looking forward to seeing you and your beautiful artwork and items on display at the convention, and have no doubt that it will be a huge hit among our attendees.')
-            ->salutation(new HtmlString('Best regards,<br />the Eurofurence Dealers\' Den Team'));
+            ->salutation(new HtmlString("Best regards,<br />\nthe Eurofurence Dealers' Den Team"));
     }
 
     public function toArray(object $notifiable): array
diff --git a/app/Notifications/TableOfferedShareNotification.php b/app/Notifications/TableOfferedShareNotification.php
index 50e7d02..ab77ced 100644
--- a/app/Notifications/TableOfferedShareNotification.php
+++ b/app/Notifications/TableOfferedShareNotification.php
@@ -24,13 +24,13 @@ public function via(object $notifiable): array
     public function toMail(object $notifiable): MailMessage
     {
         return (new MailMessage)
-            ->greeting("Dear " . $notifiable->name . ",")
             ->subject(config('con.con_name') . ' Dealers\' Den - Application Accepted')
+            ->greeting('Dear ' . $notifiable->name . ',')
             ->line('We are thrilled to inform you that the application for the dealership at ' . config('con.con_name') . ' which you are part of has been accepted! Congratulations!')
             ->line('The table still has to be accepted by Dealership who will also be responsible for paying the table fee, so consult with them in case you have any questions.')
             ->line('Please note that you are required to pay all fees, including the Eurofurence event registration fee, within ' . config('con.payment_timeframe') . ' of receiving this email to secure your placement as a dealer. If payment is overdue, Dealers\' Den management may void your placement.')
             ->line('Thank you again for your interest and participation in ' . config('con.con_name') . ' Dealers\' Den! We are looking forward to seeing you and your beautiful artwork and items on display at the convention, and have no doubt that it will be a huge hit among our attendees.')
-            ->salutation(new HtmlString('Best regards,<br />the Eurofurence Dealers\' Den Team'));
+            ->salutation(new HtmlString("Best regards,<br />\nthe Eurofurence Dealers' Den Team"));
     }
 
     public function toArray(object $notifiable): array
diff --git a/app/Notifications/WaitingListNotification.php b/app/Notifications/WaitingListNotification.php
index 6b1139e..d27f8f9 100644
--- a/app/Notifications/WaitingListNotification.php
+++ b/app/Notifications/WaitingListNotification.php
@@ -25,11 +25,11 @@ public function toMail(object $notifiable): MailMessage
     {
         return (new MailMessage)
             ->subject(config('con.con_name') . ' Dealers\' Den - Application on Waiting List')
-            ->greeting("Dear " . $notifiable->name . ",")
+            ->greeting('Dear ' . $notifiable->name . ',')
             ->line('Thank you for submitting your application to sell your amazing art and items at the upcoming ' . config('con.con_name') . ' and your patience while we have been reviewing the dealer applications.')
             ->line('Unfortunately, all of our available tables have been filled, and we regret to inform you that we cannot accommodate your application at this time. However, we would like to inform you that your application has been put on the waiting list. Should any slots become available before the convention, we will contact you as soon as possible. Also, there might be last-minute sales of canceled dealership spaces on a first-come, first-serve basis at the convention itself, starting 12:00 (noon) on Monday for unclaimed dealerships. We highly encourage you to drop by in case a spot opens up.')
             ->line('Thank you for your understanding and cooperation. We appreciate your interest in the ' . config('con.con_name') . ' Dealers\' Den, and we hope that we will be able to work with you in the future.')
-            ->salutation(new HtmlString('Best regards,<br />the Eurofurence Dealers\' Den Team'));
+            ->salutation(new HtmlString("Best regards,<br />\nthe Eurofurence Dealers' Den Team"));
     }
 
     public function toArray(object $notifiable): array
diff --git a/app/Notifications/WelcomeAssistantNotification.php b/app/Notifications/WelcomeAssistantNotification.php
index 6584f16..3977c82 100644
--- a/app/Notifications/WelcomeAssistantNotification.php
+++ b/app/Notifications/WelcomeAssistantNotification.php
@@ -28,14 +28,14 @@ public function toMail($notifiable): MailMessage
     {
         return (new MailMessage)
             ->subject(config('con.con_name') . ' Dealers\' Den - Dealer Assistant Information')
-            ->greeting("Dear " . $notifiable->name . ",")
+            ->greeting('Dear ' . $notifiable->name . ',')
             ->line('We are delighted to welcome you as a Dealer Assistant at ' . config('con.con_name') . ' Dealers\' Den!')
             ->line('Thank you for accepting the invitation of ' . $this->dealershipName . ' to join their dealership by entering their invitation code. Your support in helping your dealership during setup, teardown, and opening hours is greatly appreciated.')
             ->line('As a Dealer Assistant, you play a vital role in ensuring the smooth operation and success of your dealer\'s experience at the Dealers\' Den. Your assistance will contribute significantly to the overall experience for both your dealer and the attendees.')
             ->line('In the coming weeks, we will be sending you more information about the Dealers\' Den setup, event schedules, and other important details to help you prepare for the convention. Please keep an eye on your email for these updates.')
             ->line(new HtmlString('If you have any questions or concerns, feel free to reach out to us at  <a href="mailto:' . config('con.dealers_email') . '">' . config('con.dealers_email') . '</a>.  We are here to help ensure a smooth and enjoyable experience for all our dealers and their assistants.'))
             ->line('We are looking forward to seeing you at Eurofurence and wish you and your dealer a successful and enjoyable experience!')
-            ->salutation(new HtmlString('Warm regards,<br />the Eurofurence Dealers\' Den Team'));
+            ->salutation(new HtmlString("Best regards,<br />\nthe Eurofurence Dealers' Den Team"));
     }
 
     public function toArray($notifiable): array
diff --git a/app/Notifications/WelcomeNotification.php b/app/Notifications/WelcomeNotification.php
index fac0cdd..f05940b 100644
--- a/app/Notifications/WelcomeNotification.php
+++ b/app/Notifications/WelcomeNotification.php
@@ -25,11 +25,11 @@ public function toMail($notifiable): MailMessage
     {
         return (new MailMessage)
             ->subject(config('con.con_name') . ' Dealers\' Den - Application Received')
-            ->greeting("Dear ".$notifiable->name.",")
+            ->greeting('Dear ' . $notifiable->name . ',')
             ->line('Thank you for your application for a Dealership at the upcoming Eurofurence. Your interest in being a part of this year\'s Dealers\' Den is very much appreciated.')
             ->line('We have received your application and will review it once the Dealership application period has ended. We understand that waiting can be difficult, but please know that we are working hard to review all applications in a timely manner. Once we have reviewed all the applications, we will get in touch with you to provide you with all the necessary information about the next steps.')
             ->line('Thank you in advance for your patience. The Dealers\' Den management is looking forward to reviewing your application.')
-            ->salutation(new HtmlString('Best regards,<br />the Eurofurence Dealers\' Den Team'));
+            ->salutation(new HtmlString("Best regards,<br />\nthe Eurofurence Dealers' Den Team"));
     }
 
     public function toArray($notifiable): array
diff --git a/app/Notifications/WelcomeShareNotification.php b/app/Notifications/WelcomeShareNotification.php
index e692170..7a9c3ba 100644
--- a/app/Notifications/WelcomeShareNotification.php
+++ b/app/Notifications/WelcomeShareNotification.php
@@ -32,7 +32,7 @@ public function toMail($notifiable): MailMessage
             ->line('Thank you for your application as part of your joint dealership with ' . $this->dealershipName . ' at the upcoming Eurofurence. Your interest in being a part of this year\'s Dealers\' Den is very much appreciated.')
             ->line('We have received your application and will review it once the Dealership application period has ended. We understand that waiting can be difficult, but please know that we are working hard to review all applications in a timely manner. Once we have reviewed all the applications, we will get in touch with you to provide you with all the necessary information about the next steps.')
             ->line('Thank you in advance for your patience. The Dealers\' Den management is looking forward to reviewing your application.')
-            ->salutation(new HtmlString('Best regards,<br />the Eurofurence Dealers\' Den Team'));
+            ->salutation(new HtmlString("Best regards,<br />\nthe Eurofurence Dealers' Den Team"));
     }
 
     public function toArray($notifiable): array
diff --git a/resources/views/application/invitees.blade.php b/resources/views/application/invitees.blade.php
index 6fdeadc..fc261aa 100644
--- a/resources/views/application/invitees.blade.php
+++ b/resources/views/application/invitees.blade.php
@@ -3,6 +3,13 @@
     Shares and Assistants
 @endsection
 @section('content')
+    <style>
+        .dd-table-button {
+            width: 5ex;
+            height: 5ex;
+            font-weight: bold;
+        }
+    </style>
     <div class="">
         <div class="col-md-6 mx-auto">
             <h1 class="text-center">Manage Shares and Assistants</h1>
@@ -22,6 +29,22 @@
                 <a href="{{ route('dashboard') }}" class="btn btn-sm btn-primary">Return to dashboard</a>
             </div>
         @endif
+        <div class="col-md-6 mx-auto">
+            <h3 class="text-center">Seats in your Dealership</h3>
+            <div class="mx-auto text-center mb-1">
+                <button class="btn btn-sm btn-primary dd-table-button" type="button" title="Dealer">D</button>
+                <button class="btn btn-sm bg-info dd-table-button" type="button" title="Assistant">A</button>
+                <button class="btn btn-sm btn-secondary dd-table-button" type="button" title="Free">F</button>
+                <button class="btn btn-sm btn-dark dd-table-button" type="button" title="Free (Assistant)">F*</button>
+            </div>
+            <div class="mx-auto text-center mb-4">
+                Legend:
+                <span class="badge text-bg-primary">Dealer</span>
+                <span class="badge text-bg-info">Assistant</span>
+                <span class="badge text-bg-secondary">Free</span>
+                <span class="badge text-bg-dark">Free (Assistant)</span>
+            </div>
+        </div>
         <div class="row">
             <div class="col-md-6">
                 @if ($shares_active_count > $shares_count)
diff --git a/resources/views/vendor/mail/text/header.blade.php b/resources/views/vendor/mail/text/header.blade.php
index aaa3e57..3338f62 100644
--- a/resources/views/vendor/mail/text/header.blade.php
+++ b/resources/views/vendor/mail/text/header.blade.php
@@ -1 +1 @@
-[{{ $slot }}]({{ $url }})
+{{ $slot }}
diff --git a/resources/views/vendor/mail/text/layout.blade.php b/resources/views/vendor/mail/text/layout.blade.php
index 9378baa..731c5e3 100644
--- a/resources/views/vendor/mail/text/layout.blade.php
+++ b/resources/views/vendor/mail/text/layout.blade.php
@@ -1,9 +1,5 @@
 {!! strip_tags($header) !!}
 
 {!! strip_tags($slot) !!}
-@isset($subcopy)
-
-{!! strip_tags($subcopy) !!}
-@endisset
 
 {!! strip_tags($footer) !!}
diff --git a/resources/views/vendor/mail/text/message.blade.php b/resources/views/vendor/mail/text/message.blade.php
index 1ae9ed8..e4b7349 100644
--- a/resources/views/vendor/mail/text/message.blade.php
+++ b/resources/views/vendor/mail/text/message.blade.php
@@ -1,27 +1,23 @@
 @component('mail::layout')
     {{-- Header --}}
     @slot('header')
-        @component('mail::header', ['url' => config('app.url')])
-            {{ config('app.name') }}
+        @component('mail::header')
         @endcomponent
     @endslot
 
     {{-- Body --}}
-    {{ $slot }}
-
-    {{-- Subcopy --}}
-    @isset($subcopy)
-        @slot('subcopy')
-            @component('mail::subcopy')
-                {{ $subcopy }}
-            @endcomponent
-        @endslot
-    @endisset
+{{ $slot }}
 
     {{-- Footer --}}
     @slot('footer')
         @component('mail::footer')
-            © {{ date('Y') }} {{ config('app.name') }}. @lang('All rights reserved.')
+Any help required? Shoot us an email to: dealers@eurofurence.org
+
+Eurofurence e.V. - Am Kielshof 21a - 51105 Köln
+Vereinsregister AG Köln, Nr. 19784
+1. Vorsitzender: Sven Tegethoff
+
+Legal information according to §5 TMG obtainable at http://www.eurofurence.de/index.php?impressum
         @endcomponent
     @endslot
 @endcomponent
diff --git a/resources/views/vendor/notifications/email.blade.php b/resources/views/vendor/notifications/email.blade.php
index bcf39f0..399035e 100644
--- a/resources/views/vendor/notifications/email.blade.php
+++ b/resources/views/vendor/notifications/email.blade.php
@@ -1,14 +1,16 @@
 @component('mail::message')
 {{-- Greeting --}}
-@if (! empty($greeting))
-# {{ $greeting }}
+<h1>
+@if (!empty($greeting))
+{{ $greeting }}
 @else
 @if ($level === 'error')
-# @lang('Whoops!')
+@lang('Whoops!')
 @else
-# @lang('Hello!')
+@lang('Hello!')
 @endif
 @endif
+</h1>
 
 {{-- Intro Lines --}}
 @foreach ($introLines as $line)