ilmedova
/
Attendize
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

help desk HelpdeskTicket Comment

This commit is contained in:
merdan 2020-05-11 14:41:53 +05:00
parent 3101f9224a
commit bedf42dc4c
16 changed files with 74 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Http/Controllers/EventCheckoutController.php
View File

@ -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');

10
app/Mailers/AttendeeMailer.php
View File

@ -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]));

4
app/Mailers/Mailer.php
View File

@ -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);
});
}
}
}

4
app/Mailers/OrderMailer.php
View File

@ -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);

11
app/Notifications/TicketReceived.php
View File

@ -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!');

4
config/mail.php
View File

@ -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

2
resources/views/Emails/ConfirmEmail.blade.php
View File

@ -1,4 +1,4 @@
@extends('ru.Emails.Layouts.Master')
@extends('Emails.Layouts.Master')
@section('message_content')

22
resources/views/Emails/Help/AdminNotification.blade.php Normal file
View File

@ -0,0 +1,22 @@
@extends('Emails.Layouts.Master')
@section('message_content')
<p>Здравствуйте! {{$first_name}}</p>
<p>
Спасибо за регистрацию на сайте {{ config('attendize.app_name') }}, в качестве организатора.
</p>
<p>
Вы можете создать мероприятие на сайте, подтвердив свой адрес электронной почты, используя ссылку ниже.
</p>
<div style="padding: 5px; border: 1px solid #ccc;">
{{route('confirmEmail', ['confirmation_code' => $confirmation_code])}}
</div>
<br><br>
<p>
Если у вас есть какие-либо вопросы, отзывы или предложения, обращайтесь к нам.
</p>
<p>
Спасибо!
</p>
@endsection

28
resources/views/Emails/Help/CustomerNotification.blade.php Normal file
View File

@ -0,0 +1,28 @@
@extends('Emails.Layouts.Master')
@section('message_content')
<p><strong>Здравствуйте!</strong></p>
<p>
My poluchili wash zapros <a href="{{route('help.show',['code' => $ticket->code])}}"> No:{{ $ticket->code }}.</a> Ozhidayte uvedomlenie ob otwete.
</p>
<p>
S uwazheniem, sluzhba podderzhki klientow
</p>
<div style="margin-top: 10px; background-color: #ccc;">
<p><strong>Salam!</strong></p>
<p>
My poluchili wash zapros <a href="{{route('help.show',['code' => $ticket->code])}}"> No:{{ $ticket->code }}.</a> Ozhidayte uvedomlenie ob otwete.
</p>
<p>
Hormatlamak bilen, tehpodderzhka
</p>
</div>
@endsection
@section('footer')
@stop

2
resources/views/Emails/OrderConfirmation.blade.php
View File

@ -1,4 +1,4 @@
@extends('en.Emails.Layouts.Master')
@extends('Emails.Layouts.Master')
@section('message_content')
Здравствуйте,<br><br>

2
resources/views/Emails/OrderNotification.blade.php
View File

@ -1,4 +1,4 @@
@extends('ru.Emails.Layouts.Master')
@extends('Emails.Layouts.Master')
@section('message_content')
Здравствуйте,<br><br>

2
resources/views/Emails/inviteUser.blade.php
View File

@ -1,4 +1,4 @@
@extends('ru.Emails.Layouts.Master')
@extends('Emails.Layouts.Master')
@section('message_content')

2
resources/views/Emails/messageReceived.blade.php
View File

@ -1,4 +1,4 @@
@extends('ru.Emails.Layouts.Master')
@extends('Emails.Layouts.Master')
@section('message_content')

2
resources/views/Emails/notifyCancelledAttendee.blade.php
View File

@ -1,4 +1,4 @@
@extends('ru.Emails.Layouts.Master')
@extends('Emails.Layouts.Master')
@section('message_content')

2
resources/views/Emails/notifyRefundedAttendee.blade.php
View File

@ -1,4 +1,4 @@
@extends('ru.Emails.Layouts.Master')
@extends('Emails.Layouts.Master')
@section('message_content')

1
resources/views/desktop/Pages/HelpDeskCreateForm.blade.php
View File

@ -13,6 +13,7 @@
<div>
<form action="{{route('help.show',['code'=>''])}}" method="GET">
{!! Form::text('code', null, array('class'=>'form-control','placeholder' => trans('ClientSide.search_ticket'))) !!}
{!! Form::submit('search') !!}
</form>
</div>
</div>