merge commit
This commit is contained in:
commit
fb84f4d0b2
|
|
@ -11,6 +11,7 @@ use Illuminate\Http\Request;
|
|||
use Image;
|
||||
use Log;
|
||||
use Validator;
|
||||
use Spatie\GoogleCalendar\Event as GCEvent;
|
||||
|
||||
class EventController extends MyBaseController
|
||||
{
|
||||
|
|
@ -222,10 +223,13 @@ class EventController extends MyBaseController
|
|||
}
|
||||
|
||||
$event->is_live = $request->get('is_live');
|
||||
$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');
|
||||
$event->category_id = $request->get('category_id');
|
||||
$event->google_tag_manager_code = $request->get('google_tag_manager_code');
|
||||
|
||||
/*
|
||||
* If the google place ID is the same as before then don't update the venue
|
||||
*/
|
||||
|
|
@ -266,6 +270,7 @@ class EventController extends MyBaseController
|
|||
}
|
||||
|
||||
$event->end_date = $request->get('end_date');
|
||||
$event->event_image_position = $request->get('event_image_position');
|
||||
|
||||
if ($request->get('remove_current_image') == '1') {
|
||||
EventImage::where('event_id', '=', $event->id)->delete();
|
||||
|
|
@ -342,4 +347,20 @@ class EventController extends MyBaseController
|
|||
]);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Puplish event and redirect
|
||||
* @param Integer|false $event_id
|
||||
* @return \Illuminate\Http\RedirectResponse
|
||||
*/
|
||||
public function makeEventLive($event_id = false) {
|
||||
$event = Event::scope()->findOrFail($event_id);
|
||||
$event->is_live = 1;
|
||||
$event->save();
|
||||
\Session::flash('message', trans('Event.go_live'));
|
||||
|
||||
return redirect()->action(
|
||||
'EventDashboardController@showDashboard', ['event_id' => $event_id]
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
"vinelab/http": "~1.5",
|
||||
"laravel/framework": "~5.6",
|
||||
"mcamara/laravel-localization": "~1.2",
|
||||
"mews/purifier": "~2.0",
|
||||
"mews/purifier": "^2.1",
|
||||
"nitmedia/wkhtml2pdf": "dev-master",
|
||||
|
||||
"laravel/socialite": "~3.0",
|
||||
|
|
@ -39,6 +39,7 @@
|
|||
"omnipay/dummy": "~3",
|
||||
"omnipay/paypal": "~3",
|
||||
"omnipay/stripe": "~3",
|
||||
"laravel/tinker": "^1.0",
|
||||
"backpack/crud": "^3.5",
|
||||
"barryvdh/laravel-elfinder": "^0.4.1",
|
||||
"backpack/backupmanager": "^1.4",
|
||||
|
|
@ -56,6 +57,7 @@
|
|||
"symfony/css-selector": "~3.0",
|
||||
"backpack/generators": "^1.2",
|
||||
"laracasts/generators": "dev-master"
|
||||
|
||||
},
|
||||
"autoload": {
|
||||
"classmap": [
|
||||
|
|
|
|||
|
|
@ -22,6 +22,18 @@
|
|||
)) !!}
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
{!! Form::label('currency_id', trans("ManageEvent.default_currency"), array('class'=>'control-label required')) !!}
|
||||
{!! Form::select('currency_id', $currencies, $event->currency_id, ['class' => 'form-control']) !!}
|
||||
</div>
|
||||
<div class="form-group">
|
||||
{!! Form::label('is_live', trans("Event.event_visibility"), array('class'=>'control-label required')) !!}
|
||||
{!! Form::select('is_live', [
|
||||
'1' => trans("Event.vis_public"),
|
||||
'0' => trans("Event.vis_hide")],null,
|
||||
array(
|
||||
'class'=>'form-control'
|
||||
)) !!}
|
||||
</div>
|
||||
<div class="form-group">
|
||||
{!! Form::label('title', trans("Event.event_title"), array('class'=>'control-label required')) !!}
|
||||
|
|
@ -161,10 +173,21 @@
|
|||
{!! Form::label('event_image', trans("Event.event_flyer"), array('class'=>'control-label ')) !!}
|
||||
{!! Form::styledFile('event_image', 1) !!}
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="float-l">
|
||||
@if($event->images->count())
|
||||
|
||||
@if($event->images->count())
|
||||
<div class="form-group">
|
||||
{!! Form::label('event_image_position', trans("Event.event_image_position"), array('class'=>'control-label')) !!}
|
||||
{!! Form::select('event_image_position', [
|
||||
'' => trans("Event.event_image_position_hide"),
|
||||
'before' => trans("Event.event_image_position_before"),
|
||||
'after' => trans("Event.event_image_position_after"),
|
||||
'left' => trans("Event.event_image_position_left"),
|
||||
'right' => trans("Event.event_image_position_right"),
|
||||
],
|
||||
Input::old('event_image_position'),
|
||||
['class'=>'form-control']
|
||||
) !!}
|
||||
</div>
|
||||
{!! Form::label('', trans("Event.current_event_flyer"), array('class'=>'control-label ')) !!}
|
||||
<div class="form-group">
|
||||
<div class="well well-sm well-small">
|
||||
|
|
@ -173,6 +196,11 @@
|
|||
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="float-l">
|
||||
@if($event->images->count())
|
||||
<div class="thumbnail">
|
||||
{!!HTML::image('/'.$event->images->first()['image_path'])!!}
|
||||
</div>
|
||||
|
|
@ -180,6 +208,18 @@
|
|||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
{!! Form::label('google_tag_manager_code', trans("Organiser.google_tag_manager_code"), ['class'=>'control-label']) !!}
|
||||
{!! Form::text('google_tag_manager_code', Input::old('google_tag_manager_code'), [
|
||||
'class'=>'form-control',
|
||||
'placeholder' => trans("Organiser.google_tag_manager_code_placeholder"),
|
||||
])
|
||||
!!}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-12">
|
||||
|
|
|
|||
Loading…
Reference in New Issue