create event bug fixes
This commit is contained in:
parent
9718be2b3c
commit
c44a861f29
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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');
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 134 KiB |
|
|
@ -1,13 +1,14 @@
|
|||
<div class="col-12 p-0">
|
||||
|
||||
<h2 class="main-title" style="padding-left: 5px">Расписание</h2>
|
||||
<div class="main-title-bottom-line" style="margin-left: 5px"></div>
|
||||
@if($event->end_date->isPast())
|
||||
<div class="alert alert-boring">
|
||||
@lang("Public_ViewEvent.event_already", ['started' => trans('Public_ViewEvent.event_already_ended')])
|
||||
</div>
|
||||
@else
|
||||
@if(count($ticket_dates) > 0)
|
||||
<div class="main-title-bottom-line" style="margin-left: 5px"></div>
|
||||
|
||||
<h4 class="date-small-title">Дата проведения</h4>
|
||||
<div class="date-box-wrap">
|
||||
@foreach($ticket_dates as $date =>$ticket)
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@
|
|||
<div class="col-2 text-center">
|
||||
|
||||
@include('Bilettm.Partials.EventShareButtons')
|
||||
<img src="assets/assets/img/konserty/adv.png" style="width: 100%">
|
||||
<img src="{{asset('assets/images/advs/adv.png')}}" style="width: 100%">
|
||||
</div>
|
||||
<div class="col-12 p-0">
|
||||
@include('Bilettm.Partials.EventTags')
|
||||
|
|
|
|||
|
|
@ -207,7 +207,7 @@
|
|||
<!-- tab content -->
|
||||
<div class="tab-content panel">
|
||||
<div class="tab-pane {{($tab == 'general' || !$tab) ? 'active' : ''}}" id="general">
|
||||
@include('ManageEvent.Partials.EditEventForm', ['event'=>$event, 'organisers'=>\Auth::user()->account->organisers])
|
||||
@include('ManageEvent.Partials.EditEventForm', ['event'=>$event, 'organisers'=>organisers()])
|
||||
</div>
|
||||
|
||||
<div class="tab-pane {{$tab == 'affiliates' ? 'active' : ''}}" id="affiliates">
|
||||
|
|
@ -334,77 +334,8 @@
|
|||
<div class="tab-pane scale_iframe {{$tab == 'design' ? 'active' : ''}}" id="design">
|
||||
|
||||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
|
||||
{!! Form::open(array('url' => route('postEditEventDesign', ['event_id' => $event->id]), 'files'=> true, 'class' => 'ajax customizeForm')) !!}
|
||||
|
||||
{!! Form::hidden('bg_type', $event->bg_type) !!}
|
||||
|
||||
<h4>@lang("Design.background_options")</h4>
|
||||
|
||||
<div class="panel-group" id="bgOptions">
|
||||
|
||||
<div class="panel panel-default" data-type="color">
|
||||
<div class="panel-heading">
|
||||
<h4 class="panel-title">
|
||||
<a data-toggle="collapse" data-parent="#bgOptions" href="#bgColor"
|
||||
class="{{($event->bg_type == 'color') ? '' : 'collapsed'}}">
|
||||
<span class="arrow mr5"></span> @lang("Design.use_a_colour_for_the_background")
|
||||
</a>
|
||||
</h4>
|
||||
</div>
|
||||
<div id="bgColor"
|
||||
class="panel-collapse {{($event->bg_type == 'color') ? 'in' : 'collapse'}}">
|
||||
<div class="panel-body">
|
||||
{!! Form::text('bg_color', $event->bg_color, ['class' => 'colorpicker form-control']) !!}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="panel panel-default" data-type="image">
|
||||
<div class="panel-heading">
|
||||
<h4 class="panel-title">
|
||||
<a data-toggle="collapse" data-parent="#bgOptions" href="#bgImage"
|
||||
class="{{($event->bg_type == 'image') ? '' : 'collapsed'}}">
|
||||
<span class="arrow mr5"></span> @lang("Design.select_from_available_images")
|
||||
</a>
|
||||
</h4>
|
||||
</div>
|
||||
<div id="bgImage"
|
||||
class="panel-collapse {{($event->bg_type == 'image') ? 'in' : 'collapse'}}">
|
||||
<div class="panel-body">
|
||||
@foreach($available_bg_images_thumbs as $bg_image)
|
||||
|
||||
<img data-3="{{str_replace('/thumbs', '', $event->bg_image_path)}}"
|
||||
class="img-thumbnail ma5 bgImage {{ ($bg_image === str_replace('/thumbs', '', $event->bg_image_path) ? 'selected' : '') }}"
|
||||
style="width: 120px;" src="{{asset($bg_image)}}"
|
||||
data-src="{{str_replace('/thumbs', '', substr($bg_image,1))}}"/>
|
||||
|
||||
@endforeach
|
||||
|
||||
{!! Form::hidden('bg_image_path_custom', ($event->bg_type == 'image') ? $event->bg_image_path : '') !!}
|
||||
</div>
|
||||
<a class="btn btn-link" href="https://pixabay.com?ref=attendize" title="PixaBay Free Images">
|
||||
@lang("Design.images_provided_by_pixabay")
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="panel-footer mt15 text-right">
|
||||
<span class="uploadProgress" style="display:none;"></span>
|
||||
{!! Form::submit(trans("basic.save_changes"), ['class'=>"btn btn-success"]) !!}
|
||||
</div>
|
||||
|
||||
<div class="panel-footer ar hide">
|
||||
{!! Form::button(trans("basic.cancel"), ['class'=>"btn modal-close btn-danger",'data-dismiss'=>'modal']) !!}
|
||||
{!! Form::submit(trans("basic.save_changes"), ['class'=>"btn btn-success"]) !!}
|
||||
</div>
|
||||
|
||||
{!! Form::close() !!}
|
||||
|
||||
</div>
|
||||
<div class="col-sm-6">
|
||||
<div class="col-sm-12">
|
||||
<h4>@lang("Design.event_page_preview")</h4>
|
||||
|
||||
<div class="iframe_wrap" style="overflow:hidden; height: 600px; border: 1px solid #ccc;">
|
||||
|
|
|
|||
|
|
@ -27,10 +27,17 @@
|
|||
'rows' => 5
|
||||
)) !!}
|
||||
</div>
|
||||
<div class="form-group">
|
||||
{!! Form::label('categor', trans("Category.event_category"), array('class'=>'control-label required')) !!}
|
||||
{!! Form::select('category_id',$categories, Input::old('category_id'), ['class' => 'form-control']) !!}
|
||||
<div class="row">
|
||||
<div class="form-group col-md-6">
|
||||
{!! 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']) !!}
|
||||
</div>
|
||||
<div class="form-group col-md-6">
|
||||
{!! 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']) !!}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-sm-6">
|
||||
<div class="form-group">
|
||||
|
|
|
|||
Loading…
Reference in New Issue