ilmedova
/
Attendize
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Dave Earley 2016-05-23 22:23:15 +01:00
parent 00aa02563c 8e20164d56
commit 05d038af33
8 changed files with 31 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/EventCheckoutController.php
View File

@ -270,7 +270,6 @@ class EventCheckoutController extends Controller
]);
}
$mirror_buyer_info = ($request->get('mirror_buyer_info') == 'on');
$event = Event::findOrFail($event_id);
$order = new Order;
$ticket_order = session()->get('ticket_order_' . $event_id);
@ -456,7 +455,6 @@ class EventCheckoutController extends Controller
$request_data = $ticket_order['request_data'][0];
$event = Event::findOrFail($ticket_order['event_id']);
$attendee_increment = 1;
$mirror_buyer_info = isset($request_data['mirror_buyer_info']) ? ($request_data['mirror_buyer_info'] == 'on') : false;
$ticket_questions = isset($request_data['ticket_holder_questions']) ? $request_data['ticket_holder_questions'] : [];
@ -546,9 +544,9 @@ class EventCheckoutController extends Controller
for ($i = 0; $i < $attendee_details['qty']; $i++) {
$attendee = new Attendee();
$attendee->first_name = $event->ask_for_all_attendees_info ? ($mirror_buyer_info ? $order->first_name : $request_data["ticket_holder_first_name"][$i][$attendee_details['ticket']['id']]) : $order->first_name;
$attendee->last_name = $event->ask_for_all_attendees_info ? ($mirror_buyer_info ? $order->last_name : $request_data["ticket_holder_last_name"][$i][$attendee_details['ticket']['id']]) : $order->last_name;
$attendee->email = $event->ask_for_all_attendees_info ? ($mirror_buyer_info ? $order->email : $request_data["ticket_holder_email"][$i][$attendee_details['ticket']['id']]) : $order->email;
$attendee->first_name = $request_data["ticket_holder_first_name"][$i][$attendee_details['ticket']['id']];
$attendee->last_name = $request_data["ticket_holder_last_name"][$i][$attendee_details['ticket']['id']];
$attendee->email = $request_data["ticket_holder_email"][$i][$attendee_details['ticket']['id']];
$attendee->event_id = $event_id;
$attendee->order_id = $order->id;
$attendee->ticket_id = $attendee_details['ticket']['id'];

1
app/Http/Controllers/EventCustomizeController.php
View File

@ -224,7 +224,6 @@ class EventCustomizeController extends MyBaseController
$event->pre_order_display_message = trim($request->get('pre_order_display_message'));
$event->post_order_display_message = trim($request->get('post_order_display_message'));
$event->ask_for_all_attendees_info = ($request->get('ask_for_all_attendees_info') == 'on');
$event->save();
return response()->json([

1
database/factories/ModelFactory.php
View File

@ -167,7 +167,6 @@ $factory->define(App\Models\Event::class, function (Faker\Generator $faker) {
'location_lat' => $faker->latitude,
'location_long' => $faker->longitude,
'location_google_place_id' => $faker->randomDigit,
'ask_for_all_attendees_info' => 0,
'pre_order_display_message' => $faker->text,
'post_order_display_message' => $faker->text,
'social_share_text' => 'Check Out [event_title] - [event_url]',

19
database/migrations/2016_05_22_041458_remove_ask_for_in_events.php Normal file
View File

@ -0,0 +1,19 @@
<?php
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class RemoveAskForInEvents extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('events', function (Blueprint $table) {
$table->dropColumn('ask_for_all_attendees_info');
});
}
}

5
public/assets/javascript/check_in.js
View File

@ -111,6 +111,9 @@ var checkinApp = new Vue({
navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia || navigator.mozGetUserMedia;
navigator.getUserMedia({video: true, audio: false}, function (stream) {
that.stream = stream;
if (window.webkitURL) {
that.videoElement.src = window.webkitURL.createObjectURL(stream);
} else {
@ -159,6 +162,8 @@ var checkinApp = new Vue({
closeScanner: function () {
clearTimeout(this.QrTimeout);
this.showScannerModal = false;
track = this.stream.getTracks()[0];
track.stop();
}
}
});

4
resources/views/ManageEvent/CheckIn.blade.php
View File

@ -10,7 +10,7 @@
{!! HTML::style('assets/stylesheet/application.css') !!}
{!! HTML::style('assets/stylesheet/check_in.css') !!}
{!! HTML::script('vendor/jquery/jquery.js') !!}
{!! HTML::script('vendor/jquery/dist/jquery.min.js') !!}
@include('Shared/Layouts/ViewJavascript')
<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0">
@ -158,4 +158,4 @@ Vue.http.headers.common['X-CSRF-TOKEN'] = '{{ csrf_token() }}';
{!! HTML::script('vendor/qrcode-scan/llqrcode.js') !!}
{!! HTML::script('assets/javascript/check_in.js') !!}
</body>
</html>
</html>

2
resources/views/ManageOrganiser/Customize.blade.php
View File

@ -130,7 +130,7 @@
@endif
<div class="form-group">
{!! Form::labelWithHelp('organiser_logo', 'Organiser Logo', array('class'=>'control-label '),
'We recommend a square image, as this will look best on printed tickets and event pages.') !!}l
'We recommend a square image, as this will look best on printed tickets and event pages.') !!}
{!!Form::styledFile('organiser_logo')!!}
</div>
<div class="modal-footer">

2
resources/views/ManageOrganiser/Modals/CreateEvent.blade.php
View File

@ -20,7 +20,7 @@
</div>
<div class="form-group custom-theme">
{!! Form::label('description', 'Event Description', array('class'=>'control-label')) !!}
{!! Form::label('description', 'Event Description', array('class'=>'control-label required')) !!}
{!! Form::textarea('description', Input::old('description'),
array(
'class'=>'form-control editable',