From e1c9cf343502fb1b9b67b527c5cf8cfeb231d874 Mon Sep 17 00:00:00 2001
From: Graham Blair <graham@grahamarthurblair.com>
Date: Sat, 19 Oct 2024 10:41:27 -0700
Subject: [PATCH 1/2] Various semantic changes in email text, footer, and
 changes event page title to end with organizer name

---
 .../resources/views/emails/orders/attendee-ticket.blade.php  | 5 ++---
 .../resources/views/emails/orders/order-cancelled.blade.php  | 2 +-
 backend/resources/views/emails/orders/order-failed.blade.php | 5 ++---
 .../resources/views/emails/orders/order-refunded.blade.php   | 3 ++-
 .../orders/payment-success-but-order-expired.blade.php       | 2 +-
 backend/resources/views/emails/orders/summary.blade.php      | 3 +--
 backend/resources/views/vendor/mail/html/message.blade.php   | 5 ++---
 frontend/src/components/common/EventDocumentHead/index.tsx   | 2 +-
 8 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/backend/resources/views/emails/orders/attendee-ticket.blade.php b/backend/resources/views/emails/orders/attendee-ticket.blade.php
index 9379fb26f1..dcad7287a3 100644
--- a/backend/resources/views/emails/orders/attendee-ticket.blade.php
+++ b/backend/resources/views/emails/orders/attendee-ticket.blade.php
@@ -21,9 +21,8 @@
 {{ __('If you have any questions or need assistance, please reply to this email or contact the event organizer') }}
 {{ __('at') }} <a href="mailto:{{$eventSettings->getSupportEmail()}}">{{$eventSettings->getSupportEmail()}}</a>.
 
-{{ __('Best regards,') }}
-<br>
-{{config('app.name')}}
+{{ __('Best regards,') }}<br>
+{{ config('app.name') }}
 
 <script type="application/ld+json">
         {
diff --git a/backend/resources/views/emails/orders/order-cancelled.blade.php b/backend/resources/views/emails/orders/order-cancelled.blade.php
index ea51ad40bf..421199eb4c 100644
--- a/backend/resources/views/emails/orders/order-cancelled.blade.php
+++ b/backend/resources/views/emails/orders/order-cancelled.blade.php
@@ -17,7 +17,7 @@
 {{ __('If you have any questions or need assistance, please respond to this email.') }}
 <br><br>
 {{ __('Thank you') }},<br>
-{{config('app.name')}}
+{{ config('app.name') }}
 
 {!! $eventSettings->getGetEmailFooterHtml() !!}
 </x-mail::message>
diff --git a/backend/resources/views/emails/orders/order-failed.blade.php b/backend/resources/views/emails/orders/order-failed.blade.php
index 0e54cd6668..1ba5d25604 100644
--- a/backend/resources/views/emails/orders/order-failed.blade.php
+++ b/backend/resources/views/emails/orders/order-failed.blade.php
@@ -17,9 +17,8 @@
 {{ __('If you have any questions or need assistance, feel free to reach out to our support team') }}
 {{ __('at') }} {{ $supportEmail ?? 'hello@hi.events' }}.
 
-{{ __('Best regards') }},
-<br>
-{{config('app.name')}}
+{{ __('Best regards') }},<br>
+{{ config('app.name') }}
 
 {!! $eventSettings->getGetEmailFooterHtml() !!}
 </x-mail::message>
diff --git a/backend/resources/views/emails/orders/order-refunded.blade.php b/backend/resources/views/emails/orders/order-refunded.blade.php
index e10e15f50a..6eb43362d1 100644
--- a/backend/resources/views/emails/orders/order-refunded.blade.php
+++ b/backend/resources/views/emails/orders/order-refunded.blade.php
@@ -10,7 +10,8 @@
 
 {{ __('You have received a refund of :refundAmount for the following event: :eventTitle.', ['refundAmount' => $refundAmount, 'eventTitle' => $event->getTitle()]) }}
 
-{{ __('Thank you') }}
+{{ __('Thank you') }},<br>
+{{ config('app.name') }}
 
 {!! $eventSettings->getGetEmailFooterHtml() !!}
 </x-mail::message>
diff --git a/backend/resources/views/emails/orders/payment-success-but-order-expired.blade.php b/backend/resources/views/emails/orders/payment-success-but-order-expired.blade.php
index a4574597e1..0581058723 100644
--- a/backend/resources/views/emails/orders/payment-success-but-order-expired.blade.php
+++ b/backend/resources/views/emails/orders/payment-success-but-order-expired.blade.php
@@ -20,7 +20,7 @@
 </x-mail::button>
 
 {{ __('Best regards') }},<br>
-{{ __('Hi.Events') }}
+{{ config('app.name') }}
 
 {!! $eventSettings->getGetEmailFooterHtml() !!}
 </x-mail::message>
diff --git a/backend/resources/views/emails/orders/summary.blade.php b/backend/resources/views/emails/orders/summary.blade.php
index 5ea348e3fa..1ffe4918e8 100644
--- a/backend/resources/views/emails/orders/summary.blade.php
+++ b/backend/resources/views/emails/orders/summary.blade.php
@@ -34,7 +34,6 @@
 - **{{ __('Prepare for the Event:') }}** {{ __('Make sure to note the event date, time, and location.') }}
 - **{{ __('Stay Updated:') }}** {{ __('Keep an eye on your email for any updates from the event organizer.') }}
 
-{{ __('Best regards,') }}
-<br>
+{{ __('Best regards,') }}<br>
 {{ config('app.name') }}
 </x-mail::message>
diff --git a/backend/resources/views/vendor/mail/html/message.blade.php b/backend/resources/views/vendor/mail/html/message.blade.php
index c77007d4e4..5ac7f6a79a 100644
--- a/backend/resources/views/vendor/mail/html/message.blade.php
+++ b/backend/resources/views/vendor/mail/html/message.blade.php
@@ -36,9 +36,8 @@
                 {{-- You can find the full license text at: https://github.com/HiEventsDev/hi.events/blob/main/LICENSE --}}
                 {{-- In accordance with Section 7(b) of the AGPL, we ask that you retain the "Powered by Hi.Events" notice. --}}
                 {{-- If you wish to remove this notice, a commercial license is available at: https://hi.events/licensing --}}
-                © {{ date('Y') }} <a title="Manage events and sell tickets online with Hi.Events"
-                                     href="https://hi.events?utm_source=app-email-footer">Hi.Events</a> - Effortless
-                Event Management
+
+                © {{ date('Y') }} {{ config('app.app_name') }} | Powered by <a title="Manage events and sell tickets online with Hi.Events" href="https://hi.events?utm_source=app-email-footer">Hi.Events</a>
             @endif
         </x-mail::footer>
     </x-slot:footer>
diff --git a/frontend/src/components/common/EventDocumentHead/index.tsx b/frontend/src/components/common/EventDocumentHead/index.tsx
index 6bf6df1d44..2c693d942a 100644
--- a/frontend/src/components/common/EventDocumentHead/index.tsx
+++ b/frontend/src/components/common/EventDocumentHead/index.tsx
@@ -10,7 +10,7 @@ interface EventDocumentHeadProps {
 
 export const EventDocumentHead = ({event}: EventDocumentHeadProps) => {
     const eventSettings = event.settings;
-    const title = (eventSettings?.seo_title ?? event.title) + ' | ' + `Hi.Events`;
+    const title = (eventSettings?.seo_title ?? event.title) + ' | ' + event.organizer?.name;
     const description = eventSettings?.seo_description ?? event.description_preview;
     const keywords = eventSettings?.seo_keywords;
     const image = eventCoverImageUrl(event);

From f2ce92986549f5f9fd915064c548ae21923bd712 Mon Sep 17 00:00:00 2001
From: Graham Blair <graham@grahamarthurblair.com>
Date: Sat, 19 Oct 2024 11:46:18 -0700
Subject: [PATCH 2/2] Fix app name variable

---
 backend/resources/views/vendor/mail/html/message.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/resources/views/vendor/mail/html/message.blade.php b/backend/resources/views/vendor/mail/html/message.blade.php
index 5ac7f6a79a..82a1d311c7 100644
--- a/backend/resources/views/vendor/mail/html/message.blade.php
+++ b/backend/resources/views/vendor/mail/html/message.blade.php
@@ -37,7 +37,7 @@
                 {{-- In accordance with Section 7(b) of the AGPL, we ask that you retain the "Powered by Hi.Events" notice. --}}
                 {{-- If you wish to remove this notice, a commercial license is available at: https://hi.events/licensing --}}
 
-                © {{ date('Y') }} {{ config('app.app_name') }} | Powered by <a title="Manage events and sell tickets online with Hi.Events" href="https://hi.events?utm_source=app-email-footer">Hi.Events</a>
+                © {{ date('Y') }} {{ config('app.name') }} | Powered by <a title="Manage events and sell tickets online with Hi.Events" href="https://hi.events?utm_source=app-email-footer">Hi.Events</a>
             @endif
         </x-mail::footer>
     </x-slot:footer>