diff --git a/app/Helpers/helpers.php b/app/Helpers/helpers.php index afdb327b..572988b1 100644 --- a/app/Helpers/helpers.php +++ b/app/Helpers/helpers.php @@ -39,4 +39,12 @@ if(! function_exists('sub_categories')){ ->get(); } } +if(!function_exists('organisers')){ + function organisers(){ + if(Illuminate\Support\Facades\Auth::user()->is_admin) + return \App\Models\Organiser::all(); + else + return \Illuminate\Support\Facades\Auth::user()->account->organisers; + } +} diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php index 1bd1fb0c..8cd9afc5 100644 --- a/app/Http/Controllers/EventController.php +++ b/app/Http/Controllers/EventController.php @@ -86,7 +86,7 @@ class EventController extends MyBaseController $event->end_date = $request->get('end_date'); - $event->currency_id = Auth::user()->account->currency_id; +// $event->currency_id = Auth::user()->account->currency_id; //$event->timezone_id = Auth::user()->account->timezone_id; /* * Set a default background for the event @@ -223,7 +223,7 @@ class EventController extends MyBaseController } $event->is_live = $request->get('is_live'); - $event->currency_id = $request->get('currency_id'); +// $event->currency_id = $request->get('currency_id'); $event->title = $request->get('title'); $event->description = strip_tags($request->get('description')); $event->start_date = $request->get('start_date'); diff --git a/public/assets/images/advs/adv.png b/public/assets/images/advs/adv.png new file mode 100644 index 00000000..07c365f0 Binary files /dev/null and b/public/assets/images/advs/adv.png differ diff --git a/resources/views/Bilettm/Partials/TicketSchedule.blade.php b/resources/views/Bilettm/Partials/TicketSchedule.blade.php index 0b9a5976..8c71261d 100644 --- a/resources/views/Bilettm/Partials/TicketSchedule.blade.php +++ b/resources/views/Bilettm/Partials/TicketSchedule.blade.php @@ -1,13 +1,14 @@

Расписание

+
@if($event->end_date->isPast())
@lang("Public_ViewEvent.event_already", ['started' => trans('Public_ViewEvent.event_already_ended')])
@else @if(count($ticket_dates) > 0) -
+

Дата проведения

@foreach($ticket_dates as $date =>$ticket) diff --git a/resources/views/Bilettm/ViewEvent/EventPage.blade.php b/resources/views/Bilettm/ViewEvent/EventPage.blade.php index 92a1920c..7dffbbd6 100644 --- a/resources/views/Bilettm/ViewEvent/EventPage.blade.php +++ b/resources/views/Bilettm/ViewEvent/EventPage.blade.php @@ -32,7 +32,7 @@
@include('Bilettm.Partials.EventShareButtons') - +
@include('Bilettm.Partials.EventTags') diff --git a/resources/views/ManageEvent/Customize.blade.php b/resources/views/ManageEvent/Customize.blade.php index da77b381..03f75dc9 100644 --- a/resources/views/ManageEvent/Customize.blade.php +++ b/resources/views/ManageEvent/Customize.blade.php @@ -207,7 +207,7 @@
- @include('ManageEvent.Partials.EditEventForm', ['event'=>$event, 'organisers'=>\Auth::user()->account->organisers]) + @include('ManageEvent.Partials.EditEventForm', ['event'=>$event, 'organisers'=>organisers()])
@@ -334,77 +334,8 @@
-
- {!! Form::open(array('url' => route('postEditEventDesign', ['event_id' => $event->id]), 'files'=> true, 'class' => 'ajax customizeForm')) !!} - - {!! Form::hidden('bg_type', $event->bg_type) !!} - -

@lang("Design.background_options")

- -
- -
- -
-
- {!! Form::text('bg_color', $event->bg_color, ['class' => 'colorpicker form-control']) !!} -
-
-
- -
- -
-
- @foreach($available_bg_images_thumbs as $bg_image) - - - - @endforeach - - {!! Form::hidden('bg_image_path_custom', ($event->bg_type == 'image') ? $event->bg_image_path : '') !!} -
- - @lang("Design.images_provided_by_pixabay") - -
-
- -
- - - - - {!! Form::close() !!} - -
-
+

@lang("Design.event_page_preview")

diff --git a/resources/views/ManageOrganiser/Modals/CreateEvent.blade.php b/resources/views/ManageOrganiser/Modals/CreateEvent.blade.php index 60ecabb3..3ea189f2 100644 --- a/resources/views/ManageOrganiser/Modals/CreateEvent.blade.php +++ b/resources/views/ManageOrganiser/Modals/CreateEvent.blade.php @@ -27,10 +27,17 @@ 'rows' => 5 )) !!}
-
- {!! Form::label('categor', trans("Category.event_category"), array('class'=>'control-label required')) !!} - {!! Form::select('category_id',$categories, Input::old('category_id'), ['class' => 'form-control']) !!} +
+
+ {!! Form::label('category_id', trans("Category.event_category"), array('class'=>'control-label required')) !!} + {!! Form::select('category_id',main_categories(), Input::old('category_id'), ['class' => 'form-control','id'=>'categories']) !!} +
+
+ {!! Form::label('subCategory',trans('Category.event_sub_category'), array('class'=>'control-label')) !!} + {!! Form::subSelect('sub_category_id',sub_categories(), Input::old('sub_category_id'), ['class' => 'form-control','id'=>'subCategories']) !!} +
+