diff --git a/app/Http/Controllers/EventCheckoutController.php b/app/Http/Controllers/EventCheckoutController.php index 5ef67472..9d2af4c4 100644 --- a/app/Http/Controllers/EventCheckoutController.php +++ b/app/Http/Controllers/EventCheckoutController.php @@ -125,6 +125,7 @@ class EventCheckoutController extends Controller $booked_tickets = Attendee::where('ticket_id',$ticket_id) ->where('event_id',$event_id) + ->where('is_cancelled',false) ->whereIn('seat_no',$seat_nos) ->pluck('seat_no'); diff --git a/app/Mailers/AttendeeMailer.php b/app/Mailers/AttendeeMailer.php index 0b3e791f..93e512a8 100644 --- a/app/Mailers/AttendeeMailer.php +++ b/app/Mailers/AttendeeMailer.php @@ -21,7 +21,7 @@ class AttendeeMailer extends Mailer 'attendee' => $attendee, ]; - Mail::send('Mailers.TicketMailer.SendAttendeeTicket', $data, function ($message) use ($attendee) { + Mail::queue('Mailers.TicketMailer.SendAttendeeTicket', $data, function ($message) use ($attendee) { $message->to($attendee->email); $message->subject(trans("Email.your_ticket_for_event", ["event" => $attendee->order->event->title])); @@ -48,11 +48,11 @@ class AttendeeMailer extends Mailer $message_object->account_id)->get(); foreach ($attendees as $attendee) { - + if ($attendee->is_cancelled) { continue; } - + $data = [ 'attendee' => $attendee, 'event' => $event, @@ -61,7 +61,7 @@ class AttendeeMailer extends Mailer 'email_logo' => $attendee->event->organiser->full_logo_path, ]; - Mail::send('Emails.messageReceived', $data, function ($message) use ($attendee, $data) { + Mail::queue('Emails.messageReceived', $data, function ($message) use ($attendee, $data) { $message->to($attendee->email, $attendee->full_name) ->from(config('attendize.outgoing_email_noreply'), $attendee->event->organiser->name) ->replyTo($attendee->event->organiser->email, $attendee->event->organiser->name) @@ -83,7 +83,7 @@ class AttendeeMailer extends Mailer 'attendee' => $attendee, ]; - Mail::send('Mailers.TicketMailer.SendAttendeeInvite', $data, function ($message) use ($attendee) { + Mail::queue('Mailers.TicketMailer.SendAttendeeInvite', $data, function ($message) use ($attendee) { $message->to($attendee->email); $message->subject(trans("Email.your_ticket_for_event", ["event" => $attendee->order->event->title])); diff --git a/app/Mailers/Mailer.php b/app/Mailers/Mailer.php index 35cb3abb..e86b38f8 100644 --- a/app/Mailers/Mailer.php +++ b/app/Mailers/Mailer.php @@ -8,7 +8,7 @@ class Mailer { public function sendTo($toEmail, $fromEmail, $fromName, $subject, $view, $data = [], $attachment = false) { - Mail::send($view, $data, function ($message) use ($toEmail, $fromEmail, $fromName, $subject, $attachment) { + Mail::queue($view, $data, function ($message) use ($toEmail, $fromEmail, $fromName, $subject, $attachment) { $replyEmail = $fromEmail; $fromEmail = config('attendize.outgoing_email'); if ($attachment) { @@ -21,4 +21,4 @@ class Mailer ->subject($subject); }); } -} \ No newline at end of file +} diff --git a/app/Mailers/OrderMailer.php b/app/Mailers/OrderMailer.php index 1f03e23d..97950369 100644 --- a/app/Mailers/OrderMailer.php +++ b/app/Mailers/OrderMailer.php @@ -19,7 +19,7 @@ class OrderMailer 'orderService' => $orderService ]; - Mail::send('Emails.OrderNotification', $data, function ($message) use ($order) { + Mail::queue('Emails.OrderNotification', $data, function ($message) use ($order) { $message->to($order->account->email); $message->subject('New order received on the event ' . $order->event->title . ' [' . $order->order_reference . ']'); }); @@ -44,7 +44,7 @@ class OrderMailer return; } - Mail::send('Mailers.TicketMailer.SendOrderTickets', $data, function ($message) use ($order, $file_path) { + Mail::queue('Mailers.TicketMailer.SendOrderTickets', $data, function ($message) use ($order, $file_path) { $message->to($order->email); $message->subject(trans("Controllers.tickets_for_event", ["event" => $order->event->title])); $message->attach($file_path); diff --git a/app/Notifications/TicketReceived.php b/app/Notifications/TicketReceived.php index a278dedd..95bd8758 100644 --- a/app/Notifications/TicketReceived.php +++ b/app/Notifications/TicketReceived.php @@ -55,19 +55,16 @@ class TicketReceived extends Notification implements ShouldQueue Log::info($notifiable); try{ if($notifiable instanceof HelpTicket){ - return (new MailMessage) - ->line('The introduction to the notification.') - ->line($this->ticket->text) - ->line($this->ticket->created_at) - ->action('Notification Action', route('help.show',['code' => $this->ticket->code])) - ->line('Thank you for using our application!'); + return (new MailMessage)->from(config('mail.from_help.address'),config('mail.from.name')) + ->view('Emails.Help.CustomerNotification',['ticket' => $this->ticket]); } else return (new MailMessage) + ->from(config('mail.from_help.address'),config('mail.from.name')) ->line('You have new ticket') ->line($this->ticket->text) ->line($this->ticket->created_at) - ->action('Notification Action', route('ticket.replay',['id'=>$this->ticket->id])) + ->action('Reply here', route('ticket.replay',['id'=>$this->ticket->id])) ->line('Thank you for using our application!'); diff --git a/config/mail.php b/config/mail.php index a7b7d557..808aab34 100644 --- a/config/mail.php +++ b/config/mail.php @@ -28,7 +28,7 @@ return [ | */ - 'host' => env('MAIL_HOST', 'smtp.sendgrid.net'), + 'host' => env('MAIL_HOST', 'smtp.yandex.com'), /* |-------------------------------------------------------------------------- @@ -55,7 +55,7 @@ return [ */ 'from' => ['address' => env('MAIL_FROM_ADDRESS'), 'name' => env('MAIL_FROM_NAME')], - + 'from_help' => ['address' => env('MAIL_FROM_ADDRESS','maglumat@.bilettm.com'), 'name' => env('MAIL_FROM_NAME','Magulumat')], /* |-------------------------------------------------------------------------- | E-Mail Encryption Protocol diff --git a/resources/views/Emails/ConfirmEmail.blade.php b/resources/views/Emails/ConfirmEmail.blade.php index eea59815..cea62336 100644 --- a/resources/views/Emails/ConfirmEmail.blade.php +++ b/resources/views/Emails/ConfirmEmail.blade.php @@ -1,4 +1,4 @@ -@extends('ru.Emails.Layouts.Master') +@extends('Emails.Layouts.Master') @section('message_content') diff --git a/resources/views/Emails/Help/AdminNotification.blade.php b/resources/views/Emails/Help/AdminNotification.blade.php new file mode 100644 index 00000000..eb663027 --- /dev/null +++ b/resources/views/Emails/Help/AdminNotification.blade.php @@ -0,0 +1,22 @@ +@extends('Emails.Layouts.Master') +@section('message_content') +

Здравствуйте! {{$first_name}}

+

+ Спасибо за регистрацию на сайте {{ config('attendize.app_name') }}, в качестве организатора. +

+ +

+ Вы можете создать мероприятие на сайте, подтвердив свой адрес электронной почты, используя ссылку ниже. +

+ +
+ {{route('confirmEmail', ['confirmation_code' => $confirmation_code])}} +
+

+

+ Если у вас есть какие-либо вопросы, отзывы или предложения, обращайтесь к нам. +

+

+ Спасибо! +

+@endsection diff --git a/resources/views/Emails/Help/CustomerNotification.blade.php b/resources/views/Emails/Help/CustomerNotification.blade.php new file mode 100644 index 00000000..9105438e --- /dev/null +++ b/resources/views/Emails/Help/CustomerNotification.blade.php @@ -0,0 +1,28 @@ +@extends('Emails.Layouts.Master') +@section('message_content') +

Здравствуйте!

+

+ My poluchili wash zapros No:{{ $ticket->code }}. Ozhidayte uvedomlenie ob otwete. +

+ +

+ S uwazheniem, sluzhba podderzhki klientow +

+ +
+

Salam!

+

+ My poluchili wash zapros No:{{ $ticket->code }}. Ozhidayte uvedomlenie ob otwete. +

+

+ Hormatlamak bilen, tehpodderzhka +

+
+ + +@endsection + +@section('footer') + + +@stop diff --git a/resources/views/Emails/OrderConfirmation.blade.php b/resources/views/Emails/OrderConfirmation.blade.php index 445335ba..6b14c6ab 100644 --- a/resources/views/Emails/OrderConfirmation.blade.php +++ b/resources/views/Emails/OrderConfirmation.blade.php @@ -1,4 +1,4 @@ -@extends('en.Emails.Layouts.Master') +@extends('Emails.Layouts.Master') @section('message_content') Здравствуйте,

diff --git a/resources/views/Emails/OrderNotification.blade.php b/resources/views/Emails/OrderNotification.blade.php index d8f73a69..1a56d26e 100644 --- a/resources/views/Emails/OrderNotification.blade.php +++ b/resources/views/Emails/OrderNotification.blade.php @@ -1,4 +1,4 @@ -@extends('ru.Emails.Layouts.Master') +@extends('Emails.Layouts.Master') @section('message_content') Здравствуйте,

diff --git a/resources/views/Emails/inviteUser.blade.php b/resources/views/Emails/inviteUser.blade.php index 781850d4..d4f0c1ef 100644 --- a/resources/views/Emails/inviteUser.blade.php +++ b/resources/views/Emails/inviteUser.blade.php @@ -1,4 +1,4 @@ -@extends('ru.Emails.Layouts.Master') +@extends('Emails.Layouts.Master') @section('message_content') diff --git a/resources/views/Emails/messageReceived.blade.php b/resources/views/Emails/messageReceived.blade.php index 07a25467..28965a58 100644 --- a/resources/views/Emails/messageReceived.blade.php +++ b/resources/views/Emails/messageReceived.blade.php @@ -1,4 +1,4 @@ -@extends('ru.Emails.Layouts.Master') +@extends('Emails.Layouts.Master') @section('message_content') diff --git a/resources/views/Emails/notifyCancelledAttendee.blade.php b/resources/views/Emails/notifyCancelledAttendee.blade.php index 5cc92412..26970a61 100644 --- a/resources/views/Emails/notifyCancelledAttendee.blade.php +++ b/resources/views/Emails/notifyCancelledAttendee.blade.php @@ -1,4 +1,4 @@ -@extends('ru.Emails.Layouts.Master') +@extends('Emails.Layouts.Master') @section('message_content') diff --git a/resources/views/Emails/notifyRefundedAttendee.blade.php b/resources/views/Emails/notifyRefundedAttendee.blade.php index 448c3dc3..649d9af3 100644 --- a/resources/views/Emails/notifyRefundedAttendee.blade.php +++ b/resources/views/Emails/notifyRefundedAttendee.blade.php @@ -1,4 +1,4 @@ -@extends('ru.Emails.Layouts.Master') +@extends('Emails.Layouts.Master') @section('message_content') diff --git a/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php b/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php index 01a18a16..31cf3d14 100644 --- a/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php +++ b/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php @@ -13,6 +13,7 @@
{!! Form::text('code', null, array('class'=>'form-control','placeholder' => trans('ClientSide.search_ticket'))) !!} + {!! Form::submit('search') !!}