Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various semantic changes in email text, footer, and event page #262

Merged
merged 2 commits into from
Oct 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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">
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
5 changes: 2 additions & 3 deletions backend/resources/views/emails/orders/order-failed.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@
{{ __('If you have any questions or need assistance, feel free to reach out to our support team') }}
{{ __('at') }} {{ $supportEmail ?? '[email protected]' }}.

{{ __('Best regards') }},
<br>
{{config('app.name')}}
{{ __('Best regards') }},<br>
{{ config('app.name') }}

{!! $eventSettings->getGetEmailFooterHtml() !!}
</x-mail::message>
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</x-mail::button>

{{ __('Best regards') }},<br>
{{ __('Hi.Events') }}
{{ config('app.name') }}

{!! $eventSettings->getGetEmailFooterHtml() !!}
</x-mail::message>
3 changes: 1 addition & 2 deletions backend/resources/views/emails/orders/summary.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -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>
5 changes: 2 additions & 3 deletions backend/resources/views/vendor/mail/html/message.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -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.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>
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/common/EventDocumentHead/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
Loading