From 9ec1cc20f2a56d4c3af5cc1029755fab0c9f6c56 Mon Sep 17 00:00:00 2001 From: Dave Earley Date: Tue, 6 Sep 2016 21:39:27 +0100 Subject: [PATCH] Reformat code --- .dockerignore | 1 + app/Console/Commands/Install.php | 8 +- app/Events/OrderCompletedEvent.php | 2 - app/Exceptions/Handler.php | 10 +- app/Handlers/QueueHandler.php | 11 +- app/Helpers/helpers.php | 5 +- app/Helpers/macros.php | 33 +- .../Controllers/API/ApiBaseController.php | 3 +- .../API/AttendeesApiController.php | 16 +- .../Controllers/API/EventsApiController.php | 16 +- app/Http/Controllers/Auth/AuthController.php | 2 +- .../Controllers/Auth/PasswordController.php | 2 +- .../Controllers/EventAttendeesController.php | 26 +- .../Controllers/EventCheckInController.php | 5 +- .../Controllers/EventCheckoutController.php | 8 +- app/Http/Controllers/EventController.php | 4 +- .../Controllers/EventCustomizeController.php | 4 +- .../Controllers/EventDashboardController.php | 16 +- .../Controllers/EventOrdersController.php | 54 +- .../Controllers/EventPromoteController.php | 2 +- .../EventQrcodeCheckInController.php | 67 +- .../Controllers/EventQuestionsController.php | 2 +- .../Controllers/EventSurveyController.php | 6 +- .../Controllers/EventTicketsController.php | 49 +- app/Http/Controllers/EventViewController.php | 4 +- .../Controllers/EventWidgetsController.php | 4 - app/Http/Controllers/ImageController.php | 2 +- app/Http/Controllers/InstallerController.php | 42 +- .../Controllers/ManageAccountController.php | 56 +- app/Http/Controllers/MyBaseController.php | 25 +- app/Http/Controllers/OrganiserController.php | 18 +- .../OrganiserCustomizeController.php | 22 +- .../Controllers/OrganiserEventsController.php | 3 +- .../Controllers/OrganiserViewController.php | 6 +- app/Http/Controllers/RemindersController.php | 4 +- app/Http/Controllers/UserController.php | 13 +- app/Http/Controllers/UserLoginController.php | 2 - app/Http/Controllers/UserSignupController.php | 12 +- app/Http/Kernel.php | 10 +- app/Http/Middleware/Authenticate.php | 6 +- app/Http/Middleware/CheckInstalled.php | 5 +- app/Http/Middleware/FirstRunMiddleware.php | 5 +- app/Http/Middleware/GeneralChecks.php | 4 +- .../Middleware/RedirectIfAuthenticated.php | 2 +- app/Http/Middleware/VerifyCsrfToken.php | 4 +- .../Requests/StoreEventQuestionRequest.php | 4 +- app/Http/api_routes.php | 11 +- app/Jobs/GenerateTicket.php | 72 +- app/Jobs/Job.php | 22 +- app/Jobs/SendAttendeeInvite.php | 8 +- app/Jobs/SendAttendeeTicket.php | 9 +- app/Jobs/SendMessageToAttendee.php | 5 +- app/Jobs/SendMessageToAttendees.php | 8 +- app/Jobs/SendOrderNotification.php | 5 +- app/Jobs/SendOrderTickets.php | 7 +- app/Listeners/OrderCompletedListener.php | 5 +- app/Mailers/AttendeeMailer.php | 3 +- app/Mailers/OrderMailer.php | 17 +- app/Models/Account.php | 61 +- app/Models/AccountPaymentGateway.php | 9 +- app/Models/Activity.php | 6 +- app/Models/Attendee.php | 26 +- app/Models/Currency.php | 20 +- app/Models/DateFormat.php | 6 +- app/Models/DateTimeFormat.php | 20 +- app/Models/DiscountCode.php | 6 +- app/Models/EventImage.php | 6 +- app/Models/EventStats.php | 10 +- app/Models/Message.php | 8 +- app/Models/MyBaseModel.php | 82 +- app/Models/OrderItem.php | 7 +- app/Models/OrderStatus.php | 6 +- app/Models/Organiser.php | 4 +- app/Models/QuestionOption.php | 17 +- app/Models/ReservedTickets.php | 6 +- app/Models/Ticket.php | 56 +- app/Models/TicketStatus.php | 6 +- app/Models/Timezone.php | 7 +- app/Models/User.php | 2 +- app/Providers/AppServiceProvider.php | 2 +- app/Providers/AuthServiceProvider.php | 2 +- app/Transformers/EventTransformer.php | 15 + app/Transformers/Transformer.php | 22 + composer.lock | 841 +++++++++++------- config/app.php | 1 + 85 files changed, 1142 insertions(+), 889 deletions(-) create mode 100644 .dockerignore create mode 100644 app/Transformers/EventTransformer.php create mode 100644 app/Transformers/Transformer.php diff --git a/.dockerignore b/.dockerignore new file mode 100644 index 00000000..b512c09d --- /dev/null +++ b/.dockerignore @@ -0,0 +1 @@ +node_modules \ No newline at end of file diff --git a/app/Console/Commands/Install.php b/app/Console/Commands/Install.php index fe127cc9..dce86f60 100644 --- a/app/Console/Commands/Install.php +++ b/app/Console/Commands/Install.php @@ -2,14 +2,14 @@ namespace App\Console\Commands; -use App\Models\Timezone; use App\Models\Account; +use App\Models\Timezone; use App\Models\User; use DB; +use Hash; use Illuminate\Console\Command; use Illuminate\Support\Facades\Artisan; use PhpSpec\Exception\Exception; -use Hash; class Install extends Command { @@ -45,7 +45,7 @@ class Install extends Command } $this->comment('--------------------'); - $this->comment('Attempting to install Attendize v'.$version); + $this->comment('Attempting to install Attendize v' . $version); $this->comment('--------------------'); @@ -71,7 +71,7 @@ class Install extends Command /* * If there is no account prompt the user to create one; */ - if(Account::count() === 0) { + if (Account::count() === 0) { DB::beginTransaction(); try { $this->comment('--------------------'); diff --git a/app/Events/OrderCompletedEvent.php b/app/Events/OrderCompletedEvent.php index ded88068..066f4f1a 100644 --- a/app/Events/OrderCompletedEvent.php +++ b/app/Events/OrderCompletedEvent.php @@ -2,10 +2,8 @@ namespace App\Events; -use App\Events\Event; use App\Models\Order; use Illuminate\Queue\SerializesModels; -use Illuminate\Contracts\Broadcasting\ShouldBroadcast; class OrderCompletedEvent extends Event { diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index e48f968c..dce7e340 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -3,11 +3,11 @@ namespace App\Exceptions; use Exception; -use Illuminate\Validation\ValidationException; use Illuminate\Auth\Access\AuthorizationException; use Illuminate\Database\Eloquent\ModelNotFoundException; -use Symfony\Component\HttpKernel\Exception\HttpException; use Illuminate\Foundation\Exceptions\Handler as ExceptionHandler; +use Illuminate\Validation\ValidationException; +use Symfony\Component\HttpKernel\Exception\HttpException; //use Bugsnag\BugsnagLaravel\BugsnagExceptionHandler as ExceptionHandler; @@ -30,7 +30,7 @@ class Handler extends ExceptionHandler * * This is a great spot to send exceptions to Sentry, Bugsnag, etc. * - * @param \Exception $e + * @param \Exception $e * @return void */ public function report(Exception $e) @@ -41,8 +41,8 @@ class Handler extends ExceptionHandler /** * Render an exception into an HTTP response. * - * @param \Illuminate\Http\Request $request - * @param \Exception $e + * @param \Illuminate\Http\Request $request + * @param \Exception $e * @return \Illuminate\Http\Response */ public function render($request, Exception $e) diff --git a/app/Handlers/QueueHandler.php b/app/Handlers/QueueHandler.php index 682e8250..7afc3ac3 100644 --- a/app/Handlers/QueueHandler.php +++ b/app/Handlers/QueueHandler.php @@ -37,7 +37,7 @@ class QueueHandler 'attendees' => $order->attendees, ]; - $pdf_file = storage_path().'/'.$order->order_reference; + $pdf_file = storage_path() . '/' . $order->order_reference; exit($pdf_file); PDF::setOutputMode('F'); // force to file @@ -61,7 +61,8 @@ class QueueHandler $message_object = Message::find($data['message_id']); $event = $message_object->event; - $attendees = ($message_object->recipients == 0) ? $event->attendees : Attendee::where('ticket_id', '=', $message_object->recipients)->where('account_id', '=', $message_object->account_id)->get(); + $attendees = ($message_object->recipients == 0) ? $event->attendees : Attendee::where('ticket_id', '=', + $message_object->recipients)->where('account_id', '=', $message_object->account_id)->get(); $toFields = []; foreach ($attendees as $attendee) { @@ -76,9 +77,9 @@ class QueueHandler Mail::send('Emails.messageAttendees', $data, function ($message) use ($toFields, $event, $message_object) { $message->to($toFields) - ->from(config('attendize.outgoing_email_noreply'), $event->organiser->name) - ->replyTo($event->organiser->email, $event->organiser->name) - ->subject($message_object->subject); + ->from(config('attendize.outgoing_email_noreply'), $event->organiser->name) + ->replyTo($event->organiser->email, $event->organiser->name) + ->subject($message_object->subject); }); $message_object->is_sent = 1; diff --git a/app/Helpers/helpers.php b/app/Helpers/helpers.php index 98b67800..3a1a5280 100644 --- a/app/Helpers/helpers.php +++ b/app/Helpers/helpers.php @@ -1,6 +1,6 @@ symbol_left . number_format($amount, $currency->decimal_place, $currency->decimal_point, $currency->thousand_point) . $currency->symbol_right; + return $currency->symbol_left . number_format($amount, $currency->decimal_place, $currency->decimal_point, + $currency->thousand_point) . $currency->symbol_right; } } diff --git a/app/Helpers/macros.php b/app/Helpers/macros.php index 87f6a6ec..e075fc38 100644 --- a/app/Helpers/macros.php +++ b/app/Helpers/macros.php @@ -19,9 +19,9 @@ Form::macro('labelWithHelp', function ($name, $value, $options, $help_text) { $label = Form::label($name, '%s', $options); return sprintf($label, $value) - .'' - .'' - .''; + . '' + . '' + . ''; }); Form::macro('customCheckbox', function ($name, $value, $checked = false, $label = false, $options = []) { @@ -38,11 +38,11 @@ Form::macro('customCheckbox', function ($name, $value, $checked = false, $label }); Form::macro('styledFile', function ($name, $multiple = false) { - $out = '
+ $out = '
- Browse… + Browse… @@ -57,25 +57,26 @@ Form::macro('styledFile', function ($name, $multiple = false) { return $out; }); -HTML::macro('sortable_link', function ($title, $active_sort, $sort_by, $sort_order, $url_params = [], $class = '', $extra = '') { +HTML::macro('sortable_link', + function ($title, $active_sort, $sort_by, $sort_order, $url_params = [], $class = '', $extra = '') { - $sort_order = $sort_order == 'asc' ? 'desc' : 'asc'; + $sort_order = $sort_order == 'asc' ? 'desc' : 'asc'; - $url_params = http_build_query([ - 'sort_by' => $sort_by, - 'sort_order' => $sort_order, + $url_params = http_build_query([ + 'sort_by' => $sort_by, + 'sort_order' => $sort_order, ] + $url_params); - $html = ""; + $html = ""; - $html .= ($active_sort == $sort_by) ? "$title" : $title; + $html .= ($active_sort == $sort_by) ? "$title" : $title; - $html .= ($sort_order == 'desc') ? '' : ''; + $html .= ($sort_order == 'desc') ? '' : ''; - $html .= ''; + $html .= ''; - return $html; -}); + return $html; + }); Blade::directive('money', function ($expression) { return ""; diff --git a/app/Http/Controllers/API/ApiBaseController.php b/app/Http/Controllers/API/ApiBaseController.php index d23c4205..f610eb20 100644 --- a/app/Http/Controllers/API/ApiBaseController.php +++ b/app/Http/Controllers/API/ApiBaseController.php @@ -4,7 +4,6 @@ namespace app\Http\Controllers\API; use App\Http\Controllers\Controller; -use App\Http\Requests\Request; use Illuminate\Support\Facades\Auth; class ApiBaseController extends Controller @@ -15,6 +14,6 @@ class ApiBaseController extends Controller { $this->account_id = Auth::guard('api')->user()->account_id; } - + } \ No newline at end of file diff --git a/app/Http/Controllers/API/AttendeesApiController.php b/app/Http/Controllers/API/AttendeesApiController.php index d4577962..fa349f22 100644 --- a/app/Http/Controllers/API/AttendeesApiController.php +++ b/app/Http/Controllers/API/AttendeesApiController.php @@ -25,16 +25,24 @@ class AttendeesApiController extends ApiBaseController */ public function show(Request $request, $attendee_id) { - if($attendee_id) { + if ($attendee_id) { return Attendee::scope($this->account_id)->find($attendee_id); } return response('Attendee Not Found', 404); } - public function store(Request $request) {} - public function update(Request $request) {} - public function destroy(Request $request) {} + public function store(Request $request) + { + } + + public function update(Request $request) + { + } + + public function destroy(Request $request) + { + } } \ No newline at end of file diff --git a/app/Http/Controllers/API/EventsApiController.php b/app/Http/Controllers/API/EventsApiController.php index 6547334b..0efb5e42 100644 --- a/app/Http/Controllers/API/EventsApiController.php +++ b/app/Http/Controllers/API/EventsApiController.php @@ -24,16 +24,24 @@ class EventsApiController extends ApiBaseController */ public function show(Request $request, $attendee_id) { - if($attendee_id) { + if ($attendee_id) { return Event::scope($this->account_id)->find($attendee_id); } return response('Event Not Found', 404); } - public function store(Request $request) {} - public function update(Request $request) {} - public function destroy(Request $request) {} + public function store(Request $request) + { + } + + public function update(Request $request) + { + } + + public function destroy(Request $request) + { + } } \ No newline at end of file diff --git a/app/Http/Controllers/Auth/AuthController.php b/app/Http/Controllers/Auth/AuthController.php index 5cee6132..2b656738 100644 --- a/app/Http/Controllers/Auth/AuthController.php +++ b/app/Http/Controllers/Auth/AuthController.php @@ -25,7 +25,7 @@ class AuthController extends Controller /** * Create a new authentication controller instance. * - * @param \Illuminate\Contracts\Auth\Guard $auth + * @param \Illuminate\Contracts\Auth\Guard $auth * @param \Illuminate\Contracts\Auth\Registrar $registrar * * @return void diff --git a/app/Http/Controllers/Auth/PasswordController.php b/app/Http/Controllers/Auth/PasswordController.php index 62f76e4f..677005bb 100644 --- a/app/Http/Controllers/Auth/PasswordController.php +++ b/app/Http/Controllers/Auth/PasswordController.php @@ -23,7 +23,7 @@ class PasswordController extends Controller /** * Create a new password controller instance. * - * @param \Illuminate\Contracts\Auth\Guard $auth + * @param \Illuminate\Contracts\Auth\Guard $auth * @param \Illuminate\Contracts\Auth\PasswordBroker $passwords * * @return void diff --git a/app/Http/Controllers/EventAttendeesController.php b/app/Http/Controllers/EventAttendeesController.php index c3bb456e..ecedfc88 100644 --- a/app/Http/Controllers/EventAttendeesController.php +++ b/app/Http/Controllers/EventAttendeesController.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers; +use App\Jobs\GenerateTicket; use App\Jobs\SendAttendeeInvite; use App\Jobs\SendAttendeeTicket; use App\Jobs\SendMessageToAttendees; -use App\Jobs\GenerateTicket; use App\Models\Attendee; use App\Models\Event; use App\Models\EventStats; @@ -13,16 +13,16 @@ use App\Models\Message; use App\Models\Order; use App\Models\OrderItem; use App\Models\Ticket; -use Illuminate\Http\Request; use Auth; +use Config; use DB; use Excel; +use Illuminate\Http\Request; +use Log; use Mail; use Omnipay\Omnipay; use PDF; use Validator; -use Config; -use Log; class EventAttendeesController extends MyBaseController { @@ -111,9 +111,9 @@ class EventAttendeesController extends MyBaseController public function postInviteAttendee(Request $request, $event_id) { $rules = [ - 'first_name' => 'required', - 'ticket_id' => 'required|exists:tickets,id,account_id,' . \Auth::user()->account_id, - 'email' => 'email|required', + 'first_name' => 'required', + 'ticket_id' => 'required|exists:tickets,id,account_id,' . \Auth::user()->account_id, + 'email' => 'email|required', ]; $messages = [ @@ -195,7 +195,7 @@ class EventAttendeesController extends MyBaseController if ($email_attendee == '1') { - $this->dispatch(new SendAttendeeInvite($attendee)); + $this->dispatch(new SendAttendeeInvite($attendee)); } session()->flash('message', 'Attendee Successfully Invited'); @@ -529,11 +529,11 @@ class EventAttendeesController extends MyBaseController Log::info($attendee); - $this->dispatch(new GenerateTicket($attendee->order->order_reference."-".$attendee->reference_index)); + $this->dispatch(new GenerateTicket($attendee->order->order_reference . "-" . $attendee->reference_index)); - $pdf_file_name = $attendee->order->order_reference.'-'.$attendee->reference_index; - $pdf_file_path = public_path(config('attendize.event_pdf_tickets_path')).'/'.$pdf_file_name; - $pdf_file = $pdf_file_path.'.pdf'; + $pdf_file_name = $attendee->order->order_reference . '-' . $attendee->reference_index; + $pdf_file_path = public_path(config('attendize.event_pdf_tickets_path')) . '/' . $pdf_file_name; + $pdf_file = $pdf_file_path . '.pdf'; return response()->download($pdf_file); @@ -718,7 +718,7 @@ class EventAttendeesController extends MyBaseController }); } - if($request->get('refund_attendee') == '1') { + if ($request->get('refund_attendee') == '1') { try { // This does not account for an increased/decreased ticket price diff --git a/app/Http/Controllers/EventCheckInController.php b/app/Http/Controllers/EventCheckInController.php index 8ba471ca..362ef1e7 100644 --- a/app/Http/Controllers/EventCheckInController.php +++ b/app/Http/Controllers/EventCheckInController.php @@ -2,11 +2,11 @@ namespace App\Http\Controllers; -use Illuminate\Http\Request; use App\Models\Attendee; use App\Models\Event; use Carbon\Carbon; use DB; +use Illuminate\Http\Request; use JavaScript; class EventCheckInController extends MyBaseController @@ -59,7 +59,8 @@ class EventCheckInController extends MyBaseController $query->where('attendees.event_id', '=', $event_id); })->where(function ($query) use ($searchQuery) { $query->orWhere('attendees.first_name', 'like', $searchQuery . '%') - ->orWhere(DB::raw("CONCAT_WS(' ', attendees.first_name, attendees.last_name)"), 'like', $searchQuery . '%') + ->orWhere(DB::raw("CONCAT_WS(' ', attendees.first_name, attendees.last_name)"), 'like', + $searchQuery . '%') //->orWhere('attendees.email', 'like', $searchQuery . '%') ->orWhere('orders.order_reference', 'like', $searchQuery . '%') ->orWhere('attendees.last_name', 'like', $searchQuery . '%'); diff --git a/app/Http/Controllers/EventCheckoutController.php b/app/Http/Controllers/EventCheckoutController.php index 09529fe2..3dbd8920 100644 --- a/app/Http/Controllers/EventCheckoutController.php +++ b/app/Http/Controllers/EventCheckoutController.php @@ -9,8 +9,8 @@ use App\Models\Event; use App\Models\EventStats; use App\Models\Order; use App\Models\OrderItem; -use App\Models\ReservedTickets; use App\Models\QuestionAnswer; +use App\Models\ReservedTickets; use App\Models\Ticket; use Carbon\Carbon; use Cookie; @@ -61,7 +61,7 @@ class EventCheckoutController extends Controller if (!$request->has('tickets')) { return response()->json([ - 'status' => 'error', + 'status' => 'error', 'message' => 'No tickets selected', ]); } @@ -311,7 +311,7 @@ class EventCheckoutController extends Controller * Check if the user has chosen to pay offline * and if they are allowed */ - if($request->get('pay_offline') && $event->enable_offline_payments) { + if ($request->get('pay_offline') && $event->enable_offline_payments) { return $this->completeOrder($event_id); } @@ -489,7 +489,7 @@ class EventCheckoutController extends Controller if (isset($ticket_order['transaction_id'])) { $order->transaction_id = $ticket_order['transaction_id'][0]; } - if ($ticket_order['order_requires_payment'] && !isset($request_data['pay_offline']) ) { + if ($ticket_order['order_requires_payment'] && !isset($request_data['pay_offline'])) { $order->payment_gateway_id = $ticket_order['payment_gateway']->id; } $order->first_name = $request_data['order_first_name']; diff --git a/app/Http/Controllers/EventController.php b/app/Http/Controllers/EventController.php index cfcf7968..d34acf6a 100644 --- a/app/Http/Controllers/EventController.php +++ b/app/Http/Controllers/EventController.php @@ -5,12 +5,12 @@ namespace App\Http\Controllers; use App\Models\Event; use App\Models\EventImage; use App\Models\Organiser; -use Illuminate\Http\Request; use Auth; use Carbon\Carbon; +use Illuminate\Http\Request; use Image; -use Validator; use Log; +use Validator; class EventController extends MyBaseController { diff --git a/app/Http/Controllers/EventCustomizeController.php b/app/Http/Controllers/EventCustomizeController.php index b6036fda..e29413f8 100644 --- a/app/Http/Controllers/EventCustomizeController.php +++ b/app/Http/Controllers/EventCustomizeController.php @@ -4,9 +4,9 @@ namespace App\Http\Controllers; use App\Models\Event; use File; +use Illuminate\Http\Request; use Image; use Validator; -use Illuminate\Http\Request; class EventCustomizeController extends MyBaseController { @@ -225,7 +225,7 @@ 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->offline_payment_instructions = trim($request->get('offline_payment_instructions')); - $event->enable_offline_payments = (int) $request->get('enable_offline_payments'); + $event->enable_offline_payments = (int)$request->get('enable_offline_payments'); $event->save(); return response()->json([ diff --git a/app/Http/Controllers/EventDashboardController.php b/app/Http/Controllers/EventDashboardController.php index 2805afc8..6640e7cf 100644 --- a/app/Http/Controllers/EventDashboardController.php +++ b/app/Http/Controllers/EventDashboardController.php @@ -31,9 +31,9 @@ class EventDashboardController extends MyBaseController * should be done in the DB */ $chartData = EventStats::where('event_id', '=', $event->id) - ->where('date', '>', Carbon::now()->subDays($num_days)->format('Y-m-d')) - ->get() - ->toArray(); + ->where('date', '>', Carbon::now()->subDays($num_days)->format('Y-m-d')) + ->get() + ->toArray(); $startDate = new DateTime("-$num_days days"); $dateItter = new DatePeriod( @@ -55,11 +55,11 @@ class EventDashboardController extends MyBaseController foreach ($chartData as $item) { if ($item['date'] == $date->format('Y-m-d')) { - $views = $item['views']; - $sales_volume = $item['sales_volume']; + $views = $item['views']; + $sales_volume = $item['sales_volume']; $organiser_fees_volume = $item['organiser_fees_volume']; - $unique_views = $item['unique_views']; - $tickets_sold = $item['tickets_sold']; + $unique_views = $item['unique_views']; + $tickets_sold = $item['tickets_sold']; break; } @@ -74,7 +74,7 @@ class EventDashboardController extends MyBaseController ]; } - foreach($event->tickets as $ticket) { + foreach ($event->tickets as $ticket) { $tickets_data[] = [ 'value' => $ticket->quantity_sold, 'label' => $ticket->title, diff --git a/app/Http/Controllers/EventOrdersController.php b/app/Http/Controllers/EventOrdersController.php index 670aa242..8f8d5430 100644 --- a/app/Http/Controllers/EventOrdersController.php +++ b/app/Http/Controllers/EventOrdersController.php @@ -6,9 +6,9 @@ namespace App\Http\Controllers; use App\Models\Attendee; use App\Models\Event; use App\Models\Order; -use Illuminate\Http\Request; use DB; use Excel; +use Illuminate\Http\Request; use Log; use Mail; use Omnipay; @@ -29,8 +29,8 @@ class EventOrdersController extends MyBaseController $allowed_sorts = ['first_name', 'email', 'order_reference', 'order_status_id', 'created_at']; $searchQuery = $request->get('q'); - $sort_by = (in_array($request->get('sort_by'), $allowed_sorts) ? $request->get('sort_by') : 'created_at'); - $sort_order = $request->get('sort_order') == 'asc' ? 'asc' : 'desc'; + $sort_by = (in_array($request->get('sort_by'), $allowed_sorts) ? $request->get('sort_by') : 'created_at'); + $sort_order = $request->get('sort_order') == 'asc' ? 'asc' : 'desc'; $event = Event::scope()->find($event_id); @@ -45,10 +45,10 @@ class EventOrdersController extends MyBaseController $orders = $event->orders() ->where(function ($query) use ($searchQuery) { - $query->where('order_reference', 'like', $searchQuery.'%') - ->orWhere('first_name', 'like', $searchQuery.'%') - ->orWhere('email', 'like', $searchQuery.'%') - ->orWhere('last_name', 'like', $searchQuery.'%'); + $query->where('order_reference', 'like', $searchQuery . '%') + ->orWhere('first_name', 'like', $searchQuery . '%') + ->orWhere('email', 'like', $searchQuery . '%') + ->orWhere('last_name', 'like', $searchQuery . '%'); }) ->orderBy($sort_by, $sort_order) ->paginate(); @@ -131,10 +131,10 @@ class EventOrdersController extends MyBaseController $order = Order::scope()->findOrFail($order_id); - $refund_order = ($request->get('refund_order') === 'on') ? true : false; - $refund_type = $request->get('refund_type'); + $refund_order = ($request->get('refund_order') === 'on') ? true : false; + $refund_type = $request->get('refund_type'); $refund_amount = round(floatval($request->get('refund_amount')), 2); - $attendees = $request->get('attendees'); + $attendees = $request->get('attendees'); $error_message = false; if ($refund_order && $order->payment_gateway->can_refund) { @@ -146,8 +146,11 @@ class EventOrdersController extends MyBaseController $error_message = 'This order has already been refunded'; } elseif ($order->organiser_amount == 0) { $error_message = 'Nothing to refund'; - } elseif ($refund_type !== 'full' && $refund_amount > round(($order->organiser_amount - $order->amount_refunded), 2)) { - $error_message = 'The maximum amount you can refund is '.(money($order->organiser_amount - $order->amount_refunded, $order->event->currency)); + } elseif ($refund_type !== 'full' && $refund_amount > round(($order->organiser_amount - $order->amount_refunded), + 2) + ) { + $error_message = 'The maximum amount you can refund is ' . (money($order->organiser_amount - $order->amount_refunded, + $order->event->currency)); } if (!$error_message) { try { @@ -210,7 +213,7 @@ class EventOrdersController extends MyBaseController } \Session::flash('message', - (!$refund_amount && !$attendees) ? 'Nothing To Do' : 'Successfully '.($refund_order ? ' Refunded Order' : ' ').($attendees && $refund_order ? ' & ' : '').($attendees ? 'Cancelled Attendee(s)' : '')); + (!$refund_amount && !$attendees) ? 'Nothing To Do' : 'Successfully ' . ($refund_order ? ' Refunded Order' : ' ') . ($attendees && $refund_order ? ' & ' : '') . ($attendees ? 'Cancelled Attendee(s)' : '')); return response()->json([ 'status' => 'success', @@ -228,9 +231,9 @@ class EventOrdersController extends MyBaseController { $event = Event::scope()->findOrFail($event_id); - Excel::create('orders-as-of-'.date('d-m-Y-g.i.a'), function ($excel) use ($event) { + Excel::create('orders-as-of-' . date('d-m-Y-g.i.a'), function ($excel) use ($event) { - $excel->setTitle('Orders For Event: '.$event->title); + $excel->setTitle('Orders For Event: ' . $event->title); // Chain the setters $excel->setCreator(config('attendize.app_name')) @@ -259,7 +262,15 @@ class EventOrdersController extends MyBaseController // Add headings to first row $sheet->row(1, [ - 'First Name', 'Last Name', 'Email', 'Order Reference', 'Amount', 'Fully Refunded', 'Partially Refunded', 'Amount Refunded', 'Order Date', + 'First Name', + 'Last Name', + 'Email', + 'Order Reference', + 'Amount', + 'Fully Refunded', + 'Partially Refunded', + 'Amount Refunded', + 'Order Date', ]); // Set gray background on first row @@ -282,8 +293,8 @@ class EventOrdersController extends MyBaseController $order = Order::scope()->findOrFail($order_id); $data = [ - 'order' => $order, - 'event' => $order->event, + 'order' => $order, + 'event' => $order->event, ]; return view('ManageEvent.Modals.MessageOrder', $data); @@ -335,7 +346,7 @@ class EventOrdersController extends MyBaseController $message->to($order->event->organiser->email) ->from(config('attendize.outgoing_email_noreply'), $order->event->organiser->name) ->replyTo($order->event->organiser->email, $order->event->organiser->name) - ->subject($data['subject'].' [Organiser copy]'); + ->subject($data['subject'] . ' [Organiser copy]'); }); } @@ -352,7 +363,8 @@ class EventOrdersController extends MyBaseController * @param $order_id * @return \Illuminate\Http\JsonResponse */ - public function postMarkPaymentReceived(Request $request, $order_id) { + public function postMarkPaymentReceived(Request $request, $order_id) + { $order = Order::scope()->findOrFail($order_id); $order->is_payment_received = 1; @@ -363,7 +375,7 @@ class EventOrdersController extends MyBaseController session()->flash('message', 'Order Payment Status Successfully Updated'); return response()->json([ - 'status' => 'success', + 'status' => 'success', ]); } } diff --git a/app/Http/Controllers/EventPromoteController.php b/app/Http/Controllers/EventPromoteController.php index db94a74e..0d56fa54 100644 --- a/app/Http/Controllers/EventPromoteController.php +++ b/app/Http/Controllers/EventPromoteController.php @@ -11,7 +11,7 @@ class EventPromoteController extends MyBaseController public function showPromote($event_id) { $data = [ - 'event' => Event::scope()->find($event_id), + 'event' => Event::scope()->find($event_id), ]; return view('ManageEvent.Promote', $data); diff --git a/app/Http/Controllers/EventQrcodeCheckInController.php b/app/Http/Controllers/EventQrcodeCheckInController.php index a5791e4b..8df1f33e 100644 --- a/app/Http/Controllers/EventQrcodeCheckInController.php +++ b/app/Http/Controllers/EventQrcodeCheckInController.php @@ -2,7 +2,6 @@ namespace App\Http\Controllers; -use App\Http\Controllers\Controller; use App\Http\Requests; use App\Models\Attendee; use App\Models\Event; @@ -29,7 +28,7 @@ class EventQrcodeCheckInController extends Controller return view('ManageEvent.QrcodeCheckIn', compact('event')); } - /** + /** * Check in an attendee * * @param $event_id @@ -43,43 +42,43 @@ class EventQrcodeCheckInController extends Controller $qrcodeToken = $request->get('qrcode_token'); $attendee = Attendee::scope()->withoutCancelled() - ->join('tickets', 'tickets.id', '=', 'attendees.ticket_id') - ->where(function ($query) use ($event, $qrcodeToken) { - $query->where('attendees.event_id', $event->id) - ->where('attendees.private_reference_number', $qrcodeToken); - })->select([ - 'attendees.id', - 'attendees.order_id', - 'attendees.first_name', - 'attendees.last_name', - 'attendees.email', - 'attendees.reference', - 'attendees.arrival_time', - 'attendees.has_arrived', - 'tickets.title as ticket', - ])->first(); + ->join('tickets', 'tickets.id', '=', 'attendees.ticket_id') + ->where(function ($query) use ($event, $qrcodeToken) { + $query->where('attendees.event_id', $event->id) + ->where('attendees.private_reference_number', $qrcodeToken); + })->select([ + 'attendees.id', + 'attendees.order_id', + 'attendees.first_name', + 'attendees.last_name', + 'attendees.email', + 'attendees.reference', + 'attendees.arrival_time', + 'attendees.has_arrived', + 'tickets.title as ticket', + ])->first(); - if (is_null($attendee)){ - return response()->json(['status' => 'error', 'message' => "Invalid Ticket! Please try again."]); + if (is_null($attendee)) { + return response()->json(['status' => 'error', 'message' => "Invalid Ticket! Please try again."]); } $relatedAttendesCount = Attendee::where('id', '!=', $attendee->id) - ->where([ - 'order_id' => $attendee->order_id, - 'has_arrived' => false - ])->count(); + ->where([ + 'order_id' => $attendee->order_id, + 'has_arrived' => false + ])->count(); $appendedText = ''; - if ($relatedAttendesCount >= 1){ + if ($relatedAttendesCount >= 1) { $confirmOrderTicketsRoute = route('confirmCheckInOrderTickets', [$event->id, $attendee->order_id]); - $appendedText = '

'. csrf_field() .'
'; + $appendedText = '

' . csrf_field() . '
'; } if ($attendee->has_arrived) { return response()->json([ 'status' => 'error', - 'message' => 'Warning: This attendee has already been checked in at '. $attendee->arrival_time->format('H:i A, F j'). '.' . $appendedText + 'message' => 'Warning: This attendee has already been checked in at ' . $attendee->arrival_time->format('H:i A, F j') . '.' . $appendedText ]); } @@ -87,7 +86,7 @@ class EventQrcodeCheckInController extends Controller return response()->json([ 'status' => 'success', - 'message' => 'Success !
Name: ' . $attendee->first_name . ' ' . $attendee->last_name . '
Reference: '. $attendee->reference . '
Ticket: '. $attendee->ticket . '.' . $appendedText + 'message' => 'Success !
Name: ' . $attendee->first_name . ' ' . $attendee->last_name . '
Reference: ' . $attendee->reference . '
Ticket: ' . $attendee->ticket . '.' . $appendedText ]); } @@ -100,13 +99,13 @@ class EventQrcodeCheckInController extends Controller */ public function confirmOrderTickets($event_id, $order_id) { - $updateRowsCount = Attendee::scope()->where([ - 'event_id' => $event_id, - 'order_id' => $order_id, - 'has_arrived' => false, - 'arrival_time' => Carbon::now(), - ]) - ->update(['has_arrived' => true, 'arrival_time' => Carbon::now()]); + $updateRowsCount = Attendee::scope()->where([ + 'event_id' => $event_id, + 'order_id' => $order_id, + 'has_arrived' => false, + 'arrival_time' => Carbon::now(), + ]) + ->update(['has_arrived' => true, 'arrival_time' => Carbon::now()]); return response()->json([ 'message' => $updateRowsCount . ' Attendee(s) Checked in.' diff --git a/app/Http/Controllers/EventQuestionsController.php b/app/Http/Controllers/EventQuestionsController.php index 1fd6f7a6..41ed4887 100644 --- a/app/Http/Controllers/EventQuestionsController.php +++ b/app/Http/Controllers/EventQuestionsController.php @@ -6,5 +6,5 @@ namespace App\Http\Controllers; class EventQuestionsController extends MyBaseController { - + } \ No newline at end of file diff --git a/app/Http/Controllers/EventSurveyController.php b/app/Http/Controllers/EventSurveyController.php index ee01fe10..98f783d6 100644 --- a/app/Http/Controllers/EventSurveyController.php +++ b/app/Http/Controllers/EventSurveyController.php @@ -3,14 +3,14 @@ namespace App\Http\Controllers; use App\Http\Requests\StoreEventQuestionRequest; -use App\Models\Event; use App\Models\Attendee; +use App\Models\Event; use App\Models\Question; use App\Models\QuestionAnswer; use App\Models\QuestionType; -use JavaScript; -use Illuminate\Http\Request; use Excel; +use Illuminate\Http\Request; +use JavaScript; /* Attendize.com - Event Management & Ticketing diff --git a/app/Http/Controllers/EventTicketsController.php b/app/Http/Controllers/EventTicketsController.php index 60aa8011..414df9d4 100644 --- a/app/Http/Controllers/EventTicketsController.php +++ b/app/Http/Controllers/EventTicketsController.php @@ -22,10 +22,10 @@ class EventTicketsController extends MyBaseController public function showTickets(Request $request, $event_id) { $allowed_sorts = [ - 'created_at' => 'Creation date', - 'title' => 'Ticket title', + 'created_at' => 'Creation date', + 'title' => 'Ticket title', 'quantity_sold' => 'Quantity sold', - 'sales_volume' => 'Sales volume', + 'sales_volume' => 'Sales volume', ]; // Getting get parameters. @@ -43,8 +43,8 @@ class EventTicketsController extends MyBaseController // Get tickets for event. $tickets = empty($q) === false - ? $event->tickets()->where('title', 'like', '%'.$q.'%')->orderBy($sort_by, 'desc')->paginate() - : $event->tickets()->orderBy($sort_by, 'desc')->paginate(); + ? $event->tickets()->where('title', 'like', '%' . $q . '%')->orderBy($sort_by, 'desc')->paginate() + : $event->tickets()->orderBy($sort_by, 'desc')->paginate(); // Return view. return view('ManageEvent.Tickets', compact('event', 'tickets', 'sort_by', 'q', 'allowed_sorts')); @@ -97,15 +97,17 @@ class EventTicketsController extends MyBaseController ]); } - $ticket->event_id = $event_id; - $ticket->title = $request->get('title'); + $ticket->event_id = $event_id; + $ticket->title = $request->get('title'); $ticket->quantity_available = !$request->get('quantity_available') ? null : $request->get('quantity_available'); - $ticket->start_sale_date = $request->get('start_sale_date') ? Carbon::createFromFormat('d-m-Y H:i', $request->get('start_sale_date')) : null; - $ticket->end_sale_date = $request->get('end_sale_date') ? Carbon::createFromFormat('d-m-Y H:i', $request->get('end_sale_date')) : null; - $ticket->price = $request->get('price'); - $ticket->min_per_person = $request->get('min_per_person'); - $ticket->max_per_person = $request->get('max_per_person'); - $ticket->description = $request->get('description'); + $ticket->start_sale_date = $request->get('start_sale_date') ? Carbon::createFromFormat('d-m-Y H:i', + $request->get('start_sale_date')) : null; + $ticket->end_sale_date = $request->get('end_sale_date') ? Carbon::createFromFormat('d-m-Y H:i', + $request->get('end_sale_date')) : null; + $ticket->price = $request->get('price'); + $ticket->min_per_person = $request->get('min_per_person'); + $ticket->max_per_person = $request->get('max_per_person'); + $ticket->description = $request->get('description'); $ticket->save(); @@ -211,7 +213,10 @@ class EventTicketsController extends MyBaseController /* * Override some validation rules */ - $validation_rules['quantity_available'] = ['integer', 'min:'.($ticket->quantity_sold + $ticket->quantity_reserved)]; + $validation_rules['quantity_available'] = [ + 'integer', + 'min:' . ($ticket->quantity_sold + $ticket->quantity_reserved) + ]; $validation_messages['quantity_available.min'] = 'Quantity available can\'t be less the amount sold or reserved.'; $ticket->rules = $validation_rules + $ticket->rules; @@ -224,14 +229,16 @@ class EventTicketsController extends MyBaseController ]); } - $ticket->title = $request->get('title'); + $ticket->title = $request->get('title'); $ticket->quantity_available = !$request->get('quantity_available') ? null : $request->get('quantity_available'); - $ticket->price = $request->get('price'); - $ticket->start_sale_date = $request->get('start_sale_date') ? Carbon::createFromFormat('d-m-Y H:i', $request->get('start_sale_date')) : null; - $ticket->end_sale_date = $request->get('end_sale_date') ? Carbon::createFromFormat('d-m-Y H:i', $request->get('end_sale_date')) : null; - $ticket->description = $request->get('description'); - $ticket->min_per_person = $request->get('min_per_person'); - $ticket->max_per_person = $request->get('max_per_person'); + $ticket->price = $request->get('price'); + $ticket->start_sale_date = $request->get('start_sale_date') ? Carbon::createFromFormat('d-m-Y H:i', + $request->get('start_sale_date')) : null; + $ticket->end_sale_date = $request->get('end_sale_date') ? Carbon::createFromFormat('d-m-Y H:i', + $request->get('end_sale_date')) : null; + $ticket->description = $request->get('description'); + $ticket->min_per_person = $request->get('min_per_person'); + $ticket->max_per_person = $request->get('max_per_person'); $ticket->save(); diff --git a/app/Http/Controllers/EventViewController.php b/app/Http/Controllers/EventViewController.php index f63ba777..4681bdfe 100644 --- a/app/Http/Controllers/EventViewController.php +++ b/app/Http/Controllers/EventViewController.php @@ -61,7 +61,7 @@ class EventViewController extends Controller $affiliate->save(); - Cookie::queue('affiliate_'.$event_id, $affiliate_ref, 60 * 24 * 60); + Cookie::queue('affiliate_' . $event_id, $affiliate_ref, 60 * 24 * 60); } } @@ -116,7 +116,7 @@ class EventViewController extends Controller $message->to($event->organiser->email, $event->organiser->name) ->from(config('attendize.outgoing_email_noreply'), $data['sender_name']) ->replyTo($data['sender_email'], $data['sender_name']) - ->subject('Message Regarding: '.$event->title); + ->subject('Message Regarding: ' . $event->title); }); return response()->json([ diff --git a/app/Http/Controllers/EventWidgetsController.php b/app/Http/Controllers/EventWidgetsController.php index faaddd4f..d680599e 100644 --- a/app/Http/Controllers/EventWidgetsController.php +++ b/app/Http/Controllers/EventWidgetsController.php @@ -2,10 +2,7 @@ namespace App\Http\Controllers; -use App\Http\Requests\StoreEventQuestionRequest; use App\Models\Event; -use App\Models\Question; -use App\Models\QuestionType; use Illuminate\Http\Request; /* @@ -34,5 +31,4 @@ class EventWidgetsController extends MyBaseController } - } diff --git a/app/Http/Controllers/ImageController.php b/app/Http/Controllers/ImageController.php index b77998c0..a9f544fd 100644 --- a/app/Http/Controllers/ImageController.php +++ b/app/Http/Controllers/ImageController.php @@ -7,7 +7,7 @@ class ImageController extends Controller /** * Generate a thumbnail for a given image - * + * * @param $image_src * @param bool $width * @param bool $height diff --git a/app/Http/Controllers/InstallerController.php b/app/Http/Controllers/InstallerController.php index d5d4f24d..ae413fd0 100644 --- a/app/Http/Controllers/InstallerController.php +++ b/app/Http/Controllers/InstallerController.php @@ -7,10 +7,6 @@ use Artisan; use Config; use DB; use Illuminate\Http\Request; -use Input; -use Redirect; -use Response; -use View; class InstallerController extends Controller { @@ -122,26 +118,26 @@ class InstallerController extends Controller ]; } - $config = "APP_ENV=production\n". - "APP_DEBUG=false\n". - "APP_URL={$app_url}\n". - "APP_KEY={$app_key}\n". - "DB_TYPE={$database['type']}\n". - "DB_HOST={$database['host']}\n". - "DB_DATABASE={$database['name']}\n". - "DB_USERNAME={$database['username']}\n". - "DB_PASSWORD={$database['password']}\n\n". - "MAIL_DRIVER={$mail['driver']}\n". - "MAIL_PORT={$mail['port']}\n". - "MAIL_ENCRYPTION={$mail['encryption']}\n". - "MAIL_HOST={$mail['host']}\n". - "MAIL_USERNAME={$mail['username']}\n". - "MAIL_FROM_NAME=\"{$mail['from_name']}\"\n". - "MAIL_FROM_ADDRESS={$mail['from_address']}\n". - "WKHTML2PDF_BIN_FILE=wkhtmltopdf-amd64\n". + $config = "APP_ENV=production\n" . + "APP_DEBUG=false\n" . + "APP_URL={$app_url}\n" . + "APP_KEY={$app_key}\n" . + "DB_TYPE={$database['type']}\n" . + "DB_HOST={$database['host']}\n" . + "DB_DATABASE={$database['name']}\n" . + "DB_USERNAME={$database['username']}\n" . + "DB_PASSWORD={$database['password']}\n\n" . + "MAIL_DRIVER={$mail['driver']}\n" . + "MAIL_PORT={$mail['port']}\n" . + "MAIL_ENCRYPTION={$mail['encryption']}\n" . + "MAIL_HOST={$mail['host']}\n" . + "MAIL_USERNAME={$mail['username']}\n" . + "MAIL_FROM_NAME=\"{$mail['from_name']}\"\n" . + "MAIL_FROM_ADDRESS={$mail['from_address']}\n" . + "WKHTML2PDF_BIN_FILE=wkhtmltopdf-amd64\n" . "MAIL_PASSWORD={$mail['password']}\n\n"; - $fp = fopen(base_path().'/.env', 'w'); + $fp = fopen(base_path() . '/.env', 'w'); fwrite($fp, $config); fclose($fp); @@ -162,7 +158,7 @@ class InstallerController extends Controller } Artisan::call('optimize', ['--force' => true]); - $fp = fopen(base_path().'/installed', 'w'); + $fp = fopen(base_path() . '/installed', 'w'); fwrite($fp, $version); fclose($fp); diff --git a/app/Http/Controllers/ManageAccountController.php b/app/Http/Controllers/ManageAccountController.php index 1487286f..602e8d0a 100644 --- a/app/Http/Controllers/ManageAccountController.php +++ b/app/Http/Controllers/ManageAccountController.php @@ -9,12 +9,12 @@ use App\Models\PaymentGateway; use App\Models\Timezone; use App\Models\User; use Auth; +use Hash; use HttpClient; use Illuminate\Http\Request; use Input; -use Validator; -use Hash; use Mail; +use Validator; class ManageAccountController extends MyBaseController { @@ -27,10 +27,10 @@ class ManageAccountController extends MyBaseController public function showEditAccount(Request $request) { $data = [ - 'account' => Account::find(Auth::user()->account_id), - 'timezones' => Timezone::lists('location', 'id'), - 'currencies' => Currency::lists('title', 'id'), - 'payment_gateways' => PaymentGateway::lists('provider_name', 'id'), + 'account' => Account::find(Auth::user()->account_id), + 'timezones' => Timezone::lists('location', 'id'), + 'currencies' => Currency::lists('title', 'id'), + 'payment_gateways' => PaymentGateway::lists('provider_name', 'id'), 'account_payment_gateways' => AccountPaymentGateway::scope()->get() ]; @@ -49,12 +49,12 @@ class ManageAccountController extends MyBaseController } $request = [ - 'url' => 'https://connect.stripe.com/oauth/token', + 'url' => 'https://connect.stripe.com/oauth/token', 'params' => [ 'client_secret' => STRIPE_SECRET_KEY, - 'code' => Input::get('code'), - 'grant_type' => 'authorization_code', + 'code' => Input::get('code'), + 'grant_type' => 'authorization_code', ], ]; @@ -70,10 +70,10 @@ class ManageAccountController extends MyBaseController $account = Account::find(\Auth::user()->account_id); - $account->stripe_access_token = $content->access_token; - $account->stripe_refresh_token = $content->refresh_token; + $account->stripe_access_token = $content->access_token; + $account->stripe_refresh_token = $content->refresh_token; $account->stripe_publishable_key = $content->stripe_publishable_key; - $account->stripe_data_raw = json_encode($content); + $account->stripe_data_raw = json_encode($content); $account->save(); @@ -94,21 +94,21 @@ class ManageAccountController extends MyBaseController if (!$account->validate(Input::all())) { return response()->json([ - 'status' => 'error', + 'status' => 'error', 'messages' => $account->errors(), ]); } - $account->first_name = Input::get('first_name'); - $account->last_name = Input::get('last_name'); - $account->email = Input::get('email'); + $account->first_name = Input::get('first_name'); + $account->last_name = Input::get('last_name'); + $account->email = Input::get('email'); $account->timezone_id = Input::get('timezone_id'); $account->currency_id = Input::get('currency_id'); $account->save(); return response()->json([ - 'status' => 'success', - 'id' => $account->id, + 'status' => 'success', + 'id' => $account->id, 'message' => 'Account Successfully Updated', ]); } @@ -139,7 +139,7 @@ class ManageAccountController extends MyBaseController $account_payment_gateway = AccountPaymentGateway::firstOrNew( [ 'payment_gateway_id' => $gateway_id, - 'account_id' => $account->id, + 'account_id' => $account->id, ]); $account_payment_gateway->config = $config; $account_payment_gateway->account_id = $account->id; @@ -150,8 +150,8 @@ class ManageAccountController extends MyBaseController $account->save(); return response()->json([ - 'status' => 'success', - 'id' => $account_payment_gateway->id, + 'status' => 'success', + 'id' => $account_payment_gateway->id, 'message' => 'Payment Information Successfully Updated', ]); } @@ -177,7 +177,7 @@ class ManageAccountController extends MyBaseController if ($validation->fails()) { return response()->json([ - 'status' => 'error', + 'status' => 'error', 'messages' => $validation->messages()->toArray(), ]); } @@ -186,25 +186,25 @@ class ManageAccountController extends MyBaseController $user = new User(); - $user->email = Input::get('email'); - $user->password = Hash::make($temp_password); + $user->email = Input::get('email'); + $user->password = Hash::make($temp_password); $user->account_id = Auth::user()->account_id; $user->save(); $data = [ - 'user' => $user, + 'user' => $user, 'temp_password' => $temp_password, - 'inviter' => Auth::user(), + 'inviter' => Auth::user(), ]; Mail::send('Emails.inviteUser', $data, function ($message) use ($data) { $message->to($data['user']->email) - ->subject($data['inviter']->first_name . ' ' . $data['inviter']->last_name . ' added you to an '. config('attendize.app_name') .' account.'); + ->subject($data['inviter']->first_name . ' ' . $data['inviter']->last_name . ' added you to an ' . config('attendize.app_name') . ' account.'); }); return response()->json([ - 'status' => 'success', + 'status' => 'success', 'message' => 'Success! ' . $user->email . ' has been sent further instructions.', ]); } diff --git a/app/Http/Controllers/MyBaseController.php b/app/Http/Controllers/MyBaseController.php index d850076e..807eb09e 100644 --- a/app/Http/Controllers/MyBaseController.php +++ b/app/Http/Controllers/MyBaseController.php @@ -3,7 +3,6 @@ namespace App\Http\Controllers; use App\Models\Event; - use App\Models\Organiser; use Auth; use JavaScript; @@ -18,17 +17,17 @@ class MyBaseController extends Controller * Set up JS across all views */ JavaScript::put([ - 'User' => [ - 'full_name' => Auth::user()->full_name, - 'email' => Auth::user()->email, - 'is_confirmed' => Auth::user()->is_confirmed, - ], + 'User' => [ + 'full_name' => Auth::user()->full_name, + 'email' => Auth::user()->email, + 'is_confirmed' => Auth::user()->is_confirmed, + ], /* * @todo These should be user selectable */ - 'DateFormat' => 'dd-MM-yyyy', - 'DateTimeFormat' => 'dd-MM-yyyy hh:mm', - 'GenericErrorMessage' => 'Whoops! An unknown error has occurred. Please try again or contact support if the problem persists.' + 'DateFormat' => 'dd-MM-yyyy', + 'DateTimeFormat' => 'dd-MM-yyyy hh:mm', + 'GenericErrorMessage' => 'Whoops! An unknown error has occurred. Please try again or contact support if the problem persists.' ]); /* @@ -40,7 +39,7 @@ class MyBaseController extends Controller /** * Returns data which is required in each view, optionally combined with additional data. * - * @param int $event_id + * @param int $event_id * @param array $additional_data * * @return arrau @@ -51,12 +50,12 @@ class MyBaseController extends Controller $image_path = $event->organiser->full_logo_path; if ($event->images->first() != null) { - $image_path = $event->images()->first()->image_path; + $image_path = $event->images()->first()->image_path; } return array_merge([ - 'event' => $event, - 'questions' => $event->questions()->get(), + 'event' => $event, + 'questions' => $event->questions()->get(), 'image_path' => $image_path, ], $additional_data); } diff --git a/app/Http/Controllers/OrganiserController.php b/app/Http/Controllers/OrganiserController.php index 58fd93cc..2dec4f6d 100644 --- a/app/Http/Controllers/OrganiserController.php +++ b/app/Http/Controllers/OrganiserController.php @@ -45,18 +45,18 @@ class OrganiserController extends MyBaseController ]); } - $organiser->name = $request->get('name'); - $organiser->about = $request->get('about'); - $organiser->email = $request->get('email'); - $organiser->facebook = $request->get('facebook'); - $organiser->twitter = $request->get('twitter'); + $organiser->name = $request->get('name'); + $organiser->about = $request->get('about'); + $organiser->email = $request->get('email'); + $organiser->facebook = $request->get('facebook'); + $organiser->twitter = $request->get('twitter'); $organiser->confirmation_key = str_random(15); if ($request->hasFile('organiser_logo')) { - $path = public_path().'/'.config('attendize.organiser_images_path'); - $filename = 'organiser_logo-'.$organiser->id.'.'.strtolower($request->file('organiser_logo')->getClientOriginalExtension()); + $path = public_path() . '/' . config('attendize.organiser_images_path'); + $filename = 'organiser_logo-' . $organiser->id . '.' . strtolower($request->file('organiser_logo')->getClientOriginalExtension()); - $file_full_path = $path.'/'.$filename; + $file_full_path = $path . '/' . $filename; $request->file('organiser_logo')->move($path, $filename); @@ -69,7 +69,7 @@ class OrganiserController extends MyBaseController $img->save($file_full_path); if (file_exists($file_full_path)) { - $organiser->logo_path = config('attendize.organiser_images_path').'/'.$filename; + $organiser->logo_path = config('attendize.organiser_images_path') . '/' . $filename; } } diff --git a/app/Http/Controllers/OrganiserCustomizeController.php b/app/Http/Controllers/OrganiserCustomizeController.php index a115c886..b51e8a3b 100644 --- a/app/Http/Controllers/OrganiserCustomizeController.php +++ b/app/Http/Controllers/OrganiserCustomizeController.php @@ -4,8 +4,8 @@ namespace App\Http\Controllers; use App\Models\Organiser; use File; -use Image; use Illuminate\Http\Request; +use Image; use Validator; class OrganiserCustomizeController extends MyBaseController @@ -43,12 +43,12 @@ class OrganiserCustomizeController extends MyBaseController ]); } - $organiser->name = $request->get('name'); - $organiser->about = $request->get('about'); - $organiser->email = $request->get('email'); + $organiser->name = $request->get('name'); + $organiser->about = $request->get('about'); + $organiser->email = $request->get('email'); $organiser->enable_organiser_page = $request->get('enable_organiser_page'); - $organiser->facebook = $request->get('facebook'); - $organiser->twitter = $request->get('twitter'); + $organiser->facebook = $request->get('facebook'); + $organiser->twitter = $request->get('twitter'); if ($request->get('remove_current_image') == '1') { $organiser->logo_path = ''; @@ -56,9 +56,9 @@ class OrganiserCustomizeController extends MyBaseController if ($request->hasFile('organiser_logo')) { $the_file = \File::get($request->file('organiser_logo')->getRealPath()); - $file_name = str_slug($organiser->name).'-logo-'.$organiser->id.'.'.strtolower($request->file('organiser_logo')->getClientOriginalExtension()); + $file_name = str_slug($organiser->name) . '-logo-' . $organiser->id . '.' . strtolower($request->file('organiser_logo')->getClientOriginalExtension()); - $relative_path_to_file = config('attendize.organiser_images_path').'/'.$file_name; + $relative_path_to_file = config('attendize.organiser_images_path') . '/' . $file_name; $full_path_to_file = public_path($relative_path_to_file); $img = Image::make($the_file); @@ -110,14 +110,14 @@ class OrganiserCustomizeController extends MyBaseController if ($validator->fails()) { return response()->json([ - 'status' => 'error', + 'status' => 'error', 'messages' => $validator->messages()->toArray(), ]); } - $event->page_bg_color = $request->get('page_bg_color'); + $event->page_bg_color = $request->get('page_bg_color'); $event->page_header_bg_color = $request->get('page_header_bg_color'); - $event->page_text_color = $request->get('page_text_color'); + $event->page_text_color = $request->get('page_text_color'); $event->save(); diff --git a/app/Http/Controllers/OrganiserEventsController.php b/app/Http/Controllers/OrganiserEventsController.php index f27b7494..9c975cd2 100644 --- a/app/Http/Controllers/OrganiserEventsController.php +++ b/app/Http/Controllers/OrganiserEventsController.php @@ -25,7 +25,8 @@ class OrganiserEventsController extends MyBaseController $sort_by = (in_array($request->get('sort_by'), $allowed_sorts) ? $request->get('sort_by') : 'start_date'); $events = $searchQuery - ? Event::scope()->where('title', 'like', '%'.$searchQuery.'%')->orderBy($sort_by, 'desc')->where('organiser_id', '=', $organiser_id)->paginate(12) + ? Event::scope()->where('title', 'like', '%' . $searchQuery . '%')->orderBy($sort_by, + 'desc')->where('organiser_id', '=', $organiser_id)->paginate(12) : Event::scope()->where('organiser_id', '=', $organiser_id)->orderBy($sort_by, 'desc')->paginate(12); $data = [ diff --git a/app/Http/Controllers/OrganiserViewController.php b/app/Http/Controllers/OrganiserViewController.php index 8f6a7267..9d683d4f 100644 --- a/app/Http/Controllers/OrganiserViewController.php +++ b/app/Http/Controllers/OrganiserViewController.php @@ -4,8 +4,8 @@ namespace App\Http\Controllers; use App\Attendize\Utils; use App\Models\Organiser; -use Carbon\Carbon; use Auth; +use Carbon\Carbon; use Illuminate\Http\Request; class OrganiserViewController extends Controller @@ -22,14 +22,14 @@ class OrganiserViewController extends Controller { $organiser = Organiser::findOrFail($organiser_id); - if(!$organiser->enable_organiser_page && !Utils::userOwns($organiser)) { + if (!$organiser->enable_organiser_page && !Utils::userOwns($organiser)) { abort(404); } /* * If we are previewing styles from the backend we set them here. */ - if($request->get('preview_styles') && Auth::check()) { + if ($request->get('preview_styles') && Auth::check()) { $query_string = rawurldecode($request->get('preview_styles')); parse_str($query_string, $preview_styles); diff --git a/app/Http/Controllers/RemindersController.php b/app/Http/Controllers/RemindersController.php index acde2cf4..d8884e57 100644 --- a/app/Http/Controllers/RemindersController.php +++ b/app/Http/Controllers/RemindersController.php @@ -121,8 +121,8 @@ class RemindersController extends Controller default: return redirect()->back() - ->withInput($request->only('email')) - ->withErrors(['email' => trans($response)]); + ->withInput($request->only('email')) + ->withErrors(['email' => trans($response)]); } } } diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index 6b07e76c..3fee4f12 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -3,9 +3,8 @@ namespace App\Http\Controllers; use Auth; -use Illuminate\Http\Request; -use Input; use Hash; +use Illuminate\Http\Request; use Validator; class UserController extends Controller @@ -33,7 +32,11 @@ class UserController extends Controller public function postEditUser(Request $request) { $rules = [ - 'email' => ['required', 'email', 'unique:users,email,' . Auth::user()->id . ',id,account_id,' . Auth::user()->account_id], + 'email' => [ + 'required', + 'email', + 'unique:users,email,' . Auth::user()->id . ',id,account_id,' . Auth::user()->account_id + ], 'new_password' => ['min:5', 'confirmed', 'required_with:password'], 'password' => 'passcheck', 'first_name' => ['required'], @@ -65,8 +68,8 @@ class UserController extends Controller } $user->first_name = $request->get('first_name'); - $user->last_name = $request->get('last_name'); - $user->email = $request->get('email'); + $user->last_name = $request->get('last_name'); + $user->email = $request->get('email'); $user->save(); diff --git a/app/Http/Controllers/UserLoginController.php b/app/Http/Controllers/UserLoginController.php index 99ddb70d..eb3dbabb 100644 --- a/app/Http/Controllers/UserLoginController.php +++ b/app/Http/Controllers/UserLoginController.php @@ -2,10 +2,8 @@ namespace App\Http\Controllers; -use Auth; use Illuminate\Contracts\Auth\Guard; use Illuminate\Http\Request; -use Input; use Redirect; use View; diff --git a/app/Http/Controllers/UserSignupController.php b/app/Http/Controllers/UserSignupController.php index af804326..da5613c9 100644 --- a/app/Http/Controllers/UserSignupController.php +++ b/app/Http/Controllers/UserSignupController.php @@ -5,10 +5,10 @@ namespace App\Http\Controllers; use App\Attendize\Utils; use App\Models\Account; use App\Models\User; +use Hash; use Illuminate\Contracts\Auth\Guard; use Illuminate\Http\Request; use Mail; -use Hash; class UserSignupController extends Controller { @@ -62,10 +62,12 @@ class UserSignupController extends Controller if ($is_attendize) { // TODO: Do this async? - Mail::send('Emails.ConfirmEmail', ['first_name' => $user->first_name, 'confirmation_code' => $user->confirmation_code], function ($message) use ($request) { - $message->to($request->get('email'), $request->get('first_name')) - ->subject('Thank you for registering for Attendize'); - }); + Mail::send('Emails.ConfirmEmail', + ['first_name' => $user->first_name, 'confirmation_code' => $user->confirmation_code], + function ($message) use ($request) { + $message->to($request->get('email'), $request->get('first_name')) + ->subject('Thank you for registering for Attendize'); + }); } session()->flash('message', 'Success! You can now login.'); diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 27213125..55f8b3d0 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -1,6 +1,8 @@ \App\Http\Middleware\Authenticate::class, + 'auth' => \App\Http\Middleware\Authenticate::class, 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, - 'can' => \Illuminate\Foundation\Http\Middleware\Authorize::class, - 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, - 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, + 'can' => \Illuminate\Foundation\Http\Middleware\Authorize::class, + 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, + 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'first.run' => \App\Http\Middleware\FirstRunMiddleware::class, 'installed' => \App\Http\Middleware\CheckInstalled::class, ]; diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index a777bf63..dc406090 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -10,9 +10,9 @@ class Authenticate /** * Handle an incoming request. * - * @param \Illuminate\Http\Request $request - * @param \Closure $next - * @param string|null $guard + * @param \Illuminate\Http\Request $request + * @param \Closure $next + * @param string|null $guard * @return mixed */ public function handle($request, Closure $next, $guard = null) diff --git a/app/Http/Middleware/CheckInstalled.php b/app/Http/Middleware/CheckInstalled.php index 017b37b9..e20ab510 100644 --- a/app/Http/Middleware/CheckInstalled.php +++ b/app/Http/Middleware/CheckInstalled.php @@ -6,7 +6,6 @@ use App\Attendize\Utils; use App\Models\Account; use Closure; use Redirect; -use Request; class CheckInstalled { @@ -14,7 +13,7 @@ class CheckInstalled * Handle an incoming request. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * * @return mixed */ @@ -30,7 +29,7 @@ class CheckInstalled /* * Redirect user to signup page if there are no accounts */ - if(Account::count() === 0 && !$request->is('signup*')) { + if (Account::count() === 0 && !$request->is('signup*')) { return redirect()->to('signup'); } diff --git a/app/Http/Middleware/FirstRunMiddleware.php b/app/Http/Middleware/FirstRunMiddleware.php index f9f1c779..61b7a152 100644 --- a/app/Http/Middleware/FirstRunMiddleware.php +++ b/app/Http/Middleware/FirstRunMiddleware.php @@ -4,9 +4,6 @@ namespace app\Http\Middleware; use App\Models\Organiser; use Closure; -use Redirect; -use Request; -use DB; class FirstRunMiddleware { @@ -14,7 +11,7 @@ class FirstRunMiddleware * Handle an incoming request. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * * @return mixed */ diff --git a/app/Http/Middleware/GeneralChecks.php b/app/Http/Middleware/GeneralChecks.php index 719ea69d..9fb2f0a1 100644 --- a/app/Http/Middleware/GeneralChecks.php +++ b/app/Http/Middleware/GeneralChecks.php @@ -10,7 +10,7 @@ class GeneralChecks * Handle an incoming request. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * * @return mixed */ @@ -21,7 +21,7 @@ class GeneralChecks if (isset($_SERVER['HTTP_USER_AGENT']) && preg_match('/(?i)msie [2-8]/', $_SERVER['HTTP_USER_AGENT'])) { session()->flash('message', 'Please update your browser. This application requires a modern browser.'); } - + $response = $next($request); return $response; diff --git a/app/Http/Middleware/RedirectIfAuthenticated.php b/app/Http/Middleware/RedirectIfAuthenticated.php index b806a18b..2588333f 100644 --- a/app/Http/Middleware/RedirectIfAuthenticated.php +++ b/app/Http/Middleware/RedirectIfAuthenticated.php @@ -31,7 +31,7 @@ class RedirectIfAuthenticated * Handle an incoming request. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * * @return mixed */ diff --git a/app/Http/Middleware/VerifyCsrfToken.php b/app/Http/Middleware/VerifyCsrfToken.php index 30c8b13b..74bc5fef 100644 --- a/app/Http/Middleware/VerifyCsrfToken.php +++ b/app/Http/Middleware/VerifyCsrfToken.php @@ -8,14 +8,14 @@ use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as BaseVerifier; class VerifyCsrfToken extends BaseVerifier { protected $except = [ - 'install/*', + 'install/*', ]; /** * Handle an incoming request. * * @param \Illuminate\Http\Request $request - * @param \Closure $next + * @param \Closure $next * * @return mixed */ diff --git a/app/Http/Requests/StoreEventQuestionRequest.php b/app/Http/Requests/StoreEventQuestionRequest.php index 130983b2..5627644d 100644 --- a/app/Http/Requests/StoreEventQuestionRequest.php +++ b/app/Http/Requests/StoreEventQuestionRequest.php @@ -2,8 +2,6 @@ namespace App\Http\Requests; -use App\Http\Requests\Request; - class StoreEventQuestionRequest extends Request { /** @@ -24,7 +22,7 @@ class StoreEventQuestionRequest extends Request public function rules() { return [ - 'title' => 'required', + 'title' => 'required', 'option' => 'array', ]; } diff --git a/app/Http/api_routes.php b/app/Http/api_routes.php index 6cd56648..0a388a80 100644 --- a/app/Http/api_routes.php +++ b/app/Http/api_routes.php @@ -1,5 +1,15 @@ version('v1', function ($api) { + + $api->get('events', function () { + return \App\Models\Event::all(); + }); + +}); + Route::group(['prefix' => 'api', 'middleware' => 'auth:api'], function () { /* @@ -44,7 +54,6 @@ Route::group(['prefix' => 'api', 'middleware' => 'auth:api'], function () { */ - Route::get('/', function () { return response()->json([ 'Hello' => Auth::guard('api')->user()->full_name . '!' diff --git a/app/Jobs/GenerateTicket.php b/app/Jobs/GenerateTicket.php index f786c514..81ee0893 100644 --- a/app/Jobs/GenerateTicket.php +++ b/app/Jobs/GenerateTicket.php @@ -2,11 +2,10 @@ namespace App\Jobs; -use App\Jobs\Job; use App\Models\Order; -use Illuminate\Queue\SerializesModels; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; +use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Queue\SerializesModels; use Log; use PDF; @@ -25,11 +24,11 @@ class GenerateTicket extends Job implements ShouldQueue */ public function __construct($reference) { - Log::info("Generating ticket: #".$reference); + Log::info("Generating ticket: #" . $reference); $this->reference = $reference; $this->order_reference = explode("-", $reference)[0]; if (strpos($reference, "-")) { - $this->attendee_reference_index = explode("-", $reference)[1]; + $this->attendee_reference_index = explode("-", $reference)[1]; } } @@ -41,45 +40,46 @@ class GenerateTicket extends Job implements ShouldQueue public function handle() { - $file_name = $this->reference; - $file_path = public_path(config('attendize.event_pdf_tickets_path')).'/'.$file_name; - $file_with_ext = $file_path.".pdf"; + $file_name = $this->reference; + $file_path = public_path(config('attendize.event_pdf_tickets_path')) . '/' . $file_name; + $file_with_ext = $file_path . ".pdf"; - if (file_exists($file_with_ext)) { - Log::info("Use ticket from cache: ".$file_with_ext); - return; - } + if (file_exists($file_with_ext)) { + Log::info("Use ticket from cache: " . $file_with_ext); + return; + } - $order = Order::where('order_reference', $this->order_reference)->first(); - Log::info($order); - $event = $order->event; + $order = Order::where('order_reference', $this->order_reference)->first(); + Log::info($order); + $event = $order->event; - $query = $order->attendees(); - if ($this->isAttendeeTicket()) { - $query = $query->where('reference_index', '=', $this->attendee_reference_index); - } - $attendees = $query->get(); + $query = $order->attendees(); + if ($this->isAttendeeTicket()) { + $query = $query->where('reference_index', '=', $this->attendee_reference_index); + } + $attendees = $query->get(); - $image_path = $event->organiser->full_logo_path; - if ($event->images->first() != null) { - $image_path = $event->images()->first()->image_path; - } + $image_path = $event->organiser->full_logo_path; + if ($event->images->first() != null) { + $image_path = $event->images()->first()->image_path; + } - $data = [ - 'order' => $order, - 'event' => $event, - 'attendees' => $attendees, - 'css' => file_get_contents(public_path('assets/stylesheet/ticket.css')), - 'image' => base64_encode(file_get_contents(public_path($image_path))), - ]; + $data = [ + 'order' => $order, + 'event' => $event, + 'attendees' => $attendees, + 'css' => file_get_contents(public_path('assets/stylesheet/ticket.css')), + 'image' => base64_encode(file_get_contents(public_path($image_path))), + ]; - PDF::setOutputMode('F'); // force to file - PDF::html('Public.ViewEvent.Partials.PDFTicket', $data, $file_path); + PDF::setOutputMode('F'); // force to file + PDF::html('Public.ViewEvent.Partials.PDFTicket', $data, $file_path); - Log::info("Ticket generated!"); + Log::info("Ticket generated!"); } - private function isAttendeeTicket() { - return ($this->attendee_reference_index != null); + private function isAttendeeTicket() + { + return ($this->attendee_reference_index != null); } } diff --git a/app/Jobs/Job.php b/app/Jobs/Job.php index 798c060b..a707c8e4 100644 --- a/app/Jobs/Job.php +++ b/app/Jobs/Job.php @@ -6,15 +6,15 @@ use Illuminate\Bus\Queueable; abstract class Job { - /* - |-------------------------------------------------------------------------- - | Queueable Jobs - |-------------------------------------------------------------------------- - | - | This job base class provides a central location to place any logic that - | is shared across all of your jobs. The trait included with the class - | provides access to the "onQueue" and "delay" queue helper methods. - | - */ - use Queueable; + /* + |-------------------------------------------------------------------------- + | Queueable Jobs + |-------------------------------------------------------------------------- + | + | This job base class provides a central location to place any logic that + | is shared across all of your jobs. The trait included with the class + | provides access to the "onQueue" and "delay" queue helper methods. + | + */ + use Queueable; } diff --git a/app/Jobs/SendAttendeeInvite.php b/app/Jobs/SendAttendeeInvite.php index f433ddc2..5b353179 100644 --- a/app/Jobs/SendAttendeeInvite.php +++ b/app/Jobs/SendAttendeeInvite.php @@ -2,14 +2,12 @@ namespace App\Jobs; -use App\Jobs\Job; use App\Mailers\AttendeeMailer; use App\Models\Attendee; -use App\Jobs\GenerateTicket; -use Illuminate\Foundation\Bus\DispatchesJobs; -use Illuminate\Queue\SerializesModels; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; +use Illuminate\Foundation\Bus\DispatchesJobs; +use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Queue\SerializesModels; class SendAttendeeInvite extends Job implements ShouldQueue { diff --git a/app/Jobs/SendAttendeeTicket.php b/app/Jobs/SendAttendeeTicket.php index f788a413..f10dcb99 100644 --- a/app/Jobs/SendAttendeeTicket.php +++ b/app/Jobs/SendAttendeeTicket.php @@ -2,20 +2,19 @@ namespace App\Jobs; -use App\Jobs\Job; use App\Mailers\AttendeeMailer; use App\Models\Attendee; -use Illuminate\Foundation\Bus\DispatchesJobs; -use Illuminate\Queue\SerializesModels; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; +use Illuminate\Foundation\Bus\DispatchesJobs; +use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Queue\SerializesModels; class SendAttendeeTicket extends Job implements ShouldQueue { use InteractsWithQueue, SerializesModels, DispatchesJobs; public $attendee; - + /** * Create a new job instance. * diff --git a/app/Jobs/SendMessageToAttendee.php b/app/Jobs/SendMessageToAttendee.php index d8235187..a3e82ea9 100644 --- a/app/Jobs/SendMessageToAttendee.php +++ b/app/Jobs/SendMessageToAttendee.php @@ -2,10 +2,9 @@ namespace App\Jobs; -use App\Jobs\Job; -use Illuminate\Queue\SerializesModels; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; +use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Queue\SerializesModels; class SendMessageToAttendee extends Job implements ShouldQueue { diff --git a/app/Jobs/SendMessageToAttendees.php b/app/Jobs/SendMessageToAttendees.php index d96a4643..06951585 100644 --- a/app/Jobs/SendMessageToAttendees.php +++ b/app/Jobs/SendMessageToAttendees.php @@ -2,20 +2,18 @@ namespace App\Jobs; -use App\Jobs\Job; use App\Mailers\AttendeeMailer; use App\Models\Message; -use Illuminate\Queue\SerializesModels; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; -use Log; +use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Queue\SerializesModels; class SendMessageToAttendees extends Job implements ShouldQueue { use InteractsWithQueue, SerializesModels; public $attendeeMessage; - + /** * Create a new job instance. * diff --git a/app/Jobs/SendOrderNotification.php b/app/Jobs/SendOrderNotification.php index d78f84f6..7665ddcf 100644 --- a/app/Jobs/SendOrderNotification.php +++ b/app/Jobs/SendOrderNotification.php @@ -2,12 +2,11 @@ namespace App\Jobs; -use App\Jobs\Job; use App\Mailers\OrderMailer; use App\Models\Order; -use Illuminate\Queue\SerializesModels; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; +use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Queue\SerializesModels; class SendOrderNotification extends Job implements ShouldQueue { diff --git a/app/Jobs/SendOrderTickets.php b/app/Jobs/SendOrderTickets.php index 1a483ce9..18c5d07d 100644 --- a/app/Jobs/SendOrderTickets.php +++ b/app/Jobs/SendOrderTickets.php @@ -2,13 +2,12 @@ namespace App\Jobs; -use App\Jobs\Job; use App\Mailers\OrderMailer; use App\Models\Order; -use Illuminate\Foundation\Bus\DispatchesJobs; -use Illuminate\Queue\SerializesModels; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; +use Illuminate\Foundation\Bus\DispatchesJobs; +use Illuminate\Queue\InteractsWithQueue; +use Illuminate\Queue\SerializesModels; class SendOrderTickets extends Job implements ShouldQueue { diff --git a/app/Listeners/OrderCompletedListener.php b/app/Listeners/OrderCompletedListener.php index a5dce35f..825c58ac 100644 --- a/app/Listeners/OrderCompletedListener.php +++ b/app/Listeners/OrderCompletedListener.php @@ -6,9 +6,8 @@ use App\Events\OrderCompletedEvent; use App\Jobs\GenerateTicket; use App\Jobs\SendOrderNotification; use App\Jobs\SendOrderTickets; -use Illuminate\Foundation\Bus\DispatchesJobs; -use Illuminate\Queue\InteractsWithQueue; use Illuminate\Contracts\Queue\ShouldQueue; +use Illuminate\Foundation\Bus\DispatchesJobs; use Illuminate\Support\Facades\Log; class OrderCompletedListener implements ShouldQueue @@ -29,7 +28,7 @@ class OrderCompletedListener implements ShouldQueue /** * Handle the event. * - * @param OrderCompletedEvent $event + * @param OrderCompletedEvent $event * @return void */ public function handle(OrderCompletedEvent $event) diff --git a/app/Mailers/AttendeeMailer.php b/app/Mailers/AttendeeMailer.php index 0a2e45c7..7636f6f9 100644 --- a/app/Mailers/AttendeeMailer.php +++ b/app/Mailers/AttendeeMailer.php @@ -4,10 +4,9 @@ namespace App\Mailers; use App\Models\Attendee; use App\Models\Message; -use App\Models\Order; use Carbon\Carbon; -use Mail; use Log; +use Mail; class AttendeeMailer extends Mailer diff --git a/app/Mailers/OrderMailer.php b/app/Mailers/OrderMailer.php index 1baefb29..19282622 100644 --- a/app/Mailers/OrderMailer.php +++ b/app/Mailers/OrderMailer.php @@ -6,7 +6,7 @@ use App\Models\Order; use Log; use Mail; -class OrderMailer +class OrderMailer { public function sendOrderNotification(Order $order) { @@ -14,27 +14,28 @@ class OrderMailer 'order' => $order ]; - Mail::send('Emails.OrderNotification', $data, function($message) use ($order) { + Mail::send('Emails.OrderNotification', $data, function ($message) use ($order) { $message->to($order->account->email); - $message->subject('New order received on the event '.$order->event->title.' ['.$order->order_reference.']'); + $message->subject('New order received on the event ' . $order->event->title . ' [' . $order->order_reference . ']'); }); } - public function sendOrderTickets($order) { + public function sendOrderTickets($order) + { - Log::info("Sending ticket to: ".$order->email); + Log::info("Sending ticket to: " . $order->email); $data = [ 'order' => $order, ]; - Mail::send('Mailers.TicketMailer.SendOrderTickets', $data, function($message) use ($order) { + Mail::send('Mailers.TicketMailer.SendOrderTickets', $data, function ($message) use ($order) { $message->to($order->email); - $message->subject('Your tickets for the event '.$order->event->title); + $message->subject('Your tickets for the event ' . $order->event->title); $file_name = $order->order_reference; - $file_path = public_path(config('attendize.event_pdf_tickets_path')).'/'.$file_name.'.pdf'; + $file_path = public_path(config('attendize.event_pdf_tickets_path')) . '/' . $file_name . '.pdf'; $message->attach($file_path); }); diff --git a/app/Models/Account.php b/app/Models/Account.php index 6cebdf50..32505b2f 100644 --- a/app/Models/Account.php +++ b/app/Models/Account.php @@ -4,12 +4,17 @@ namespace App\Models; use App\Attendize\Utils; use Illuminate\Database\Eloquent\SoftDeletes; -use DB; class Account extends MyBaseModel { use SoftDeletes; + /** + * The attributes that should be mutated to dates. + * + * @var array $dates + */ + public $dates = ['deleted_at']; /** * The validation rules * @@ -20,14 +25,6 @@ class Account extends MyBaseModel 'last_name' => ['required'], 'email' => ['required', 'email'], ]; - - /** - * The attributes that should be mutated to dates. - * - * @var array $dates - */ - public $dates = ['deleted_at']; - /** * The validation error messages. * @@ -98,6 +95,16 @@ class Account extends MyBaseModel return $this->belongsTo('\App\Models\Currency'); } + /** + * Alias for $this->account_payment_gateways() + * + * @return \Illuminate\Database\Eloquent\Relations\HasMany + */ + public function gateways() + { + return $this->account_payment_gateways(); + } + /** * Payment gateways associated with an account * @@ -108,15 +115,6 @@ class Account extends MyBaseModel return $this->hasMany('\App\Models\AccountPaymentGateway'); } - /** - * Alias for $this->account_payment_gateways() - * - * @return \Illuminate\Database\Eloquent\Relations\HasMany - */ - public function gateways() { - return $this->account_payment_gateways(); - } - /** * Get an accounts active payment gateway * @@ -124,18 +122,8 @@ class Account extends MyBaseModel */ public function active_payment_gateway() { - return $this->hasOne('\App\Models\AccountPaymentGateway', 'payment_gateway_id', 'payment_gateway_id')->where('account_id', $this->id); - } - - /** - * Get an accounts gateways - * - * @param $gateway_id - * @return mixed - */ - public function getGateway($gateway_id) - { - return $this->gateways->where('payment_gateway_id', $gateway_id)->first(); + return $this->hasOne('\App\Models\AccountPaymentGateway', 'payment_gateway_id', + 'payment_gateway_id')->where('account_id', $this->id); } /** @@ -149,14 +137,23 @@ class Account extends MyBaseModel { $gateway = $this->getGateway($gateway_id); - if($gateway && is_array($gateway->config)) { + if ($gateway && is_array($gateway->config)) { return isset($gateway->config[$key]) ? $gateway->config[$key] : false; } return false; } - + /** + * Get an accounts gateways + * + * @param $gateway_id + * @return mixed + */ + public function getGateway($gateway_id) + { + return $this->gateways->where('payment_gateway_id', $gateway_id)->first(); + } /** * Get the stripe api key. diff --git a/app/Models/AccountPaymentGateway.php b/app/Models/AccountPaymentGateway.php index c44e7495..d6779513 100644 --- a/app/Models/AccountPaymentGateway.php +++ b/app/Models/AccountPaymentGateway.php @@ -25,7 +25,8 @@ class AccountPaymentGateway extends MyBaseModel * * @return \Illuminate\Database\Eloquent\Relations\BelongsTo */ - public function account() { + public function account() + { return $this->belongsTo('\App\Models\Account'); } @@ -43,11 +44,13 @@ class AccountPaymentGateway extends MyBaseModel * @param $val * @return mixed */ - public function getConfigAttribute($value) { + public function getConfigAttribute($value) + { return json_decode($value, true); } - public function setConfigAttribute($value) { + public function setConfigAttribute($value) + { $this->attributes['config'] = json_encode($value); } diff --git a/app/Models/Activity.php b/app/Models/Activity.php index 7f5e7d9f..09159c0e 100644 --- a/app/Models/Activity.php +++ b/app/Models/Activity.php @@ -2,9 +2,9 @@ namespace App\Models; -/* - Attendize.com - Event Management & Ticketing - */ + /* + Attendize.com - Event Management & Ticketing + */ /** * Description of Activity. diff --git a/app/Models/Attendee.php b/app/Models/Attendee.php index 189a2bc6..7c613576 100644 --- a/app/Models/Attendee.php +++ b/app/Models/Attendee.php @@ -36,18 +36,18 @@ class Attendee extends MyBaseModel 'arrival_time' ]; - /** - * Generate a private reference number for the attendee. Use for checking in the attendee. - * - */ - public static function boot() - { - parent::boot(); + /** + * Generate a private reference number for the attendee. Use for checking in the attendee. + * + */ + public static function boot() + { + parent::boot(); - static::creating(function ($order) { + static::creating(function ($order) { $order->private_reference_number = str_pad(rand(0, pow(10, 9) - 1), 9, '0', STR_PAD_LEFT); }); - } + } /** * The order associated with the attendee. @@ -78,7 +78,7 @@ class Attendee extends MyBaseModel { return $this->belongsTo('\App\Models\Event'); } - + /** * @return \Illuminate\Database\Eloquent\Relations\HasMany */ @@ -105,7 +105,8 @@ class Attendee extends MyBaseModel * * @return string */ - public function getReferenceAttribute() { + public function getReferenceAttribute() + { return $this->order->order_reference . '-' . $this->reference_index; } @@ -116,11 +117,10 @@ class Attendee extends MyBaseModel */ public function getFullNameAttribute() { - return $this->first_name.' '.$this->last_name; + return $this->first_name . ' ' . $this->last_name; } - /** * The attributes that should be mutated to dates. * diff --git a/app/Models/Currency.php b/app/Models/Currency.php index f04efa71..f4c23878 100644 --- a/app/Models/Currency.php +++ b/app/Models/Currency.php @@ -2,9 +2,9 @@ namespace App\Models; -/* - Attendize.com - Event Management & Ticketing - */ + /* + Attendize.com - Event Management & Ticketing + */ /** * Description of Currency. @@ -13,20 +13,18 @@ namespace App\Models; */ class Currency extends \Illuminate\Database\Eloquent\Model { - /** - * The database table used by the model. - * - * @var string $table - */ - protected $table = 'currencies'; - /** * Indicates whether the model should be timestamped. * * @var bool $timestamps */ public $timestamps = false; - + /** + * The database table used by the model. + * + * @var string $table + */ + protected $table = 'currencies'; /** * Indicates whether the model should use soft deletes. * diff --git a/app/Models/DateFormat.php b/app/Models/DateFormat.php index 1f2d3f89..11a8007c 100644 --- a/app/Models/DateFormat.php +++ b/app/Models/DateFormat.php @@ -2,9 +2,9 @@ namespace App\Models; -/* - Attendize.com - Event Management & Ticketing - */ + /* + Attendize.com - Event Management & Ticketing + */ /** * Description of DateFormat. diff --git a/app/Models/DateTimeFormat.php b/app/Models/DateTimeFormat.php index 0a3f9deb..51097c77 100644 --- a/app/Models/DateTimeFormat.php +++ b/app/Models/DateTimeFormat.php @@ -2,9 +2,9 @@ namespace App\Models; -/* - Attendize.com - Event Management & Ticketing - */ + /* + Attendize.com - Event Management & Ticketing + */ /** * Description of DateTimeFormat. @@ -13,20 +13,18 @@ namespace App\Models; */ class DateTimeFormat extends \Illuminate\Database\Eloquent\Model { - /** - * The database table used by the model. - * - * @var string $table - */ - protected $table = 'datetime_formats'; - /** * Indicates whether the model should be timestamped. * * @var bool $timestamps */ public $timestamps = false; - + /** + * The database table used by the model. + * + * @var string $table + */ + protected $table = 'datetime_formats'; /** * Indicates whether the model should use soft deletes. * diff --git a/app/Models/DiscountCode.php b/app/Models/DiscountCode.php index e28de770..ccc14a0c 100644 --- a/app/Models/DiscountCode.php +++ b/app/Models/DiscountCode.php @@ -2,9 +2,9 @@ namespace App\Models; -/* - Attendize.com - Event Management & Ticketing - */ + /* + Attendize.com - Event Management & Ticketing + */ /** * Description of DiscountCode. diff --git a/app/Models/EventImage.php b/app/Models/EventImage.php index f1c1c456..2db11025 100644 --- a/app/Models/EventImage.php +++ b/app/Models/EventImage.php @@ -2,9 +2,9 @@ namespace App\Models; -/* - Attendize.com - Event Management & Ticketing - */ + /* + Attendize.com - Event Management & Ticketing + */ /** * Description of EventImage. diff --git a/app/Models/EventStats.php b/app/Models/EventStats.php index e2001223..92a0d921 100644 --- a/app/Models/EventStats.php +++ b/app/Models/EventStats.php @@ -7,21 +7,21 @@ use DB; class EventStats extends \Illuminate\Database\Eloquent\Model { + public static $unguarded = true; /** * Indicates if the model should be timestamped. * * @var bool $timestamps */ public $timestamps = false; - public static $unguarded = true; /** * @todo This shouldn't be in a view. * Update the amount of revenue a ticket has earned. * - * @param int $ticket_id + * @param int $ticket_id * @param float $amount - * @param bool $deduct + * @param bool $deduct * * @return bool */ @@ -37,7 +37,7 @@ class EventStats extends \Illuminate\Database\Eloquent\Model return $ticket->save(); } - + /** * Update the amount of views a ticket has earned. @@ -53,7 +53,7 @@ class EventStats extends \Illuminate\Database\Eloquent\Model 'date' => DB::raw('CURRENT_DATE'), ]); - $cookie_name = 'visitTrack_'.$event_id.'_'.date('dmy'); + $cookie_name = 'visitTrack_' . $event_id . '_' . date('dmy'); if (!Cookie::get($cookie_name)) { Cookie::queue($cookie_name, true, 60 * 24 * 14); diff --git a/app/Models/Message.php b/app/Models/Message.php index c983e852..4743b1de 100644 --- a/app/Models/Message.php +++ b/app/Models/Message.php @@ -2,9 +2,9 @@ namespace App\Models; -/* - Attendize.com - Event Management & Ticketing - */ + /* + Attendize.com - Event Management & Ticketing + */ /** * Description of Message. @@ -47,7 +47,7 @@ class Message extends MyBaseModel $ticket = Ticket::scope()->find($this->recipients); - return 'Ticket: '.$ticket->title; + return 'Ticket: ' . $ticket->title; } /** diff --git a/app/Models/MyBaseModel.php b/app/Models/MyBaseModel.php index c9f0783e..e2d23643 100644 --- a/app/Models/MyBaseModel.php +++ b/app/Models/MyBaseModel.php @@ -11,20 +11,18 @@ use Validator; class MyBaseModel extends \Illuminate\Database\Eloquent\Model { - /** - * Indicates whether the model uses soft deletes. - * - * @var bool $softDelete - */ - protected $softDelete = true; - /** * Indicates if the model should be timestamped. * * @var bool $timestamps */ public $timestamps = true; - + /** + * Indicates whether the model uses soft deletes. + * + * @var bool $softDelete + */ + protected $softDelete = true; /** * The validation rules of the model. * @@ -46,6 +44,39 @@ class MyBaseModel extends \Illuminate\Database\Eloquent\Model */ protected $errors; + /** + * Create a new model. + * + * @param int $account_id + * @param int $user_id + * @param bool $ignore_user_id + * + * @return \className + */ + public static function createNew($account_id = false, $user_id = false, $ignore_user_id = false) + { + $className = get_called_class(); + $entity = new $className(); + + if (Auth::check()) { + if (!$ignore_user_id) { + $entity->user_id = Auth::user()->id; + } + + $entity->account_id = Auth::user()->account_id; + } elseif ($account_id || $user_id) { + if ($user_id && !$ignore_user_id) { + $entity->user_id = $user_id; + } + + $entity->account_id = $account_id; + } else { + App::abort(500); + } + + return $entity; + } + /** * Validate the model instance. * @@ -79,39 +110,6 @@ class MyBaseModel extends \Illuminate\Database\Eloquent\Model return $returnArray ? $this->errors->toArray() : $this->errors; } - /** - * Create a new model. - * - * @param int $account_id - * @param int $user_id - * @param bool $ignore_user_id - * - * @return \className - */ - public static function createNew($account_id = false, $user_id = false, $ignore_user_id = false) - { - $className = get_called_class(); - $entity = new $className(); - - if (Auth::check()) { - if (!$ignore_user_id) { - $entity->user_id = Auth::user()->id; - } - - $entity->account_id = Auth::user()->account_id; - } elseif ($account_id || $user_id) { - if ($user_id && !$ignore_user_id) { - $entity->user_id = $user_id; - } - - $entity->account_id = $account_id; - } else { - App::abort(500); - } - - return $entity; - } - /** * Get a formatted date. * @@ -150,7 +148,7 @@ class MyBaseModel extends \Illuminate\Database\Eloquent\Model $table = $this->getTable(); $query->where(function ($query) use ($accountId, $table) { - $query->whereRaw(\DB::raw('('.$table.'.account_id = '.$accountId.')')); + $query->whereRaw(\DB::raw('(' . $table . '.account_id = ' . $accountId . ')')); }); return $query; diff --git a/app/Models/OrderItem.php b/app/Models/OrderItem.php index a5c8b218..0b164d29 100644 --- a/app/Models/OrderItem.php +++ b/app/Models/OrderItem.php @@ -2,9 +2,9 @@ namespace App\Models; -/* - Attendize.com - Event Management & Ticketing - */ + /* + Attendize.com - Event Management & Ticketing + */ /** * Description of OrderItems. @@ -15,7 +15,6 @@ class OrderItem extends MyBaseModel { /** * Indicates if the model should be timestamped. - * * @var bool $timestamps */ diff --git a/app/Models/OrderStatus.php b/app/Models/OrderStatus.php index cf067088..3aced013 100644 --- a/app/Models/OrderStatus.php +++ b/app/Models/OrderStatus.php @@ -2,9 +2,9 @@ namespace App\Models; -/* - Attendize.com - Event Management & Ticketing - */ + /* + Attendize.com - Event Management & Ticketing + */ /** * Description of OrderStatus. diff --git a/app/Models/Organiser.php b/app/Models/Organiser.php index 48ae3fe7..30ef6a68 100644 --- a/app/Models/Organiser.php +++ b/app/Models/Organiser.php @@ -76,8 +76,8 @@ class Organiser extends MyBaseModel */ public function getFullLogoPathAttribute() { - if ($this->logo_path && (file_exists(config('attendize.cdn_url_user_assets').'/'.$this->logo_path) || file_exists(public_path($this->logo_path)))) { - return config('attendize.cdn_url_user_assets').'/'.$this->logo_path; + if ($this->logo_path && (file_exists(config('attendize.cdn_url_user_assets') . '/' . $this->logo_path) || file_exists(public_path($this->logo_path)))) { + return config('attendize.cdn_url_user_assets') . '/' . $this->logo_path; } return config('attendize.fallback_organiser_logo_url'); diff --git a/app/Models/QuestionOption.php b/app/Models/QuestionOption.php index b5af3674..a3e801c4 100644 --- a/app/Models/QuestionOption.php +++ b/app/Models/QuestionOption.php @@ -2,18 +2,8 @@ namespace App\Models; -use Illuminate\Database\Eloquent\Model; - class QuestionOption extends MyBaseModel { - /** - * The attributes that are mass assignable. - * - * @access protected - * @var array - */ - protected $fillable = ['name']; - /** * Indicates if the model should be timestamped. * @@ -21,6 +11,13 @@ class QuestionOption extends MyBaseModel * @var bool */ public $timestamps = false; + /** + * The attributes that are mass assignable. + * + * @access protected + * @var array + */ + protected $fillable = ['name']; /** * The question associated with the question option. diff --git a/app/Models/ReservedTickets.php b/app/Models/ReservedTickets.php index aa86c3ad..5657513e 100644 --- a/app/Models/ReservedTickets.php +++ b/app/Models/ReservedTickets.php @@ -2,9 +2,9 @@ namespace App\Models; -/* - Attendize.com - Event Management & Ticketing - */ + /* + Attendize.com - Event Management & Ticketing + */ /** * Description of ReservedTickets. diff --git a/app/Models/Ticket.php b/app/Models/Ticket.php index 94716859..e44a0150 100644 --- a/app/Models/Ticket.php +++ b/app/Models/Ticket.php @@ -8,8 +8,6 @@ class Ticket extends MyBaseModel { use SoftDeletes; - protected $perPage = 10; - /** * The rules to validate the model. * @@ -22,7 +20,6 @@ class Ticket extends MyBaseModel 'end_sale_date' => ['date', 'after:start_sale_date'], 'quantity_available' => ['integer', 'min:0'], ]; - /** * The validation error messages. * @@ -33,6 +30,7 @@ class Ticket extends MyBaseModel 'title.required' => 'You must at least give a title for your ticket. (e.g Early Bird)', 'quantity_available.integer' => 'Please ensure the quantity available is a number.', ]; + protected $perPage = 10; /** * The event associated with the ticket. @@ -113,31 +111,21 @@ class Ticket extends MyBaseModel public function getQuantityReservedAttribute() { $reserved_total = \DB::table('reserved_tickets') - ->where('ticket_id', $this->id) - ->where('expires', '>', \Carbon::now()) - ->sum('quantity_reserved'); + ->where('ticket_id', $this->id) + ->where('expires', '>', \Carbon::now()) + ->sum('quantity_reserved'); return $reserved_total; } /** - * Get the booking fee of the ticket. + * Get the total price of the ticket. * * @return float|int */ - public function getBookingFeeAttribute() + public function getTotalPriceAttribute() { - return (int) ceil($this->price) === 0 ? 0 : round(($this->price * (config('attendize.ticket_booking_fee_percentage') / 100)) + (config('attendize.ticket_booking_fee_fixed')), 2); - } - - /** - * Get the organizer's booking fee. - * - * @return float|int - */ - public function getOrganiserBookingFeeAttribute() - { - return (int) ceil($this->price) === 0 ? 0 : round(($this->price * ($this->event->organiser_fee_percentage / 100)) + ($this->event->organiser_fee_fixed), 2); + return $this->getTotalBookingFeeAttribute() + $this->price; } /** @@ -151,13 +139,25 @@ class Ticket extends MyBaseModel } /** - * Get the total price of the ticket. + * Get the booking fee of the ticket. * * @return float|int */ - public function getTotalPriceAttribute() + public function getBookingFeeAttribute() { - return $this->getTotalBookingFeeAttribute() + $this->price; + return (int)ceil($this->price) === 0 ? 0 : round(($this->price * (config('attendize.ticket_booking_fee_percentage') / 100)) + (config('attendize.ticket_booking_fee_fixed')), + 2); + } + + /** + * Get the organizer's booking fee. + * + * @return float|int + */ + public function getOrganiserBookingFeeAttribute() + { + return (int)ceil($this->price) === 0 ? 0 : round(($this->price * ($this->event->organiser_fee_percentage / 100)) + ($this->event->organiser_fee_fixed), + 2); } /** @@ -193,17 +193,21 @@ class Ticket extends MyBaseModel */ public function getSaleStatusAttribute() { - if ($this->start_sale_date !== null && $this->start_sale_date->isFuture()) + if ($this->start_sale_date !== null && $this->start_sale_date->isFuture()) { return config('attendize.ticket_status_before_sale_date'); + } - if ($this->end_sale_date !== null && $this->end_sale_date->isPast()) + if ($this->end_sale_date !== null && $this->end_sale_date->isPast()) { return config('attendize.ticket_status_after_sale_date'); + } - if ((int) $this->quantity_available > 0 && (int) $this->quantity_remaining <= 0) + if ((int)$this->quantity_available > 0 && (int)$this->quantity_remaining <= 0) { return config('attendize.ticket_status_sold_out'); + } - if ($this->event->start_date->lte(\Carbon::now())) + if ($this->event->start_date->lte(\Carbon::now())) { return config('attendize.ticket_status_off_sale'); + } return config('attendize.ticket_status_on_sale'); } diff --git a/app/Models/TicketStatus.php b/app/Models/TicketStatus.php index b0d5bab1..6c3b5ed5 100644 --- a/app/Models/TicketStatus.php +++ b/app/Models/TicketStatus.php @@ -2,9 +2,9 @@ namespace App\Models; -/* - Attendize.com - Event Management & Ticketing - */ + /* + Attendize.com - Event Management & Ticketing + */ /** * Description of TicketStatuses. diff --git a/app/Models/Timezone.php b/app/Models/Timezone.php index 15515248..de60b9d0 100644 --- a/app/Models/Timezone.php +++ b/app/Models/Timezone.php @@ -2,9 +2,9 @@ namespace App\Models; -/* - Attendize.com - Event Management & Ticketing - */ + /* + Attendize.com - Event Management & Ticketing + */ /** * Description of Timezone. @@ -15,7 +15,6 @@ class Timezone extends \Illuminate\Database\Eloquent\Model { /** * Indicates if the model should be timestamped. - * * @var bool $timestamps */ diff --git a/app/Models/User.php b/app/Models/User.php index 56598138..e4274e1d 100644 --- a/app/Models/User.php +++ b/app/Models/User.php @@ -140,7 +140,7 @@ class User extends Model implements AuthenticatableContract, CanResetPasswordCon */ public function getFullNameAttribute() { - return $this->first_name.' '.$this->last_name; + return $this->first_name . ' ' . $this->last_name; } /** diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 09fbaa90..78815cb4 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -28,7 +28,7 @@ class AppServiceProvider extends ServiceProvider public function register() { $this->app->bind( - 'Illuminate\Contracts\Auth\Registrar', 'App\Services\Registrar' + 'Illuminate\Contracts\Auth\Registrar', 'App\Services\Registrar' ); } } diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php index 57d88ea3..728240f4 100644 --- a/app/Providers/AuthServiceProvider.php +++ b/app/Providers/AuthServiceProvider.php @@ -19,7 +19,7 @@ class AuthServiceProvider extends ServiceProvider /** * Register any application authentication / authorization services. * - * @param \Illuminate\Contracts\Auth\Access\Gate $gate + * @param \Illuminate\Contracts\Auth\Access\Gate $gate * @return void */ public function boot(GateContract $gate) diff --git a/app/Transformers/EventTransformer.php b/app/Transformers/EventTransformer.php new file mode 100644 index 00000000..46f5607c --- /dev/null +++ b/app/Transformers/EventTransformer.php @@ -0,0 +1,15 @@ + $event['id'], + ]; + } + +} \ No newline at end of file diff --git a/app/Transformers/Transformer.php b/app/Transformers/Transformer.php new file mode 100644 index 00000000..8a35d320 --- /dev/null +++ b/app/Transformers/Transformer.php @@ -0,0 +1,22 @@ +=0.12.0", + "php": "^5.5.9 || ^7.0" + }, + "require-dev": { + "illuminate/auth": "5.1.* || 5.2.* || 5.3.*", + "illuminate/cache": "5.1.* || 5.2.* || 5.3.*", + "illuminate/console": "5.1.* || 5.2.* || 5.3.*", + "illuminate/database": "5.1.* || 5.2.* || 5.3.*", + "illuminate/events": "5.1.* || 5.2.* || 5.3.*", + "illuminate/filesystem": "5.1.* || 5.2.* || 5.3.*", + "illuminate/log": "5.1.* || 5.2.* || 5.3.*", + "illuminate/pagination": "5.1.* || 5.2.* || 5.3.*", + "laravel/lumen-framework": "5.1.* || 5.2.*", + "lucadegasperi/oauth2-server-laravel": "5.0.*", + "mockery/mockery": "~0.9", + "phpunit/phpunit": "^4.8 || ^5.0", + "squizlabs/php_codesniffer": "~2.0", + "tymon/jwt-auth": "1.0.*" + }, + "suggest": { + "lucadegasperi/oauth2-server-laravel": "Protect your API with OAuth 2.0.", + "tymon/jwt-auth": "Protect your API with JSON Web Tokens." + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Dingo\\Api\\": "src/" + }, + "files": [ + "src/helpers.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jason Lewis", + "email": "jason.lewis1991@gmail.com" + } + ], + "description": "A RESTful API package for the Laravel and Lumen frameworks.", + "keywords": [ + "api", + "dingo", + "laravel", + "restful" + ], + "time": "2016-09-02 05:51:07" + }, + { + "name": "dingo/blueprint", + "version": "v0.2.0", + "source": { + "type": "git", + "url": "https://github.com/dingo/blueprint.git", + "reference": "d37fb7433aeadb3d40d5e790978c3c8d229d0e7d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dingo/blueprint/zipball/d37fb7433aeadb3d40d5e790978c3c8d229d0e7d", + "reference": "d37fb7433aeadb3d40d5e790978c3c8d229d0e7d", + "shasum": "" + }, + "require": { + "doctrine/annotations": "1.2.*", + "illuminate/filesystem": "5.1.* || 5.2.* || 5.3.*", + "illuminate/support": "5.1.* || 5.2.* || 5.3.*", + "php": ">=5.5.9", + "phpdocumentor/reflection-docblock": "3.1.*" + }, + "require-dev": { + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.2-dev" + } + }, + "autoload": { + "psr-4": { + "Dingo\\Blueprint\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jason Lewis", + "email": "jason.lewis1991@gmail.com" + } + ], + "description": "API Blueprint documentation generator.", + "keywords": [ + "api", + "blueprint", + "dingo", + "docs", + "laravel" + ], + "time": "2016-08-30 03:27:49" + }, { "name": "dnoegel/php-xdg-base-dir", "version": "0.1", @@ -174,6 +305,74 @@ "description": "implementation of xdg base directory specification for php", "time": "2014-10-24 07:27:01" }, + { + "name": "doctrine/annotations", + "version": "v1.2.7", + "source": { + "type": "git", + "url": "https://github.com/doctrine/annotations.git", + "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535", + "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535", + "shasum": "" + }, + "require": { + "doctrine/lexer": "1.*", + "php": ">=5.3.2" + }, + "require-dev": { + "doctrine/cache": "1.*", + "phpunit/phpunit": "4.*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Common\\Annotations\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Benjamin Eberlei", + "email": "kontakt@beberlei.de" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Jonathan Wage", + "email": "jonwage@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Docblock Annotations Parser", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "annotations", + "docblock", + "parser" + ], + "time": "2015-08-31 12:32:49" + }, { "name": "doctrine/inflector", "version": "v1.1.0", @@ -241,6 +440,60 @@ ], "time": "2015-11-06 14:35:42" }, + { + "name": "doctrine/lexer", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "https://github.com/doctrine/lexer.git", + "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c", + "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c", + "shasum": "" + }, + "require": { + "php": ">=5.3.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Doctrine\\Common\\Lexer\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Borschel", + "email": "roman@code-factory.org" + }, + { + "name": "Guilherme Blanco", + "email": "guilhermeblanco@gmail.com" + }, + { + "name": "Johannes Schmitt", + "email": "schmittjoh@gmail.com" + } + ], + "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.", + "homepage": "http://www.doctrine-project.org", + "keywords": [ + "lexer", + "parser" + ], + "time": "2014-09-09 13:34:57" + }, { "name": "dompdf/dompdf", "version": "dev-master", @@ -251,7 +504,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dompdf/dompdf/zipball/8db6e1478e11b4e2bd0753c903dabe375b58ac3b", + "url": "https://api.github.com/repos/dompdf/dompdf/zipball/e4b49285f8c7165f31b5cc6395a5ee1bbc35144a", "reference": "8db6e1478e11b4e2bd0753c903dabe375b58ac3b", "shasum": "" }, @@ -719,7 +972,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Intervention/image/zipball/22088b04728a039bd1fc32f7e79a89a118b78698", + "url": "https://api.github.com/repos/Intervention/image/zipball/4064a980324f6c3bfa2bd981dfb247afa705ec3c", "reference": "22088b04728a039bd1fc32f7e79a89a118b78698", "shasum": "" }, @@ -1471,6 +1724,69 @@ "description": "Flysystem adapter for the AWS S3 SDK v3.x", "time": "2016-06-06 11:18:47" }, + { + "name": "league/fractal", + "version": "0.14.0", + "source": { + "type": "git", + "url": "https://github.com/thephpleague/fractal.git", + "reference": "56ad8933fbb40328ca3321c84143b2c16186eebf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/thephpleague/fractal/zipball/56ad8933fbb40328ca3321c84143b2c16186eebf", + "reference": "56ad8933fbb40328ca3321c84143b2c16186eebf", + "shasum": "" + }, + "require": { + "php": ">=5.4" + }, + "require-dev": { + "illuminate/contracts": "~5.0", + "mockery/mockery": "~0.9", + "pagerfanta/pagerfanta": "~1.0.0", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~1.5", + "zendframework/zend-paginator": "~2.3" + }, + "suggest": { + "illuminate/pagination": "The Illuminate Pagination component.", + "pagerfanta/pagerfanta": "Pagerfanta Paginator", + "zendframework/zend-paginator": "Zend Framework Paginator" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.13-dev" + } + }, + "autoload": { + "psr-4": { + "League\\Fractal\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Phil Sturgeon", + "email": "me@philsturgeon.uk", + "homepage": "http://philsturgeon.uk/", + "role": "Developer" + } + ], + "description": "Handle the output of complex data structures ready for API output.", + "homepage": "http://fractal.thephpleague.com/", + "keywords": [ + "api", + "json", + "league", + "rest" + ], + "time": "2016-07-21 09:56:14" + }, { "name": "league/oauth1-client", "version": "1.6.1", @@ -2522,6 +2838,152 @@ "homepage": "https://github.com/PhenX/php-svg-lib", "time": "2015-05-06 18:49:49" }, + { + "name": "phpdocumentor/reflection-common", + "version": "1.0", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionCommon.git", + "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", + "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", + "shasum": "" + }, + "require": { + "php": ">=5.5" + }, + "require-dev": { + "phpunit/phpunit": "^4.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jaap van Otterdijk", + "email": "opensource@ijaap.nl" + } + ], + "description": "Common reflection classes used by phpdocumentor to reflect the code structure", + "homepage": "http://www.phpdoc.org", + "keywords": [ + "FQSEN", + "phpDocumentor", + "phpdoc", + "reflection", + "static analysis" + ], + "time": "2015-12-27 11:43:31" + }, + { + "name": "phpdocumentor/reflection-docblock", + "version": "3.1.0", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", + "reference": "9270140b940ff02e58ec577c237274e92cd40cdd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd", + "reference": "9270140b940ff02e58ec577c237274e92cd40cdd", + "shasum": "" + }, + "require": { + "php": ">=5.5", + "phpdocumentor/reflection-common": "^1.0@dev", + "phpdocumentor/type-resolver": "^0.2.0", + "webmozart/assert": "^1.0" + }, + "require-dev": { + "mockery/mockery": "^0.9.4", + "phpunit/phpunit": "^4.4" + }, + "type": "library", + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", + "time": "2016-06-10 09:48:41" + }, + { + "name": "phpdocumentor/type-resolver", + "version": "0.2", + "source": { + "type": "git", + "url": "https://github.com/phpDocumentor/TypeResolver.git", + "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443", + "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443", + "shasum": "" + }, + "require": { + "php": ">=5.5", + "phpdocumentor/reflection-common": "^1.0" + }, + "require-dev": { + "mockery/mockery": "^0.9.4", + "phpunit/phpunit": "^5.2||^4.8.24" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "phpDocumentor\\Reflection\\": [ + "src/" + ] + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Mike van Riel", + "email": "me@mikevanriel.com" + } + ], + "time": "2016-06-10 07:14:17" + }, { "name": "phpoffice/phpexcel", "version": "1.8.1", @@ -3846,7 +4308,7 @@ }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Vinelab/http/zipball/26974a6f2c635795aed893f9aa0f87118f137d95", + "url": "https://api.github.com/repos/Vinelab/http/zipball/30b6f71c127dbc213e56d1d07c4bfeca8224604f", "reference": "26974a6f2c635795aed893f9aa0f87118f137d95", "shasum": "" }, @@ -3935,6 +4397,55 @@ "environment" ], "time": "2016-06-14 14:14:52" + }, + { + "name": "webmozart/assert", + "version": "1.0.2", + "source": { + "type": "git", + "url": "https://github.com/webmozart/assert.git", + "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozart/assert/zipball/30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde", + "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "^4.6" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "Webmozart\\Assert\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" + } + ], + "description": "Assertions to validate method input/output with nice error messages.", + "keywords": [ + "assert", + "check", + "validate" + ], + "time": "2015-08-24 13:29:44" } ], "packages-dev": [ @@ -4053,74 +4564,6 @@ ], "time": "2016-06-13 19:28:20" }, - { - "name": "doctrine/annotations", - "version": "v1.2.7", - "source": { - "type": "git", - "url": "https://github.com/doctrine/annotations.git", - "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535", - "reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535", - "shasum": "" - }, - "require": { - "doctrine/lexer": "1.*", - "php": ">=5.3.2" - }, - "require-dev": { - "doctrine/cache": "1.*", - "phpunit/phpunit": "4.*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3.x-dev" - } - }, - "autoload": { - "psr-0": { - "Doctrine\\Common\\Annotations\\": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Benjamin Eberlei", - "email": "kontakt@beberlei.de" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Jonathan Wage", - "email": "jonwage@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "Docblock Annotations Parser", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "annotations", - "docblock", - "parser" - ], - "time": "2015-08-31 12:32:49" - }, { "name": "doctrine/cache", "version": "v1.6.0", @@ -4455,60 +4898,6 @@ ], "time": "2015-06-14 21:17:01" }, - { - "name": "doctrine/lexer", - "version": "v1.0.1", - "source": { - "type": "git", - "url": "https://github.com/doctrine/lexer.git", - "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c", - "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c", - "shasum": "" - }, - "require": { - "php": ">=5.3.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-0": { - "Doctrine\\Common\\Lexer\\": "lib/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Roman Borschel", - "email": "roman@code-factory.org" - }, - { - "name": "Guilherme Blanco", - "email": "guilhermeblanco@gmail.com" - }, - { - "name": "Johannes Schmitt", - "email": "schmittjoh@gmail.com" - } - ], - "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.", - "homepage": "http://www.doctrine-project.org", - "keywords": [ - "lexer", - "parser" - ], - "time": "2014-09-09 13:34:57" - }, { "name": "fzaninotto/faker", "version": "v1.6.0", @@ -4557,152 +4946,6 @@ ], "time": "2016-04-29 12:21:54" }, - { - "name": "phpdocumentor/reflection-common", - "version": "1.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionCommon.git", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c", - "reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c", - "shasum": "" - }, - "require": { - "php": ">=5.5" - }, - "require-dev": { - "phpunit/phpunit": "^4.6" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Jaap van Otterdijk", - "email": "opensource@ijaap.nl" - } - ], - "description": "Common reflection classes used by phpdocumentor to reflect the code structure", - "homepage": "http://www.phpdoc.org", - "keywords": [ - "FQSEN", - "phpDocumentor", - "phpdoc", - "reflection", - "static analysis" - ], - "time": "2015-12-27 11:43:31" - }, - { - "name": "phpdocumentor/reflection-docblock", - "version": "3.1.0", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "9270140b940ff02e58ec577c237274e92cd40cdd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd", - "reference": "9270140b940ff02e58ec577c237274e92cd40cdd", - "shasum": "" - }, - "require": { - "php": ">=5.5", - "phpdocumentor/reflection-common": "^1.0@dev", - "phpdocumentor/type-resolver": "^0.2.0", - "webmozart/assert": "^1.0" - }, - "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^4.4" - }, - "type": "library", - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2016-06-10 09:48:41" - }, - { - "name": "phpdocumentor/type-resolver", - "version": "0.2", - "source": { - "type": "git", - "url": "https://github.com/phpDocumentor/TypeResolver.git", - "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443", - "reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443", - "shasum": "" - }, - "require": { - "php": ">=5.5", - "phpdocumentor/reflection-common": "^1.0" - }, - "require-dev": { - "mockery/mockery": "^0.9.4", - "phpunit/phpunit": "^5.2||^4.8.24" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "phpDocumentor\\Reflection\\": [ - "src/" - ] - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Mike van Riel", - "email": "me@mikevanriel.com" - } - ], - "time": "2016-06-10 07:14:17" - }, { "name": "phpspec/php-diff", "version": "v1.0.2", @@ -5779,55 +6022,6 @@ "description": "Symfony Yaml Component", "homepage": "https://symfony.com", "time": "2016-05-26 21:46:24" - }, - { - "name": "webmozart/assert", - "version": "1.0.2", - "source": { - "type": "git", - "url": "https://github.com/webmozart/assert.git", - "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde", - "reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "require-dev": { - "phpunit/phpunit": "^4.6" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0-dev" - } - }, - "autoload": { - "psr-4": { - "Webmozart\\Assert\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Bernhard Schussek", - "email": "bschussek@gmail.com" - } - ], - "description": "Assertions to validate method input/output with nice error messages.", - "keywords": [ - "assert", - "check", - "validate" - ], - "time": "2015-08-24 13:29:44" } ], "aliases": [], @@ -5840,7 +6034,8 @@ "vinelab/http": 20, "maxhoffmann/parsedown-laravel": 20, "omnipay/bitpay": 20, - "omnipay/coinbase": 20 + "omnipay/coinbase": 20, + "dingo/api": 20 }, "prefer-stable": false, "prefer-lowest": false, diff --git a/config/app.php b/config/app.php index d71674a5..8ccc2791 100644 --- a/config/app.php +++ b/config/app.php @@ -170,6 +170,7 @@ return [ MaxHoffmann\Parsedown\ParsedownServiceProvider::class, Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class, Laracasts\Utilities\JavaScript\JavaScriptServiceProvider::class, + Dingo\Api\Provider\LaravelServiceProvider::class, ],