Merge branch 'master' of https://github.com/Attendize/Attendize
This commit is contained in:
Jeremy Quinton
commit
39ce03e9c5
|
|
@ -7,6 +7,7 @@ module.exports = function (grunt) {
|
|||
development: {
|
||||
options: {
|
||||
compress: true,
|
||||
javascriptEnabled: true,
|
||||
},
|
||||
files: {
|
||||
"./public/assets/stylesheet/application.css": "./public/assets/stylesheet/application.less",
|
||||
|
|
|
|||
|
|
@ -591,6 +591,7 @@ class EventAttendeesController extends MyBaseController
|
|||
'attendees.first_name',
|
||||
'attendees.last_name',
|
||||
'attendees.email',
|
||||
'attendees.private_reference_number',
|
||||
'orders.order_reference',
|
||||
'tickets.title',
|
||||
'orders.created_at',
|
||||
|
|
@ -607,6 +608,7 @@ class EventAttendeesController extends MyBaseController
|
|||
'First Name',
|
||||
'Last Name',
|
||||
'Email',
|
||||
'Ticket ID',
|
||||
'Order Reference',
|
||||
'Ticket Type',
|
||||
'Purchase Date',
|
||||
|
|
|
|||
|
|
@ -463,7 +463,7 @@ class EventCheckoutController extends Controller
|
|||
{
|
||||
|
||||
if ($request->get('is_payment_cancelled') == '1') {
|
||||
session()->flash('message', 'You cancelled your payment. You may try again.');
|
||||
session()->flash('message', trans('Event.payment_cancelled'));
|
||||
return response()->redirectToRoute('showEventCheckout', [
|
||||
'event_id' => $event_id,
|
||||
'is_payment_cancelled' => 1,
|
||||
|
|
|
|||
|
|
@ -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');
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -341,8 +341,7 @@ Route::group(
|
|||
$event = \App\Models\Event::scope()->findOrFail($event_id);
|
||||
$event->is_live = 1;
|
||||
$event->save();
|
||||
\Session::flash('message',
|
||||
'Event Successfully Made Live! You can undo this action in event settings page.');
|
||||
\Session::flash('message', trans('Event.go_live'));
|
||||
|
||||
return Redirect::route('showEventDashboard', [
|
||||
'event_id' => $event_id,
|
||||
|
|
|
|||
20
package.json
20
package.json
|
|
@ -4,20 +4,20 @@
|
|||
"description": "Attendize Ticketing Platform",
|
||||
"main": "public/index.php",
|
||||
"dependencies": {
|
||||
"less": "~1.7.0"
|
||||
"less": "^3.9.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"bower": "^1.8.4",
|
||||
"grunt": "^0.4.5",
|
||||
"grunt-cli": "^1.2.0",
|
||||
"grunt-contrib-concat": "^0.5.1",
|
||||
"grunt-contrib-less": "^0.12.0",
|
||||
"grunt-contrib-uglify": "^0.6.0",
|
||||
"grunt-contrib-watch": "^0.6.1",
|
||||
"gulp": "^3.8.8",
|
||||
"laravel-elixir": "*"
|
||||
"bower": "^1.8.8",
|
||||
"grunt": "^1.0.3",
|
||||
"grunt-cli": "^1.3.2",
|
||||
"grunt-contrib-concat": "^1.0.1",
|
||||
"grunt-contrib-less": "^2.0.0",
|
||||
"grunt-contrib-uglify": "^4.0.0",
|
||||
"grunt-contrib-watch": "^1.1.0",
|
||||
"laravel-elixir": "6.0.0-18"
|
||||
},
|
||||
"scripts": {
|
||||
"build-frontend": "grunt",
|
||||
"test": "echo \"Error: no test specified\" && exit 1"
|
||||
},
|
||||
"repository": {
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,5 +1,3 @@
|
|||
@import url(https://fonts.googleapis.com/css?family=Source+Sans+Pro:200,300,400,600,700);
|
||||
|
||||
@import "../../vendor/bootstrap/less/bootstrap.less";
|
||||
// Copied the bootstrap vars file to allow customisation
|
||||
@import "bootstrap_custom_variables.less";
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -1,12 +1,9 @@
|
|||
@import url(https://fonts.googleapis.com/css?family=Open+Sans:100,400,300);
|
||||
@import url(https://fonts.googleapis.com/css?family=Roboto:300,100);
|
||||
|
||||
html, body {
|
||||
height: 100%;
|
||||
}
|
||||
|
||||
body {
|
||||
font-family: 'Open Sans', sans-serif;
|
||||
font-family: sans-serif;
|
||||
}
|
||||
|
||||
table {
|
||||
|
|
|
|||
|
|
@ -66,12 +66,12 @@ Attendize is open-sourced software licensed under the Attribution Assurance Lice
|
|||
|
||||
Contributors
|
||||
---
|
||||
|
||||
* Jeremy Quinton ([Github](https://github.com/jeremyquinton))
|
||||
* Sam Bell ([Github](https://github.com/samdb))
|
||||
* Sebastian Schmidt ([Github](https://github.com/publicarray))
|
||||
* Brett B ([Github](https://github.com/bretto36))
|
||||
* G0dLik3 ([Github](https://github.com/G0dLik3))
|
||||
* Honoré Hounwanou ([Github](http://github.com/mercuryseries)) <mercuryseries@gmail.com>
|
||||
* Honoré Hounwanou ([Github](http://github.com/mercuryseries))
|
||||
* James Campbell ([Github](https://github.com/jncampbell))
|
||||
* JapSeyz ([Github](https://github.com/JapSeyz))
|
||||
* Mark Walet ([Github](https://github.com/markwalet))
|
||||
* Jeremy Quinton ([Github](https://github.com/jeremyquinton))
|
||||
* Sebastian Schmidt ([Github](https://github.com/publicarray))
|
||||
|
|
|
|||
|
|
@ -26,13 +26,16 @@ return array (
|
|||
'event_title' => 'Event Title',
|
||||
'event_title_placeholder' => 'E.g: :name\'s Interational Conference',
|
||||
'event_visibility' => 'Event Visibility',
|
||||
'go_live' => 'Event Successfully Made Live! You can undo this action in event settings page.',
|
||||
'n_attendees_for_event' => ':num Attendee(s) for event: :name (:date)',
|
||||
'no_events_yet' => 'No Event Yet!',
|
||||
'no_events_yet_text' => 'Looks like you have yet to create an event. You can create one by clicking the button below.',
|
||||
'num_events' => ':num Events',
|
||||
'or(manual/existing_venue)' => 'or',
|
||||
'payment_cancelled' => 'You cancelled your payment. You may try again.',
|
||||
'post_code' => 'Post Code',
|
||||
'post_code_placeholder' => 'E.g: 94568.',
|
||||
'print_attendees_title' => 'Attendees',
|
||||
'promote' => 'Promote',
|
||||
'promote_event' => 'Promote Event',
|
||||
'revenue' => 'Revenue',
|
||||
|
|
|
|||
|
|
@ -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',
|
||||
|
|
|
|||
|
|
@ -26,6 +26,7 @@ return array (
|
|||
'offline_payment_settings' => 'Offline Payment Settings',
|
||||
'order_attendees' => 'Order Attendees',
|
||||
'order_date' => 'Order Date',
|
||||
'order_items' => 'Order Items',
|
||||
'order_page_settings' => 'Order Page Settings',
|
||||
'order_ref' => 'Reference',
|
||||
'organiser_booking_fees' => 'Organiser Booking Fees',
|
||||
|
|
@ -37,6 +38,7 @@ return array (
|
|||
'reference' => 'Reference',
|
||||
'refund/cancel' => 'Refund / Cancel',
|
||||
'registered' => 'registered',
|
||||
'search_placeholder' => 'Search Orders..',
|
||||
'status' => 'Status',
|
||||
'sub_total' => 'Sub Total',
|
||||
'ticket' => 'Ticket',
|
||||
|
|
|
|||
|
|
@ -65,6 +65,7 @@ return array (
|
|||
'yes' => 'Yes',
|
||||
'no' => 'No',
|
||||
'sales_volume' => 'Sales Volume',
|
||||
'search_placeholder' => 'Search Events..',
|
||||
'select_an_organiser' => 'Select An Organiser',
|
||||
'select_organiser' => 'Select Organiser',
|
||||
'text_color' => 'Text Color',
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ return [
|
|||
'free' => 'FREE',
|
||||
'has_unlock_codes' => 'Do you have an unlock code?',
|
||||
'inc_fees' => 'Booking Fees',
|
||||
'grand_total' => 'Grand Total',
|
||||
'last_name' => 'Last name',
|
||||
'offline_payment_instructions' => 'Offline payment instructions',
|
||||
'offline_payment_methods_available' => 'Offline Payment Methods Available',
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ return array (
|
|||
'enabled' => 'Enabled',
|
||||
'error_404' => 'Looks like the page you are looking for no longer exists or has moved.',
|
||||
'event_dashboard' => 'Event Dashboard',
|
||||
'event_menu' => 'Event Menu',
|
||||
'event_page_design' => 'Event Page Design',
|
||||
'export' => 'Export',
|
||||
'general' => 'General',
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
@stop
|
||||
|
||||
@section('head')
|
||||
{!! HTML::script('https://maps.googleapis.com/maps/api/js?sensor=false&libraries=places&key='.env("GOOGLE_MAPS_GEOCODING_KEY")) !!}
|
||||
{!! HTML::script('https://maps.googleapis.com/maps/api/js?libraries=places&key='.env("GOOGLE_MAPS_GEOCODING_KEY")) !!}
|
||||
{!! HTML::script('vendor/geocomplete/jquery.geocomplete.min.js') !!}
|
||||
<script>
|
||||
$(function () {
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@
|
|||
<script src="//cdnjs.cloudflare.com/ajax/libs/morris.js/0.5.1/morris.min.js" integrity="sha256-0rg2VtfJo3VUij/UY9X0HJP7NET6tgAY98aMOfwP0P8=" crossorigin="anonymous"></script>
|
||||
<script>
|
||||
$(function () {
|
||||
$.getJSON('http://graph.facebook.com/?id=' + '{{route('showEventPage',['event_id' => $event->id, 'event_slug' => Str::slug($event->title)])}}', function (fbdata) {
|
||||
$.getJSON('https://graph.facebook.com/?id=' + '{{route('showEventPage',['event_id' => $event->id, 'event_slug' => Str::slug($event->title)])}}', function (fbdata) {
|
||||
$('#facebook-count').html(fbdata.shares);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -73,7 +73,7 @@
|
|||
</div>
|
||||
</div>
|
||||
|
||||
<h3>Order Items</h3>
|
||||
<h3>@lang('Order.order_items')</h3>
|
||||
<div class="well nopad bgcolor-white p0">
|
||||
<div class="table-responsive">
|
||||
<table class="table table-hover" >
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@
|
|||
<div class="col-md-3 col-sm-6">
|
||||
{!! Form::open(array('url' => route('showEventOrders', ['event_id'=>$event->id,'sort_by'=>$sort_by]), 'method' => 'get')) !!}
|
||||
<div class="input-group">
|
||||
<input name='q' value="{{$q or ''}}" placeholder="Search Orders.." type="text" class="form-control">
|
||||
<input name='q' value="{{$q or ''}}" placeholder="@lang('Order.search_placeholder')" type="text" class="form-control">
|
||||
<span class="input-group-btn">
|
||||
<button class="btn btn-default" type="submit"><i class="ico-search"></i></button>
|
||||
</span>
|
||||
|
|
|
|||
|
|
@ -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', [
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
<h5 class="heading">Event Menu</h5>
|
||||
<h5 class="heading">@lang('basic.event_menu')</h5>
|
||||
<ul id="nav_event" class="topmenu">
|
||||
<li class="{{ Request::is('*dashboard*') ? 'active' : '' }}">
|
||||
<a href="{{route('showEventDashboard', array('event_id' => $event->id))}}">
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
<html>
|
||||
<head>
|
||||
<title>
|
||||
Attendees
|
||||
@lang('Event.print_attendees_title')
|
||||
</title>
|
||||
|
||||
<!--Style-->
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
<script src="//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.4/raphael-min.js" integrity="sha256-Gk+dzc4kV2rqAZMkyy3gcfW6Xd66BhGYjVWa/FjPu+s=" crossorigin="anonymous"></script>
|
||||
<script src="//cdnjs.cloudflare.com/ajax/libs/morris.js/0.5.1/morris.min.js" integrity="sha256-0rg2VtfJo3VUij/UY9X0HJP7NET6tgAY98aMOfwP0P8=" crossorigin="anonymous"></script>
|
||||
|
||||
{!! HTML::script('https://maps.googleapis.com/maps/api/js?sensor=false&libraries=places&key='.env("GOOGLE_MAPS_GEOCODING_KEY")) !!}
|
||||
{!! HTML::script('https://maps.googleapis.com/maps/api/js?libraries=places&key='.env("GOOGLE_MAPS_GEOCODING_KEY")) !!}
|
||||
{!! HTML::script('vendor/geocomplete/jquery.geocomplete.min.js')!!}
|
||||
{!! HTML::script('vendor/moment/moment.js')!!}
|
||||
{!! HTML::script('vendor/fullcalendar/dist/fullcalendar.min.js')!!}
|
||||
|
|
@ -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">
|
||||
|
|
|
|||
|
|
@ -14,7 +14,7 @@
|
|||
@stop
|
||||
|
||||
@section('head')
|
||||
{!! HTML::script('https://maps.googleapis.com/maps/api/js?sensor=false&libraries=places&key='.env("GOOGLE_MAPS_GEOCODING_KEY")) !!}
|
||||
{!! HTML::script('https://maps.googleapis.com/maps/api/js?libraries=places&key='.env("GOOGLE_MAPS_GEOCODING_KEY")) !!}
|
||||
{!! HTML::script('vendor/geocomplete/jquery.geocomplete.min.js')!!}
|
||||
@stop
|
||||
|
||||
|
|
@ -33,7 +33,7 @@
|
|||
<div class="col-md-3">
|
||||
{!! Form::open(array('url' => route('showOrganiserEvents', ['organiser_id'=>$organiser->id]), 'method' => 'get')) !!}
|
||||
<div class="input-group">
|
||||
<input name="q" value="{{$search['q'] or ''}}" placeholder="Search Events.." type="text" class="form-control">
|
||||
<input name="q" value="{{$search['q'] or ''}}" placeholder="@lang('Organiser.search_placeholder')" type="text" class="form-control">
|
||||
<span class="input-group-btn">
|
||||
<button class="btn btn-default" type="submit"><i class="ico-search"></i></button>
|
||||
</span>
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@
|
|||
<span style="float: right;"><b>{{ $orderService->getTaxAmount(true) }}</b></span>
|
||||
</h5>
|
||||
<h5>
|
||||
<strong>Grand Total:</strong>
|
||||
<strong>@lang("Public_ViewEvent.grand_total")</strong>
|
||||
<span style="float: right;"><b>{{ $orderService->getGrandTotal(true) }}</b></span>
|
||||
</h5>
|
||||
@endif
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
</p>
|
||||
<div class="contact_form well well-sm">
|
||||
{!! Form::open(array('url' => route('postContactOrganiser', array('event_id' => $event->id)), 'class' => 'reset ajax')) !!}
|
||||
<h3>Contact <i>{{$event->organiser->name}}</i></h3>
|
||||
<h3>@lang("Public_ViewEvent.Contact") <i>{{$event->organiser->name}}</i></h3>
|
||||
<div class="form-group">
|
||||
{!! Form::label(trans("Public_ViewEvent.your_name")) !!}
|
||||
{!! Form::text('name', null,
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@
|
|||
|
||||
|
||||
<li class="divider"></li>
|
||||
<li><a target="_blank" href="https://www.attendize.com/feedback.php?v={{ config('attendize.version') }}"><span class="icon ico-megaphone"></span>@lang("Top.feedback_bug_report")</a></li>
|
||||
<li><a target="_blank" href="https://github.com/Attendize/Attendize/issues/new?body=Version%20{{ config('attendize.version') }}"><span class="icon ico-megaphone"></span>@lang("Top.feedback_bug_report")</a></li>
|
||||
<li class="divider"></li>
|
||||
<li><a href="{{route('logout')}}"><span class="icon ico-exit"></span>@lang("Top.sign_out")</a></li>
|
||||
</ul>
|
||||
|
|
|
|||
Loading…
Reference in New Issue