Applied fixes from StyleCI

This commit is contained in:
Attendize 2016-03-07 12:37:16 -05:00 committed by Dave
parent ce50408b7e
commit cb83b43b76
21 changed files with 872 additions and 884 deletions

View File

@ -412,7 +412,6 @@ class EventAttendeesController extends MyBaseController
]);
}
$attendee->ticket->decrement('quantity_sold');
$attendee->is_cancelled = 1;
$attendee->save();

View File

@ -3,7 +3,6 @@
namespace App\Http\Controllers;
use App;
use App\Attendize\Utils;
use App\Commands\OrderTicketsCommand;
use App\Models\Affiliate;
use App\Models\Attendee;
@ -18,6 +17,7 @@ use Cookie;
use DB;
use Input;
use Log;
use Omnipay;
use PDF;
use Redirect;
use Request;
@ -25,9 +25,6 @@ use Response;
use Session;
use Validator;
use View;
use Omnipay;
class EventCheckoutController extends Controller
{
@ -247,7 +244,6 @@ class EventCheckoutController extends Controller
* Begin payment attempt before creating the attendees etc.
* */
if ($ticket_order['order_requires_payment']) {
try {
$error = false;
$token = Input::get('stripeToken');
@ -255,7 +251,7 @@ class EventCheckoutController extends Controller
$gateway = Omnipay::gateway('stripe');
$gateway->initialize([
'apiKey' => $event->account->stripe_api_key
'apiKey' => $event->account->stripe_api_key,
]);
$transaction = $gateway->purchase([
@ -263,12 +259,11 @@ class EventCheckoutController extends Controller
'currency' => $event->currency->code,
'description' => Input::get('order_email'),
'description' => 'Order for customer: '.Input::get('order_email'),
'token' => $token
'token' => $token,
]);
$response = $transaction->send();
if ($response->isSuccessful()) {
$order->transaction_id = $response->getTransactionReference();
} elseif ($response->isRedirect()) {
@ -280,7 +275,6 @@ class EventCheckoutController extends Controller
'message' => $response->getMessage(),
]);
}
} catch (\Exeption $e) {
Log::error($e);
$error = 'Sorry, there was an error processing your payment. Please try again.';
@ -474,11 +468,11 @@ class EventCheckoutController extends Controller
return View::make('Public.ViewEvent.Partials.PDFTicket', $data);
}
public function handleStripePayment() {
}
public function handlePaypalPayment() {
public function handleStripePayment()
{
}
public function handlePaypalPayment()
{
}
}

View File

@ -7,14 +7,13 @@ use App\Models\Event;
use App\Models\Order;
use DB;
use Excel;
use Exception;
use Input;
use Log;
use Mail;
use Omnipay;
use Response;
use Validator;
use View;
use Omnipay;
class EventOrdersController extends MyBaseController
{
@ -129,13 +128,12 @@ class EventOrdersController extends MyBaseController
$error_message = 'The maximum amount you can refund is '.(money($order->organiser_amount - $order->amount_refunded, $order->event->currency->code));
}
if (!$error_message) {
# @todo - remove the code repetition here
// @todo - remove the code repetition here
try {
$gateway = Omnipay::gateway('stripe');
$gateway->initialize([
'apiKey' => $order->account->stripe_api_key
'apiKey' => $order->account->stripe_api_key,
]);
if ($refund_type === 'full') { /* Full refund */
@ -145,7 +143,7 @@ class EventOrdersController extends MyBaseController
$request = $gateway->refund([
'transactionReference' => $order->transaction_id,
'amount' => $refund_amount,
'refundApplicationFee' => floatval($order->booking_fee) > 0 ? true : false
'refundApplicationFee' => floatval($order->booking_fee) > 0 ? true : false,
]);
$response = $request->send();
@ -160,8 +158,6 @@ class EventOrdersController extends MyBaseController
} else {
$error_message = $response->getMessage();
}
} else { /* Partial refund */
$refund = $gateway->refund([
@ -187,7 +183,6 @@ class EventOrdersController extends MyBaseController
} else {
$error_message = $response->getMessage();
}
}
$order->amount_refunded = round(($order->amount_refunded + $refund_amount), 2);
$order->save();

View File

@ -1,9 +1,9 @@
<?php
return array(
return [
'debug' => false,
'binpath' => 'lib/',
'binfile' => 'wkhtmltopdf-amd64',
'output_mode' => 'I'
);
'output_mode' => 'I',
];

View File

@ -17,8 +17,8 @@ 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,
@ -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' => '',
];

View File

@ -1,5 +1,5 @@
<?php
return [
'store_path' => public_path("/"),
'store_path' => public_path('/'),
];

View File

@ -29,11 +29,11 @@ return [
'stores' => [
'apc' => [
'driver' => 'apc'
'driver' => 'apc',
],
'array' => [
'driver' => 'array'
'driver' => 'array',
],
'database' => [
@ -51,7 +51,7 @@ return [
'driver' => 'memcached',
'servers' => [
[
'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100
'host' => '127.0.0.1', 'port' => 11211, 'weight' => 100,
],
],
],

View File

@ -1,6 +1,6 @@
<?php
return array(
return [
/*
|--------------------------------------------------------------------------
@ -26,12 +26,12 @@ return array(
| can also be used. For PDO, run the package migrations first.
|
*/
'storage' => array(
'storage' => [
'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 array(
|
*/
'collectors' => array(
'collectors' => [
'phpinfo' => true, // Php version
'messages' => true, // Messages
'time' => true, // Time Datalogger
@ -90,7 +90,7 @@ return array(
'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 array(
|
*/
'options' => array(
'auth' => array(
'options' => [
'auth' => [
'show_name' => false, // Also show the users name/email in the debugbar
),
'db' => array(
],
'db' => [
'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' => array( // EXPERIMENTAL: Show EXPLAIN output on queries
'explain' => [ // EXPERIMENTAL: Show EXPLAIN output on queries
'enabled' => false,
'types' => array('SELECT'), // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+
),
'types' => ['SELECT'], // array('SELECT', 'INSERT', 'UPDATE', 'DELETE'); for MySQL 5.6.3+
],
'hints' => true, // Show hints for common mistakes
),
'mail' => array(
'full_log' => false
),
'views' => array(
],
'mail' => [
'full_log' => false,
],
'views' => [
'data' => false, //Note: Can slow down the application, because the data can be quite large..
),
'route' => array(
'label' => true // show complete route on bar
),
'logs' => array(
'file' => null
),
),
],
'route' => [
'label' => true, // show complete route on bar
],
'logs' => [
'file' => null,
],
],
/*
|--------------------------------------------------------------------------
@ -142,4 +142,4 @@ return array(
'inject' => true,
);
];

View File

@ -1,8 +1,8 @@
<?php
return array(
return [
'cache' => array(
'cache' => [
/*
|--------------------------------------------------------------------------
@ -29,24 +29,24 @@ return array(
| Cache settings
|--------------------------------------------------------------------------
*/
'settings' => array(
'settings' => [
'memoryCacheSize' => '32MB',
'cacheTime' => 600
'cacheTime' => 600,
),
],
/*
|--------------------------------------------------------------------------
| Memcache settings
|--------------------------------------------------------------------------
*/
'memcache' => array(
'memcache' => [
'host' => 'localhost',
'port' => 11211,
),
],
/*
|--------------------------------------------------------------------------
@ -54,10 +54,10 @@ return array(
|--------------------------------------------------------------------------
*/
'dir' => storage_path('cache')
),
'dir' => storage_path('cache'),
],
'properties' => array(
'properties' => [
'creator' => 'Maatwebsite',
'lastModifiedBy' => 'Maatwebsite',
'title' => 'Spreadsheet',
@ -67,35 +67,35 @@ return array(
'category' => 'Excel',
'manager' => 'Maatwebsite',
'company' => 'Maatwebsite',
),
],
/*
|--------------------------------------------------------------------------
| Sheets settings
|--------------------------------------------------------------------------
*/
'sheets' => array(
'sheets' => [
/*
|--------------------------------------------------------------------------
| Default page setup
|--------------------------------------------------------------------------
*/
'pageSetup' => array(
'pageSetup' => [
'orientation' => 'portrait',
'paperSize' => '9',
'scale' => '100',
'fitToPage' => false,
'fitToHeight' => true,
'fitToWidth' => true,
'columnsToRepeatAtLeft' => array('', ''),
'rowsToRepeatAtTop' => array(0, 0),
'columnsToRepeatAtLeft' => ['', ''],
'rowsToRepeatAtTop' => [0, 0],
'horizontalCentered' => false,
'verticalCentered' => false,
'printArea' => null,
'firstPageNumber' => null,
),
),
],
],
/*
|--------------------------------------------------------------------------
@ -108,7 +108,7 @@ return array(
'creator' => 'Maatwebsite',
'csv' => array(
'csv' => [
/*
|--------------------------------------------------------------------------
| Delimiter
@ -134,10 +134,10 @@ return array(
|--------------------------------------------------------------------------
*/
'line_ending' => "\r\n"
),
'line_ending' => "\r\n",
],
'export' => array(
'export' => [
/*
|--------------------------------------------------------------------------
@ -210,7 +210,7 @@ return array(
| Default sheet settings
|--------------------------------------------------------------------------
*/
'sheets' => array(
'sheets' => [
/*
|--------------------------------------------------------------------------
@ -245,8 +245,8 @@ return array(
| Apply strict comparison when testing for null values in the array
|--------------------------------------------------------------------------
*/
'strictNullComparison' => false
),
'strictNullComparison' => false,
],
/*
|--------------------------------------------------------------------------
@ -254,7 +254,7 @@ return array(
|--------------------------------------------------------------------------
*/
'store' => array(
'store' => [
/*
|--------------------------------------------------------------------------
@ -274,16 +274,16 @@ return array(
| Whether we want to return information about the stored file or not
|
*/
'returnInfo' => false
'returnInfo' => false,
),
],
/*
|--------------------------------------------------------------------------
| PDF Settings
|--------------------------------------------------------------------------
*/
'pdf' => array(
'pdf' => [
/*
|--------------------------------------------------------------------------
@ -298,48 +298,48 @@ return array(
| PDF Driver settings
|--------------------------------------------------------------------------
*/
'drivers' => array(
'drivers' => [
/*
|--------------------------------------------------------------------------
| DomPDF settings
|--------------------------------------------------------------------------
*/
'DomPDF' => array(
'path' => base_path('vendor/dompdf/dompdf/')
),
'DomPDF' => [
'path' => base_path('vendor/dompdf/dompdf/'),
],
/*
|--------------------------------------------------------------------------
| tcPDF settings
|--------------------------------------------------------------------------
*/
'tcPDF' => array(
'path' => base_path('vendor/tecnick.com/tcpdf/')
),
'tcPDF' => [
'path' => base_path('vendor/tecnick.com/tcpdf/'),
],
/*
|--------------------------------------------------------------------------
| mPDF settings
|--------------------------------------------------------------------------
*/
'mPDF' => array(
'path' => base_path('vendor/mpdf/mpdf/')
),
)
)
),
'mPDF' => [
'path' => base_path('vendor/mpdf/mpdf/'),
],
],
],
],
'filters' => array(
'filters' => [
/*
|--------------------------------------------------------------------------
| Register read filters
|--------------------------------------------------------------------------
*/
'registered' => array(
'chunk' => 'Maatwebsite\Excel\Filters\ChunkReadFilter'
),
'registered' => [
'chunk' => 'Maatwebsite\Excel\Filters\ChunkReadFilter',
],
/*
|--------------------------------------------------------------------------
@ -347,10 +347,10 @@ return array(
|--------------------------------------------------------------------------
*/
'enabled' => array()
),
'enabled' => [],
],
'import' => array(
'import' => [
/*
|--------------------------------------------------------------------------
@ -415,12 +415,12 @@ return array(
|--------------------------------------------------------------------------
*/
'encoding' => array(
'encoding' => [
'input' => 'UTF-8',
'output' => 'UTF-8'
'output' => 'UTF-8',
),
],
/*
|--------------------------------------------------------------------------
@ -466,7 +466,7 @@ return array(
|
*/
'dates' => array(
'dates' => [
/*
|--------------------------------------------------------------------------
@ -490,15 +490,15 @@ return array(
| Date columns
|--------------------------------------------------------------------------
*/
'columns' => array()
),
'columns' => [],
],
/*
|--------------------------------------------------------------------------
| Import sheets by config
|--------------------------------------------------------------------------
*/
'sheets' => array(
'sheets' => [
/*
|--------------------------------------------------------------------------
@ -509,16 +509,16 @@ return array(
|
*/
'test' => array(
'test' => [
'firstname' => 'A2'
'firstname' => 'A2',
)
],
)
),
],
],
'views' => array(
'views' => [
/*
|--------------------------------------------------------------------------
@ -529,155 +529,155 @@ return array(
|
*/
'styles' => array(
'styles' => [
/*
|--------------------------------------------------------------------------
| Table headings
|--------------------------------------------------------------------------
*/
'th' => array(
'font' => array(
'th' => [
'font' => [
'bold' => true,
'size' => 12,
)
),
],
],
/*
|--------------------------------------------------------------------------
| Strong tags
|--------------------------------------------------------------------------
*/
'strong' => array(
'font' => array(
'strong' => [
'font' => [
'bold' => true,
'size' => 12,
)
),
],
],
/*
|--------------------------------------------------------------------------
| Bold tags
|--------------------------------------------------------------------------
*/
'b' => array(
'font' => array(
'b' => [
'font' => [
'bold' => true,
'size' => 12,
)
),
],
],
/*
|--------------------------------------------------------------------------
| Italic tags
|--------------------------------------------------------------------------
*/
'i' => array(
'font' => array(
'i' => [
'font' => [
'italic' => true,
'size' => 12,
)
),
],
],
/*
|--------------------------------------------------------------------------
| Heading 1
|--------------------------------------------------------------------------
*/
'h1' => array(
'font' => array(
'h1' => [
'font' => [
'bold' => true,
'size' => 24,
)
),
],
],
/*
|--------------------------------------------------------------------------
| Heading 2
|--------------------------------------------------------------------------
*/
'h2' => array(
'font' => array(
'h2' => [
'font' => [
'bold' => true,
'size' => 18,
)
),
],
],
/*
|--------------------------------------------------------------------------
| Heading 2
|--------------------------------------------------------------------------
*/
'h3' => array(
'font' => array(
'h3' => [
'font' => [
'bold' => true,
'size' => 13.5,
)
),
],
],
/*
|--------------------------------------------------------------------------
| Heading 4
|--------------------------------------------------------------------------
*/
'h4' => array(
'font' => array(
'h4' => [
'font' => [
'bold' => true,
'size' => 12,
)
),
],
],
/*
|--------------------------------------------------------------------------
| Heading 5
|--------------------------------------------------------------------------
*/
'h5' => array(
'font' => array(
'h5' => [
'font' => [
'bold' => true,
'size' => 10,
)
),
],
],
/*
|--------------------------------------------------------------------------
| Heading 6
|--------------------------------------------------------------------------
*/
'h6' => array(
'font' => array(
'h6' => [
'font' => [
'bold' => true,
'size' => 7.5,
)
),
],
],
/*
|--------------------------------------------------------------------------
| Hyperlinks
|--------------------------------------------------------------------------
*/
'a' => array(
'font' => array(
'a' => [
'font' => [
'underline' => true,
'color' => array('argb' => 'FF0000FF'),
)
),
'color' => ['argb' => 'FF0000FF'],
],
],
/*
|--------------------------------------------------------------------------
| Horizontal rules
|--------------------------------------------------------------------------
*/
'hr' => array(
'borders' => array(
'bottom' => array(
'hr' => [
'borders' => [
'bottom' => [
'style' => 'thin',
'color' => array('FF000000')
),
)
)
)
'color' => ['FF000000'],
],
],
],
],
)
],
);
];

View File

@ -1,6 +1,6 @@
<?php
return array(
return [
/*
|--------------------------------------------------------------------------
@ -15,6 +15,6 @@ return array(
|
*/
'driver' => 'gd'
'driver' => 'gd',
);
];

View File

@ -12,13 +12,13 @@ return [
'options' => [
'solutionType' => '',
'landingPage' => '',
'headerImageUrl' => ''
]
'headerImageUrl' => '',
],
],
'stripe' => [
'driver' => 'Stripe',
'options'=> []
]
]
'options' => [],
],
],
];

View File

@ -8,7 +8,7 @@
* if ( ! $this->config->get('purifier.finalize')) {
* $config->autoFinalize = false;
* }
* $config->loadArray($this->getConfig());
* $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.
@ -30,11 +30,11 @@ return [
'AutoFormat.RemoveEmpty' => true,
],
'test' => [
'Attr.EnableID' => true
'Attr.EnableID' => true,
],
"youtube" => [
"HTML.SafeIframe" => 'true',
"URI.SafeIframeRegexp" => "%^(http://|https://|//)(www.youtube.com/embed/|player.vimeo.com/video/)%",
'youtube' => [
'HTML.SafeIframe' => 'true',
'URI.SafeIframeRegexp' => '%^(http://|https://|//)(www.youtube.com/embed/|player.vimeo.com/video/)%',
],
],

View File

@ -57,7 +57,7 @@ return [
'token' => 'e86QTHwOmEDzqYtti9xAKSgjS7E',
'project' => '535d254120fa16000900000a',
'queue' => '54e8a61d8d560bccac9dc83e',
'encrypt' => true
'encrypt' => true,
],
'redis' => [
'driver' => 'redis',

View File

@ -14,7 +14,7 @@ return [
*/
'paths' => [
realpath(base_path('resources/views'))
realpath(base_path('resources/views')),
],
/*