Merge pull request #605 from Attendize/event_currency_level

Event currency level
This commit is contained in:
Jeremy Quinton 2019-03-22 16:08:11 +02:00 committed by GitHub
commit c95072ef30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 12 deletions

View File

@ -220,6 +220,7 @@ 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');

View File

@ -5,6 +5,7 @@ namespace App\Http\Controllers;
use App\Models\Event;
use File;
use Illuminate\Http\Request;
use App\Models\Currency;
use Image;
use Validator;
@ -20,6 +21,7 @@ class EventCustomizeController extends MyBaseController
public function showCustomize($event_id = '', $tab = '')
{
$data = $this->getEventViewData($event_id, [
'currencies' => Currency::pluck('title', 'id'),
'available_bg_images' => $this->getAvailableBackgroundImages(),
'available_bg_images_thumbs' => $this->getAvailableBackgroundImagesThumbs(),
'tab' => $tab,

View File

@ -23,6 +23,7 @@ return array (
'confirm_order_cancel' => 'Confirm Order Cancel',
'create_attendees' => 'Create Attendees',
'create_ticket' => 'Create Ticket',
'default_currency' => 'Default currency',
'download_pdf_ticket' => 'Download PDF Ticket',
'edit_attendee' => 'Edit Attendee',
'edit_attendee_title' => 'Edit :attendee',

View File

@ -4,6 +4,10 @@
<div class="row">
<div class="col-md-12">
<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', [

View File

@ -52,7 +52,7 @@
@section('content')
<div class="row">
<div class="col-sm-4">
<div class="col-sm-6">
<div class="stat-box">
<h3>
{{$organiser->events->count()}}
@ -62,7 +62,7 @@
</span>
</div>
</div>
<div class="col-sm-4">
<div class="col-sm-6">
<div class="stat-box">
<h3>
{{$organiser->attendees->count()}}
@ -72,16 +72,6 @@
</span>
</div>
</div>
<div class="col-sm-4">
<div class="stat-box">
<h3>
{{ money($organiser->events->sum('sales_volume') + $organiser->events->sum('organiser_fees_volume'), $organiser->account->currency) }}
</h3>
<span>
@lang("Organiser.sales_volume")
</span>
</div>
</div>
</div>
<div class="row">