Saluki / Barmate

app/Http/Middleware/User.php

Indentation +4 added lines, -4 removed lines

@@ -12,8 +12,8 @@ 
         $this->auth = $auth;
     }
 
-	public function handle($request, Closure $next)
-	{
+    public function handle($request, Closure $next)
+    {
         if ($this->auth->guest() || (session('role')!=='USER' && session('role')!=='MNGR' && session('role')!=='ADMN') )
         {
             if ($request->ajax())
@@ -26,7 +26,7 @@ 
             }
         }
 
-		return $next($request);
-	}
+        return $next($request);
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -14,7 +14,7 @@
 
 	public function handle($request, Closure $next)
 	{
-        if ($this->auth->guest() || (session('role')!=='USER' && session('role')!=='MNGR' && session('role')!=='ADMN') )
+        if ($this->auth->guest() || (session('role') !== 'USER' && session('role') !== 'MNGR' && session('role') !== 'ADMN'))
         {
             if ($request->ajax())
             {

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
             if ($request->ajax())
             {
                 return response('Unauthorized.', 401);
-            }
-            else
+            } else
             {
                 return redirect()->guest('/');
             }

app/Http/Middleware/VerifyCsrfToken.php

Indentation +17 added lines, -17 removed lines

@@ -5,24 +5,24 @@
 
 class VerifyCsrfToken extends BaseVerifier {
 
-	private $openRoutes = [];
+    private $openRoutes = [];
 	
-	/**
-	 * Handle an incoming request.
-	 *
-	 * @param  \Illuminate\Http\Request  $request
-	 * @param  \Closure  $next
-	 * @return mixed
-	 */
-	public function handle($request, Closure $next)
-	{
-		// Disable CSRF control for xHttp Requests
-		if($request->isXmlHttpRequest())	
-		{
-			return $next($request);
-		}
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
+     * @return mixed
+     */
+    public function handle($request, Closure $next)
+    {
+        // Disable CSRF control for xHttp Requests
+        if($request->isXmlHttpRequest())	
+        {
+            return $next($request);
+        }
 		
-		return parent::handle($request, $next);
-	}
+        return parent::handle($request, $next);
+    }
 
 }

Spacing +1 added lines, -1 removed lines

@@ -17,7 +17,7 @@
 	public function handle($request, Closure $next)
 	{
 		// Disable CSRF control for xHttp Requests
-		if($request->isXmlHttpRequest())	
+		if ($request->isXmlHttpRequest())	
 		{
 			return $next($request);
 		}

app/Http/Requests/Request.php

Indentation +1 added lines, -1 removed lines

@@ -4,6 +4,6 @@
 
 abstract class Request extends FormRequest {
 
-	//
+    //
 
 }

app/Http/routes.php

Indentation +23 added lines, -23 removed lines

@@ -40,7 +40,7 @@ 
 
 Route::group(['prefix'=>'app', 'middleware'=>'user'], function(){
 
-	// POS MODULE
+    // POS MODULE
 
     Route::get('/', 'BarController@app');
     
@@ -48,11 +48,11 @@ 
 
     // ACCOUNT MODULE
 	
-	Route::get('account', 'AccountController@index');
+    Route::get('account', 'AccountController@index');
     
     Route::post('account', 'AccountController@saveProfile');
 
-	Route::get('logout', 'LoginController@logout');
+    Route::get('logout', 'LoginController@logout');
 
 });
 
@@ -60,33 +60,33 @@ 
 
 Route::group(['prefix'=>'app', 'middleware'=>'manager'], function(){
 
-	// STOCK MODULE
+    // STOCK MODULE
 			
     Route::get('stock', 'StockController@dashboard');
 
-	Route::resource('stock/category', 'CategoryController', ['except' => ['create','edit']]);
+    Route::resource('stock/category', 'CategoryController', ['except' => ['create','edit']]);
 
-	Route::resource('stock/product', 'ProductController', ['except' => ['create','edit']]);
+    Route::resource('stock/product', 'ProductController', ['except' => ['create','edit']]);
 
-	// CASH MODULE
+    // CASH MODULE
 
-	Route::get('cash/{snapshot?}', 'CashController@dashboard')->where('snapshot', '[0-9]+');
+    Route::get('cash/{snapshot?}', 'CashController@dashboard')->where('snapshot', '[0-9]+');
 
-	Route::get('cash/register-operation', 'CashController@operationForm');
+    Route::get('cash/register-operation', 'CashController@operationForm');
 
-	Route::post('cash/register-operation', 'CashController@registerOperation');
+    Route::post('cash/register-operation', 'CashController@registerOperation');
 
-	Route::get('cash/new-snapshot', 'CashController@snapshotForm');
+    Route::get('cash/new-snapshot', 'CashController@snapshotForm');
 
-	Route::post('cash/new-snapshot', 'CashController@createSnapshot');
+    Route::post('cash/new-snapshot', 'CashController@createSnapshot');
 
     Route::get('cash/remove/{id}', 'CashController@removeDetail')->where('id', '[0-9]+');
 
-	Route::get('cash/history', 'CashController@showHistory');
+    Route::get('cash/history', 'CashController@showHistory');
 
-	// STATS MODULE
+    // STATS MODULE
 	
-	Route::get('stats/{interval?}', 'StatsController@dashboard')->where('interval', '[0-9]+[hd]');
+    Route::get('stats/{interval?}', 'StatsController@dashboard')->where('interval', '[0-9]+[hd]');
 	
 });
 
@@ -96,24 +96,24 @@ 
 
     // USERS MODULE
 	
-	Route::get('users', 'UsersController@getActiveUsers');
+    Route::get('users', 'UsersController@getActiveUsers');
 
     Route::get('users/connections/{id}', 'UsersController@showConnections');
 
-	Route::get('users/disabled', 'UsersController@getDisabledUsers');
+    Route::get('users/disabled', 'UsersController@getDisabledUsers');
 	
-	Route::get('users/register', 'UsersController@getRegisterForm');
+    Route::get('users/register', 'UsersController@getRegisterForm');
 			
-	Route::post('users/register', 'UsersController@registerNewUser');
+    Route::post('users/register', 'UsersController@registerNewUser');
 	
-	Route::get('users/change-status/{id}', 'UsersController@changeAccountStatus')->where('id', '[0-9]+');;
+    Route::get('users/change-status/{id}', 'UsersController@changeAccountStatus')->where('id', '[0-9]+');;
 	
-	Route::get('users/change-role/{id}', 'UsersController@changeAccountRole')->where('id', '[0-9]+');;
+    Route::get('users/change-role/{id}', 'UsersController@changeAccountRole')->where('id', '[0-9]+');;
 	
-	Route::get('users/delete/{id}', 'UsersController@deleteUser')->where('id', '[0-9]+');;
+    Route::get('users/delete/{id}', 'UsersController@deleteUser')->where('id', '[0-9]+');;
 
     // SETTINGS MODULE
 	
-	Route::get('settings', 'SettingsController@index');
+    Route::get('settings', 'SettingsController@index');
 
 });

Spacing +10 added lines, -10 removed lines

@@ -2,7 +2,7 @@ 
 
 // INSTALLATION ROUTES
 
-Route::group(['prefix'=>'install', 'middleware'=>'installed'], function(){
+Route::group(['prefix'=>'install', 'middleware'=>'installed'], function() {
 
     Route::get('/', 'InstallController@displayWelcome');
 
@@ -28,7 +28,7 @@ 
 
 // PUBLIC ROUTES
 
-Route::group(['middleware'=>'guest'], function(){
+Route::group(['middleware'=>'guest'], function() {
 
     Route::get('/', 'LoginController@getLoginForm');
 
@@ -38,7 +38,7 @@ 
 
 // USER ROUTES
 
-Route::group(['prefix'=>'app', 'middleware'=>'user'], function(){
+Route::group(['prefix'=>'app', 'middleware'=>'user'], function() {
 
 	// POS MODULE
 
@@ -58,15 +58,15 @@ 
 
 // MANAGER ROUTES
 
-Route::group(['prefix'=>'app', 'middleware'=>'manager'], function(){
+Route::group(['prefix'=>'app', 'middleware'=>'manager'], function() {
 
 	// STOCK MODULE
 			
     Route::get('stock', 'StockController@dashboard');
 
-	Route::resource('stock/category', 'CategoryController', ['except' => ['create','edit']]);
+	Route::resource('stock/category', 'CategoryController', ['except' => ['create', 'edit']]);
 
-	Route::resource('stock/product', 'ProductController', ['except' => ['create','edit']]);
+	Route::resource('stock/product', 'ProductController', ['except' => ['create', 'edit']]);
 
 	// CASH MODULE
 
@@ -92,7 +92,7 @@ 
 
 // ADMIN ROUTES
 
-Route::group(['prefix'=>'app', 'middleware'=>'administrator'], function(){
+Route::group(['prefix'=>'app', 'middleware'=>'administrator'], function() {
 
     // USERS MODULE
 	
@@ -106,11 +106,11 @@ 
 			
 	Route::post('users/register', 'UsersController@registerNewUser');
 	
-	Route::get('users/change-status/{id}', 'UsersController@changeAccountStatus')->where('id', '[0-9]+');;
+	Route::get('users/change-status/{id}', 'UsersController@changeAccountStatus')->where('id', '[0-9]+'); ;
 	
-	Route::get('users/change-role/{id}', 'UsersController@changeAccountRole')->where('id', '[0-9]+');;
+	Route::get('users/change-role/{id}', 'UsersController@changeAccountRole')->where('id', '[0-9]+'); ;
 	
-	Route::get('users/delete/{id}', 'UsersController@deleteUser')->where('id', '[0-9]+');;
+	Route::get('users/delete/{id}', 'UsersController@deleteUser')->where('id', '[0-9]+'); ;
 
     // SETTINGS MODULE
 	

app/Models/CashSnapshots.php

Indentation +14 added lines, -14 removed lines

@@ -4,22 +4,22 @@
 
 class CashSnapshots extends Model {
 
-	protected $table = 'cash_snapshots';
-	public $primaryKey = 'cs_id';
-	public $timestamps = false;
+    protected $table = 'cash_snapshots';
+    public $primaryKey = 'cs_id';
+    public $timestamps = false;
 
-	public static $validationRules = [	'title'       => 'required|name',
-										'description' => '',
-										'amount'      => 'required|numeric|between:0,9999' ];
+    public static $validationRules = [	'title'       => 'required|name',
+                                        'description' => '',
+                                        'amount'      => 'required|numeric|between:0,9999' ];
 
-	public function details()
-	{
-		return $this->hasMany('App\Models\SnapshotDetails','cs_id');
-	}
+    public function details()
+    {
+        return $this->hasMany('App\Models\SnapshotDetails','cs_id');
+    }
 
-	public function scopeWithUsers($query)
-	{
-		$query->join('users', 'users.user_id', 'cash_snapshots.user_id');
-	}
+    public function scopeWithUsers($query)
+    {
+        $query->join('users', 'users.user_id', 'cash_snapshots.user_id');
+    }
 	
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -8,13 +8,13 @@
 	public $primaryKey = 'cs_id';
 	public $timestamps = false;
 
-	public static $validationRules = [	'title'       => 'required|name',
+	public static $validationRules = ['title'       => 'required|name',
 										'description' => '',
-										'amount'      => 'required|numeric|between:0,9999' ];
+										'amount'      => 'required|numeric|between:0,9999'];
 
 	public function details()
 	{
-		return $this->hasMany('App\Models\SnapshotDetails','cs_id');
+		return $this->hasMany('App\Models\SnapshotDetails', 'cs_id');
 	}
 
 	public function scopeWithUsers($query)

app/Models/Categories.php

Indentation +35 added lines, -35 removed lines

@@ -7,56 +7,56 @@
 
 class Categories extends Model {
 
-	use SoftDeletes;
+    use SoftDeletes;
 
-	protected $table = 'categories';
-	public $timestamps = true;
-	protected $dates = ['deleted_at'];
+    protected $table = 'categories';
+    public $timestamps = true;
+    protected $dates = ['deleted_at'];
 
-	protected $guarded = ['category_id'];
+    protected $guarded = ['category_id'];
 
-	public function getKeyName(){
+    public function getKeyName(){
 
         return 'category_id';
     }
 
     public static function allAPI() {
 
-    	$query = 'SELECT c.category_id as "id", c.category_title as "title", 
+        $query = 'SELECT c.category_id as "id", c.category_title as "title", 
     				c.description, c.is_active as "active", c.created_at as "created"
 					FROM categories c
 					WHERE c.group_id = ?
 					AND c.deleted_at IS NULL';
 
-		return DB::select($query, [ Session::get('groupID') ]);
+        return DB::select($query, [ Session::get('groupID') ]);
     }
 
-	/**
-	 * Selects all the categories from the current group
-	 *
-	 * Allows to extend the query (scope) to only selects the categories from the group 
-	 * where the user is connected.
-	 * @example Categories::group();
-	 *
-	 * @param 	Object 	[Laravel]
-	 */
-	public function scopeFromGroup($query) {
-
-		return $query->where('group_id', Session::get('groupID') );
-	}
-
-	/**
-	 * Selects all the products from one category
-	 *
-	 * Easily fetch all the products that belongs to a category. Watch out, 
-	 * only works for ONE category.
-	 * @example Categories::find(1)->products;
-	 *
-	 * @return 	Object 	[Laravel]
-	 */
-	public function products() {
-
-		return $this->hasMany('App\Models\Products', 'category_id', 'category_id');
-	}
+    /**
+     * Selects all the categories from the current group
+     *
+     * Allows to extend the query (scope) to only selects the categories from the group 
+     * where the user is connected.
+     * @example Categories::group();
+     *
+     * @param 	Object 	[Laravel]
+     */
+    public function scopeFromGroup($query) {
+
+        return $query->where('group_id', Session::get('groupID') );
+    }
+
+    /**
+     * Selects all the products from one category
+     *
+     * Easily fetch all the products that belongs to a category. Watch out, 
+     * only works for ONE category.
+     * @example Categories::find(1)->products;
+     *
+     * @return 	Object 	[Laravel]
+     */
+    public function products() {
+
+        return $this->hasMany('App\Models\Products', 'category_id', 'category_id');
+    }
 	
 }
\ No newline at end of file

Spacing +3 added lines, -3 removed lines

@@ -15,7 +15,7 @@ 
 
 	protected $guarded = ['category_id'];
 
-	public function getKeyName(){
+	public function getKeyName() {
 
         return 'category_id';
     }
@@ -28,7 +28,7 @@ 
 					WHERE c.group_id = ?
 					AND c.deleted_at IS NULL';
 
-		return DB::select($query, [ Session::get('groupID') ]);
+		return DB::select($query, [Session::get('groupID')]);
     }
 
 	/**
@@ -42,7 +42,7 @@ 
 	 */
 	public function scopeFromGroup($query) {
 
-		return $query->where('group_id', Session::get('groupID') );
+		return $query->where('group_id', Session::get('groupID'));
 	}
 
 	/**

app/Models/ConnectHistory.php

Indentation +2 added lines, -2 removed lines

@@ -4,8 +4,8 @@
 
 class ConnectHistory extends Model {
 
-	protected $table = 'connect_history';
+    protected $table = 'connect_history';
 	
-	public $timestamps = false;
+    public $timestamps = false;
 	
 }
\ No newline at end of file

app/Models/Groups.php

Indentation +4 added lines, -4 removed lines

@@ -4,13 +4,13 @@
 
 class Groups extends Model {
 
-	protected $table = 'groups';
+    protected $table = 'groups';
 	
-	public $timestamps = false;
+    public $timestamps = false;
 
-	protected $guarded = ['group_id']; 
+    protected $guarded = ['group_id']; 
 
-	public function getKeyName(){
+    public function getKeyName(){
 
         return 'group_id';
     }

Spacing +1 added lines, -1 removed lines

@@ -10,7 +10,7 @@
 
 	protected $guarded = ['group_id']; 
 
-	public function getKeyName(){
+	public function getKeyName() {
 
         return 'group_id';
     }

app/Models/Products.php

Indentation +24 added lines, -24 removed lines

@@ -6,50 +6,50 @@
 
 class Products extends Model {
 
-	use SoftDeletes; 
+    use SoftDeletes; 
 
-	protected $table      = 'products';
-	public    $timestamps = true;
-	protected $dates      = ['deleted_at'];
-	public    $primaryKey = 'product_id';
+    protected $table      = 'products';
+    public    $timestamps = true;
+    protected $dates      = ['deleted_at'];
+    public    $primaryKey = 'product_id';
 
-	public static $validationRules = [
+    public static $validationRules = [
 
-		'category'    => 'required|integer|min:0',
-		'name'        => 'required|name',
-		'description' => 'max:250',
-		'price'       => 'required|numeric|min:0',
-		'quantity'    => 'required|integer|min:0'
-	];
+        'category'    => 'required|integer|min:0',
+        'name'        => 'required|name',
+        'description' => 'max:250',
+        'price'       => 'required|numeric|min:0',
+        'quantity'    => 'required|integer|min:0'
+    ];
 
     public function category() {
 
-    	return $this->belongsTo('Categories', 'category_id', 'category_id');
+        return $this->belongsTo('Categories', 'category_id', 'category_id');
     }
 
     public function scopeGroup($query, $groupID) {
 
-    	$query->select('products.*')
-    			->join('categories', 'categories.category_id', '=', 'products.category_id')
-    			->where('group_id', $groupID);
+        $query->select('products.*')
+                ->join('categories', 'categories.category_id', '=', 'products.category_id')
+                ->where('group_id', $groupID);
     }
 	
-	// Still used by the App Component.
-	public static function getSpecificExtended($id) {
+    // Still used by the App Component.
+    public static function getSpecificExtended($id) {
 
-		$query = 'SELECT p.*
+        $query = 'SELECT p.*
 					FROM products p
 					INNER JOIN categories c ON p.category_id = c.category_id
 					WHERE c.category_id = p.category_id
 					AND c.group_id = ?
 					AND p.product_id = ?';
 
-		$products = DB::select($query, [ Session::get('groupID'), $id ]);
+        $products = DB::select($query, [ Session::get('groupID'), $id ]);
 
-		if( count($products) == 0 )
-			return null;
+        if( count($products) == 0 )
+            return null;
 
-		return $products[0];
-	}
+        return $products[0];
+    }
 
 }
\ No newline at end of file

Spacing +2 added lines, -2 removed lines

@@ -44,9 +44,9 @@
 					AND c.group_id = ?
 					AND p.product_id = ?';
 
-		$products = DB::select($query, [ Session::get('groupID'), $id ]);
+		$products = DB::select($query, [Session::get('groupID'), $id]);
 
-		if( count($products) == 0 )
+		if (count($products) == 0)
 			return null;
 
 		return $products[0];

Braces +3 added lines, -2 removed lines

@@ -46,8 +46,9 @@
 
 		$products = DB::select($query, [ Session::get('groupID'), $id ]);
 
-		if( count($products) == 0 )
-			return null;
+		if( count($products) == 0 ) {
+					return null;
+		}
 
 		return $products[0];
 	}