From ac746196f41996af6b2d151a51a3a552f4890fd0 Mon Sep 17 00:00:00 2001 From: merdan Date: Mon, 4 May 2020 16:30:25 +0500 Subject: [PATCH 01/91] help desk create view --- .../Pages/HelpDeskCreateForm.blade.php | 22 ++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php b/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php index 5471429c..ff2ff62c 100644 --- a/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php +++ b/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php @@ -13,36 +13,48 @@ {!! Form::label('name', trans("ClientSide.name"), array('class'=>'control-label')) !!} {!! Form::text('name', old('name'),array('class'=>'form-control' )) !!} -
+
{!! Form::label('email', trans("ClientSide.email"), array('class'=>'control-label required')) !!} {!! Form::text('email', old('email'),array('class'=>'form-control' )) !!} + @if($errors->has('email')) +

{{ $errors->first('email') }}

+ @endif
{!! Form::label('phone', trans("ClientSide.phone"), array('class'=>'control-label')) !!} {!! Form::text('phone', old('phone'),array('class'=>'form-control' )) !!}
-
+
{!! Form::label('topic', trans("ClientSide.topic"), array('class'=>'control-label')) !!} {!! Form::select('topic',help_topics(), old('topic'), ['placeholder'=>trans('ClientSide.please_select'),'class' => 'form-control','id'=>'topic']) !!} + @if($errors->has('topic')) +

{{ $errors->first('topic') }}

+ @endif
{!! Form::label('subject', trans("ClientSide.subject"), array('class'=>'control-label')) !!} {!! Form::text('subject', old('subject',trans('ClientSide.other')),array('class'=>'form-control' )) !!}
-
+
{!! Form::label('text', trans("ClientSide.text"), array('class'=>'control-label required')) !!} {!! Form::textarea('text', old('text'), array( 'class'=>'form-control editable', 'rows' => 5 )) !!} + @if($errors->has('text')) +

{{ $errors->first('text') }}

+ @endif
-
+
{!! Form::label('attachment', trans("ClientSide.attachment"), array('class'=>'control-label')) !!} {!! Form::file('attachment') !!}
{!! Form::submit(trans("ClientSide.create_ticket"), ['class'=>"btn btn-success"]) !!} + @if($errors->has('attachment')) +

{{ $errors->first('attachment') }}

+ @endif
@@ -52,7 +64,7 @@ @section('after_scripts') From cbb4b3c7449932b0fb95fdbdaf33731daeac2177 Mon Sep 17 00:00:00 2001 From: merdan Date: Mon, 4 May 2020 17:20:54 +0500 Subject: [PATCH 06/91] help desk create view --- resources/views/desktop/Pages/HelpDeskCreateForm.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php b/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php index 915a8dcb..e4b16f09 100644 --- a/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php +++ b/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php @@ -63,9 +63,9 @@ @endsection @section('after_scripts') - - - - - @stack('crud_list_scripts') -@endsection From aaf9ff9d947a32bae5c65e996dac46495dfd9fbf Mon Sep 17 00:00:00 2001 From: merdan Date: Tue, 5 May 2020 15:48:38 +0500 Subject: [PATCH 31/91] help desk admin --- resources/views/vendor/backpack/crud/buttons/replay.blade.php | 2 +- routes/backpack/custom.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/vendor/backpack/crud/buttons/replay.blade.php b/resources/views/vendor/backpack/crud/buttons/replay.blade.php index d9285c30..e073e140 100644 --- a/resources/views/vendor/backpack/crud/buttons/replay.blade.php +++ b/resources/views/vendor/backpack/crud/buttons/replay.blade.php @@ -1 +1 @@ - Replay + Replay diff --git a/routes/backpack/custom.php b/routes/backpack/custom.php index a349b520..25f06644 100644 --- a/routes/backpack/custom.php +++ b/routes/backpack/custom.php @@ -24,5 +24,5 @@ Route::group([ CRUD::resource('account', 'AccountCrudController'); CRUD::resource('helpTopic','HelpTopicCrudController'); CRUD::resource('helpTicket','HelpTicketCrudController'); - Route::get('helpTopic/{id}/replay', 'HelpTopicCrudController@replay'); + Route::get('helpTicket/{id}/replay', 'HelpTopicCrudController@replay')->name('ticket.replay'); }); // this should be the absolute last line of this file From 787f6b3b9e530bc127ac5fc548657250751c74bd Mon Sep 17 00:00:00 2001 From: merdan Date: Tue, 5 May 2020 15:50:54 +0500 Subject: [PATCH 32/91] help desk admin --- resources/views/vendor/backpack/crud/buttons/replay.blade.php | 2 +- routes/backpack/custom.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/vendor/backpack/crud/buttons/replay.blade.php b/resources/views/vendor/backpack/crud/buttons/replay.blade.php index e073e140..8d4e2e36 100644 --- a/resources/views/vendor/backpack/crud/buttons/replay.blade.php +++ b/resources/views/vendor/backpack/crud/buttons/replay.blade.php @@ -1 +1 @@ - Replay + Replay diff --git a/routes/backpack/custom.php b/routes/backpack/custom.php index 25f06644..09ed0f9c 100644 --- a/routes/backpack/custom.php +++ b/routes/backpack/custom.php @@ -24,5 +24,5 @@ Route::group([ CRUD::resource('account', 'AccountCrudController'); CRUD::resource('helpTopic','HelpTopicCrudController'); CRUD::resource('helpTicket','HelpTicketCrudController'); - Route::get('helpTicket/{id}/replay', 'HelpTopicCrudController@replay')->name('ticket.replay'); + Route::get('helpTicket/{id}/replay', 'HelpTicketCrudController@replay')->name('ticket.replay'); }); // this should be the absolute last line of this file From 6b6ce8a5410f359cfb59bf02ab191823e3111c15 Mon Sep 17 00:00:00 2001 From: merdan Date: Tue, 5 May 2020 15:52:49 +0500 Subject: [PATCH 33/91] help desk admin --- app/Http/Controllers/Admin/HelpTicketCrudController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/Admin/HelpTicketCrudController.php b/app/Http/Controllers/Admin/HelpTicketCrudController.php index 2274db6d..d5d376c7 100644 --- a/app/Http/Controllers/Admin/HelpTicketCrudController.php +++ b/app/Http/Controllers/Admin/HelpTicketCrudController.php @@ -91,6 +91,6 @@ class HelpTicketCrudController extends CrudController public function replay($id){ - return view('admin.HelpDeskTicket'); + return view('admin.HelpDeskTicket')->with('crud',$this->crud); } } From 4724338f92a141c135beffeb8744bc1fa9182584 Mon Sep 17 00:00:00 2001 From: merdan Date: Tue, 5 May 2020 15:55:21 +0500 Subject: [PATCH 34/91] help desk admin --- .../views/admin/HelpDeskTicket.blade.php | 70 ++++++++++++++++++- 1 file changed, 69 insertions(+), 1 deletion(-) diff --git a/resources/views/admin/HelpDeskTicket.blade.php b/resources/views/admin/HelpDeskTicket.blade.php index 4c2fc0be..b90f6bc2 100644 --- a/resources/views/admin/HelpDeskTicket.blade.php +++ b/resources/views/admin/HelpDeskTicket.blade.php @@ -14,5 +14,73 @@ @endsection @section('content') + @if ($crud->hasAccess('list')) + {{ trans('backpack::crud.back_to_all') }} {{ $crud->entity_name_plural }} - @endsection + + @endif + +
+
+ + +
+ @if ($crud->model->translationEnabled()) +
+
+ +
+ +
    + @foreach ($crud->model->getAvailableLocales() as $key => $locale) +
  • {{ $locale }}
    • + @endforeach +
+
+
+
+ @else + @endif +
+ + + @foreach ($crud->columns as $column) + + + + + @endforeach + @if ($crud->buttons->where('stack', 'line')->count()) + + + + + @endif + +
+ {{ $column['label'] }} + + @if (!isset($column['type'])) + @include('crud::columns.text') + @else + @if(view()->exists('vendor.backpack.crud.columns.'.$column['type'])) + @include('vendor.backpack.crud.columns.'.$column['type']) + @else + @if(view()->exists('crud::columns.'.$column['type'])) + @include('crud::columns.'.$column['type']) + @else + @include('crud::columns.text') + @endif + @endif + @endif +
{{ trans('backpack::crud.actions') }} + @include('crud::inc.button_stack', ['stack' => 'line']) +
+
+
+ +
+
+@endsection From 1e1ef7499c7f27827f510146595caee9feba274c Mon Sep 17 00:00:00 2001 From: merdan Date: Tue, 5 May 2020 15:59:31 +0500 Subject: [PATCH 35/91] help desk admin --- app/Http/Controllers/Admin/HelpTicketCrudController.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/Admin/HelpTicketCrudController.php b/app/Http/Controllers/Admin/HelpTicketCrudController.php index d5d376c7..d46f506e 100644 --- a/app/Http/Controllers/Admin/HelpTicketCrudController.php +++ b/app/Http/Controllers/Admin/HelpTicketCrudController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers\Admin; +use App\Models\HelpTicket; use Backpack\CRUD\app\Http\Controllers\CrudController; // VALIDATION: change the requests to match your own file names if you need form validation @@ -91,6 +92,9 @@ class HelpTicketCrudController extends CrudController public function replay($id){ - return view('admin.HelpDeskTicket')->with('crud',$this->crud); + $entry = HelpTicket::with(['comments','topic'])->findOrFail($id); + return view('admin.HelpDeskTicket') + ->with('entry',$entry) + ->with('crud',$this->crud); } } From 61da2f3ee8ec31655b2b16b0e460cf6d9ce64840 Mon Sep 17 00:00:00 2001 From: merdan Date: Tue, 5 May 2020 16:00:34 +0500 Subject: [PATCH 36/91] help desk admin --- app/Models/HelpTicket.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Models/HelpTicket.php b/app/Models/HelpTicket.php index 36f90681..d6532966 100644 --- a/app/Models/HelpTicket.php +++ b/app/Models/HelpTicket.php @@ -36,7 +36,7 @@ class HelpTicket extends Model |-------------------------------------------------------------------------- */ - public function category(){ + public function topic(){ return $this->belongsTo(HelpTopic::class,'ticket_category_id'); } From 731e70326bdf7c27ea320f91d9c0fa3b49bf942e Mon Sep 17 00:00:00 2001 From: merdan Date: Tue, 5 May 2020 16:46:35 +0500 Subject: [PATCH 37/91] help desk admin --- .../views/admin/HelpDeskTicket.blade.php | 76 +++++++------------ 1 file changed, 26 insertions(+), 50 deletions(-) diff --git a/resources/views/admin/HelpDeskTicket.blade.php b/resources/views/admin/HelpDeskTicket.blade.php index b90f6bc2..d6919eeb 100644 --- a/resources/views/admin/HelpDeskTicket.blade.php +++ b/resources/views/admin/HelpDeskTicket.blade.php @@ -2,8 +2,8 @@ @section('header')

- {!! $crud->getHeading() ?? $crud->entity_name_plural !!} - {!! $crud->getSubheading() ?? mb_ucfirst(trans('backpack::crud.preview')).' '.$crud->entity_name !!}. + {!! $crud->getHeading() ?? $crud->entity_name !!} + {!! $crud->getSubheading() ?? '#'.$entry->code !!}.

  1. {{ trans('backpack::crud.admin') }}
    2. @@ -25,57 +25,33 @@
    - @if ($crud->model->translationEnabled()) -
    -
    - -
    - -
      - @foreach ($crud->model->getAvailableLocales() as $key => $locale) -
    • {{ $locale }}
      • - @endforeach -
    -
    -
    -
    - @else - @endif
    - @foreach ($crud->columns as $column) - - - - - @endforeach - @if ($crud->buttons->where('stack', 'line')->count()) - - - - - @endif + + + + + + + + + + + + + +
    - {{ $column['label'] }} - - @if (!isset($column['type'])) - @include('crud::columns.text') - @else - @if(view()->exists('vendor.backpack.crud.columns.'.$column['type'])) - @include('vendor.backpack.crud.columns.'.$column['type']) - @else - @if(view()->exists('crud::columns.'.$column['type'])) - @include('crud::columns.'.$column['type']) - @else - @include('crud::columns.text') - @endif - @endif - @endif -
    {{ trans('backpack::crud.actions') }} - @include('crud::inc.button_stack', ['stack' => 'line']) -
    + Name : + + {{$entry->name}} + + + Email : + + {{$entry->email}} + Phone : + {{$entry->phone}}
    Subject : {{$entry->subject}}
    {{$entry->text}}
    From dcfc1f41f9e1f5f47f13002bace553c2888893ce Mon Sep 17 00:00:00 2001 From: merdan Date: Tue, 5 May 2020 16:49:23 +0500 Subject: [PATCH 38/91] help desk admin --- resources/views/admin/HelpDeskTicket.blade.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/views/admin/HelpDeskTicket.blade.php b/resources/views/admin/HelpDeskTicket.blade.php index d6919eeb..559239ed 100644 --- a/resources/views/admin/HelpDeskTicket.blade.php +++ b/resources/views/admin/HelpDeskTicket.blade.php @@ -42,15 +42,15 @@ {{$entry->email}} - Phone : + Phone : {{$entry->phone}} Subject : - {{$entry->subject}} + {{$entry->subject}} - {{$entry->text}} + {{$entry->text}} From 66595cd83583b0683b100f9b52503f4e83dd3331 Mon Sep 17 00:00:00 2001 From: merdan Date: Tue, 5 May 2020 16:52:22 +0500 Subject: [PATCH 39/91] help desk admin --- resources/views/admin/HelpDeskTicket.blade.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/views/admin/HelpDeskTicket.blade.php b/resources/views/admin/HelpDeskTicket.blade.php index 559239ed..424882f8 100644 --- a/resources/views/admin/HelpDeskTicket.blade.php +++ b/resources/views/admin/HelpDeskTicket.blade.php @@ -35,12 +35,16 @@ {{$entry->name}} + + Email : {{$entry->email}} + + Phone : @@ -48,9 +52,8 @@ Subject : - {{$entry->subject}} + {{$entry->subject}} - {{$entry->text}} From 0fa1c593c2b49a7988f6d09e386a48ca08fea025 Mon Sep 17 00:00:00 2001 From: merdan Date: Tue, 5 May 2020 17:05:07 +0500 Subject: [PATCH 40/91] help desk admin --- resources/views/admin/HelpDeskTicket.blade.php | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/resources/views/admin/HelpDeskTicket.blade.php b/resources/views/admin/HelpDeskTicket.blade.php index 424882f8..554f1319 100644 --- a/resources/views/admin/HelpDeskTicket.blade.php +++ b/resources/views/admin/HelpDeskTicket.blade.php @@ -54,11 +54,21 @@ Subject : {{$entry->subject}} - + @if($entry->attachment) + + Attachment: + {{$entry->attachment}} + + @endif
+
+ +
From 0ccac4b87c1313c543612d7608729b838f7f79dd Mon Sep 17 00:00:00 2001 From: merdan Date: Tue, 5 May 2020 17:16:25 +0500 Subject: [PATCH 41/91] help desk admin --- resources/views/admin/HelpDeskTicket.blade.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/views/admin/HelpDeskTicket.blade.php b/resources/views/admin/HelpDeskTicket.blade.php index 554f1319..8ce83c4a 100644 --- a/resources/views/admin/HelpDeskTicket.blade.php +++ b/resources/views/admin/HelpDeskTicket.blade.php @@ -57,14 +57,14 @@ @if($entry->attachment) Attachment: - {{$entry->attachment}} + {{$entry->attachment}} @endif -
+
From 206b491f25cd2525a68a4379575383bb9cccb862 Mon Sep 17 00:00:00 2001 From: merdan Date: Tue, 5 May 2020 17:34:46 +0500 Subject: [PATCH 42/91] help desk admin --- .../views/admin/HelpDeskTicket.blade.php | 31 ++++++++++++++----- 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/resources/views/admin/HelpDeskTicket.blade.php b/resources/views/admin/HelpDeskTicket.blade.php index 8ce83c4a..9fa2dfe7 100644 --- a/resources/views/admin/HelpDeskTicket.blade.php +++ b/resources/views/admin/HelpDeskTicket.blade.php @@ -54,20 +54,35 @@ Subject : {{$entry->subject}} - @if($entry->attachment) - - Attachment: - {{$entry->attachment}} - - @endif +
-
From 9ebb4b1944ca7b29d0c1ae14f3913e19623bbb2f Mon Sep 17 00:00:00 2001 From: merdan Date: Tue, 5 May 2020 17:40:12 +0500 Subject: [PATCH 43/91] help desk admin --- resources/views/admin/HelpDeskTicket.blade.php | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/views/admin/HelpDeskTicket.blade.php b/resources/views/admin/HelpDeskTicket.blade.php index 9fa2dfe7..b606dc78 100644 --- a/resources/views/admin/HelpDeskTicket.blade.php +++ b/resources/views/admin/HelpDeskTicket.blade.php @@ -65,6 +65,7 @@
-
- From 352fcb7dc31d285b57275756bc165bf572dee8dd Mon Sep 17 00:00:00 2001 From: merdan Date: Wed, 6 May 2020 19:50:03 +0500 Subject: [PATCH 45/91] help desk notification ticketReceived --- resources/views/admin/HelpDeskTicket.blade.php | 2 +- routes/backpack/custom.php | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/views/admin/HelpDeskTicket.blade.php b/resources/views/admin/HelpDeskTicket.blade.php index cb76b28e..4d326fa1 100644 --- a/resources/views/admin/HelpDeskTicket.blade.php +++ b/resources/views/admin/HelpDeskTicket.blade.php @@ -87,7 +87,7 @@
-
+ @csrf
{!! Form::label('text', trans("ClientSide.text"), array('class'=>'control-label required')) !!} diff --git a/routes/backpack/custom.php b/routes/backpack/custom.php index 09ed0f9c..63bc6ac9 100644 --- a/routes/backpack/custom.php +++ b/routes/backpack/custom.php @@ -25,4 +25,5 @@ Route::group([ CRUD::resource('helpTopic','HelpTopicCrudController'); CRUD::resource('helpTicket','HelpTicketCrudController'); Route::get('helpTicket/{id}/replay', 'HelpTicketCrudController@replay')->name('ticket.replay'); + Route::post('helpTicket/{id}/replay', 'HelpTicketCrudController@replay')->name('ticket.replay.post'); }); // this should be the absolute last line of this file From b41f11f7cc0ec339feaa6a1d0b8c51f098c9c6bb Mon Sep 17 00:00:00 2001 From: merdan Date: Wed, 6 May 2020 20:53:50 +0500 Subject: [PATCH 46/91] help desk notification ticketReceived --- .../Admin/HelpTicketCrudController.php | 20 ++++++ app/Notifications/TicketCommented.php | 65 +++++++++++++++++++ routes/backpack/custom.php | 2 +- 3 files changed, 86 insertions(+), 1 deletion(-) create mode 100644 app/Notifications/TicketCommented.php diff --git a/app/Http/Controllers/Admin/HelpTicketCrudController.php b/app/Http/Controllers/Admin/HelpTicketCrudController.php index d46f506e..c2f6e17f 100644 --- a/app/Http/Controllers/Admin/HelpTicketCrudController.php +++ b/app/Http/Controllers/Admin/HelpTicketCrudController.php @@ -2,13 +2,17 @@ namespace App\Http\Controllers\Admin; +use App\Http\Requests\HelpTicketCommentRequest; use App\Models\HelpTicket; +use App\Models\HelpTicketComment; +use App\Notifications\TicketCommented; use Backpack\CRUD\app\Http\Controllers\CrudController; // VALIDATION: change the requests to match your own file names if you need form validation use App\Http\Requests\HelpTicketRequest as StoreRequest; use App\Http\Requests\HelpTicketRequest as UpdateRequest; use Backpack\CRUD\CrudPanel; +use Illuminate\Support\Facades\Notification; /** * Class HelpTicletCrudController @@ -97,4 +101,20 @@ class HelpTicketCrudController extends CrudController ->with('entry',$entry) ->with('crud',$this->crud); } + + public function replayPost(HelpTicketCommentRequest $request, $ticket_id){ + $ticket = HelpTicket::findOrFail($ticket_id,['id','email','name']); + + $comment = HelpTicketComment::create([ + 'help_ticket_id' => $ticket_id, + 'text' => $request->text, + 'name' => auth()->user()->full_name, + 'user_id' => auth()->id() + ]); + + Notification::route('mail', $ticket->email) + ->notify(new TicketCommented($comment)); + + return redirect()->route('ticket.replay',['id'=>$ticket_id]); + } } diff --git a/app/Notifications/TicketCommented.php b/app/Notifications/TicketCommented.php new file mode 100644 index 00000000..23a11268 --- /dev/null +++ b/app/Notifications/TicketCommented.php @@ -0,0 +1,65 @@ +comment = $comment; + // + } + + /** + * Get the notification's delivery channels. + * + * @param mixed $notifiable + * @return array + */ + public function via($notifiable) + { + return ['mail']; + } + + /** + * Get the mail representation of the notification. + * + * @param mixed $notifiable + * @return \Illuminate\Notifications\Messages\MailMessage + */ + public function toMail($notifiable) + { + return (new MailMessage) + ->line('The introduction to the notification.') + ->action('Notification Action', url('/')) + ->line('Thank you for using our application!'); + } + + /** + * Get the array representation of the notification. + * + * @param mixed $notifiable + * @return array + */ + public function toArray($notifiable) + { + return [ + // + ]; + } +} diff --git a/routes/backpack/custom.php b/routes/backpack/custom.php index 63bc6ac9..18bb806a 100644 --- a/routes/backpack/custom.php +++ b/routes/backpack/custom.php @@ -25,5 +25,5 @@ Route::group([ CRUD::resource('helpTopic','HelpTopicCrudController'); CRUD::resource('helpTicket','HelpTicketCrudController'); Route::get('helpTicket/{id}/replay', 'HelpTicketCrudController@replay')->name('ticket.replay'); - Route::post('helpTicket/{id}/replay', 'HelpTicketCrudController@replay')->name('ticket.replay.post'); + Route::post('helpTicket/{id}/replay', 'HelpTicketCrudController@replayPost')->name('ticket.replay.post'); }); // this should be the absolute last line of this file From 9a47156f6afbea321d9a752785a75a72fc5c743c Mon Sep 17 00:00:00 2001 From: merdan Date: Wed, 6 May 2020 21:01:08 +0500 Subject: [PATCH 47/91] help desk notification ticketCommented --- app/Http/Controllers/HelpDeskController.php | 1 + app/Notifications/TicketCommented.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/HelpDeskController.php b/app/Http/Controllers/HelpDeskController.php index f5b3acbe..286fc175 100644 --- a/app/Http/Controllers/HelpDeskController.php +++ b/app/Http/Controllers/HelpDeskController.php @@ -9,6 +9,7 @@ use App\Http\Requests\HelpTicketRequest; use App\Models\HelpTicket; use App\Models\HelpTicketComment; use App\Models\HelpTopic; +use App\Models\User; use App\Notifications\TicketReceived; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Notification; diff --git a/app/Notifications/TicketCommented.php b/app/Notifications/TicketCommented.php index 23a11268..2384bf55 100644 --- a/app/Notifications/TicketCommented.php +++ b/app/Notifications/TicketCommented.php @@ -8,7 +8,7 @@ use Illuminate\Notifications\Notification; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Notifications\Messages\MailMessage; -class TicketCommented extends Notification +class TicketCommented extends Notification implements ShouldQueue { use Queueable; From 70acc87a46bb6dbffa6c16a197b0ed5c625260d2 Mon Sep 17 00:00:00 2001 From: merdan Date: Wed, 6 May 2020 21:08:44 +0500 Subject: [PATCH 48/91] help desk notification ticketCommented --- app/Notifications/TicketReceived.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Notifications/TicketReceived.php b/app/Notifications/TicketReceived.php index 272e73cb..e1d71e7c 100644 --- a/app/Notifications/TicketReceived.php +++ b/app/Notifications/TicketReceived.php @@ -7,6 +7,7 @@ use Illuminate\Bus\Queueable; use Illuminate\Notifications\Notification; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Notifications\Messages\MailMessage; +use Illuminate\Support\Facades\Log; class TicketReceived extends Notification implements ShouldQueue { @@ -55,6 +56,8 @@ class TicketReceived extends Notification implements ShouldQueue ->line('You have new ticket') ->action('Notification Action', route('ticket.replay',['id'=>$this->ticket->id])) ->line('Thank you for using our application!'); + + Log::info('Mail Notification: ',$notifiable); } /** @@ -66,5 +69,6 @@ class TicketReceived extends Notification implements ShouldQueue public function toDatabase($notifiable) { return $this->ticket->toArray(); + Log::info('Database Notification: ',$notifiable); } } From df21ce952985ae8c9ab37abf670143ba4132a1bd Mon Sep 17 00:00:00 2001 From: merdan Date: Wed, 6 May 2020 21:56:39 +0500 Subject: [PATCH 49/91] help desk notification ticketCommented --- app/Http/routes.php | 2 ++ app/Notifications/TicketReceived.php | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/app/Http/routes.php b/app/Http/routes.php index 9198ca7e..5cb9cc9a 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -762,6 +762,8 @@ Route::group( // return 'TODO: add terms and cond'; // } // ]); + Route::get('helpTicket/{id}/replay', 'HelpTicketCrudController@replay')->name('ticket.replay'); + Route::post('helpTicket/{id}/replay', 'HelpTicketCrudController@replayPost')->name('ticket.replay.post'); /** CATCH-ALL ROUTE for Backpack/PageManager - needs to be at the end of your routes.php file **/ Route::get('{page}/{subs?}', ['uses' => '\App\Http\Controllers\PageController@index','as'=>'about']) ->where(['page' => '^(((?=(?!admin))(?=(?!\/)).))*$', 'subs' => '.*']); diff --git a/app/Notifications/TicketReceived.php b/app/Notifications/TicketReceived.php index e1d71e7c..41ebed18 100644 --- a/app/Notifications/TicketReceived.php +++ b/app/Notifications/TicketReceived.php @@ -19,6 +19,13 @@ class TicketReceived extends Notification implements ShouldQueue * @return void */ + /** + * The maximum number of exceptions to allow before failing. + * + * @var int + */ + public $maxExceptions = 3; + protected $ticket; public function __construct(HelpTicket $ticket) From 402c54d3f7de47506d2a2eb999be2a6f46480da5 Mon Sep 17 00:00:00 2001 From: merdan Date: Wed, 6 May 2020 22:07:31 +0500 Subject: [PATCH 50/91] help desk notification ticketCommented --- app/Notifications/TicketReceived.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Notifications/TicketReceived.php b/app/Notifications/TicketReceived.php index 41ebed18..31cfe3e0 100644 --- a/app/Notifications/TicketReceived.php +++ b/app/Notifications/TicketReceived.php @@ -55,13 +55,13 @@ class TicketReceived extends Notification implements ShouldQueue if($notifiable instanceof HelpTicket){ return (new MailMessage) ->line('The introduction to the notification.') - ->action('Notification Action', route('help.show',['code' => $this->ticket->code])) +// ->action('Notification Action', route('help.show',['code' => $this->ticket->code])) ->line('Thank you for using our application!'); } else return (new MailMessage) ->line('You have new ticket') - ->action('Notification Action', route('ticket.replay',['id'=>$this->ticket->id])) +// ->action('Notification Action', route('ticket.replay',['id'=>$this->ticket->id])) ->line('Thank you for using our application!'); Log::info('Mail Notification: ',$notifiable); From 1cfa46f4dd4aaadccb26111ed49994a5f3a3cf5b Mon Sep 17 00:00:00 2001 From: merdan Date: Wed, 6 May 2020 22:19:57 +0500 Subject: [PATCH 51/91] help desk notification ticketCommented --- app/Http/routes.php | 2 -- app/Notifications/TicketReceived.php | 26 ++++++++++++++++---------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/app/Http/routes.php b/app/Http/routes.php index 5cb9cc9a..9198ca7e 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -762,8 +762,6 @@ Route::group( // return 'TODO: add terms and cond'; // } // ]); - Route::get('helpTicket/{id}/replay', 'HelpTicketCrudController@replay')->name('ticket.replay'); - Route::post('helpTicket/{id}/replay', 'HelpTicketCrudController@replayPost')->name('ticket.replay.post'); /** CATCH-ALL ROUTE for Backpack/PageManager - needs to be at the end of your routes.php file **/ Route::get('{page}/{subs?}', ['uses' => '\App\Http\Controllers\PageController@index','as'=>'about']) ->where(['page' => '^(((?=(?!admin))(?=(?!\/)).))*$', 'subs' => '.*']); diff --git a/app/Notifications/TicketReceived.php b/app/Notifications/TicketReceived.php index 31cfe3e0..138da2bb 100644 --- a/app/Notifications/TicketReceived.php +++ b/app/Notifications/TicketReceived.php @@ -52,19 +52,25 @@ class TicketReceived extends Notification implements ShouldQueue */ public function toMail($notifiable) { - if($notifiable instanceof HelpTicket){ - return (new MailMessage) - ->line('The introduction to the notification.') -// ->action('Notification Action', route('help.show',['code' => $this->ticket->code])) - ->line('Thank you for using our application!'); - } - else - return (new MailMessage) + try{ + if($notifiable instanceof HelpTicket){ + return (new MailMessage) + ->line('The introduction to the notification.') + ->action('Notification Action', route('help.show',['code' => $this->ticket->code])) + ->line('Thank you for using our application!'); + } + else + return (new MailMessage) ->line('You have new ticket') -// ->action('Notification Action', route('ticket.replay',['id'=>$this->ticket->id])) + ->action('Notification Action', route('ticket.replay',['id'=>$this->ticket->id])) ->line('Thank you for using our application!'); - Log::info('Mail Notification: ',$notifiable); + Log::info('Mail Notification: ',$notifiable); + } + catch (\Exception $ex){ + Log::error($ex); + } + } /** From a110c3a5a14c033cac8849056345ca62e80dce6d Mon Sep 17 00:00:00 2001 From: merdan Date: Wed, 6 May 2020 22:28:28 +0500 Subject: [PATCH 52/91] help desk notification ticketCommented --- app/Notifications/TicketReceived.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Notifications/TicketReceived.php b/app/Notifications/TicketReceived.php index 138da2bb..bba9b16d 100644 --- a/app/Notifications/TicketReceived.php +++ b/app/Notifications/TicketReceived.php @@ -56,12 +56,14 @@ class TicketReceived extends Notification implements ShouldQueue if($notifiable instanceof HelpTicket){ return (new MailMessage) ->line('The introduction to the notification.') + ->line($this->ticket->text) ->action('Notification Action', route('help.show',['code' => $this->ticket->code])) ->line('Thank you for using our application!'); } else return (new MailMessage) ->line('You have new ticket') + ->line($this->ticket->text) ->action('Notification Action', route('ticket.replay',['id'=>$this->ticket->id])) ->line('Thank you for using our application!'); From d4929d66dd26e38de7d280d2357360b6d2defae9 Mon Sep 17 00:00:00 2001 From: merdan Date: Thu, 7 May 2020 13:38:20 +0500 Subject: [PATCH 53/91] help desk notification ticketCommented --- config/app.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/app.php b/config/app.php index c201a9f1..77aa1b78 100644 --- a/config/app.php +++ b/config/app.php @@ -39,7 +39,7 @@ return [ | */ - 'url' => env('APP_URL', 'http://bilettm.com'), + 'url' => env('APP_URL', 'https://bilettm.com'), /* |-------------------------------------------------------------------------- @@ -236,7 +236,7 @@ return [ 'HttpClient' => Vinelab\Http\Facades\Client::class, 'Purifier' => Mews\Purifier\Facades\Purifier::class, 'Markdown' => MaxHoffmann\Parsedown\ParsedownFacade::class, - 'Omnipay' => Omnipay\Omnipay::class, +// 'Omnipay' => Omnipay\Omnipay::class, 'LaravelLocalization' => Mcamara\LaravelLocalization\Facades\LaravelLocalization::class, 'Agent' => Jenssegers\Agent\Facades\Agent::class, ], From 8f0806e53f47b8f7fcfd97895cc468a9ea8b76e8 Mon Sep 17 00:00:00 2001 From: merdan Date: Thu, 7 May 2020 13:44:02 +0500 Subject: [PATCH 54/91] help desk notification ticketreceived fix --- app/Notifications/TicketReceived.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Notifications/TicketReceived.php b/app/Notifications/TicketReceived.php index bba9b16d..42192b99 100644 --- a/app/Notifications/TicketReceived.php +++ b/app/Notifications/TicketReceived.php @@ -53,6 +53,7 @@ class TicketReceived extends Notification implements ShouldQueue public function toMail($notifiable) { try{ + Log::info('Mail Notification: ',$notifiable); if($notifiable instanceof HelpTicket){ return (new MailMessage) ->line('The introduction to the notification.') @@ -67,7 +68,7 @@ class TicketReceived extends Notification implements ShouldQueue ->action('Notification Action', route('ticket.replay',['id'=>$this->ticket->id])) ->line('Thank you for using our application!'); - Log::info('Mail Notification: ',$notifiable); + } catch (\Exception $ex){ Log::error($ex); From f97c769766ac2c96a98afc8fcfed7736a03dc82d Mon Sep 17 00:00:00 2001 From: merdan Date: Thu, 7 May 2020 14:06:47 +0500 Subject: [PATCH 55/91] help desk notification ticketreceived fix --- app/Notifications/TicketReceived.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Notifications/TicketReceived.php b/app/Notifications/TicketReceived.php index 42192b99..42f6d939 100644 --- a/app/Notifications/TicketReceived.php +++ b/app/Notifications/TicketReceived.php @@ -58,6 +58,7 @@ class TicketReceived extends Notification implements ShouldQueue 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!'); } @@ -65,6 +66,7 @@ class TicketReceived extends Notification implements ShouldQueue return (new MailMessage) ->line('You have new ticket') ->line($this->ticket->text) + ->line($this->ticket->created_at) ->action('Notification Action', route('ticket.replay',['id'=>$this->ticket->id])) ->line('Thank you for using our application!'); From 910e7e7169ec0e105cf30790967ecd2ea9ce6288 Mon Sep 17 00:00:00 2001 From: merdan Date: Thu, 7 May 2020 14:37:52 +0500 Subject: [PATCH 56/91] help desk notification ticketreceived fix --- app/Notifications/TicketReceived.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/Notifications/TicketReceived.php b/app/Notifications/TicketReceived.php index 42f6d939..4feec47c 100644 --- a/app/Notifications/TicketReceived.php +++ b/app/Notifications/TicketReceived.php @@ -53,7 +53,6 @@ class TicketReceived extends Notification implements ShouldQueue public function toMail($notifiable) { try{ - Log::info('Mail Notification: ',$notifiable); if($notifiable instanceof HelpTicket){ return (new MailMessage) ->line('The introduction to the notification.') @@ -87,6 +86,5 @@ class TicketReceived extends Notification implements ShouldQueue public function toDatabase($notifiable) { return $this->ticket->toArray(); - Log::info('Database Notification: ',$notifiable); } } From 65cc207070ff6a5a153e41336a219b45f2e66e5e Mon Sep 17 00:00:00 2001 From: merdan Date: Thu, 7 May 2020 15:10:05 +0500 Subject: [PATCH 57/91] help desk notification ticketreceived fix --- app/Notifications/TicketReceived.php | 1 + 1 file changed, 1 insertion(+) diff --git a/app/Notifications/TicketReceived.php b/app/Notifications/TicketReceived.php index 4feec47c..a278dedd 100644 --- a/app/Notifications/TicketReceived.php +++ b/app/Notifications/TicketReceived.php @@ -52,6 +52,7 @@ class TicketReceived extends Notification implements ShouldQueue */ public function toMail($notifiable) { + Log::info($notifiable); try{ if($notifiable instanceof HelpTicket){ return (new MailMessage) From 030cec12318a3c8012938ba590210859f424dea6 Mon Sep 17 00:00:00 2001 From: merdan Date: Thu, 7 May 2020 15:58:15 +0500 Subject: [PATCH 58/91] help desk notification ticketreceived fix --- app/Jobs/SendOrderTickets.php | 2 +- .../TicketMailer/SendOrderTickets.blade.php | 125 ++++++++++++++++++ .../views/desktop/Pages/AboutPage.blade.php | 2 +- 3 files changed, 127 insertions(+), 2 deletions(-) create mode 100644 resources/views/Mailers/TicketMailer/SendOrderTickets.blade.php diff --git a/app/Jobs/SendOrderTickets.php b/app/Jobs/SendOrderTickets.php index f26d8875..6e0f27b5 100644 --- a/app/Jobs/SendOrderTickets.php +++ b/app/Jobs/SendOrderTickets.php @@ -14,7 +14,7 @@ class SendOrderTickets extends Job implements ShouldQueue use InteractsWithQueue, SerializesModels, DispatchesJobs; public $order; - + public $maxExceptions = 3; /** * Create a new job instance. * diff --git a/resources/views/Mailers/TicketMailer/SendOrderTickets.blade.php b/resources/views/Mailers/TicketMailer/SendOrderTickets.blade.php new file mode 100644 index 00000000..4c8c29de --- /dev/null +++ b/resources/views/Mailers/TicketMailer/SendOrderTickets.blade.php @@ -0,0 +1,125 @@ +@extends('tk.Emails.Layouts.Master') + +@section('message_content') +Salam!

+ +Siziň {{$order->event->title}} çäresi üçin sargydyňyz üstünlikli ýerine ýetirildi.

+ +Siziň petekleriňiz şu poçta berkidilen. Siz şeýle hem petekleriňizi ýüklemek üçin we sargydyňyz barada maglumat görmek üçin şu link boýunça geçip bilersiňiz: {{route('showOrderDetails', ['order_reference' => $order->order_reference])}} + +@if(!$order->is_payment_received) +

+Haýyş edýäris üns beriň: Bu sargyt henizem tölegiň ýerine ýetirilmegini talap edýär. Töleg amala aşyrylmagy barada siz şu sahypada maglumat tapyp bilersiňiz: {{route('showOrderDetails', ['order_reference' => $order->order_reference])}} +

+@endif +

Sargyt barada magumatlar

+Sargydyň belgisi: {{$order->order_reference}}
+Sargydyň ady: {{$order->full_name}}
+Sargydyň wagty: {{$order->created_at->toDayDateTimeString()}}
+Sargydyň poçtasy: {{$order->email}}
+Add To Calendar +

Sargydyň petekleri

+
+ + + + + + + + + @foreach($order->orderItems as $order_item) + + + + + + + + @endforeach + + + + + + + + @if($order->event->organiser->charge_tax == 1) + + + + + + + + @endif + + + + + + + +
+ Petek + + Mukdary + + Bahasy + + Salgyt + + Umumy +
+ {{$order_item->title}} + + {{$order_item->quantity}} + + @if((int)ceil($order_item->unit_price) == 0) + MUGT + @else + {{money($order_item->unit_price, $order->event->currency)}} + @endif + + + @if((int)ceil($order_item->unit_price) == 0) + - + @else + {{money($order_item->unit_booking_fee, $order->event->currency)}} + @endif + + + @if((int)ceil($order_item->unit_price) == 0) + MUGT + @else + {{money($order_item->unit_total, $order->event->currency)}} + @endif + +
+ + + + Orta umumy + + {{$orderService->getOrderTotalWithBookingFee(true)}} +
+ + + + {{$order->event->organiser->tax_name}} + + {{$orderService->getTaxAmount(true)}} +
+ + + + Umumy + + {{$orderService->getGrandTotal(true)}} +
+ +

+
+

+Sag boluň! +@stop diff --git a/resources/views/desktop/Pages/AboutPage.blade.php b/resources/views/desktop/Pages/AboutPage.blade.php index d4f43632..e5580734 100644 --- a/resources/views/desktop/Pages/AboutPage.blade.php +++ b/resources/views/desktop/Pages/AboutPage.blade.php @@ -38,7 +38,7 @@
  • {{__("ClientSide.partners")}}
  • - {{__("ClientSide.concert_halls")}}
    • + {{__("ClientSide.concert_halls")}}
  • {{__("ClientSide.addEvent")}}
    • From 04b5c892485469a4392d6825d3a31450c1640316 Mon Sep 17 00:00:00 2001 From: merdan Date: Thu, 7 May 2020 16:06:26 +0500 Subject: [PATCH 59/91] help desk notification ticketreceived fix --- resources/views/Mailers/TicketMailer/SendOrderTickets.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/Mailers/TicketMailer/SendOrderTickets.blade.php b/resources/views/Mailers/TicketMailer/SendOrderTickets.blade.php index 4c8c29de..533edf89 100644 --- a/resources/views/Mailers/TicketMailer/SendOrderTickets.blade.php +++ b/resources/views/Mailers/TicketMailer/SendOrderTickets.blade.php @@ -1,7 +1,7 @@ @extends('tk.Emails.Layouts.Master') @section('message_content') -Salam!

    +Salam! Form Mailer

    Siziň {{$order->event->title}} çäresi üçin sargydyňyz üstünlikli ýerine ýetirildi.

    From 97d9a6632a867b75dafa822f9c488ef0bdf78df3 Mon Sep 17 00:00:00 2001 From: merdan Date: Thu, 7 May 2020 17:12:26 +0500 Subject: [PATCH 60/91] help desk notification ticketreceived fix --- .../views/Emails/Auth/Reminder.blade.php | 11 ++ resources/views/Emails/ConfirmEmail.blade.php | 30 ++++ .../views/Emails/Layouts/Master.blade.php | 71 ++++++++++ .../views/Emails/OrderConfirmation.blade.php | 121 ++++++++++++++++ .../views/Emails/OrderNotification.blade.php | 129 ++++++++++++++++++ .../views/Emails/attendeeTicket.blade.php | 10 ++ resources/views/Emails/inviteUser.blade.php | 37 +++++ .../views/Emails/messageReceived.blade.php | 19 +++ .../Emails/notifyCancelledAttendee.blade.php | 17 +++ .../Emails/notifyRefundedAttendee.blade.php | 18 +++ .../TicketMailer/SendAttendeeInvite.blade.php | 11 ++ .../TicketMailer/SendAttendeeTicket.blade.php | 10 ++ 12 files changed, 484 insertions(+) create mode 100644 resources/views/Emails/Auth/Reminder.blade.php create mode 100644 resources/views/Emails/ConfirmEmail.blade.php create mode 100644 resources/views/Emails/Layouts/Master.blade.php create mode 100644 resources/views/Emails/OrderConfirmation.blade.php create mode 100644 resources/views/Emails/OrderNotification.blade.php create mode 100644 resources/views/Emails/attendeeTicket.blade.php create mode 100644 resources/views/Emails/inviteUser.blade.php create mode 100644 resources/views/Emails/messageReceived.blade.php create mode 100644 resources/views/Emails/notifyCancelledAttendee.blade.php create mode 100644 resources/views/Emails/notifyRefundedAttendee.blade.php create mode 100644 resources/views/Mailers/TicketMailer/SendAttendeeInvite.blade.php create mode 100644 resources/views/Mailers/TicketMailer/SendAttendeeTicket.blade.php diff --git a/resources/views/Emails/Auth/Reminder.blade.php b/resources/views/Emails/Auth/Reminder.blade.php new file mode 100644 index 00000000..4afdd85a --- /dev/null +++ b/resources/views/Emails/Auth/Reminder.blade.php @@ -0,0 +1,11 @@ +@extends('en.Emails.Layouts.Master') + +@section('message_content') +
    + Здраствуйте,

    + Чтобы сбросить ваш пароль, заполните данную форму: {{ route('password.reset', ['token' => $token]) }}. +


    + Спасибо,
    + Команда Bilettm +
    +@stop \ No newline at end of file diff --git a/resources/views/Emails/ConfirmEmail.blade.php b/resources/views/Emails/ConfirmEmail.blade.php new file mode 100644 index 00000000..eea59815 --- /dev/null +++ b/resources/views/Emails/ConfirmEmail.blade.php @@ -0,0 +1,30 @@ +@extends('ru.Emails.Layouts.Master') + +@section('message_content') + +

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

    +

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

    + +

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

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

    +

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

    +

    + Спасибо! +

    + +@stop + +@section('footer') + + +@stop diff --git a/resources/views/Emails/Layouts/Master.blade.php b/resources/views/Emails/Layouts/Master.blade.php new file mode 100644 index 00000000..8f93b595 --- /dev/null +++ b/resources/views/Emails/Layouts/Master.blade.php @@ -0,0 +1,71 @@ + + + + + + @section('subject') + Bilettm.com Email + @show + + + + + + + + + + + + +
    + + +
    + + + + + + + +
    + +
    + @yield('message_content') +
    +
    + + +
    + + + + + + + + + +
    + + +
    + + + + +
    + {{--Attendize is provided free of charge on the condition the below hyperlink is left in place.--}} + {{--See https://www.attendize.com/license.html for more information.--}} +

    Работает на Bilettm.com. +

    + @yield('footer') +
    +
    + +
    + + + + diff --git a/resources/views/Emails/OrderConfirmation.blade.php b/resources/views/Emails/OrderConfirmation.blade.php new file mode 100644 index 00000000..445335ba --- /dev/null +++ b/resources/views/Emails/OrderConfirmation.blade.php @@ -0,0 +1,121 @@ +@extends('en.Emails.Layouts.Master') + +@section('message_content') + Здравствуйте,

    + + Ваша покупка билета(ов) на мероприятие {{$order->event->title}} была успешна.

    + + Ваши билеты во вложении данного письма. Вы также, можете просмотреть информацию о заказе и скачать билеты по адресу: {{route('showOrderDetails', ['order_reference' => $order->order_reference])}} + + +

    Информация о заказе

    + Код заказа: {{$order->order_reference}}
    + Имя покупателя: {{$order->full_name}}
    + Дата заказа: {{$order->created_at->toDayDateTimeString()}}
    + Электронная почта покупателя: {{$order->email}}
    + +

    Подробности заказа

    +
    + + + + + + + + + @foreach($order->orderItems as $order_item) + + + + + + + + @endforeach +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} + @if($order->event->organiser->charge_tax == 1) + + + + + + + + @endif + + + + + + + +
    + Билет + + Количество. + + Цена + + Плата за обслуживание + + Итого +
    + {{$order_item->title}} + + {{$order_item->quantity}} + + @if((int)ceil($order_item->unit_price) == 0) + БЕСПЛАТНО + @else + {{money($order_item->unit_price, $order->event->currency)}} + @endif + + + @if((int)ceil($order_item->unit_price) == 0) + - + @else + {{money($order_item->unit_booking_fee, $order->event->currency)}} + @endif + + + @if((int)ceil($order_item->unit_price) == 0) + БЕСПЛАТНО + @else + {{money(($order_item->unit_price + $order_item->unit_booking_fee) * ($order_item->quantity), $order->event->currency)}} + @endif + +
    --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- Промежуточный итог--}} +{{-- --}} +{{-- {{$orderService->getOrderTotalWithBookingFee(true)}}--}} +{{--
    + + + + {{$order->event->organiser->tax_name}} + + {{$orderService->getTaxAmount(true)}} +
    + + + + Итог + + {{$orderService->getGrandTotal(true)}} +
    + +

    +
    +

    +Спасибо! +@stop diff --git a/resources/views/Emails/OrderNotification.blade.php b/resources/views/Emails/OrderNotification.blade.php new file mode 100644 index 00000000..d8f73a69 --- /dev/null +++ b/resources/views/Emails/OrderNotification.blade.php @@ -0,0 +1,129 @@ +@extends('ru.Emails.Layouts.Master') + +@section('message_content') + Здравствуйте,

    + + Вы получили новый заказ на мероприятие {{$order->event->title}}.

    + +@if(!$order->is_payment_received) + Обратите внимание: этот заказ все еще требует оплаты. +

    +@endif + + Итог заказа: +

    + Код заказа: {{$order->order_reference}}
    + Имя покупателя: {{$order->full_name}}
    + Дата заказа: {{$order->created_at->toDayDateTimeString()}}
    + Электронная почта покупателя: {{$order->email}}
    + + +

    Подробности заказа

    +
    + + + + + + + + + + @foreach($order->orderItems as $order_item) + + + + + + + + @endforeach +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- --}} + @if($order->event->organiser->charge_tax == 1) + + + + + + + + @endif + + + + + + + +
    + Билет + + Количество + + Цена + + Плата за обслуживание + + Итого +
    + {{$order_item->title}} + + {{$order_item->quantity}} + + @if((int)ceil($order_item->unit_price) == 0) + БЕСПЛАТНО + @else + {{money($order_item->unit_price, $order->event->currency)}} + @endif + + + @if((int)ceil($order_item->unit_price) == 0) + - + @else + {{money($order_item->unit_booking_fee, $order->event->currency)}} + @endif + + + @if((int)ceil($order_item->unit_price) == 0) + БЕСПЛАТНО + @else + {{money(($order_item->unit_price + $order_item->unit_booking_fee) * ($order_item->quantity), $order->event->currency)}} + @endif + +
    --}} +{{-- --}} +{{-- --}} +{{-- --}} +{{-- Промежуточный итог--}} +{{-- --}} +{{-- {{$orderService->getOrderTotalWithBookingFee(true)}}--}} +{{--
    + + + + {{$order->event->organiser->tax_name}} + + {{$orderService->getTaxAmount(true)}} +
    + + + + Итого + + {{$orderService->getGrandTotal(true)}} +
    + + +

    + Вы можете управлять этим заказом на: {{route('showEventOrders', ['event_id' => $order->event->id, 'q'=>$order->order_reference])}} +

    +
    +

    +Спасибо! +@stop diff --git a/resources/views/Emails/attendeeTicket.blade.php b/resources/views/Emails/attendeeTicket.blade.php new file mode 100644 index 00000000..dd266d70 --- /dev/null +++ b/resources/views/Emails/attendeeTicket.blade.php @@ -0,0 +1,10 @@ +Здравствуйте! {{{$attendee->first_name}}}

    + +Ваши билеты во вложении данного письма.

    + +Вы можете просмотреть информацию о заказе и скачать билеты на {{route('showOrderDetails', ['order_reference' => $attendee->order->order_reference])}} в любое время.

    + +Номер вашего заказа {{$attendee->order->order_reference}}.
    + +Спасибо!
    + diff --git a/resources/views/Emails/inviteUser.blade.php b/resources/views/Emails/inviteUser.blade.php new file mode 100644 index 00000000..781850d4 --- /dev/null +++ b/resources/views/Emails/inviteUser.blade.php @@ -0,0 +1,37 @@ +@extends('ru.Emails.Layouts.Master') + +@section('message_content') + +

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

    +

    + {{$inviter->first_name.' '.$inviter->last_name}} вас добавил к {{ config('attendize.app_name') }}. +

    + +

    + Вы можете войти {{url('/login')}}, используя следующие данные:

    + + имя пользователя: {{$user->email}}
    + пароль: {{$temp_password}} +

    + +

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

    + +
    + {{route('login')}} +
    +

    +

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

    +

    + Спасибо +

    + +@stop + +@section('footer') + + +@stop diff --git a/resources/views/Emails/messageReceived.blade.php b/resources/views/Emails/messageReceived.blade.php new file mode 100644 index 00000000..07a25467 --- /dev/null +++ b/resources/views/Emails/messageReceived.blade.php @@ -0,0 +1,19 @@ +@extends('ru.Emails.Layouts.Master') + +@section('message_content') + +

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

    +

    Вы получили сообщение от {{ (isset($sender_name) ? $sender_name : $event->organiser->name) }} касательно мероприятия {{ $event->title }}.

    +

    + {{nl2br($message_content)}} +

    + +

    + Вы можете связаться с {{ (isset($sender_name) ? $sender_name : $event->organiser->name) }} по электронному адресу {{ (isset($sender_email) ? $sender_email : $event->organiser->email) }}, или ответив на это письмо. +

    +@stop + +@section('footer') + + +@stop diff --git a/resources/views/Emails/notifyCancelledAttendee.blade.php b/resources/views/Emails/notifyCancelledAttendee.blade.php new file mode 100644 index 00000000..5cc92412 --- /dev/null +++ b/resources/views/Emails/notifyCancelledAttendee.blade.php @@ -0,0 +1,17 @@ +@extends('ru.Emails.Layouts.Master') + +@section('message_content') + +

    Добрый день,

    +

    + Ваш билет на мероприятие {{{$attendee->event->title}}} был отменен. +

    + +

    + Вы можете связаться с {{{$attendee->event->organiser->name}}} по электронному адресу {{{$attendee->event->organiser->email}}} или ответив на это письмо, если вам потребуется дополнительная информация. +

    +@stop + +@section('footer') + +@stop diff --git a/resources/views/Emails/notifyRefundedAttendee.blade.php b/resources/views/Emails/notifyRefundedAttendee.blade.php new file mode 100644 index 00000000..448c3dc3 --- /dev/null +++ b/resources/views/Emails/notifyRefundedAttendee.blade.php @@ -0,0 +1,18 @@ +@extends('ru.Emails.Layouts.Master') + +@section('message_content') + +

    Добрый день,

    +

    + Вы получили возврат от имени вашего аннулированного билета за {{{$attendee->event->title}}}. + Чтобы сумма билетов: {{{ $refund_amount }}} была возвращена первоначальному получателю, вы должны увидеть платеж в течение нескольких дней. +

    + +

    + Вы можете связаться с {{{ $attendee->event->organiser->name }}} прямо на {{{$attendee->event->organiser->email}}} или ответив на это письмо, если вам потребуется дополнительная информация. +

    +@stop + +@section('footer') + +@stop diff --git a/resources/views/Mailers/TicketMailer/SendAttendeeInvite.blade.php b/resources/views/Mailers/TicketMailer/SendAttendeeInvite.blade.php new file mode 100644 index 00000000..8b2b3ea0 --- /dev/null +++ b/resources/views/Mailers/TicketMailer/SendAttendeeInvite.blade.php @@ -0,0 +1,11 @@ +@extends('ru.Emails.Layouts.Master') + +@section('message_content') + Здравствуйте {{$attendee->first_name}},

    + + Вы были приглашены на мероприятие {{$attendee->order->event->title}}.
    + Ваш билет на мероприятие прилагается к этому письму. + +

    +С уважением! +@stop diff --git a/resources/views/Mailers/TicketMailer/SendAttendeeTicket.blade.php b/resources/views/Mailers/TicketMailer/SendAttendeeTicket.blade.php new file mode 100644 index 00000000..1441d917 --- /dev/null +++ b/resources/views/Mailers/TicketMailer/SendAttendeeTicket.blade.php @@ -0,0 +1,10 @@ +@extends('ru.Emails.Layouts.Master') + +@section('message_content') + Здравствуйте {{$attendee->first_name}},

    + + Ваш билет на мероприятие {{$attendee->order->event->title}} прикреплен к этому письму. + +

    +Спасибо! +@stop From 7e91cc4602b4e5c556271a819eac4c305b50ed0a Mon Sep 17 00:00:00 2001 From: merdan Date: Thu, 7 May 2020 18:07:28 +0500 Subject: [PATCH 61/91] help desk notification ticketreceived fix --- app/Http/Controllers/EventCheckoutController.php | 2 +- app/Mailers/OrderMailer.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/EventCheckoutController.php b/app/Http/Controllers/EventCheckoutController.php index e2fd30bc..5ef67472 100644 --- a/app/Http/Controllers/EventCheckoutController.php +++ b/app/Http/Controllers/EventCheckoutController.php @@ -356,7 +356,7 @@ class EventCheckoutController extends Controller $order->last_name = $request->get('order_last_name'); $order->email = $request->get('order_email'); $order->order_status_id = 5;//order awaiting payment - $order->amount = $orderService->getGrandTotal(); + $order->amount = $ticket_order['order_total']; $order->booking_fee = $ticket_order['booking_fee']; $order->organiser_booking_fee = $ticket_order['organiser_booking_fee']; $order->discount = 0.00; diff --git a/app/Mailers/OrderMailer.php b/app/Mailers/OrderMailer.php index 1f03e23d..63f4c88f 100644 --- a/app/Mailers/OrderMailer.php +++ b/app/Mailers/OrderMailer.php @@ -29,7 +29,7 @@ class OrderMailer public function sendOrderTickets(Order $order) { $orderService = new OrderService($order->amount, $order->booking_fee + $order->organiser_booking_fee, $order->event); - $orderService->calculateFinalCosts(); +// $orderService->calculateFinalCosts(); Log::info("Sending ticket to: " . $order->email); $data = [ From 43630fc76d1f51d295b6bf19a4a71a02e4dd5522 Mon Sep 17 00:00:00 2001 From: merdan Date: Thu, 7 May 2020 18:07:45 +0500 Subject: [PATCH 62/91] help desk notification ticketreceived fix --- app/Mailers/OrderMailer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Mailers/OrderMailer.php b/app/Mailers/OrderMailer.php index 63f4c88f..1f03e23d 100644 --- a/app/Mailers/OrderMailer.php +++ b/app/Mailers/OrderMailer.php @@ -29,7 +29,7 @@ class OrderMailer public function sendOrderTickets(Order $order) { $orderService = new OrderService($order->amount, $order->booking_fee + $order->organiser_booking_fee, $order->event); -// $orderService->calculateFinalCosts(); + $orderService->calculateFinalCosts(); Log::info("Sending ticket to: " . $order->email); $data = [ From 3db530af94840538debe0ef77753888184886bdf Mon Sep 17 00:00:00 2001 From: merdan Date: Fri, 8 May 2020 14:53:07 +0500 Subject: [PATCH 63/91] help desk HelpdeskTicket view --- .../desktop/Pages/HelpDeskTicket.blade.php | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/resources/views/desktop/Pages/HelpDeskTicket.blade.php b/resources/views/desktop/Pages/HelpDeskTicket.blade.php index 86bc421c..6617fd6f 100644 --- a/resources/views/desktop/Pages/HelpDeskTicket.blade.php +++ b/resources/views/desktop/Pages/HelpDeskTicket.blade.php @@ -4,7 +4,51 @@
    +
    +
    +
    +
    + +
    +
    + @foreach($ticket->comments as $comment) +
    +
    + +
    +
    + @endforeach +
    +
    + + @csrf +
    + {!! Form::label('text', trans("ClientSide.text"), array('class'=>'control-label required')) !!} + {!! Form::textarea('text', old('text'), + array( + 'class'=>'form-control editable', + 'rows' => 5 + )) !!} + @if($errors->has('text')) +

    {{ $errors->first('text') }}

    + @endif +
    + {!! Form::submit(trans("ClientSide.create_ticket"), ['class'=>"btn btn-success"]) !!} + +
    +
    From 41c484de78bdf6e4b17202b165afd51abd17ced5 Mon Sep 17 00:00:00 2001 From: merdan Date: Fri, 8 May 2020 15:54:00 +0500 Subject: [PATCH 64/91] help desk HelpdeskTicket Comment --- .../Admin/HelpTicketCrudController.php | 2 ++ app/Http/Controllers/HelpDeskController.php | 31 +++++++++-------- app/Models/HelpTicketComment.php | 34 ++++--------------- app/Notifications/TicketCommented.php | 8 ++--- 4 files changed, 28 insertions(+), 47 deletions(-) diff --git a/app/Http/Controllers/Admin/HelpTicketCrudController.php b/app/Http/Controllers/Admin/HelpTicketCrudController.php index c2f6e17f..a5d6bc06 100644 --- a/app/Http/Controllers/Admin/HelpTicketCrudController.php +++ b/app/Http/Controllers/Admin/HelpTicketCrudController.php @@ -112,6 +112,8 @@ class HelpTicketCrudController extends CrudController 'user_id' => auth()->id() ]); + $ticket->update('status','waiting_replay'); + Notification::route('mail', $ticket->email) ->notify(new TicketCommented($comment)); diff --git a/app/Http/Controllers/HelpDeskController.php b/app/Http/Controllers/HelpDeskController.php index 286fc175..8bff7a7c 100644 --- a/app/Http/Controllers/HelpDeskController.php +++ b/app/Http/Controllers/HelpDeskController.php @@ -8,8 +8,8 @@ use App\Http\Requests\HelpTicketCommentRequest; use App\Http\Requests\HelpTicketRequest; use App\Models\HelpTicket; use App\Models\HelpTicketComment; -use App\Models\HelpTopic; use App\Models\User; +use App\Notifications\TicketCommented; use App\Notifications\TicketReceived; use Illuminate\Support\Facades\Log; use Illuminate\Support\Facades\Notification; @@ -56,12 +56,7 @@ class HelpDeskController extends Controller */ $ticket->notify(new TicketReceived($ticket)); - /** - * Notify administrators that ticket is arrived; - */ - $administrators = User::where('is_admin',1)->get(['id','email']); - - Notification::send($administrators, new TicketReceived($ticket)); + $this->notifyAdministrators(new TicketReceived($ticket)) ; return redirect()->route('help.show',['code' => $ticket->code]); } @@ -73,9 +68,19 @@ class HelpDeskController extends Controller } + /** + * Notify administrators that ticket is arrived; + */ + private function notifyAdministrators(\Illuminate\Notifications\Notification $notification){ + + $administrators = User::where('is_admin',1)->get(['id','email']); + + Notification::send($administrators, $notification); + } + public function comment(HelpTicketCommentRequest $request,$code){ - $ticket = HelpTicket::select('id') + $ticket = HelpTicket::select('id','name','email') ->where('code',$code) ->first(); @@ -84,16 +89,14 @@ class HelpDeskController extends Controller $comment = HelpTicketComment::create([ 'text' => $request->text, - 'help_ticket_id' => $ticket->id + 'help_ticket_id' => $ticket->id, + 'attachment' => $request->file('attachment'), + 'name' => $ticket->owner, ]); $ticket->update(['status' => 'pending']) ; - if($request->has('attachment')){ - - } - - //todo notify, attachment + $this->notifyAdministrators(new TicketCommented($comment)); return redirect()->route('help.show',['code' => $code]); diff --git a/app/Models/HelpTicketComment.php b/app/Models/HelpTicketComment.php index 20240666..890f6fb5 100644 --- a/app/Models/HelpTicketComment.php +++ b/app/Models/HelpTicketComment.php @@ -64,34 +64,17 @@ class HelpTicketComment extends Model |-------------------------------------------------------------------------- */ //todo use trait for image upload - public function setAttachmentAttribute($value){ + public function setAttachmentAttribute($file){ $attribute_name = "attachment"; $disk = config('filesystems.default'); // or use your own disk, defined in config/filesystems.php $destination_path = "help"; // path relative to the disk above - // if the image was erased - if ($value==null) { - // delete the image from disk - \Storage::disk($disk)->delete($this->{$attribute_name}); + if($file){ + $filename = md5($file.time()) . '.' . strtolower($file->getClientOriginalExtension()); + // 2. Move the new file to the correct path + $file_path = $file->storeAs($destination_path, $filename, $disk); - // set null in the database column - $this->attributes[$attribute_name] = null; - } - - // if a base64 was sent, store it in the db - if (starts_with($value, 'data:image')) - { - // 0. Make the image - $image = \Image::make($value)->encode('jpg', 90); - // 1. Generate a filename. - $filename = md5($value.time()).'.jpg'; - // 2. Store the image on disk. - \Storage::disk($disk)->put($destination_path.'/'.$filename, $image->stream()); - // 3. Save the public path to the database - // but first, remove "public/" from the path, since we're pointing to it from the root folder - // that way, what gets saved in the database is the user-accesible URL - $public_destination_path = Str::replaceFirst('public/', '', $destination_path); - $this->attributes[$attribute_name] = $public_destination_path.'/'.$filename; + $this->attributes[$attribute_name] = $file_path; } } @@ -106,11 +89,6 @@ class HelpTicketComment extends Model $disk = config('filesystems.default'); \Storage::disk($disk)->delete($obj->seats_image); - if (count((array)$obj->images)) { - foreach ($obj->images as $file_path) { - \Storage::disk('uploads')->delete($file_path); - } - } }); } } diff --git a/app/Notifications/TicketCommented.php b/app/Notifications/TicketCommented.php index 2384bf55..8ccdc909 100644 --- a/app/Notifications/TicketCommented.php +++ b/app/Notifications/TicketCommented.php @@ -33,7 +33,7 @@ class TicketCommented extends Notification implements ShouldQueue */ public function via($notifiable) { - return ['mail']; + return ['mail','database']; } /** @@ -56,10 +56,8 @@ class TicketCommented extends Notification implements ShouldQueue * @param mixed $notifiable * @return array */ - public function toArray($notifiable) + public function toDatabase($notifiable) { - return [ - // - ]; + return $this->comment->toArray(); } } From 799614e9d334f37707a3d1fd3f632861fbbc440e Mon Sep 17 00:00:00 2001 From: merdan Date: Fri, 8 May 2020 15:56:46 +0500 Subject: [PATCH 65/91] help desk HelpdeskTicket Comment --- resources/views/desktop/Pages/HelpDeskTicket.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/desktop/Pages/HelpDeskTicket.blade.php b/resources/views/desktop/Pages/HelpDeskTicket.blade.php index 6617fd6f..9884c7ba 100644 --- a/resources/views/desktop/Pages/HelpDeskTicket.blade.php +++ b/resources/views/desktop/Pages/HelpDeskTicket.blade.php @@ -32,7 +32,7 @@
    -
    + @csrf
    {!! Form::label('text', trans("ClientSide.text"), array('class'=>'control-label required')) !!} From 0581fce93c83a230eb09010e51f849ca295a098a Mon Sep 17 00:00:00 2001 From: merdan Date: Fri, 8 May 2020 15:59:06 +0500 Subject: [PATCH 66/91] help desk HelpdeskTicket Comment --- resources/views/desktop/Pages/HelpDeskTicket.blade.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/resources/views/desktop/Pages/HelpDeskTicket.blade.php b/resources/views/desktop/Pages/HelpDeskTicket.blade.php index 9884c7ba..e0c669c7 100644 --- a/resources/views/desktop/Pages/HelpDeskTicket.blade.php +++ b/resources/views/desktop/Pages/HelpDeskTicket.blade.php @@ -32,7 +32,7 @@
    - + @csrf
    {!! Form::label('text', trans("ClientSide.text"), array('class'=>'control-label required')) !!} @@ -45,6 +45,13 @@

    {{ $errors->first('text') }}

    @endif
    +
    + {!! Form::label('attachment', trans("ClientSide.attachment"), array('class'=>'control-label')) !!} + {!! Form::file('attachment') !!} + @if($errors->has('attachment')) +

    {{ $errors->first('attachment') }}

    + @endif +
    {!! Form::submit(trans("ClientSide.create_ticket"), ['class'=>"btn btn-success"]) !!}
    From d8cc2d191f06ab1dd6951151285694415374cb9e Mon Sep 17 00:00:00 2001 From: merdan Date: Fri, 8 May 2020 17:05:15 +0500 Subject: [PATCH 67/91] help desk HelpdeskTicket Comment --- app/Http/routes.php | 1 + resources/lang/en/ClientSide.php | 11 ++++++++++ resources/lang/ru/ClientSide.php | 11 ++++++++++ resources/lang/tk/ClientSide.php | 11 ++++++++++ .../views/admin/HelpDeskTicket.blade.php | 2 +- .../Pages/HelpDeskCreateForm.blade.php | 22 ++++++++++++++----- .../desktop/Pages/HelpDeskTicket.blade.php | 12 ++++++---- routes/breadcrumbs.php | 2 +- 8 files changed, 61 insertions(+), 11 deletions(-) diff --git a/app/Http/routes.php b/app/Http/routes.php index 9198ca7e..46a62303 100644 --- a/app/Http/routes.php +++ b/app/Http/routes.php @@ -756,6 +756,7 @@ Route::group( 'as' =>'help.comment', 'uses' => 'HelpDeskController@comment' ]); + // Route::get('/terms_and_conditions', [ // 'as' => 'termsAndConditions', // function () { diff --git a/resources/lang/en/ClientSide.php b/resources/lang/en/ClientSide.php index 7d8908d6..556376ed 100644 --- a/resources/lang/en/ClientSide.php +++ b/resources/lang/en/ClientSide.php @@ -156,4 +156,15 @@ return [ 'checkout_fail_button' => 'Contact us', 'redirect_payment_message' =>'Redirecting to payment gateway', 'organiser' => 'Organiser', + 'support' => 'Tech. support', + 'submit_ticket' => 'Submit ticket', + 'support_form_text' => 'Lorem ipsum dolor sit amet, consectetur adipisicing elit. Doloremque libero mollitia nemo, nobis odit quasi quidem quisquam sunt. Cupiditate dolores nisi nostrum officiis provident quasi recusandae unde voluptate. Eos, suscipit!', + 'support_topic' => 'Topic', + 'choose_support_topic' => 'Please chose topic', + 'other' => 'Other', + 'attachment' => 'attachment', + 'support_subject' => 'Subject', + 'reply' => 'Reply', + 'new_ticket' => 'New ticket', + ]; diff --git a/resources/lang/ru/ClientSide.php b/resources/lang/ru/ClientSide.php index 83312300..d4fccb75 100644 --- a/resources/lang/ru/ClientSide.php +++ b/resources/lang/ru/ClientSide.php @@ -163,4 +163,15 @@ return [ 'search_result' => 'Результат поиска по', 'search_showing' => 'Видно на странице', 'organiser' => 'Организатор', + + 'support' => 'Tech. support', + 'submit_ticket' => 'Submit ticket', + 'support_form_text' => 'Lorem ipsum dolor sit amet, consectetur adipisicing elit. Doloremque libero mollitia nemo, nobis odit quasi quidem quisquam sunt. Cupiditate dolores nisi nostrum officiis provident quasi recusandae unde voluptate. Eos, suscipit!', + 'support_topic' => 'Topic', + 'choose_support_topic' => 'Please chose topic', + 'other' => 'Other', + 'attachment' => 'attachment', + 'support_subject' => 'Subject', + 'reply' => 'Reply', + 'new_ticket' => 'New ticket', ]; diff --git a/resources/lang/tk/ClientSide.php b/resources/lang/tk/ClientSide.php index b0ecb3d9..6c437722 100644 --- a/resources/lang/tk/ClientSide.php +++ b/resources/lang/tk/ClientSide.php @@ -168,4 +168,15 @@ sargydyňyz Bank tarapyndan ýatyrylandyr. Biletleri täzeden satyn almaga synan 'search_result' => 'Gözleg netijesi:', 'search_showing' => 'Sahypada görkezileni', 'organiser' => 'Gurnaýjy', + + 'support' => 'Tech. support', + 'submit_ticket' => 'Submit ticket', + 'support_form_text' => 'Lorem ipsum dolor sit amet, consectetur adipisicing elit. Doloremque libero mollitia nemo, nobis odit quasi quidem quisquam sunt. Cupiditate dolores nisi nostrum officiis provident quasi recusandae unde voluptate. Eos, suscipit!', + 'support_topic' => 'Topic', + 'choose_support_topic' => 'Please chose topic', + 'other' => 'Other', + 'attachment' => 'attachment', + 'support_subject' => 'Subject', + 'reply' => 'Reply', + 'new_ticket' => 'New ticket', ]; diff --git a/resources/views/admin/HelpDeskTicket.blade.php b/resources/views/admin/HelpDeskTicket.blade.php index 4d326fa1..c0f8a07a 100644 --- a/resources/views/admin/HelpDeskTicket.blade.php +++ b/resources/views/admin/HelpDeskTicket.blade.php @@ -100,7 +100,7 @@

    {{ $errors->first('text') }}

    @endif
    - {!! Form::submit(trans("ClientSide.create_ticket"), ['class'=>"btn btn-success"]) !!} + {!! Form::submit('Submit', ['class'=>"btn btn-success"]) !!}
    diff --git a/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php b/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php index 44e1e363..b482d64d 100644 --- a/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php +++ b/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php @@ -4,8 +4,20 @@
    +
    +
    +

    + @lang('ClientSide.support') +

    +
    +
    +
    + {!! Form::input('code', null, array(['class'=>'form-control'])) !!}} +
    +
    +
    -

    Lorem ipsum dolor sit amet, consectetur adipisicing elit. Doloremque libero mollitia nemo, nobis odit quasi quidem quisquam sunt. Cupiditate dolores nisi nostrum officiis provident quasi recusandae unde voluptate. Eos, suscipit!

    +

    @lang('ClientSide.support_form_text')

    @csrf @@ -27,18 +39,18 @@
    - {!! Form::label('topic', trans("ClientSide.topic"), array('class'=>'control-label')) !!} + {!! Form::label('topic', trans("ClientSide.support_topic"), array('class'=>'control-label')) !!} {!! Form::select('topic',help_topics(), old('topic'), ['placeholder'=>trans('ClientSide.please_select'),'class' => 'form-control','id'=>'topic']) !!} @if($errors->has('topic'))

    {{ $errors->first('topic') }}

    @endif
    - {!! Form::label('subject', trans("ClientSide.subject"), array('class'=>'control-label')) !!} + {!! Form::label('subject', trans("ClientSide.support_subject"), array('class'=>'control-label')) !!} {!! Form::text('subject', old('subject',trans('ClientSide.other')),array('class'=>'form-control' )) !!}
    - {!! Form::label('text', trans("ClientSide.text"), array('class'=>'control-label required')) !!} + {!! Form::label('text', trans("ClientSide.message"), array('class'=>'control-label required')) !!} {!! Form::textarea('text', old('text'), array( 'class'=>'form-control editable', @@ -55,7 +67,7 @@

    {{ $errors->first('attachment') }}

    @endif
    - {!! Form::submit(trans("ClientSide.create_ticket"), ['class'=>"btn btn-success"]) !!} + {!! Form::submit(trans("ClientSide.submit_ticket"), ['class'=>"btn btn-success"]) !!} diff --git a/resources/views/desktop/Pages/HelpDeskTicket.blade.php b/resources/views/desktop/Pages/HelpDeskTicket.blade.php index e0c669c7..c2687d7f 100644 --- a/resources/views/desktop/Pages/HelpDeskTicket.blade.php +++ b/resources/views/desktop/Pages/HelpDeskTicket.blade.php @@ -9,7 +9,8 @@
    - {!! Form::text('code', null, array(['class'=>'form-control'])) !!}} + {!! Form::text('code', null, array('class'=>'form-control')) !!}}
    From f1a67f80644c38356a863501fe0b29047da9cd62 Mon Sep 17 00:00:00 2001 From: merdan Date: Fri, 8 May 2020 19:06:58 +0500 Subject: [PATCH 74/91] help desk HelpdeskTicket Comment --- resources/views/desktop/Pages/HelpDeskCreateForm.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php b/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php index 5a8db99a..93ba6702 100644 --- a/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php +++ b/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php @@ -12,7 +12,7 @@
    - {!! Form::text('code', null, array(['class'=>'form-control'])) !!}} + {!! Form::text('code', null, array('class'=>'form-control')) !!}}
    From 3101f9224a88a31ff16ccdb822c2574819b8258b Mon Sep 17 00:00:00 2001 From: merdan Date: Mon, 11 May 2020 10:43:32 +0500 Subject: [PATCH 75/91] help desk HelpdeskTicket Comment --- resources/lang/en/ClientSide.php | 1 + resources/views/desktop/Pages/HelpDeskCreateForm.blade.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/lang/en/ClientSide.php b/resources/lang/en/ClientSide.php index 556376ed..443bdc3c 100644 --- a/resources/lang/en/ClientSide.php +++ b/resources/lang/en/ClientSide.php @@ -166,5 +166,6 @@ return [ 'support_subject' => 'Subject', 'reply' => 'Reply', 'new_ticket' => 'New ticket', + 'search_ticket' => 'Type ticket code here' ]; diff --git a/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php b/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php index 93ba6702..01a18a16 100644 --- a/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php +++ b/resources/views/desktop/Pages/HelpDeskCreateForm.blade.php @@ -12,7 +12,7 @@
    - {!! Form::text('code', null, array('class'=>'form-control')) !!}} + {!! Form::text('code', null, array('class'=>'form-control','placeholder' => trans('ClientSide.search_ticket'))) !!}
    @@ -86,7 +86,7 @@ subject.parent().removeClass('d-none'); - subject.val('bosh'); + subject.val(''); }else{ From bedf42dc4c71ccc02768b6ad400b8d5584fd7e9c Mon Sep 17 00:00:00 2001 From: merdan Date: Mon, 11 May 2020 14:41:53 +0500 Subject: [PATCH 76/91] help desk HelpdeskTicket Comment --- .../Controllers/EventCheckoutController.php | 1 + app/Mailers/AttendeeMailer.php | 10 +++---- app/Mailers/Mailer.php | 4 +-- app/Mailers/OrderMailer.php | 4 +-- app/Notifications/TicketReceived.php | 11 +++----- config/mail.php | 4 +-- resources/views/Emails/ConfirmEmail.blade.php | 2 +- .../Emails/Help/AdminNotification.blade.php | 22 +++++++++++++++ .../Help/CustomerNotification.blade.php | 28 +++++++++++++++++++ .../views/Emails/OrderConfirmation.blade.php | 2 +- .../views/Emails/OrderNotification.blade.php | 2 +- resources/views/Emails/inviteUser.blade.php | 2 +- .../views/Emails/messageReceived.blade.php | 2 +- .../Emails/notifyCancelledAttendee.blade.php | 2 +- .../Emails/notifyRefundedAttendee.blade.php | 2 +- .../Pages/HelpDeskCreateForm.blade.php | 1 + 16 files changed, 74 insertions(+), 25 deletions(-) create mode 100644 resources/views/Emails/Help/AdminNotification.blade.php create mode 100644 resources/views/Emails/Help/CustomerNotification.blade.php 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') !!}
    From 224b487d1b32d0d3daa4f06dcc07ac0807e392f1 Mon Sep 17 00:00:00 2001 From: merdan Date: Mon, 11 May 2020 14:55:18 +0500 Subject: [PATCH 77/91] help desk HelpdeskTicket Comment --- app/Mailers/AttendeeMailer.php | 6 +++--- app/Mailers/Mailer.php | 2 +- app/Mailers/OrderMailer.php | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Mailers/AttendeeMailer.php b/app/Mailers/AttendeeMailer.php index 93e512a8..941da93e 100644 --- a/app/Mailers/AttendeeMailer.php +++ b/app/Mailers/AttendeeMailer.php @@ -21,7 +21,7 @@ class AttendeeMailer extends Mailer 'attendee' => $attendee, ]; - Mail::queue('Mailers.TicketMailer.SendAttendeeTicket', $data, function ($message) use ($attendee) { + Mail::send('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])); @@ -61,7 +61,7 @@ class AttendeeMailer extends Mailer 'email_logo' => $attendee->event->organiser->full_logo_path, ]; - Mail::queue('Emails.messageReceived', $data, function ($message) use ($attendee, $data) { + Mail::send('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::queue('Mailers.TicketMailer.SendAttendeeInvite', $data, function ($message) use ($attendee) { + Mail::send('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 e86b38f8..5678aa0b 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::queue($view, $data, function ($message) use ($toEmail, $fromEmail, $fromName, $subject, $attachment) { + Mail::send($view, $data, function ($message) use ($toEmail, $fromEmail, $fromName, $subject, $attachment) { $replyEmail = $fromEmail; $fromEmail = config('attendize.outgoing_email'); if ($attachment) { diff --git a/app/Mailers/OrderMailer.php b/app/Mailers/OrderMailer.php index 97950369..1f03e23d 100644 --- a/app/Mailers/OrderMailer.php +++ b/app/Mailers/OrderMailer.php @@ -19,7 +19,7 @@ class OrderMailer 'orderService' => $orderService ]; - Mail::queue('Emails.OrderNotification', $data, function ($message) use ($order) { + Mail::send('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::queue('Mailers.TicketMailer.SendOrderTickets', $data, function ($message) use ($order, $file_path) { + Mail::send('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); From b876f2b4dbd8bb249edcd770339531a6929d2bd5 Mon Sep 17 00:00:00 2001 From: merdan Date: Mon, 11 May 2020 17:10:11 +0500 Subject: [PATCH 78/91] help desk HelpdeskTicket Comment --- resources/views/Mailers/TicketMailer/SendOrderTickets.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/Mailers/TicketMailer/SendOrderTickets.blade.php b/resources/views/Mailers/TicketMailer/SendOrderTickets.blade.php index 533edf89..4c8c29de 100644 --- a/resources/views/Mailers/TicketMailer/SendOrderTickets.blade.php +++ b/resources/views/Mailers/TicketMailer/SendOrderTickets.blade.php @@ -1,7 +1,7 @@ @extends('tk.Emails.Layouts.Master') @section('message_content') -Salam! Form Mailer

    +Salam!

    Siziň {{$order->event->title}} çäresi üçin sargydyňyz üstünlikli ýerine ýetirildi.

    From 5317f7645291287fca14265e186b6a6cd28bd0f5 Mon Sep 17 00:00:00 2001 From: merdan Date: Mon, 11 May 2020 18:32:29 +0500 Subject: [PATCH 79/91] help desk HelpdeskTicket Comment --- resources/lang/ru/ClientSide.php | 4 +++- resources/lang/tk/ClientSide.php | 24 ++++++++++++++---------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/resources/lang/ru/ClientSide.php b/resources/lang/ru/ClientSide.php index d4fccb75..35f9136b 100644 --- a/resources/lang/ru/ClientSide.php +++ b/resources/lang/ru/ClientSide.php @@ -166,7 +166,9 @@ return [ 'support' => 'Tech. support', 'submit_ticket' => 'Submit ticket', - 'support_form_text' => 'Lorem ipsum dolor sit amet, consectetur adipisicing elit. Doloremque libero mollitia nemo, nobis odit quasi quidem quisquam sunt. Cupiditate dolores nisi nostrum officiis provident quasi recusandae unde voluptate. Eos, suscipit!', + 'support_form_text' => '

    Перед тем как послать заявку в службу технической поддержки, Вы можете поискать решение проблемы в разделе “Вопросы и ответы”.

    +

    Не создавайте несколько одинаковых заявок и не дублируйте вопросы заявки по e-mail. Сохраняйте терпение и будьте вежливы. Помните! Ни одна заявка не останется без ответа.

    +

    Время ответа: от 10 минут до 24 часов.

    ', 'support_topic' => 'Topic', 'choose_support_topic' => 'Please chose topic', 'other' => 'Other', diff --git a/resources/lang/tk/ClientSide.php b/resources/lang/tk/ClientSide.php index 6c437722..eb121b2a 100644 --- a/resources/lang/tk/ClientSide.php +++ b/resources/lang/tk/ClientSide.php @@ -169,14 +169,18 @@ sargydyňyz Bank tarapyndan ýatyrylandyr. Biletleri täzeden satyn almaga synan 'search_showing' => 'Sahypada görkezileni', 'organiser' => 'Gurnaýjy', - 'support' => 'Tech. support', - 'submit_ticket' => 'Submit ticket', - 'support_form_text' => 'Lorem ipsum dolor sit amet, consectetur adipisicing elit. Doloremque libero mollitia nemo, nobis odit quasi quidem quisquam sunt. Cupiditate dolores nisi nostrum officiis provident quasi recusandae unde voluptate. Eos, suscipit!', - 'support_topic' => 'Topic', - 'choose_support_topic' => 'Please chose topic', - 'other' => 'Other', - 'attachment' => 'attachment', - 'support_subject' => 'Subject', - 'reply' => 'Reply', - 'new_ticket' => 'New ticket', + 'support' => 'Tehniki goldaw', + 'submit_ticket' => 'Arz et', + 'support_form_text' => '

    Tehniki goldaw gullugyna ýüz tutmazdan öň, soragyňyzyň çözgüdini "Soraglar we jogaplar" bölüminde gözläp bilersiňiz.

    +

    Sizden şol bir sorag boýunça birnäçe arza döretmezligiňizi, ýüz tutan wagtyňyz sabyrly we sypaýy bolmagyňyzy haýyş edýäris. Hiç bir ýüzlenme jogapsyz galmaz.

    +

    +Soragyň jogabyna 10 minutdan 24 sagada çenli garaşyp bilersiňiz. +

    ', + 'support_topic' => 'Arza Mowzugy', + 'choose_support_topic' => 'Mowzuk saýlaň', + 'other' => 'Başga', + 'attachment' => 'goşundy', + 'support_subject' => 'Tema', + 'reply' => 'Jogapla', + 'new_ticket' => 'Arza döret', ]; From 2dd1e1fd413b6acd8ea6ba5f838f1e4b4ce6b6d0 Mon Sep 17 00:00:00 2001 From: merdan Date: Wed, 13 May 2020 16:25:20 +0500 Subject: [PATCH 80/91] fix booked --- app/Helpers/helpers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Helpers/helpers.php b/app/Helpers/helpers.php index 22f06a71..d302d2bb 100644 --- a/app/Helpers/helpers.php +++ b/app/Helpers/helpers.php @@ -85,7 +85,7 @@ if(!function_exists('zanitlananlar')){ ->transform(function ($item,$key){ return [$item => 'reserved']; }); - + dump($ticket->booked); $booked = $ticket->booked->pluck('seat_no') ->transform(function ($item,$key){ return [$item =>'booked']; From cf7c4a41aded89cc3bbeebf3cb221b7730f7868b Mon Sep 17 00:00:00 2001 From: merdan Date: Wed, 13 May 2020 16:28:22 +0500 Subject: [PATCH 81/91] fix booked --- app/Helpers/helpers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Helpers/helpers.php b/app/Helpers/helpers.php index d302d2bb..22f06a71 100644 --- a/app/Helpers/helpers.php +++ b/app/Helpers/helpers.php @@ -85,7 +85,7 @@ if(!function_exists('zanitlananlar')){ ->transform(function ($item,$key){ return [$item => 'reserved']; }); - dump($ticket->booked); + $booked = $ticket->booked->pluck('seat_no') ->transform(function ($item,$key){ return [$item =>'booked']; From af9a7cd8720e3d17fd2f89a29c0c82c0b47067b1 Mon Sep 17 00:00:00 2001 From: merdan Date: Wed, 13 May 2020 16:29:52 +0500 Subject: [PATCH 82/91] fix booked --- app/Helpers/helpers.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Helpers/helpers.php b/app/Helpers/helpers.php index 22f06a71..b6a8683a 100644 --- a/app/Helpers/helpers.php +++ b/app/Helpers/helpers.php @@ -86,7 +86,7 @@ if(!function_exists('zanitlananlar')){ return [$item => 'reserved']; }); - $booked = $ticket->booked->pluck('seat_no') + $booked = $ticket->booked()->pluck('seat_no') ->transform(function ($item,$key){ return [$item =>'booked']; }); From c978de849f807f7c4c0fe5fc73d1dfcd68430c5e Mon Sep 17 00:00:00 2001 From: merdan Date: Wed, 13 May 2020 16:31:09 +0500 Subject: [PATCH 83/91] fix booked --- app/Helpers/helpers.php | 2 +- app/Models/Ticket.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Helpers/helpers.php b/app/Helpers/helpers.php index b6a8683a..22f06a71 100644 --- a/app/Helpers/helpers.php +++ b/app/Helpers/helpers.php @@ -86,7 +86,7 @@ if(!function_exists('zanitlananlar')){ return [$item => 'reserved']; }); - $booked = $ticket->booked()->pluck('seat_no') + $booked = $ticket->booked->pluck('seat_no') ->transform(function ($item,$key){ return [$item =>'booked']; }); diff --git a/app/Models/Ticket.php b/app/Models/Ticket.php index 32910c98..54b8874f 100644 --- a/app/Models/Ticket.php +++ b/app/Models/Ticket.php @@ -87,8 +87,8 @@ class Ticket extends MyBaseModel public function booked(){ return $this->hasMany(Attendee::class) - ->where('is_cancelled',false) - ->where('is_refunded',false) + ->where('is_cancelled',0) + ->where('is_refunded',0) ->orderBy('seat_no','asc'); } From ae49e1b2559c5bc054daa64ded262c8e34541437 Mon Sep 17 00:00:00 2001 From: merdan Date: Wed, 13 May 2020 17:09:57 +0500 Subject: [PATCH 84/91] fix booked --- app/Http/Controllers/EventCheckInController.php | 2 +- app/Models/Event.php | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/EventCheckInController.php b/app/Http/Controllers/EventCheckInController.php index 0a2773c1..ce076c7c 100644 --- a/app/Http/Controllers/EventCheckInController.php +++ b/app/Http/Controllers/EventCheckInController.php @@ -23,7 +23,7 @@ class EventCheckInController extends MyBaseController $data = [ 'event' => $event, - 'attendees' => $event->attendees + 'attendees' => $event->attendees() ]; JavaScript::put([ diff --git a/app/Models/Event.php b/app/Models/Event.php index 56162ad9..09125566 100644 --- a/app/Models/Event.php +++ b/app/Models/Event.php @@ -77,7 +77,9 @@ class Event extends MyBaseModel */ public function attendees() { - return $this->hasMany(\App\Models\Attendee::class); + return $this->hasMany(\App\Models\Attendee::class) + ->where('is_cancelled',false) + ->where('is_refunded',false); } /** From 76b52d431cc906d3fb3db7be6aeda5ee6c8bd486 Mon Sep 17 00:00:00 2001 From: merdan Date: Wed, 13 May 2020 17:18:35 +0500 Subject: [PATCH 85/91] fix booked --- app/Http/Controllers/EventCheckInController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/EventCheckInController.php b/app/Http/Controllers/EventCheckInController.php index ce076c7c..56ac287e 100644 --- a/app/Http/Controllers/EventCheckInController.php +++ b/app/Http/Controllers/EventCheckInController.php @@ -19,11 +19,12 @@ class EventCheckInController extends MyBaseController */ public function showCheckIn($event_id) { - $event = Event::scope()->findOrFail($event_id); + $event = Event::scope()->with('attendees')->findOrFail($event_id); + dump($event->attendees); $data = [ 'event' => $event, - 'attendees' => $event->attendees() + 'attendees' => $event->attendees ]; JavaScript::put([ From 04241cbf420b9a5e46e4785a27e7837b4fa9a7fb Mon Sep 17 00:00:00 2001 From: merdan Date: Wed, 13 May 2020 17:49:16 +0500 Subject: [PATCH 86/91] fix booked --- app/Http/Controllers/EventCheckInController.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/EventCheckInController.php b/app/Http/Controllers/EventCheckInController.php index 56ac287e..5b1466e0 100644 --- a/app/Http/Controllers/EventCheckInController.php +++ b/app/Http/Controllers/EventCheckInController.php @@ -21,7 +21,8 @@ class EventCheckInController extends MyBaseController { $event = Event::scope()->with('attendees')->findOrFail($event_id); - dump($event->attendees); + dump($event->attendees->pluck()); + $data = [ 'event' => $event, 'attendees' => $event->attendees From 88fc415260abedf9f13d38d306be2b7c4be99cfb Mon Sep 17 00:00:00 2001 From: merdan Date: Wed, 13 May 2020 17:49:39 +0500 Subject: [PATCH 87/91] fix booked --- app/Http/Controllers/EventCheckInController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Http/Controllers/EventCheckInController.php b/app/Http/Controllers/EventCheckInController.php index 5b1466e0..152ddb62 100644 --- a/app/Http/Controllers/EventCheckInController.php +++ b/app/Http/Controllers/EventCheckInController.php @@ -21,7 +21,7 @@ class EventCheckInController extends MyBaseController { $event = Event::scope()->with('attendees')->findOrFail($event_id); - dump($event->attendees->pluck()); + dump($event->attendees->pluck('seat_no')); $data = [ 'event' => $event, From 909faa53c5d548a97e480879d4ba99bafa696826 Mon Sep 17 00:00:00 2001 From: merdan Date: Wed, 13 May 2020 19:23:12 +0500 Subject: [PATCH 88/91] fix booked --- app/Http/Controllers/EventCheckInController.php | 2 +- app/Services/EventOrderService.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/EventCheckInController.php b/app/Http/Controllers/EventCheckInController.php index 152ddb62..732a093a 100644 --- a/app/Http/Controllers/EventCheckInController.php +++ b/app/Http/Controllers/EventCheckInController.php @@ -21,7 +21,7 @@ class EventCheckInController extends MyBaseController { $event = Event::scope()->with('attendees')->findOrFail($event_id); - dump($event->attendees->pluck('seat_no')); +// dump($event->attendees->pluck('seat_no')); $data = [ 'event' => $event, diff --git a/app/Services/EventOrderService.php b/app/Services/EventOrderService.php index 37f81a11..7bf20e5b 100644 --- a/app/Services/EventOrderService.php +++ b/app/Services/EventOrderService.php @@ -133,7 +133,7 @@ class EventOrderService try { $request_data = $session_data['request_data'][0]; - $event = Event::findOrFail($order->id); + $event = Event::findOrFail($order->event_id); $attendee_increment = 1; $ticket_questions = isset($request_data['ticket_holder_questions']) ? $request_data['ticket_holder_questions'] : []; $order->order_status_id = isset($request_data['pay_offline']) ? config('attendize.order_awaiting_payment') : config('attendize.order_complete'); @@ -311,7 +311,7 @@ class EventOrderService $attendee->first_name = $order->first_name; $attendee->last_name = $order->last_name; $attendee->email = $order->email; - $attendee->event_id = $order->event_id; + $attendee->event_id = $event->id; $attendee->order_id = $order->id; $attendee->ticket_id = $reserved->ticket_id; $attendee->account_id = $order->account_id; From 2731e384dd8868db6d28d9ad7418af642196b265 Mon Sep 17 00:00:00 2001 From: merdan Date: Thu, 14 May 2020 13:40:45 +0500 Subject: [PATCH 89/91] fix bug on seatspage where rows is empty --- resources/lang/ru/ClientSide.php | 2 +- resources/lang/tk/ClientSide.php | 2 +- resources/views/desktop/Pages/SeatsPage.blade.php | 6 ++++-- resources/views/mobile/Pages/SeatsPage.blade.php | 7 ++++--- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/resources/lang/ru/ClientSide.php b/resources/lang/ru/ClientSide.php index 35f9136b..27f2e5d9 100644 --- a/resources/lang/ru/ClientSide.php +++ b/resources/lang/ru/ClientSide.php @@ -154,7 +154,7 @@ return [ 'currency_code' => ' манат.', 'booking_fee_text' => 'За билет взимается сервисный сбор в размере ', 'checkout_fail_title' => 'Проблемы с оплатой', - 'checkout_fail_text' => '

    Убедитесь, что средств на счету достаточно и введенные данные достоверны. В случае подтверждения оплаты банком, Вы получите смс-уведомление, а билеты придут на почту. Если в течении 15 минут проблема не решится, Ваш заказ отклонен. Попробуйте купить снова.

    + 'checkout_fail_text' => '

    Убедитесь, что средств на счету достаточно и введенные данные(Имя и фамилия,номер, срок и CVC код карты) достоверны. В случае подтверждения оплаты банком билеты придут на почту. Если в течение 15 минут проблема не решится, Ваш заказ отклонен. Попробуйте купить снова.

    В случае, если оплата прошла успешно, но билеты не пришли на почту,

    ', 'checkout_fail_button' => 'свяжитесь с нами!', diff --git a/resources/lang/tk/ClientSide.php b/resources/lang/tk/ClientSide.php index eb121b2a..71c9fef2 100644 --- a/resources/lang/tk/ClientSide.php +++ b/resources/lang/tk/ClientSide.php @@ -151,7 +151,7 @@ return [ 'currency_code' => ' manat.', 'booking_fee_text' => 'Her bilet üçin hyzmat ýygymy ', 'checkout_fail_title' => 'Tölegiňiz geçmedi.', - 'checkout_fail_text' => '

    Siziň tölegeňiz Bank tarapyndan işlenilýän bolup biler. Töleg geçenligi barada habar berýän SMS-e garaşyň. + 'checkout_fail_text' => '

    Siziň tölegiňiz Bank tarapyndan işlenilýän bolup biler. Töleg geçenligi barada habar berýän SMS-e garaşyň. Eger-de siziň elektron poçtaňyza 15 minudyň dowamynda biletler gelmedik bolsa, siziň sargydyňyz Bank tarapyndan ýatyrylandyr. Biletleri täzeden satyn almaga synanşyp görüň.

    Ýalňyşlyk ýüze çykmaklygyň sebäpleri:

    diff --git a/resources/views/desktop/Pages/SeatsPage.blade.php b/resources/views/desktop/Pages/SeatsPage.blade.php index 05e40967..b07137b5 100644 --- a/resources/views/desktop/Pages/SeatsPage.blade.php +++ b/resources/views/desktop/Pages/SeatsPage.blade.php @@ -73,6 +73,7 @@
    {{$ticket->section->section_no}} {{$ticket->section->description}}
    + @if($ticket->section->seats) @@ -98,8 +99,9 @@ @endforeach -
    - + + + @endif
    @endif diff --git a/resources/views/mobile/Pages/SeatsPage.blade.php b/resources/views/mobile/Pages/SeatsPage.blade.php index 5c74168b..5f83e604 100644 --- a/resources/views/mobile/Pages/SeatsPage.blade.php +++ b/resources/views/mobile/Pages/SeatsPage.blade.php @@ -75,7 +75,7 @@
    {{$ticket->section->section_no}} {{$ticket->section->description}}
    - + @if($ticket->section->seats) @@ -101,8 +101,9 @@ @endforeach -
    - + + + @endif
    @endif From c77a00c207af7d4bf2662f1fc8680cdff0b742e6 Mon Sep 17 00:00:00 2001 From: merdan Date: Thu, 14 May 2020 16:13:55 +0500 Subject: [PATCH 90/91] payment responce errorMessage bug fix --- app/Payment/PaymentResponse.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Payment/PaymentResponse.php b/app/Payment/PaymentResponse.php index 3f9d80a4..f52aefcb 100644 --- a/app/Payment/PaymentResponse.php +++ b/app/Payment/PaymentResponse.php @@ -31,7 +31,7 @@ abstract class PaymentResponse public function errorMessage(){ if(!$this->exception_message) { - return $this->response_data['ErrorMessage'];} + return $this->response_data['errorMessage'];} else return $this->exception_message; } From 6019aa62e0b289ab7478e2ce25a9e65e032ff6ab Mon Sep 17 00:00:00 2001 From: merdan Date: Thu, 14 May 2020 16:37:10 +0500 Subject: [PATCH 91/91] payment responce errorMessage bug fix --- app/Models/Event.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Models/Event.php b/app/Models/Event.php index 09125566..d742b822 100644 --- a/app/Models/Event.php +++ b/app/Models/Event.php @@ -78,8 +78,8 @@ class Event extends MyBaseModel public function attendees() { return $this->hasMany(\App\Models\Attendee::class) - ->where('is_cancelled',false) - ->where('is_refunded',false); + ->where('attendees.is_cancelled',false) + ->where('attendees.is_refunded',false); } /**