diff --git a/app/Http/Controllers/MyBaseController.php b/app/Http/Controllers/MyBaseController.php index 7ee1c362..d850076e 100644 --- a/app/Http/Controllers/MyBaseController.php +++ b/app/Http/Controllers/MyBaseController.php @@ -49,9 +49,15 @@ class MyBaseController extends Controller { $event = Event::scope()->findOrFail($event_id); + $image_path = $event->organiser->full_logo_path; + if ($event->images->first() != null) { + $image_path = $event->images()->first()->image_path; + } + return array_merge([ 'event' => $event, 'questions' => $event->questions()->get(), + 'image_path' => $image_path, ], $additional_data); } diff --git a/app/Jobs/GenerateTicket.php b/app/Jobs/GenerateTicket.php index ad27e1ee..f786c514 100644 --- a/app/Jobs/GenerateTicket.php +++ b/app/Jobs/GenerateTicket.php @@ -60,12 +60,17 @@ class GenerateTicket extends Job implements ShouldQueue } $attendees = $query->get(); + $image_path = $event->organiser->full_logo_path; + if ($event->images->first() != null) { + $image_path = $event->images()->first()->image_path; + } + $data = [ 'order' => $order, 'event' => $event, 'attendees' => $attendees, 'css' => file_get_contents(public_path('assets/stylesheet/ticket.css')), - 'image' => base64_encode(file_get_contents(public_path($event->organiser->full_logo_path))), + 'image' => base64_encode(file_get_contents(public_path($image_path))), ]; PDF::setOutputMode('F'); // force to file diff --git a/resources/views/ManageEvent/Partials/TicketDesignPreview.blade.php b/resources/views/ManageEvent/Partials/TicketDesignPreview.blade.php index b2311f89..737c0fda 100644 --- a/resources/views/ManageEvent/Partials/TicketDesignPreview.blade.php +++ b/resources/views/ManageEvent/Partials/TicketDesignPreview.blade.php @@ -15,7 +15,7 @@