From b4efd672578774275401038f3957e29bebe359f0 Mon Sep 17 00:00:00 2001 From: Dave Date: Sun, 6 Mar 2016 17:59:19 +0000 Subject: [PATCH] - Started work on added Omnipay - Updated the checkout to use Omipay instead of Stripes own lib --- .../Controllers/EventAttendeesController.php | 10 +- .../Controllers/EventCheckoutController.php | 186 ++++++------- composer.json | 5 +- config/Wkhtml2pdf.php | 12 +- config/app.php | 3 + config/attendize.php | 16 +- config/auth.php | 108 ++++---- config/barcode.php | 2 +- config/cache.php | 122 ++++----- config/compile.php | 60 ++--- config/database.php | 204 +++++++------- config/debugbar.php | 58 ++-- config/excel.php | 234 ++++++++-------- config/filesystems.php | 110 ++++---- config/image.php | 6 +- config/laravel-omnipay.php | 24 ++ config/mail.php | 202 +++++++------- config/purifier.php | 41 +++ config/queue.php | 26 +- config/services.php | 54 ++-- config/session.php | 250 +++++++++--------- config/view.php | 48 ++-- resources/views/Emails/ConfirmEmail.blade.php | 3 +- .../views/Emails/OrderConfirmation.blade.php | 3 +- resources/views/Emails/inviteUser.blade.php | 3 +- .../views/Emails/messageAttendees.blade.php | 9 +- resources/views/Emails/messageOrder.blade.php | 8 - 27 files changed, 926 insertions(+), 881 deletions(-) create mode 100644 config/laravel-omnipay.php create mode 100644 config/purifier.php diff --git a/app/Http/Controllers/EventAttendeesController.php b/app/Http/Controllers/EventAttendeesController.php index 9adc0a1a..2f5a1131 100644 --- a/app/Http/Controllers/EventAttendeesController.php +++ b/app/Http/Controllers/EventAttendeesController.php @@ -405,13 +405,21 @@ class EventAttendeesController extends MyBaseController { $attendee = Attendee::scope()->findOrFail($attendee_id); + if($attendee->is_cancelled) { + return Response::json([ + 'status' => 'success', + 'message' => 'Attendee Already Cancelled', + ]); + } + + $attendee->ticket->decrement('quantity_sold'); $attendee->is_cancelled = 1; $attendee->save(); $data = [ 'attendee' => $attendee, - 'email_logo' => $attendee->organiser->full_logo_path, + 'email_logo' => $attendee->event->organiser->full_logo_path, ]; if (Input::get('notify_attendee') == '1') { diff --git a/app/Http/Controllers/EventCheckoutController.php b/app/Http/Controllers/EventCheckoutController.php index 9d16fce9..e44995f3 100644 --- a/app/Http/Controllers/EventCheckoutController.php +++ b/app/Http/Controllers/EventCheckoutController.php @@ -28,6 +28,7 @@ use Stripe_Charge; use Stripe_Customer; use Validator; use View; +use Omnipay; class EventCheckoutController extends Controller { @@ -72,7 +73,7 @@ class EventCheckoutController extends Controller $quantity_available_validation_rules = []; foreach ($ticket_ids as $ticket_id) { - $current_ticket_quantity = (int) Input::get('ticket_'.$ticket_id); + $current_ticket_quantity = (int)Input::get('ticket_' . $ticket_id); if ($current_ticket_quantity < 1) { continue; @@ -89,18 +90,18 @@ class EventCheckoutController extends Controller */ $max_per_person = min($ticket_quantity_remaining, $ticket->max_per_person); - $quantity_available_validation_rules['ticket_'.$ticket_id] = ['numeric', 'min:'.$ticket->min_per_person, 'max:'.$max_per_person]; + $quantity_available_validation_rules['ticket_' . $ticket_id] = ['numeric', 'min:' . $ticket->min_per_person, 'max:' . $max_per_person]; $quantity_available_validation_messages = [ - 'ticket_'.$ticket_id.'.max' => 'The maximum number of tickets you can register is '.$ticket_quantity_remaining, - 'ticket_'.$ticket_id.'.min' => 'You must select at least '.$ticket->min_per_person.' tickets.', + 'ticket_' . $ticket_id . '.max' => 'The maximum number of tickets you can register is ' . $ticket_quantity_remaining, + 'ticket_' . $ticket_id . '.min' => 'You must select at least ' . $ticket->min_per_person . ' tickets.', ]; - $validator = Validator::make(['ticket_'.$ticket_id => (int) Input::get('ticket_'.$ticket_id)], $quantity_available_validation_rules, $quantity_available_validation_messages); + $validator = Validator::make(['ticket_' . $ticket_id => (int)Input::get('ticket_' . $ticket_id)], $quantity_available_validation_rules, $quantity_available_validation_messages); if ($validator->fails()) { return Response::json([ - 'status' => 'error', + 'status' => 'error', 'messages' => $validator->messages()->toArray(), ]); } @@ -110,12 +111,12 @@ class EventCheckoutController extends Controller $organiser_booking_fee = $organiser_booking_fee + ($current_ticket_quantity * $ticket->organiser_booking_fee); $tickets[] = [ - 'ticket' => $ticket, - 'qty' => $current_ticket_quantity, - 'price' => ($current_ticket_quantity * $ticket->price), - 'booking_fee' => ($current_ticket_quantity * $ticket->booking_fee), + 'ticket' => $ticket, + 'qty' => $current_ticket_quantity, + 'price' => ($current_ticket_quantity * $ticket->price), + 'booking_fee' => ($current_ticket_quantity * $ticket->booking_fee), 'organiser_booking_fee' => ($current_ticket_quantity * $ticket->organiser_booking_fee), - 'full_price' => $ticket->price + $ticket->total_booking_fee, + 'full_price' => $ticket->price + $ticket->total_booking_fee, ]; /* @@ -134,21 +135,21 @@ class EventCheckoutController extends Controller /* * Create our validation rules here */ - $validation_rules['ticket_holder_first_name.'.$i.'.'.$ticket_id] = ['required']; - $validation_rules['ticket_holder_last_name.'.$i.'.'.$ticket_id] = ['required']; - $validation_rules['ticket_holder_email.'.$i.'.'.$ticket_id] = ['required', 'email']; + $validation_rules['ticket_holder_first_name.' . $i . '.' . $ticket_id] = ['required']; + $validation_rules['ticket_holder_last_name.' . $i . '.' . $ticket_id] = ['required']; + $validation_rules['ticket_holder_email.' . $i . '.' . $ticket_id] = ['required', 'email']; - $validation_messages['ticket_holder_first_name.'.$i.'.'.$ticket_id.'.required'] = 'Ticket holder '.($i + 1).'\'s first name is required'; - $validation_messages['ticket_holder_last_name.'.$i.'.'.$ticket_id.'.required'] = 'Ticket holder '.($i + 1).'\'s last name is required'; - $validation_messages['ticket_holder_email.'.$i.'.'.$ticket_id.'.required'] = 'Ticket holder '.($i + 1).'\'s email is required'; - $validation_messages['ticket_holder_email.'.$i.'.'.$ticket_id.'.email'] = 'Ticket holder '.($i + 1).'\'s email appears to be invalid'; + $validation_messages['ticket_holder_first_name.' . $i . '.' . $ticket_id . '.required'] = 'Ticket holder ' . ($i + 1) . '\'s first name is required'; + $validation_messages['ticket_holder_last_name.' . $i . '.' . $ticket_id . '.required'] = 'Ticket holder ' . ($i + 1) . '\'s last name is required'; + $validation_messages['ticket_holder_email.' . $i . '.' . $ticket_id . '.required'] = 'Ticket holder ' . ($i + 1) . '\'s email is required'; + $validation_messages['ticket_holder_email.' . $i . '.' . $ticket_id . '.email'] = 'Ticket holder ' . ($i + 1) . '\'s email appears to be invalid'; } } } if (empty($tickets)) { return Response::json([ - 'status' => 'error', + 'status' => 'error', 'message' => 'No tickets selected.', ]); } @@ -156,31 +157,31 @@ class EventCheckoutController extends Controller /* * @todo - Store this in something other than a session? */ - Session::set('ticket_order_'.$event->id, [ - 'validation_rules' => $validation_rules, - 'validation_messages' => $validation_messages, - 'event_id' => $event->id, - 'tickets' => $tickets, /* probably shouldn't store the whole ticket obj in session */ - 'total_ticket_quantity' => $total_ticket_quantity, - 'order_started' => time(), - 'expires' => $order_expires_time, - 'reserved_tickets_id' => $reservedTickets->id, - 'order_total' => $order_total, - 'booking_fee' => $booking_fee, - 'organiser_booking_fee' => $organiser_booking_fee, - 'total_booking_fee' => $booking_fee + $organiser_booking_fee, + Session::set('ticket_order_' . $event->id, [ + 'validation_rules' => $validation_rules, + 'validation_messages' => $validation_messages, + 'event_id' => $event->id, + 'tickets' => $tickets, /* probably shouldn't store the whole ticket obj in session */ + 'total_ticket_quantity' => $total_ticket_quantity, + 'order_started' => time(), + 'expires' => $order_expires_time, + 'reserved_tickets_id' => $reservedTickets->id, + 'order_total' => $order_total, + 'booking_fee' => $booking_fee, + 'organiser_booking_fee' => $organiser_booking_fee, + 'total_booking_fee' => $booking_fee + $organiser_booking_fee, 'order_requires_payment' => (ceil($order_total) == 0) ? false : true, - 'account_id' => $event->account->id, - 'affiliate_referral' => Cookie::get('affiliate_'.$event_id), + 'account_id' => $event->account->id, + 'affiliate_referral' => Cookie::get('affiliate_' . $event_id), ]); if (Request::ajax()) { return Response::json([ - 'status' => 'success', + 'status' => 'success', 'redirectUrl' => route('showEventCheckout', [ - 'event_id' => $event_id, + 'event_id' => $event_id, 'is_embedded' => $this->is_embedded, - ]).'#order_form', + ]) . '#order_form', ]); } @@ -189,12 +190,12 @@ class EventCheckoutController extends Controller */ return Redirect::to(route('showEventCheckout', [ 'event_id' => $event_id, - ]).'#order_form'); + ]) . '#order_form'); } public function showEventCheckout($event_id) { - $order_session = Session::get('ticket_order_'.$event_id); + $order_session = Session::get('ticket_order_' . $event_id); if (!$order_session || $order_session['expires'] < Carbon::now()) { return Redirect::route('showEventPage', ['event_id' => $event_id]); @@ -204,9 +205,9 @@ class EventCheckoutController extends Controller //dd($secondsToExpire); $data = $order_session + [ - 'event' => Event::findorFail($order_session['event_id']), + 'event' => Event::findorFail($order_session['event_id']), 'secondsToExpire' => $secondsToExpire, - 'is_embedded' => $this->is_embedded, + 'is_embedded' => $this->is_embedded, ]; if ($this->is_embedded) { @@ -224,7 +225,7 @@ class EventCheckoutController extends Controller $order = new Order(); - $ticket_order = Session::get('ticket_order_'.$event_id); + $ticket_order = Session::get('ticket_order_' . $event_id); $attendee_increment = 1; @@ -238,7 +239,7 @@ class EventCheckoutController extends Controller if (!$order->validate(Input::all())) { return Response::json([ - 'status' => 'error', + 'status' => 'error', 'messages' => $order->errors(), ]); } @@ -247,66 +248,49 @@ class EventCheckoutController extends Controller * Begin payment attempt before creating the attendees etc. * */ if ($ticket_order['order_requires_payment']) { + try { - $stripe_error = false; - - Stripe::setApiKey($event->account->stripe_api_key); - + $error = false; $token = Input::get('stripeToken'); - $customer = Stripe_Customer::create([ - 'email' => Input::get('order_email'), - 'card' => $token, - 'description' => 'Customer: '.Input::get('order_email'), + $gateway = Omnipay::gateway('stripe'); + + $gateway->initialize([ + 'apiKey' => $event->account->stripe_api_key ]); - if (Utils::isAttendize()) { - $charge = Stripe_Charge::create([ - 'customer' => $customer->id, - 'amount' => ($ticket_order['order_total'] + $ticket_order['organiser_booking_fee']) * 100, - 'currency' => $event->currency->code, - 'description' => Input::get('order_email'), - 'application_fee' => $ticket_order['booking_fee'] * 100, - 'description' => 'Order for customer: '.Input::get('order_email'), - ]); + $transaction = $gateway->purchase([ + 'amount' => ($ticket_order['order_total'] + $ticket_order['organiser_booking_fee']), + 'currency' => $event->currency->code, + 'description' => Input::get('order_email'), + 'description' => 'Order for customer: ' . Input::get('order_email'), + 'token' => $token + ]); + + $response = $transaction->send(); + + + if ($response->isSuccessful()) { + $order->transaction_id = $response->getTransactionReference(); + } elseif ($response->isRedirect()) { + $response->redirect(); } else { - $charge = Stripe_Charge::create([ - 'customer' => $customer->id, - 'amount' => ($ticket_order['order_total'] + $ticket_order['organiser_booking_fee']) * 100, - 'currency' => $event->currency->code, - 'description' => Input::get('order_email'), - 'description' => 'Order for customer: '.Input::get('order_email'), + // display error to customer + return Response::json([ + 'status' => 'error', + 'message' => $response->getMessage(), ]); } - $order->transaction_id = $charge->id; - } catch (\Stripe_CardError $e) { - // Card was declined. - $e_json = $e->getJsonBody(); - $error = $e_json['error']; - $stripe_error = $error['message']; - Log::error($e); - } catch (\Stripe_InvalidRequestError $e) { - $stripe_error = 'Whoops, something went wrong. Please try again.'; - Log::error($e); - } catch (\Stripe_AuthenticationError $e) { - $stripe_error = 'There was a problem processing your payment. Please try again'; - Log::error($e); - } catch (\Stripe_ApiConnectionError $e) { - $stripe_error = 'There was a problem processing your payment. Please try again'; - Log::error($e); - } catch (\Stripe_Error $e) { - $stripe_error = 'There was a problem processing your payment. Please try again'; - Log::error($e); - } catch (\Exception $e) { - $stripe_error = 'There was a problem processing your payment. Please try again'; + } catch (\Exeption $e) { Log::error($e); + $error = 'Sorry, there was an error processing your payment. Please try again.'; } - if ($stripe_error) { + if ($error) { return Response::json([ - 'status' => 'error', - 'message' => $stripe_error, + 'status' => 'error', + 'message' => $error, ]); } } @@ -346,7 +330,7 @@ class EventCheckoutController extends Controller */ $event_stats = EventStats::firstOrNew([ 'event_id' => $event_id, - 'date' => DB::raw('CURDATE()'), + 'date' => DB::raw('CURDATE()'), ]); $event_stats->increment('tickets_sold', $ticket_order['total_ticket_quantity']); @@ -395,7 +379,7 @@ class EventCheckoutController extends Controller $attendee->order_id = $order->id; $attendee->ticket_id = $attendee_details['ticket']['id']; $attendee->account_id = $event->account->id; - $attendee->reference = $order->order_reference.'-'.($attendee_increment); + $attendee->reference = $order->order_reference . '-' . ($attendee_increment); $attendee->save(); /* @@ -420,16 +404,16 @@ class EventCheckoutController extends Controller /* * Kill the session */ - Session::forget('ticket_order_'.$event->id); + Session::forget('ticket_order_' . $event->id); /* * Queue the PDF creation jobs */ return Response::json([ - 'status' => 'success', + 'status' => 'success', 'redirectUrl' => route('showOrderDetails', [ - 'is_embedded' => $this->is_embedded, + 'is_embedded' => $this->is_embedded, 'order_reference' => $order->order_reference, ]), ]); @@ -451,9 +435,9 @@ class EventCheckoutController extends Controller } $data = [ - 'order' => $order, - 'event' => $order->event, - 'tickets' => $order->event->tickets, + 'order' => $order, + 'event' => $order->event, + 'tickets' => $order->event->tickets, 'is_embedded' => $this->is_embedded, ]; @@ -478,9 +462,9 @@ class EventCheckoutController extends Controller } $data = [ - 'order' => $order, - 'event' => $order->event, - 'tickets' => $order->event->tickets, + 'order' => $order, + 'event' => $order->event, + 'tickets' => $order->event->tickets, 'attendees' => $order->attendees, ]; diff --git a/composer.json b/composer.json index cbfdf573..49e229dc 100644 --- a/composer.json +++ b/composer.json @@ -20,7 +20,10 @@ "vinelab/http": "dev-master", "mews/purifier": "~2.0", "league/flysystem-aws-s3-v3" : "~1.0", - "maxhoffmann/parsedown-laravel": "dev-master" + "maxhoffmann/parsedown-laravel": "dev-master", + "ignited/laravel-omnipay": "2.*", + "omnipay/stripe": "*", + "omnipay/paypal": "*" }, "require-dev": { diff --git a/config/Wkhtml2pdf.php b/config/Wkhtml2pdf.php index 20c6dad2..59a3603e 100644 --- a/config/Wkhtml2pdf.php +++ b/config/Wkhtml2pdf.php @@ -1,9 +1,9 @@ false, - 'binpath' => 'lib/', - 'binfile' => 'wkhtmltopdf-amd64', - 'output_mode' => 'I', -]; + 'debug' => false, + 'binpath' => 'lib/', + 'binfile' => 'wkhtmltopdf-amd64', + 'output_mode' => 'I' +); \ No newline at end of file diff --git a/config/app.php b/config/app.php index cdf7e73b..fa26b8db 100644 --- a/config/app.php +++ b/config/app.php @@ -130,6 +130,8 @@ return [ 'Nitmedia\Wkhtml2pdf\L5Wkhtml2pdfServiceProvider', 'Mews\Purifier\PurifierServiceProvider', 'MaxHoffmann\Parsedown\ParsedownServiceProvider', + 'Ignited\LaravelOmnipay\LaravelOmnipayServiceProvider', + /* * Application Service Providers... */ @@ -204,6 +206,7 @@ return [ 'HttpClient' => 'Vinelab\Http\Facades\Client', 'Purifier' => 'Mews\Purifier\Facades\Purifier', 'Markdown' => 'MaxHoffmann\Parsedown\ParsedownFacade', + 'Omnipay' => 'Ignited\LaravelOmnipay\Facades\OmnipayFacade', ], ]; diff --git a/config/attendize.php b/config/attendize.php index 3ace731e..9e8b21c0 100644 --- a/config/attendize.php +++ b/config/attendize.php @@ -17,14 +17,14 @@ return [ 'fallback_organiser_logo_url' => '/assets/images/logo-100x100-lightBg.png', 'cdn_url' => '', - 'max_tickets_per_person' => 30, //Depreciated - 'checkout_timeout_after' => 8, //mintutes + 'max_tickets_per_person' => 30, #Depreciated + 'checkout_timeout_after' => 8, #mintutes 'ticket_status_sold_out' => 1, - 'ticket_status_after_sale_date' => 2, + 'ticket_status_after_sale_date' => 2, 'ticket_status_before_sale_date' => 3, 'ticket_status_on_sale' => 4, - 'ticket_status_off_sale' => 5, + 'ticket_status_off_sale' => 5, 'ticket_booking_fee_fixed' => 0, 'ticket_booking_fee_percentage' => 0, @@ -34,14 +34,14 @@ return [ 'order_partially_refunded' => 3, 'order_cancelled' => 4, - 'default_timezone' => 30, //Europe/Dublin - 'default_currency' => 2, //Euro + 'default_timezone' => 30, #Europe/Dublin + 'default_currency' => 2, #Euro 'default_date_format' => 'j M, Y', 'default_date_picker_format' => 'd M, yyyy', 'default_datetime_format' => 'F j, Y, g:i a', - 'default_query_cache' => 120, //Minutes + 'default_query_cache' => 120, #Minutes 'default_locale' => 'en', 'cdn_url_user_assets' => '', - 'cdn_url_static_assets' => '', + 'cdn_url_static_assets' => '' ]; diff --git a/config/auth.php b/config/auth.php index 9eadb35f..914949f7 100644 --- a/config/auth.php +++ b/config/auth.php @@ -2,66 +2,66 @@ return [ - /* - |-------------------------------------------------------------------------- - | Default Authentication Driver - |-------------------------------------------------------------------------- - | - | This option controls the authentication driver that will be utilized. - | This driver manages the retrieval and authentication of the users - | attempting to get access to protected areas of your application. - | - | Supported: "database", "eloquent" - | - */ + /* + |-------------------------------------------------------------------------- + | Default Authentication Driver + |-------------------------------------------------------------------------- + | + | This option controls the authentication driver that will be utilized. + | This driver manages the retrieval and authentication of the users + | attempting to get access to protected areas of your application. + | + | Supported: "database", "eloquent" + | + */ - 'driver' => 'eloquent', + 'driver' => 'eloquent', - /* - |-------------------------------------------------------------------------- - | Authentication Model - |-------------------------------------------------------------------------- - | - | When using the "Eloquent" authentication driver, we need to know which - | Eloquent model should be used to retrieve your users. Of course, it - | is often just the "User" model but you may use whatever you like. - | - */ + /* + |-------------------------------------------------------------------------- + | Authentication Model + |-------------------------------------------------------------------------- + | + | When using the "Eloquent" authentication driver, we need to know which + | Eloquent model should be used to retrieve your users. Of course, it + | is often just the "User" model but you may use whatever you like. + | + */ - 'model' => 'App\Models\User', + 'model' => 'App\Models\User', - /* - |-------------------------------------------------------------------------- - | Authentication Table - |-------------------------------------------------------------------------- - | - | When using the "Database" authentication driver, we need to know which - | table should be used to retrieve your users. We have chosen a basic - | default value but you may easily change it to any table you like. - | - */ + /* + |-------------------------------------------------------------------------- + | Authentication Table + |-------------------------------------------------------------------------- + | + | When using the "Database" authentication driver, we need to know which + | table should be used to retrieve your users. We have chosen a basic + | default value but you may easily change it to any table you like. + | + */ - 'table' => 'users', + 'table' => 'users', - /* - |-------------------------------------------------------------------------- - | Password Reset Settings - |-------------------------------------------------------------------------- - | - | Here you may set the options for resetting passwords including the view - | that is your password reset e-mail. You can also set the name of the - | table that maintains all of the reset tokens for your application. - | - | The expire time is the number of minutes that the reset token should be - | considered valid. This security feature keeps tokens short-lived so - | they have less time to be guessed. You may change this as needed. - | - */ + /* + |-------------------------------------------------------------------------- + | Password Reset Settings + |-------------------------------------------------------------------------- + | + | Here you may set the options for resetting passwords including the view + | that is your password reset e-mail. You can also set the name of the + | table that maintains all of the reset tokens for your application. + | + | The expire time is the number of minutes that the reset token should be + | considered valid. This security feature keeps tokens short-lived so + | they have less time to be guessed. You may change this as needed. + | + */ - 'password' => [ - 'email' => 'Emails.Auth.Reminder', - 'table' => 'password_resets', - 'expire' => 60, - ], + 'password' => [ + 'email' => 'Emails.Auth.Reminder', + 'table' => 'password_resets', + 'expire' => 60, + ], ]; diff --git a/config/barcode.php b/config/barcode.php index d012466b..6fc229f3 100644 --- a/config/barcode.php +++ b/config/barcode.php @@ -1,5 +1,5 @@ public_path('/'), + 'store_path' => public_path("/"), ]; diff --git a/config/cache.php b/config/cache.php index 103100ac..9ddd5f33 100644 --- a/config/cache.php +++ b/config/cache.php @@ -2,78 +2,78 @@ return [ - /* - |-------------------------------------------------------------------------- - | Default Cache Store - |-------------------------------------------------------------------------- - | - | This option controls the default cache connection that gets used while - | using this caching library. This connection is used when another is - | not explicitly specified when executing a given caching function. - | - */ + /* + |-------------------------------------------------------------------------- + | Default Cache Store + |-------------------------------------------------------------------------- + | + | This option controls the default cache connection that gets used while + | using this caching library. This connection is used when another is + | not explicitly specified when executing a given caching function. + | + */ - 'default' => env('CACHE_DRIVER', 'file'), + 'default' => env('CACHE_DRIVER', 'file'), - /* - |-------------------------------------------------------------------------- - | Cache Stores - |-------------------------------------------------------------------------- - | - | Here you may define all of the cache "stores" for your application as - | well as their drivers. You may even define multiple stores for the - | same cache driver to group types of items stored in your caches. - | - */ + /* + |-------------------------------------------------------------------------- + | Cache Stores + |-------------------------------------------------------------------------- + | + | Here you may define all of the cache "stores" for your application as + | well as their drivers. You may even define multiple stores for the + | same cache driver to group types of items stored in your caches. + | + */ - 'stores' => [ + 'stores' => [ - 'apc' => [ - 'driver' => 'apc', - ], + 'apc' => [ + 'driver' => 'apc' + ], - 'array' => [ - 'driver' => 'array', - ], + 'array' => [ + 'driver' => 'array' + ], - 'database' => [ - 'driver' => 'database', - 'table' => 'cache', - 'connection' => null, - ], + 'database' => [ + 'driver' => 'database', + 'table' => 'cache', + 'connection' => null, + ], - 'file' => [ - 'driver' => 'file', - 'path' => storage_path().'/framework/cache', - ], + 'file' => [ + 'driver' => 'file', + 'path' => storage_path().'/framework/cache', + ], - 'memcached' => [ - 'driver' => 'memcached', - 'servers' => [ - [ - 'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100, - ], - ], - ], + 'memcached' => [ + 'driver' => 'memcached', + 'servers' => [ + [ + 'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100 + ], + ], + ], - 'redis' => [ - 'driver' => 'redis', - 'connection' => 'default', - ], + 'redis' => [ + 'driver' => 'redis', + 'connection' => 'default', + ], - ], + ], - /* - |-------------------------------------------------------------------------- - | Cache Key Prefix - |-------------------------------------------------------------------------- - | - | When utilizing a RAM based store such as APC or Memcached, there might - | be other applications utilizing the same cache. So, we'll specify a - | value to get prefixed to all our keys so we can avoid collisions. - | - */ + /* + |-------------------------------------------------------------------------- + | Cache Key Prefix + |-------------------------------------------------------------------------- + | + | When utilizing a RAM based store such as APC or Memcached, there might + | be other applications utilizing the same cache. So, we'll specify a + | value to get prefixed to all our keys so we can avoid collisions. + | + */ - 'prefix' => 'laravel', + 'prefix' => 'laravel', ]; diff --git a/config/compile.php b/config/compile.php index 2f00654e..3a002fca 100644 --- a/config/compile.php +++ b/config/compile.php @@ -2,40 +2,40 @@ return [ - /* - |-------------------------------------------------------------------------- - | Additional Compiled Classes - |-------------------------------------------------------------------------- - | - | Here you may specify additional classes to include in the compiled file - | generated by the `artisan optimize` command. These should be classes - | that are included on basically every request into the application. - | - */ + /* + |-------------------------------------------------------------------------- + | Additional Compiled Classes + |-------------------------------------------------------------------------- + | + | Here you may specify additional classes to include in the compiled file + | generated by the `artisan optimize` command. These should be classes + | that are included on basically every request into the application. + | + */ - 'files' => [ + 'files' => [ - realpath(__DIR__.'/../app/Providers/AppServiceProvider.php'), - realpath(__DIR__.'/../app/Providers/BusServiceProvider.php'), - realpath(__DIR__.'/../app/Providers/ConfigServiceProvider.php'), - realpath(__DIR__.'/../app/Providers/EventServiceProvider.php'), - realpath(__DIR__.'/../app/Providers/RouteServiceProvider.php'), + realpath(__DIR__.'/../app/Providers/AppServiceProvider.php'), + realpath(__DIR__.'/../app/Providers/BusServiceProvider.php'), + realpath(__DIR__.'/../app/Providers/ConfigServiceProvider.php'), + realpath(__DIR__.'/../app/Providers/EventServiceProvider.php'), + realpath(__DIR__.'/../app/Providers/RouteServiceProvider.php'), - ], + ], - /* - |-------------------------------------------------------------------------- - | Compiled File Providers - |-------------------------------------------------------------------------- - | - | Here you may list service providers which define a "compiles" function - | that returns additional files that should be compiled, providing an - | easy way to get common files from any packages you are utilizing. - | - */ + /* + |-------------------------------------------------------------------------- + | Compiled File Providers + |-------------------------------------------------------------------------- + | + | Here you may list service providers which define a "compiles" function + | that returns additional files that should be compiled, providing an + | easy way to get common files from any packages you are utilizing. + | + */ - 'providers' => [ - // - ], + 'providers' => [ + // + ], ]; diff --git a/config/database.php b/config/database.php index 45413b8e..c47f6bc0 100644 --- a/config/database.php +++ b/config/database.php @@ -2,124 +2,124 @@ return [ - /* - |-------------------------------------------------------------------------- - | PDO Fetch Style - |-------------------------------------------------------------------------- - | - | By default, database results will be returned as instances of the PHP - | stdClass object; however, you may desire to retrieve records in an - | array format for simplicity. Here you can tweak the fetch style. - | - */ + /* + |-------------------------------------------------------------------------- + | PDO Fetch Style + |-------------------------------------------------------------------------- + | + | By default, database results will be returned as instances of the PHP + | stdClass object; however, you may desire to retrieve records in an + | array format for simplicity. Here you can tweak the fetch style. + | + */ - 'fetch' => PDO::FETCH_CLASS, + 'fetch' => PDO::FETCH_CLASS, - /* - |-------------------------------------------------------------------------- - | Default Database Connection Name - |-------------------------------------------------------------------------- - | - | Here you may specify which of the database connections below you wish - | to use as your default connection for all database work. Of course - | you may use many connections at once using the Database library. - | - */ + /* + |-------------------------------------------------------------------------- + | Default Database Connection Name + |-------------------------------------------------------------------------- + | + | Here you may specify which of the database connections below you wish + | to use as your default connection for all database work. Of course + | you may use many connections at once using the Database library. + | + */ - 'default' => 'mysql', + 'default' => 'mysql', - /* - |-------------------------------------------------------------------------- - | Database Connections - |-------------------------------------------------------------------------- - | - | Here are each of the database connections setup for your application. - | Of course, examples of configuring each database platform that is - | supported by Laravel is shown below to make development simple. - | - | - | All database work in Laravel is done through the PHP PDO facilities - | so make sure you have the driver for your particular database of - | choice installed on your machine before you begin development. - | - */ + /* + |-------------------------------------------------------------------------- + | Database Connections + |-------------------------------------------------------------------------- + | + | Here are each of the database connections setup for your application. + | Of course, examples of configuring each database platform that is + | supported by Laravel is shown below to make development simple. + | + | + | All database work in Laravel is done through the PHP PDO facilities + | so make sure you have the driver for your particular database of + | choice installed on your machine before you begin development. + | + */ - 'connections' => [ + 'connections' => [ - 'sqlite' => [ - 'driver' => 'sqlite', - 'database' => storage_path().'/database.sqlite', - 'prefix' => '', - ], + 'sqlite' => [ + 'driver' => 'sqlite', + 'database' => storage_path().'/database.sqlite', + 'prefix' => '', + ], - 'mysql' => [ - 'driver' => 'mysql', - 'host' => env('DB_HOST'), - 'database' => env('DB_DATABASE'), - 'username' => env('DB_USERNAME'), - 'password' => env('DB_PASSWORD'), - 'charset' => 'utf8', - 'collation' => 'utf8_unicode_ci', - 'prefix' => '', - 'strict' => false, - ], + 'mysql' => [ + 'driver' => 'mysql', + 'host' => env('DB_HOST'), + 'database' => env('DB_DATABASE'), + 'username' => env('DB_USERNAME'), + 'password' => env('DB_PASSWORD'), + 'charset' => 'utf8', + 'collation' => 'utf8_unicode_ci', + 'prefix' => '', + 'strict' => false, + ], - 'pgsql' => [ - 'driver' => 'pgsql', - 'host' => env('DB_HOST', 'localhost'), - 'database' => env('DB_DATABASE', 'forge'), - 'username' => env('DB_USERNAME', 'forge'), - 'password' => env('DB_PASSWORD', ''), - 'charset' => 'utf8', - 'prefix' => '', - 'schema' => 'public', - ], + 'pgsql' => [ + 'driver' => 'pgsql', + 'host' => env('DB_HOST', 'localhost'), + 'database' => env('DB_DATABASE', 'forge'), + 'username' => env('DB_USERNAME', 'forge'), + 'password' => env('DB_PASSWORD', ''), + 'charset' => 'utf8', + 'prefix' => '', + 'schema' => 'public', + ], - 'sqlsrv' => [ - 'driver' => 'sqlsrv', - 'host' => env('DB_HOST', 'localhost'), - 'database' => env('DB_DATABASE', 'forge'), - 'username' => env('DB_USERNAME', 'forge'), - 'password' => env('DB_PASSWORD', ''), - 'prefix' => '', - ], + 'sqlsrv' => [ + 'driver' => 'sqlsrv', + 'host' => env('DB_HOST', 'localhost'), + 'database' => env('DB_DATABASE', 'forge'), + 'username' => env('DB_USERNAME', 'forge'), + 'password' => env('DB_PASSWORD', ''), + 'prefix' => '', + ], - ], + ], - /* - |-------------------------------------------------------------------------- - | Migration Repository Table - |-------------------------------------------------------------------------- - | - | This table keeps track of all the migrations that have already run for - | your application. Using this information, we can determine which of - | the migrations on disk haven't actually been run in the database. - | - */ + /* + |-------------------------------------------------------------------------- + | Migration Repository Table + |-------------------------------------------------------------------------- + | + | This table keeps track of all the migrations that have already run for + | your application. Using this information, we can determine which of + | the migrations on disk haven't actually been run in the database. + | + */ - 'migrations' => 'migrations', + 'migrations' => 'migrations', - /* - |-------------------------------------------------------------------------- - | Redis Databases - |-------------------------------------------------------------------------- - | - | Redis is an open source, fast, and advanced key-value store that also - | provides a richer set of commands than a typical key-value systems - | such as APC or Memcached. Laravel makes it easy to dig right in. - | - */ + /* + |-------------------------------------------------------------------------- + | Redis Databases + |-------------------------------------------------------------------------- + | + | Redis is an open source, fast, and advanced key-value store that also + | provides a richer set of commands than a typical key-value systems + | such as APC or Memcached. Laravel makes it easy to dig right in. + | + */ - 'redis' => [ + 'redis' => [ - 'cluster' => false, + 'cluster' => false, - 'default' => [ - 'host' => '127.0.0.1', - 'port' => 6379, - 'database' => 0, - ], + 'default' => [ + 'host' => '127.0.0.1', + 'port' => 6379, + 'database' => 0, + ], - ], + ], ]; diff --git a/config/debugbar.php b/config/debugbar.php index f8200e7d..8131c837 100644 --- a/config/debugbar.php +++ b/config/debugbar.php @@ -1,6 +1,6 @@ [ - 'enabled' => true, - 'driver' => 'file', // redis, file, pdo - 'path' => storage_path().'/debugbar', // For file driver + 'storage' => array( + 'enabled' => true, + 'driver' => 'file', // redis, file, pdo + 'path' => storage_path() . '/debugbar', // For file driver 'connection' => null, // Leave null for default connection (Redis/PDO) - ], + ), /* |-------------------------------------------------------------------------- @@ -70,7 +70,7 @@ return [ | */ - 'collectors' => [ + 'collectors' => array( 'phpinfo' => true, // Php version 'messages' => true, // Messages 'time' => true, // Time Datalogger @@ -90,7 +90,7 @@ return [ 'config' => false, // Display config settings 'auth' => false, // Display Laravel authentication status 'session' => false, // Display session data in a separate tab - ], + ), /* |-------------------------------------------------------------------------- @@ -101,33 +101,33 @@ return [ | */ - 'options' => [ - 'auth' => [ + 'options' => array( + 'auth' => array( 'show_name' => false, // Also show the users name/email in the debugbar - ], - 'db' => [ + ), + 'db' => array( 'with_params' => true, // Render SQL with the parameters substituted 'timeline' => false, // Add the queries to the timeline 'backtrace' => false, // EXPERIMENTAL: Use a backtrace to find the origin of the query in your files. - 'explain' => [ // EXPERIMENTAL: Show EXPLAIN output on queries + 'explain' => array( // EXPERIMENTAL: Show EXPLAIN output on queries 'enabled' => false, - 'types' => ['SELECT'], // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+ - ], + 'types' => array('SELECT'), // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+ + ), 'hints' => true, // Show hints for common mistakes - ], - 'mail' => [ - 'full_log' => false, - ], - 'views' => [ + ), + 'mail' => array( + 'full_log' => false + ), + 'views' => array( 'data' => false, //Note: Can slow down the application, because the data can be quite large.. - ], - 'route' => [ - 'label' => true, // show complete route on bar - ], - 'logs' => [ - 'file' => null, - ], - ], + ), + 'route' => array( + 'label' => true // show complete route on bar + ), + 'logs' => array( + 'file' => null + ), + ), /* |-------------------------------------------------------------------------- @@ -142,4 +142,4 @@ return [ 'inject' => true, -]; +); diff --git a/config/excel.php b/config/excel.php index a33a787f..24fd87e7 100644 --- a/config/excel.php +++ b/config/excel.php @@ -1,8 +1,8 @@ [ + 'cache' => array( /* |-------------------------------------------------------------------------- @@ -29,24 +29,24 @@ return [ | Cache settings |-------------------------------------------------------------------------- */ - 'settings' => [ + 'settings' => array( 'memoryCacheSize' => '32MB', - 'cacheTime' => 600, + 'cacheTime' => 600 - ], + ), /* |-------------------------------------------------------------------------- | Memcache settings |-------------------------------------------------------------------------- */ - 'memcache' => [ + 'memcache' => array( 'host' => 'localhost', 'port' => 11211, - ], + ), /* |-------------------------------------------------------------------------- @@ -54,10 +54,10 @@ return [ |-------------------------------------------------------------------------- */ - 'dir' => storage_path('cache'), - ], + 'dir' => storage_path('cache') + ), - 'properties' => [ + 'properties' => array( 'creator' => 'Maatwebsite', 'lastModifiedBy' => 'Maatwebsite', 'title' => 'Spreadsheet', @@ -67,35 +67,35 @@ return [ 'category' => 'Excel', 'manager' => 'Maatwebsite', 'company' => 'Maatwebsite', - ], + ), /* |-------------------------------------------------------------------------- | Sheets settings |-------------------------------------------------------------------------- */ - 'sheets' => [ + 'sheets' => array( /* |-------------------------------------------------------------------------- | Default page setup |-------------------------------------------------------------------------- */ - 'pageSetup' => [ + 'pageSetup' => array( 'orientation' => 'portrait', 'paperSize' => '9', 'scale' => '100', 'fitToPage' => false, 'fitToHeight' => true, 'fitToWidth' => true, - 'columnsToRepeatAtLeft' => ['', ''], - 'rowsToRepeatAtTop' => [0, 0], + 'columnsToRepeatAtLeft' => array('', ''), + 'rowsToRepeatAtTop' => array(0, 0), 'horizontalCentered' => false, 'verticalCentered' => false, 'printArea' => null, 'firstPageNumber' => null, - ], - ], + ), + ), /* |-------------------------------------------------------------------------- @@ -108,7 +108,7 @@ return [ 'creator' => 'Maatwebsite', - 'csv' => [ + 'csv' => array( /* |-------------------------------------------------------------------------- | Delimiter @@ -134,10 +134,10 @@ return [ |-------------------------------------------------------------------------- */ - 'line_ending' => "\r\n", - ], + 'line_ending' => "\r\n" + ), - 'export' => [ + 'export' => array( /* |-------------------------------------------------------------------------- @@ -210,7 +210,7 @@ return [ | Default sheet settings |-------------------------------------------------------------------------- */ - 'sheets' => [ + 'sheets' => array( /* |-------------------------------------------------------------------------- @@ -245,8 +245,8 @@ return [ | Apply strict comparison when testing for null values in the array |-------------------------------------------------------------------------- */ - 'strictNullComparison' => false, - ], + 'strictNullComparison' => false + ), /* |-------------------------------------------------------------------------- @@ -254,7 +254,7 @@ return [ |-------------------------------------------------------------------------- */ - 'store' => [ + 'store' => array( /* |-------------------------------------------------------------------------- @@ -274,16 +274,16 @@ return [ | Whether we want to return information about the stored file or not | */ - 'returnInfo' => false, + 'returnInfo' => false - ], + ), /* |-------------------------------------------------------------------------- | PDF Settings |-------------------------------------------------------------------------- */ - 'pdf' => [ + 'pdf' => array( /* |-------------------------------------------------------------------------- @@ -298,48 +298,48 @@ return [ | PDF Driver settings |-------------------------------------------------------------------------- */ - 'drivers' => [ + 'drivers' => array( /* |-------------------------------------------------------------------------- | DomPDF settings |-------------------------------------------------------------------------- */ - 'DomPDF' => [ - 'path' => base_path('vendor/dompdf/dompdf/'), - ], + 'DomPDF' => array( + 'path' => base_path('vendor/dompdf/dompdf/') + ), /* |-------------------------------------------------------------------------- | tcPDF settings |-------------------------------------------------------------------------- */ - 'tcPDF' => [ - 'path' => base_path('vendor/tecnick.com/tcpdf/'), - ], + 'tcPDF' => array( + 'path' => base_path('vendor/tecnick.com/tcpdf/') + ), /* |-------------------------------------------------------------------------- | mPDF settings |-------------------------------------------------------------------------- */ - 'mPDF' => [ - 'path' => base_path('vendor/mpdf/mpdf/'), - ], - ], - ], - ], + 'mPDF' => array( + 'path' => base_path('vendor/mpdf/mpdf/') + ), + ) + ) + ), - 'filters' => [ + 'filters' => array( /* |-------------------------------------------------------------------------- | Register read filters |-------------------------------------------------------------------------- */ - 'registered' => [ - 'chunk' => 'Maatwebsite\Excel\Filters\ChunkReadFilter', - ], + 'registered' => array( + 'chunk' => 'Maatwebsite\Excel\Filters\ChunkReadFilter' + ), /* |-------------------------------------------------------------------------- @@ -347,10 +347,10 @@ return [ |-------------------------------------------------------------------------- */ - 'enabled' => [], - ], + 'enabled' => array() + ), - 'import' => [ + 'import' => array( /* |-------------------------------------------------------------------------- @@ -415,12 +415,12 @@ return [ |-------------------------------------------------------------------------- */ - 'encoding' => [ + 'encoding' => array( 'input' => 'UTF-8', - 'output' => 'UTF-8', + 'output' => 'UTF-8' - ], + ), /* |-------------------------------------------------------------------------- @@ -466,7 +466,7 @@ return [ | */ - 'dates' => [ + 'dates' => array( /* |-------------------------------------------------------------------------- @@ -490,15 +490,15 @@ return [ | Date columns |-------------------------------------------------------------------------- */ - 'columns' => [], - ], + 'columns' => array() + ), /* |-------------------------------------------------------------------------- | Import sheets by config |-------------------------------------------------------------------------- */ - 'sheets' => [ + 'sheets' => array( /* |-------------------------------------------------------------------------- @@ -509,16 +509,16 @@ return [ | */ - 'test' => [ + 'test' => array( - 'firstname' => 'A2', + 'firstname' => 'A2' - ], + ) - ], - ], + ) + ), - 'views' => [ + 'views' => array( /* |-------------------------------------------------------------------------- @@ -529,155 +529,155 @@ return [ | */ - 'styles' => [ + 'styles' => array( /* |-------------------------------------------------------------------------- | Table headings |-------------------------------------------------------------------------- */ - 'th' => [ - 'font' => [ + 'th' => array( + 'font' => array( 'bold' => true, 'size' => 12, - ], - ], + ) + ), /* |-------------------------------------------------------------------------- | Strong tags |-------------------------------------------------------------------------- */ - 'strong' => [ - 'font' => [ + 'strong' => array( + 'font' => array( 'bold' => true, 'size' => 12, - ], - ], + ) + ), /* |-------------------------------------------------------------------------- | Bold tags |-------------------------------------------------------------------------- */ - 'b' => [ - 'font' => [ + 'b' => array( + 'font' => array( 'bold' => true, 'size' => 12, - ], - ], + ) + ), /* |-------------------------------------------------------------------------- | Italic tags |-------------------------------------------------------------------------- */ - 'i' => [ - 'font' => [ + 'i' => array( + 'font' => array( 'italic' => true, 'size' => 12, - ], - ], + ) + ), /* |-------------------------------------------------------------------------- | Heading 1 |-------------------------------------------------------------------------- */ - 'h1' => [ - 'font' => [ + 'h1' => array( + 'font' => array( 'bold' => true, 'size' => 24, - ], - ], + ) + ), /* |-------------------------------------------------------------------------- | Heading 2 |-------------------------------------------------------------------------- */ - 'h2' => [ - 'font' => [ + 'h2' => array( + 'font' => array( 'bold' => true, 'size' => 18, - ], - ], + ) + ), /* |-------------------------------------------------------------------------- | Heading 2 |-------------------------------------------------------------------------- */ - 'h3' => [ - 'font' => [ + 'h3' => array( + 'font' => array( 'bold' => true, 'size' => 13.5, - ], - ], + ) + ), /* |-------------------------------------------------------------------------- | Heading 4 |-------------------------------------------------------------------------- */ - 'h4' => [ - 'font' => [ + 'h4' => array( + 'font' => array( 'bold' => true, 'size' => 12, - ], - ], + ) + ), /* |-------------------------------------------------------------------------- | Heading 5 |-------------------------------------------------------------------------- */ - 'h5' => [ - 'font' => [ + 'h5' => array( + 'font' => array( 'bold' => true, 'size' => 10, - ], - ], + ) + ), /* |-------------------------------------------------------------------------- | Heading 6 |-------------------------------------------------------------------------- */ - 'h6' => [ - 'font' => [ + 'h6' => array( + 'font' => array( 'bold' => true, 'size' => 7.5, - ], - ], + ) + ), /* |-------------------------------------------------------------------------- | Hyperlinks |-------------------------------------------------------------------------- */ - 'a' => [ - 'font' => [ + 'a' => array( + 'font' => array( 'underline' => true, - 'color' => ['argb' => 'FF0000FF'], - ], - ], + 'color' => array('argb' => 'FF0000FF'), + ) + ), /* |-------------------------------------------------------------------------- | Horizontal rules |-------------------------------------------------------------------------- */ - 'hr' => [ - 'borders' => [ - 'bottom' => [ + 'hr' => array( + 'borders' => array( + 'bottom' => array( 'style' => 'thin', - 'color' => ['FF000000'], - ], - ], - ], - ], + 'color' => array('FF000000') + ), + ) + ) + ) - ], + ) -]; +); \ No newline at end of file diff --git a/config/filesystems.php b/config/filesystems.php index 877d7c04..430c6637 100644 --- a/config/filesystems.php +++ b/config/filesystems.php @@ -2,69 +2,69 @@ return [ - /* - |-------------------------------------------------------------------------- - | Default Filesystem Disk - |-------------------------------------------------------------------------- - | - | Here you may specify the default filesystem disk that should be used - | by the framework. A "local" driver, as well as a variety of cloud - | based drivers are available for your choosing. Just store away! - | - | Supported: "local", "s3", "rackspace" - | - */ + /* + |-------------------------------------------------------------------------- + | Default Filesystem Disk + |-------------------------------------------------------------------------- + | + | Here you may specify the default filesystem disk that should be used + | by the framework. A "local" driver, as well as a variety of cloud + | based drivers are available for your choosing. Just store away! + | + | Supported: "local", "s3", "rackspace" + | + */ - 'default' => 'local', + 'default' => 'local', - /* - |-------------------------------------------------------------------------- - | Default Cloud Filesystem Disk - |-------------------------------------------------------------------------- - | - | Many applications store files both locally and in the cloud. For this - | reason, you may specify a default "cloud" driver here. This driver - | will be bound as the Cloud disk implementation in the container. - | - */ + /* + |-------------------------------------------------------------------------- + | Default Cloud Filesystem Disk + |-------------------------------------------------------------------------- + | + | Many applications store files both locally and in the cloud. For this + | reason, you may specify a default "cloud" driver here. This driver + | will be bound as the Cloud disk implementation in the container. + | + */ - 'cloud' => 's3', + 'cloud' => 's3', - /* - |-------------------------------------------------------------------------- - | Filesystem Disks - |-------------------------------------------------------------------------- - | - | Here you may configure as many filesystem "disks" as you wish, and you - | may even configure multiple disks of the same driver. Defaults have - | been setup for each driver as an example of the required options. - | - */ + /* + |-------------------------------------------------------------------------- + | Filesystem Disks + |-------------------------------------------------------------------------- + | + | Here you may configure as many filesystem "disks" as you wish, and you + | may even configure multiple disks of the same driver. Defaults have + | been setup for each driver as an example of the required options. + | + */ - 'disks' => [ + 'disks' => [ - 'local' => [ - 'driver' => 'local', - 'root' => public_path().'/user_content', - ], + 'local' => [ + 'driver' => 'local', + 'root' => public_path().'/user_content', + ], - 's3' => [ - 'driver' => 's3', - 'key' => 'your-key', - 'secret' => 'your-secret', - 'region' => 'your-region', - 'bucket' => 'your-bucket', - ], + 's3' => [ + 'driver' => 's3', + 'key' => 'your-key', + 'secret' => 'your-secret', + 'region' => 'your-region', + 'bucket' => 'your-bucket', + ], - 'rackspace' => [ - 'driver' => 'rackspace', - 'username' => 'your-username', - 'key' => 'your-key', - 'container' => 'your-container', - 'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/', - 'region' => 'IAD', - ], + 'rackspace' => [ + 'driver' => 'rackspace', + 'username' => 'your-username', + 'key' => 'your-key', + 'container' => 'your-container', + 'endpoint' => 'https://identity.api.rackspacecloud.com/v2.0/', + 'region' => 'IAD', + ], - ], + ], ]; diff --git a/config/image.php b/config/image.php index 67983819..b106809e 100644 --- a/config/image.php +++ b/config/image.php @@ -1,6 +1,6 @@ 'gd', + 'driver' => 'gd' -]; +); diff --git a/config/laravel-omnipay.php b/config/laravel-omnipay.php new file mode 100644 index 00000000..ae88bd5b --- /dev/null +++ b/config/laravel-omnipay.php @@ -0,0 +1,24 @@ + 'stripe', + + // Add in each gateway here + 'gateways' => [ + 'paypal' => [ + 'driver' => 'PayPal_Express', + 'options' => [ + 'solutionType' => '', + 'landingPage' => '', + 'headerImageUrl' => '' + ] + ], + 'stripe' => [ + 'driver' => 'Stripe', + 'options'=> [] + ] + ] + +]; \ No newline at end of file diff --git a/config/mail.php b/config/mail.php index f5db3cc7..f3e93058 100644 --- a/config/mail.php +++ b/config/mail.php @@ -2,123 +2,123 @@ return [ - /* - |-------------------------------------------------------------------------- - | Mail Driver - |-------------------------------------------------------------------------- - | - | Laravel supports both SMTP and PHP's "mail" function as drivers for the - | sending of e-mail. You may specify which one you're using throughout - | your application here. By default, Laravel is setup for SMTP mail. - | - | Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", "log" - | - */ + /* + |-------------------------------------------------------------------------- + | Mail Driver + |-------------------------------------------------------------------------- + | + | Laravel supports both SMTP and PHP's "mail" function as drivers for the + | sending of e-mail. You may specify which one you're using throughout + | your application here. By default, Laravel is setup for SMTP mail. + | + | Supported: "smtp", "mail", "sendmail", "mailgun", "mandrill", "log" + | + */ - 'driver' => env('MAIL_DRIVER', 'mail'), + 'driver' => env('MAIL_DRIVER', 'mail'), - /* - |-------------------------------------------------------------------------- - | SMTP Host Address - |-------------------------------------------------------------------------- - | - | Here you may provide the host address of the SMTP server used by your - | applications. A default option is provided that is compatible with - | the Mailgun mail service which will provide reliable deliveries. - | - */ + /* + |-------------------------------------------------------------------------- + | SMTP Host Address + |-------------------------------------------------------------------------- + | + | Here you may provide the host address of the SMTP server used by your + | applications. A default option is provided that is compatible with + | the Mailgun mail service which will provide reliable deliveries. + | + */ - 'host' => env('MAIL_HOST', 'smtp.sendgrid.net'), + 'host' => env('MAIL_HOST', 'smtp.sendgrid.net'), - /* - |-------------------------------------------------------------------------- - | SMTP Host Port - |-------------------------------------------------------------------------- - | - | This is the SMTP port used by your application to deliver e-mails to - | users of the application. Like the host we have set this value to - | stay compatible with the Mailgun e-mail application by default. - | - */ + /* + |-------------------------------------------------------------------------- + | SMTP Host Port + |-------------------------------------------------------------------------- + | + | This is the SMTP port used by your application to deliver e-mails to + | users of the application. Like the host we have set this value to + | stay compatible with the Mailgun e-mail application by default. + | + */ - 'port' => env('MAIL_PORT', 587), + 'port' => env('MAIL_PORT', 587), - /* - |-------------------------------------------------------------------------- - | Global "From" Address - |-------------------------------------------------------------------------- - | - | You may wish for all e-mails sent by your application to be sent from - | the same address. Here, you may specify a name and address that is - | used globally for all e-mails that are sent by your application. - | - */ + /* + |-------------------------------------------------------------------------- + | Global "From" Address + |-------------------------------------------------------------------------- + | + | You may wish for all e-mails sent by your application to be sent from + | the same address. Here, you may specify a name and address that is + | used globally for all e-mails that are sent by your application. + | + */ - 'from' => ['address' => env('MAIL_FROM_ADDRESS'), 'name' => env('MAIL_FROM_NAME')], + 'from' => ['address' => env('MAIL_FROM_ADDRESS'), 'name' => env('MAIL_FROM_NAME')], - /* - |-------------------------------------------------------------------------- - | E-Mail Encryption Protocol - |-------------------------------------------------------------------------- - | - | Here you may specify the encryption protocol that should be used when - | the application send e-mail messages. A sensible default using the - | transport layer security protocol should provide great security. - | - */ + /* + |-------------------------------------------------------------------------- + | E-Mail Encryption Protocol + |-------------------------------------------------------------------------- + | + | Here you may specify the encryption protocol that should be used when + | the application send e-mail messages. A sensible default using the + | transport layer security protocol should provide great security. + | + */ - 'encryption' => env('MAIL_ENCRYPTION', 'tls'), + 'encryption' => env('MAIL_ENCRYPTION','tls'), - /* - |-------------------------------------------------------------------------- - | SMTP Server Username - |-------------------------------------------------------------------------- - | - | If your SMTP server requires a username for authentication, you should - | set it here. This will get used to authenticate with your server on - | connection. You may also set the "password" value below this one. - | - */ + /* + |-------------------------------------------------------------------------- + | SMTP Server Username + |-------------------------------------------------------------------------- + | + | If your SMTP server requires a username for authentication, you should + | set it here. This will get used to authenticate with your server on + | connection. You may also set the "password" value below this one. + | + */ - 'username' => env('MAIL_USERNAME'), + 'username' => env('MAIL_USERNAME'), - /* - |-------------------------------------------------------------------------- - | SMTP Server Password - |-------------------------------------------------------------------------- - | - | Here you may set the password required by your SMTP server to send out - | messages from your application. This will be given to the server on - | connection so that the application will be able to send messages. - | - */ + /* + |-------------------------------------------------------------------------- + | SMTP Server Password + |-------------------------------------------------------------------------- + | + | Here you may set the password required by your SMTP server to send out + | messages from your application. This will be given to the server on + | connection so that the application will be able to send messages. + | + */ - 'password' => env('MAIL_PASSWORD'), + 'password' => env('MAIL_PASSWORD'), - /* - |-------------------------------------------------------------------------- - | Sendmail System Path - |-------------------------------------------------------------------------- - | - | When using the "sendmail" driver to send e-mails, we will need to know - | the path to where Sendmail lives on this server. A default path has - | been provided here, which will work well on most of your systems. - | - */ + /* + |-------------------------------------------------------------------------- + | Sendmail System Path + |-------------------------------------------------------------------------- + | + | When using the "sendmail" driver to send e-mails, we will need to know + | the path to where Sendmail lives on this server. A default path has + | been provided here, which will work well on most of your systems. + | + */ - 'sendmail' => '/usr/sbin/sendmail -bs', + 'sendmail' => '/usr/sbin/sendmail -bs', - /* - |-------------------------------------------------------------------------- - | Mail "Pretend" - |-------------------------------------------------------------------------- - | - | When this option is enabled, e-mail will not actually be sent over the - | web and will instead be written to your application's logs files so - | you may inspect the message. This is great for local development. - | - */ + /* + |-------------------------------------------------------------------------- + | Mail "Pretend" + |-------------------------------------------------------------------------- + | + | When this option is enabled, e-mail will not actually be sent over the + | web and will instead be written to your application's logs files so + | you may inspect the message. This is great for local development. + | + */ - 'pretend' => false, + 'pretend' => false, ]; diff --git a/config/purifier.php b/config/purifier.php new file mode 100644 index 00000000..202550cb --- /dev/null +++ b/config/purifier.php @@ -0,0 +1,41 @@ +set('Core.Encoding', $this->config->get('purifier.encoding')); + * $config->set('Cache.SerializerPath', $this->config->get('purifier.cachePath')); + * if ( ! $this->config->get('purifier.finalize')) { + * $config->autoFinalize = false; + * } + * $config->loadArray($this->getConfig()); + * + * You must NOT delete the default settings + * anything in settings should be compacted with params that needed to instance HTMLPurifier_Config. + * + * @link http://htmlpurifier.org/live/configdoc/plain.html + */ + +return [ + + 'encoding' => 'UTF-8', + 'finalize' => true, + 'cachePath' => storage_path('app/purifier'), + 'settings' => [ + 'default' => [ + 'HTML.Doctype' => 'XHTML 1.0 Strict', + 'HTML.Allowed' => 'div,b,strong,i,em,a[href|title],ul,ol,li,p[style],br,span[style],img[width|height|alt|src]', + 'CSS.AllowedProperties' => 'font,font-size,font-weight,font-style,font-family,text-decoration,padding-left,color,background-color,text-align', + 'AutoFormat.AutoParagraph' => true, + 'AutoFormat.RemoveEmpty' => true, + ], + 'test' => [ + 'Attr.EnableID' => true + ], + "youtube" => [ + "HTML.SafeIframe" => 'true', + "URI.SafeIframeRegexp" => "%^(http://|https://|//)(www.youtube.com/embed/|player.vimeo.com/video/)%", + ], + ], + +]; diff --git a/config/queue.php b/config/queue.php index 311da9ff..fd16e588 100644 --- a/config/queue.php +++ b/config/queue.php @@ -34,34 +34,34 @@ return [ ], 'database' => [ 'driver' => 'database', - 'table' => 'jobs', - 'queue' => 'default', + 'table' => 'jobs', + 'queue' => 'default', 'expire' => 60, ], 'beanstalkd' => [ 'driver' => 'beanstalkd', - 'host' => 'localhost', - 'queue' => 'default', - 'ttr' => 60, + 'host' => 'localhost', + 'queue' => 'default', + 'ttr' => 60, ], 'sqs' => [ 'driver' => 'sqs', - 'key' => 'your-public-key', + 'key' => 'your-public-key', 'secret' => 'your-secret-key', - 'queue' => 'your-queue-url', + 'queue' => 'your-queue-url', 'region' => 'us-east-1', ], 'iron' => [ - 'driver' => 'iron', - 'host' => 'mq-aws-eu-west-1.iron.io', - 'token' => 'e86QTHwOmEDzqYtti9xAKSgjS7E', + 'driver' => 'iron', + 'host' => 'mq-aws-eu-west-1.iron.io', + 'token' => 'e86QTHwOmEDzqYtti9xAKSgjS7E', 'project' => '535d254120fa16000900000a', - 'queue' => '54e8a61d8d560bccac9dc83e', - 'encrypt' => true, + 'queue' => '54e8a61d8d560bccac9dc83e', + 'encrypt' => true ], 'redis' => [ 'driver' => 'redis', - 'queue' => 'default', + 'queue' => 'default', 'expire' => 60, ], ], diff --git a/config/services.php b/config/services.php index e606dbe0..dddc9866 100644 --- a/config/services.php +++ b/config/services.php @@ -2,36 +2,36 @@ return [ - /* - |-------------------------------------------------------------------------- - | Third Party Services - |-------------------------------------------------------------------------- - | - | This file is for storing the credentials for third party services such - | as Stripe, Mailgun, Mandrill, and others. This file provides a sane - | default location for this type of information, allowing packages - | to have a conventional place to find your various credentials. - | - */ + /* + |-------------------------------------------------------------------------- + | Third Party Services + |-------------------------------------------------------------------------- + | + | This file is for storing the credentials for third party services such + | as Stripe, Mailgun, Mandrill, and others. This file provides a sane + | default location for this type of information, allowing packages + | to have a conventional place to find your various credentials. + | + */ - 'mailgun' => [ - 'domain' => '', - 'secret' => '', - ], + 'mailgun' => [ + 'domain' => '', + 'secret' => '', + ], - 'mandrill' => [ - 'secret' => '', - ], + 'mandrill' => [ + 'secret' => '', + ], - 'ses' => [ - 'key' => '', - 'secret' => '', - 'region' => 'us-east-1', - ], + 'ses' => [ + 'key' => '', + 'secret' => '', + 'region' => 'us-east-1', + ], - 'stripe' => [ - 'model' => 'User', - 'secret' => '', - ], + 'stripe' => [ + 'model' => 'User', + 'secret' => '', + ], ]; diff --git a/config/session.php b/config/session.php index 2514731d..47470fab 100644 --- a/config/session.php +++ b/config/session.php @@ -2,152 +2,152 @@ return [ - /* - |-------------------------------------------------------------------------- - | Default Session Driver - |-------------------------------------------------------------------------- - | - | This option controls the default session "driver" that will be used on - | requests. By default, we will use the lightweight native driver but - | you may specify any of the other wonderful drivers provided here. - | - | Supported: "file", "cookie", "database", "apc", - | "memcached", "redis", "array" - | - */ + /* + |-------------------------------------------------------------------------- + | Default Session Driver + |-------------------------------------------------------------------------- + | + | This option controls the default session "driver" that will be used on + | requests. By default, we will use the lightweight native driver but + | you may specify any of the other wonderful drivers provided here. + | + | Supported: "file", "cookie", "database", "apc", + | "memcached", "redis", "array" + | + */ - 'driver' => env('SESSION_DRIVER', 'file'), + 'driver' => env('SESSION_DRIVER', 'file'), - /* - |-------------------------------------------------------------------------- - | Session Lifetime - |-------------------------------------------------------------------------- - | - | Here you may specify the number of minutes that you wish the session - | to be allowed to remain idle before it expires. If you want them - | to immediately expire on the browser closing, set that option. - | - */ + /* + |-------------------------------------------------------------------------- + | Session Lifetime + |-------------------------------------------------------------------------- + | + | Here you may specify the number of minutes that you wish the session + | to be allowed to remain idle before it expires. If you want them + | to immediately expire on the browser closing, set that option. + | + */ - 'lifetime' => 120, + 'lifetime' => 120, - 'expire_on_close' => false, + 'expire_on_close' => false, - /* - |-------------------------------------------------------------------------- - | Session Encryption - |-------------------------------------------------------------------------- - | - | This option allows you to easily specify that all of your session data - | should be encrypted before it is stored. All encryption will be run - | automatically by Laravel and you can use the Session like normal. - | - */ + /* + |-------------------------------------------------------------------------- + | Session Encryption + |-------------------------------------------------------------------------- + | + | This option allows you to easily specify that all of your session data + | should be encrypted before it is stored. All encryption will be run + | automatically by Laravel and you can use the Session like normal. + | + */ - 'encrypt' => false, + 'encrypt' => false, - /* - |-------------------------------------------------------------------------- - | Session File Location - |-------------------------------------------------------------------------- - | - | When using the native session driver, we need a location where session - | files may be stored. A default has been set for you but a different - | location may be specified. This is only needed for file sessions. - | - */ + /* + |-------------------------------------------------------------------------- + | Session File Location + |-------------------------------------------------------------------------- + | + | When using the native session driver, we need a location where session + | files may be stored. A default has been set for you but a different + | location may be specified. This is only needed for file sessions. + | + */ - 'files' => storage_path().'/framework/sessions', + 'files' => storage_path().'/framework/sessions', - /* - |-------------------------------------------------------------------------- - | Session Database Connection - |-------------------------------------------------------------------------- - | - | When using the "database" or "redis" session drivers, you may specify a - | connection that should be used to manage these sessions. This should - | correspond to a connection in your database configuration options. - | - */ + /* + |-------------------------------------------------------------------------- + | Session Database Connection + |-------------------------------------------------------------------------- + | + | When using the "database" or "redis" session drivers, you may specify a + | connection that should be used to manage these sessions. This should + | correspond to a connection in your database configuration options. + | + */ - 'connection' => null, + 'connection' => null, - /* - |-------------------------------------------------------------------------- - | Session Database Table - |-------------------------------------------------------------------------- - | - | When using the "database" session driver, you may specify the table we - | should use to manage the sessions. Of course, a sensible default is - | provided for you; however, you are free to change this as needed. - | - */ + /* + |-------------------------------------------------------------------------- + | Session Database Table + |-------------------------------------------------------------------------- + | + | When using the "database" session driver, you may specify the table we + | should use to manage the sessions. Of course, a sensible default is + | provided for you; however, you are free to change this as needed. + | + */ - 'table' => 'sessions', + 'table' => 'sessions', - /* - |-------------------------------------------------------------------------- - | Session Sweeping Lottery - |-------------------------------------------------------------------------- - | - | Some session drivers must manually sweep their storage location to get - | rid of old sessions from storage. Here are the chances that it will - | happen on a given request. By default, the odds are 2 out of 100. - | - */ + /* + |-------------------------------------------------------------------------- + | Session Sweeping Lottery + |-------------------------------------------------------------------------- + | + | Some session drivers must manually sweep their storage location to get + | rid of old sessions from storage. Here are the chances that it will + | happen on a given request. By default, the odds are 2 out of 100. + | + */ - 'lottery' => [2, 100], + 'lottery' => [2, 100], - /* - |-------------------------------------------------------------------------- - | Session Cookie Name - |-------------------------------------------------------------------------- - | - | Here you may change the name of the cookie used to identify a session - | instance by ID. The name specified here will get used every time a - | new session cookie is created by the framework for every driver. - | - */ + /* + |-------------------------------------------------------------------------- + | Session Cookie Name + |-------------------------------------------------------------------------- + | + | Here you may change the name of the cookie used to identify a session + | instance by ID. The name specified here will get used every time a + | new session cookie is created by the framework for every driver. + | + */ - 'cookie' => 'laravel_session', + 'cookie' => 'laravel_session', - /* - |-------------------------------------------------------------------------- - | Session Cookie Path - |-------------------------------------------------------------------------- - | - | The session cookie path determines the path for which the cookie will - | be regarded as available. Typically, this will be the root path of - | your application but you are free to change this when necessary. - | - */ + /* + |-------------------------------------------------------------------------- + | Session Cookie Path + |-------------------------------------------------------------------------- + | + | The session cookie path determines the path for which the cookie will + | be regarded as available. Typically, this will be the root path of + | your application but you are free to change this when necessary. + | + */ - 'path' => '/', + 'path' => '/', - /* - |-------------------------------------------------------------------------- - | Session Cookie Domain - |-------------------------------------------------------------------------- - | - | Here you may change the domain of the cookie used to identify a session - | in your application. This will determine which domains the cookie is - | available to in your application. A sensible default has been set. - | - */ + /* + |-------------------------------------------------------------------------- + | Session Cookie Domain + |-------------------------------------------------------------------------- + | + | Here you may change the domain of the cookie used to identify a session + | in your application. This will determine which domains the cookie is + | available to in your application. A sensible default has been set. + | + */ - 'domain' => null, + 'domain' => null, - /* - |-------------------------------------------------------------------------- - | HTTPS Only Cookies - |-------------------------------------------------------------------------- - | - | By setting this option to true, session cookies will only be sent back - | to the server if the browser has a HTTPS connection. This will keep - | the cookie from being sent to you if it can not be done securely. - | - */ + /* + |-------------------------------------------------------------------------- + | HTTPS Only Cookies + |-------------------------------------------------------------------------- + | + | By setting this option to true, session cookies will only be sent back + | to the server if the browser has a HTTPS connection. This will keep + | the cookie from being sent to you if it can not be done securely. + | + */ - 'secure' => false, + 'secure' => false, ]; diff --git a/config/view.php b/config/view.php index 13ef5e9f..88fc534a 100644 --- a/config/view.php +++ b/config/view.php @@ -2,32 +2,32 @@ return [ - /* - |-------------------------------------------------------------------------- - | View Storage Paths - |-------------------------------------------------------------------------- - | - | Most templating systems load templates from disk. Here you may specify - | an array of paths that should be checked for your views. Of course - | the usual Laravel view path has already been registered for you. - | - */ + /* + |-------------------------------------------------------------------------- + | View Storage Paths + |-------------------------------------------------------------------------- + | + | Most templating systems load templates from disk. Here you may specify + | an array of paths that should be checked for your views. Of course + | the usual Laravel view path has already been registered for you. + | + */ - 'paths' => [ - realpath(base_path('resources/views')), - ], + 'paths' => [ + realpath(base_path('resources/views')) + ], - /* - |-------------------------------------------------------------------------- - | Compiled View Path - |-------------------------------------------------------------------------- - | - | This option determines where all the compiled Blade templates will be - | stored for your application. Typically, this is within the storage - | directory. However, as usual, you are free to change this value. - | - */ + /* + |-------------------------------------------------------------------------- + | Compiled View Path + |-------------------------------------------------------------------------- + | + | This option determines where all the compiled Blade templates will be + | stored for your application. Typically, this is within the storage + | directory. However, as usual, you are free to change this value. + | + */ - 'compiled' => realpath(storage_path().'/framework/views'), + 'compiled' => realpath(storage_path().'/framework/views'), ]; diff --git a/resources/views/Emails/ConfirmEmail.blade.php b/resources/views/Emails/ConfirmEmail.blade.php index 716c508e..e97f6159 100644 --- a/resources/views/Emails/ConfirmEmail.blade.php +++ b/resources/views/Emails/ConfirmEmail.blade.php @@ -19,8 +19,7 @@ If you have any questions, feedback or suggestions feel free to reply to this email.

- Thank you,
- Team Attendize. + Thank you

@stop diff --git a/resources/views/Emails/OrderConfirmation.blade.php b/resources/views/Emails/OrderConfirmation.blade.php index 28ec1290..f1354a94 100644 --- a/resources/views/Emails/OrderConfirmation.blade.php +++ b/resources/views/Emails/OrderConfirmation.blade.php @@ -87,6 +87,5 @@ Order Email: {{$order->email}}




-Thank you,
-The Attendize Team +Thank you @stop diff --git a/resources/views/Emails/inviteUser.blade.php b/resources/views/Emails/inviteUser.blade.php index d18223ca..76f2a745 100644 --- a/resources/views/Emails/inviteUser.blade.php +++ b/resources/views/Emails/inviteUser.blade.php @@ -26,8 +26,7 @@ If you have any questions, feedback or suggestions feel free to reply to this email.

- Thank you,
- The Attendize team. + Thank you

@stop diff --git a/resources/views/Emails/messageAttendees.blade.php b/resources/views/Emails/messageAttendees.blade.php index 5f373445..1eeab93c 100644 --- a/resources/views/Emails/messageAttendees.blade.php +++ b/resources/views/Emails/messageAttendees.blade.php @@ -14,13 +14,6 @@ @stop @section('footer') -
-

- You have received this message as you are listed as an attendee on an event which was created with Attendize Ticketing. -

-
-

- If you have any questions, simply contact us at {{config('attendize.incoming_email')}} and we'll be happy to help. -

+ @stop diff --git a/resources/views/Emails/messageOrder.blade.php b/resources/views/Emails/messageOrder.blade.php index 5f373445..f064e867 100644 --- a/resources/views/Emails/messageOrder.blade.php +++ b/resources/views/Emails/messageOrder.blade.php @@ -14,13 +14,5 @@ @stop @section('footer') -
-

- You have received this message as you are listed as an attendee on an event which was created with Attendize Ticketing. -

-
-

- If you have any questions, simply contact us at {{config('attendize.incoming_email')}} and we'll be happy to help. -

@stop