diff --git a/backend/app/Http/Kernel.php b/backend/app/Http/Kernel.php
index 9891f7b25f..c8fbb3bae7 100644
--- a/backend/app/Http/Kernel.php
+++ b/backend/app/Http/Kernel.php
@@ -4,6 +4,7 @@
use HiEvents\Http\Middleware\Authenticate;
use HiEvents\Http\Middleware\EncryptCookies;
+use HiEvents\Http\Middleware\HandleDeprecatedTimezones;
use HiEvents\Http\Middleware\PreventRequestsDuringMaintenance;
use HiEvents\Http\Middleware\RedirectIfAuthenticated;
use HiEvents\Http\Middleware\SetAccountContext;
@@ -45,6 +46,7 @@ class Kernel extends HttpKernel
ValidatePostSize::class,
TrimStrings::class,
ConvertEmptyStringsToNull::class,
+ HandleDeprecatedTimezones::class,
];
/**
diff --git a/backend/app/Http/Middleware/HandleDeprecatedTimezones.php b/backend/app/Http/Middleware/HandleDeprecatedTimezones.php
new file mode 100644
index 0000000000..1b9985be12
--- /dev/null
+++ b/backend/app/Http/Middleware/HandleDeprecatedTimezones.php
@@ -0,0 +1,27 @@
+has('timezone')) {
+ $timezone = $request->input('timezone');
+
+ if (array_key_exists($timezone, $timezoneMapping)) {
+ $request->merge(['timezone' => $timezoneMapping[$timezone]]);
+ } elseif (!in_array($timezone, timezone_identifiers_list(), true)) {
+ Log::warning("Unexpected timezone received: $timezone");
+ }
+ }
+
+ return $next($request);
+ }
+}
diff --git a/backend/config/app.php b/backend/config/app.php
index e302ce327d..04ac89ac2f 100644
--- a/backend/config/app.php
+++ b/backend/config/app.php
@@ -45,6 +45,7 @@
],
'email_logo_url' => env('APP_EMAIL_LOGO_URL'),
+ 'email_logo_link_url' => env('APP_EMAIL_LOGO_LINK_URL', env('APP_FRONTEND_URL', 'http://localhost')),
'email_footer_text' => env('APP_EMAIL_FOOTER_TEXT'),
/*
diff --git a/backend/config/timezones.php b/backend/config/timezones.php
new file mode 100644
index 0000000000..54a80be57c
--- /dev/null
+++ b/backend/config/timezones.php
@@ -0,0 +1,18 @@
+ [
+ 'Asia/Calcutta' => 'Asia/Kolkata',
+ 'Asia/Saigon' => 'Asia/Ho_Chi_Minh',
+ 'America/Buenos_Aires' => 'America/Argentina/Buenos_Aires',
+ 'Europe/Kiev' => 'Europe/Kyiv',
+ 'Africa/Asmera' => 'Africa/Asmara',
+ 'America/Indianapolis' => 'America/Indiana/Indianapolis',
+ 'Asia/Chongqing' => 'Asia/Shanghai',
+ 'Asia/Macao' => 'Asia/Macau',
+ 'Pacific/Samoa' => 'Pacific/Pago_Pago',
+ 'Pacific/Yap' => 'Pacific/Chuuk',
+ 'Etc/GMT+0' => 'Etc/GMT',
+ 'Etc/Greenwich' => 'Etc/GMT',
+ ],
+];
diff --git a/backend/database/migrations/schema.sql b/backend/database/migrations/schema.sql
index bb359414a7..4b20e570d5 100644
--- a/backend/database/migrations/schema.sql
+++ b/backend/database/migrations/schema.sql
@@ -276,7 +276,6 @@ create table if not exists tickets
deleted_at timestamp,
type varchar(20) default 'PAID'::character varying not null,
is_hidden boolean default false,
- start_collapsed boolean default false,
primary key (id),
constraint fk_tickets_event_id
foreign key (event_id) references events
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') }} {{$eventSettings->getSupportEmail()}}.
-{{ __('Best regards,') }}
-
-{{config('app.name')}}
+{{ __('Best regards,') }}
+{{ config('app.name') }}