Completed
Push — master ( 1e8b34...bf4aa0 )
by Sherif
02:38
created
src/Modules/V1/Reporting/ModelObservers/ReprotObserver.php 1 patch
Indentation   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -5,44 +5,44 @@
 block discarded – undo
5 5
  */
6 6
 class ReprotObserver {
7 7
 
8
-    public function saving($model)
9
-    {
10
-        //
11
-    }
12
-
13
-    public function saved($model)
14
-    {
15
-        //
16
-    }
17
-
18
-    public function creating($model)
19
-    {
20
-        //
21
-    }
22
-
23
-    public function created($model)
24
-    {
25
-        //
26
-    }
27
-
28
-    public function updating($model)
29
-    {
30
-        //
31
-    }
32
-
33
-    public function updated($model)
34
-    {
35
-        //
36
-    }
37
-
38
-    public function deleting($model)
39
-    {
40
-        //
41
-    }
42
-
43
-    public function deleted($model)
44
-    {
45
-        //
46
-    }
8
+	public function saving($model)
9
+	{
10
+		//
11
+	}
12
+
13
+	public function saved($model)
14
+	{
15
+		//
16
+	}
17
+
18
+	public function creating($model)
19
+	{
20
+		//
21
+	}
22
+
23
+	public function created($model)
24
+	{
25
+		//
26
+	}
27
+
28
+	public function updating($model)
29
+	{
30
+		//
31
+	}
32
+
33
+	public function updated($model)
34
+	{
35
+		//
36
+	}
37
+
38
+	public function deleting($model)
39
+	{
40
+		//
41
+	}
42
+
43
+	public function deleted($model)
44
+	{
45
+		//
46
+	}
47 47
 
48 48
 }
49 49
\ No newline at end of file
Please login to merge, or discard this patch.
V1/Reporting/Database/Migrations/2016_01_24_123631_initialize_reports.php 1 patch
Indentation   +58 added lines, -58 removed lines patch added patch discarded remove patch
@@ -13,65 +13,65 @@
 block discarded – undo
13 13
 	public function up()
14 14
 	{
15 15
 		/**
16
-         * Insert the permissions related to this module.
17
-         */
18
-        DB::table('permissions')->insert(
19
-        	[
20
-        		/**
21
-        		 * Reporting model permissions.
22
-        		 */
23
-	        	[
24
-	        	'name'       => 'find',
25
-	        	'model'      => 'reports',
26
-	        	'created_at' => \DB::raw('NOW()'),
27
-	        	'updated_at' => \DB::raw('NOW()')
28
-	        	],
29
-	        	[
30
-	        	'name'       => 'search',
31
-	        	'model'      => 'reports',
32
-	        	'created_at' => \DB::raw('NOW()'),
33
-	        	'updated_at' => \DB::raw('NOW()')
34
-	        	],
35
-	        	[
36
-	        	'name'       => 'list',
37
-	        	'model'      => 'reports',
38
-	        	'created_at' => \DB::raw('NOW()'),
39
-	        	'updated_at' => \DB::raw('NOW()')
40
-	        	],
41
-	        	[
42
-	        	'name'       => 'findby',
43
-	        	'model'      => 'reports',
44
-	        	'created_at' => \DB::raw('NOW()'),
45
-	        	'updated_at' => \DB::raw('NOW()')
46
-	        	],
47
-	        	[
48
-	        	'name'       => 'first',
49
-	        	'model'      => 'reports',
50
-	        	'created_at' => \DB::raw('NOW()'),
51
-	        	'updated_at' => \DB::raw('NOW()')
52
-	        	],
53
-	        	[
54
-	        	'name'       => 'paginate',
55
-	        	'model'      => 'reports',
56
-	        	'created_at' => \DB::raw('NOW()'),
57
-	        	'updated_at' => \DB::raw('NOW()')
58
-	        	],
59
-	        	[
60
-	        	'name'       => 'paginateby',
61
-	        	'model'      => 'reports',
62
-	        	'created_at' => \DB::raw('NOW()'),
63
-	        	'updated_at' => \DB::raw('NOW()')
64
-	        	],
65
-	        	[
66
-	        	'name'       => 'admin_count',
67
-	        	'model'      => 'reports',
68
-	        	'created_at' => \DB::raw('NOW()'),
69
-	        	'updated_at' => \DB::raw('NOW()')
70
-	        	]
71
-        	]
72
-        );
16
+		 * Insert the permissions related to this module.
17
+		 */
18
+		DB::table('permissions')->insert(
19
+			[
20
+				/**
21
+				 * Reporting model permissions.
22
+				 */
23
+				[
24
+				'name'       => 'find',
25
+				'model'      => 'reports',
26
+				'created_at' => \DB::raw('NOW()'),
27
+				'updated_at' => \DB::raw('NOW()')
28
+				],
29
+				[
30
+				'name'       => 'search',
31
+				'model'      => 'reports',
32
+				'created_at' => \DB::raw('NOW()'),
33
+				'updated_at' => \DB::raw('NOW()')
34
+				],
35
+				[
36
+				'name'       => 'list',
37
+				'model'      => 'reports',
38
+				'created_at' => \DB::raw('NOW()'),
39
+				'updated_at' => \DB::raw('NOW()')
40
+				],
41
+				[
42
+				'name'       => 'findby',
43
+				'model'      => 'reports',
44
+				'created_at' => \DB::raw('NOW()'),
45
+				'updated_at' => \DB::raw('NOW()')
46
+				],
47
+				[
48
+				'name'       => 'first',
49
+				'model'      => 'reports',
50
+				'created_at' => \DB::raw('NOW()'),
51
+				'updated_at' => \DB::raw('NOW()')
52
+				],
53
+				[
54
+				'name'       => 'paginate',
55
+				'model'      => 'reports',
56
+				'created_at' => \DB::raw('NOW()'),
57
+				'updated_at' => \DB::raw('NOW()')
58
+				],
59
+				[
60
+				'name'       => 'paginateby',
61
+				'model'      => 'reports',
62
+				'created_at' => \DB::raw('NOW()'),
63
+				'updated_at' => \DB::raw('NOW()')
64
+				],
65
+				[
66
+				'name'       => 'admin_count',
67
+				'model'      => 'reports',
68
+				'created_at' => \DB::raw('NOW()'),
69
+				'updated_at' => \DB::raw('NOW()')
70
+				]
71
+			]
72
+		);
73 73
 
74
-        /**
74
+		/**
75 75
 		 * Assign the permissions to the admin group.
76 76
 		 */
77 77
 		$permissionIds = DB::table('permissions')->whereIn('model', ['reports'])->select('id')->pluck('id');
Please login to merge, or discard this patch.
src/Modules/V1/Reporting/Providers/ModuleServiceProvider.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -7,23 +7,23 @@
 block discarded – undo
7 7
 class ModuleServiceProvider extends ServiceProvider
8 8
 {
9 9
 	/**
10
-     * Bootstrap the module services.
11
-     *
12
-     * @return void
13
-     */
14
-    public function boot()
15
-    {
16
-        $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'catalog');
17
-        $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'catalog');
18
-    }
10
+	 * Bootstrap the module services.
11
+	 *
12
+	 * @return void
13
+	 */
14
+	public function boot()
15
+	{
16
+		$this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'catalog');
17
+		$this->loadViewsFrom(__DIR__.'/../Resources/Views', 'catalog');
18
+	}
19 19
 
20
-    /**
21
-     * Register the module services.
22
-     *
23
-     * @return void
24
-     */
25
-    public function register()
26
-    {
27
-        $this->app->register(RouteServiceProvider::class);
28
-    }
20
+	/**
21
+	 * Register the module services.
22
+	 *
23
+	 * @return void
24
+	 */
25
+	public function register()
26
+	{
27
+		$this->app->register(RouteServiceProvider::class);
28
+	}
29 29
 }
Please login to merge, or discard this patch.
src/Modules/V1/Core/Database/Migrations/2016_01_19_084705_logs.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 			$table->integer('user_id');
22 22
 			$table->softDeletes();
23 23
 			$table->timestamps();
24
-        });
24
+		});
25 25
 	}
26 26
 
27 27
 	/**
Please login to merge, or discard this patch.
src/Modules/V1/Core/Http/Controllers/BaseApiController.php 1 patch
Indentation   +245 added lines, -245 removed lines patch added patch discarded remove patch
@@ -6,272 +6,272 @@
 block discarded – undo
6 6
 
7 7
 class BaseApiController extends Controller
8 8
 {
9
-    /**
10
-     * The model implementation.
11
-     * 
12
-     * @var model
13
-     */
14
-    protected $model;
9
+	/**
10
+	 * The model implementation.
11
+	 * 
12
+	 * @var model
13
+	 */
14
+	protected $model;
15 15
 
16
-    /**
17
-     * The config implementation.
18
-     * 
19
-     * @var config
20
-     */
21
-    protected $config;
16
+	/**
17
+	 * The config implementation.
18
+	 * 
19
+	 * @var config
20
+	 */
21
+	protected $config;
22 22
 
23
-    public function __construct()
24
-    {
25
-        \Session::put('timeZoneDiff', \Request::header('time-zone-diff') ?: 0);
23
+	public function __construct()
24
+	{
25
+		\Session::put('timeZoneDiff', \Request::header('time-zone-diff') ?: 0);
26 26
 
27
-        $locale = \Request::header('locale');
28
-        switch ($locale) 
29
-        {
30
-            case 'en':
31
-            \App::setLocale('en');
32
-            \Session::put('locale', 'en');
33
-            break;
27
+		$locale = \Request::header('locale');
28
+		switch ($locale) 
29
+		{
30
+			case 'en':
31
+			\App::setLocale('en');
32
+			\Session::put('locale', 'en');
33
+			break;
34 34
 
35
-            case 'ar':
36
-            \App::setLocale('ar');
37
-            \Session::put('locale', 'ar');
38
-            break;
35
+			case 'ar':
36
+			\App::setLocale('ar');
37
+			\Session::put('locale', 'ar');
38
+			break;
39 39
 
40
-            case 'all':
41
-            \App::setLocale('en');
42
-            \Session::put('locale', 'all');
43
-            break;
40
+			case 'all':
41
+			\App::setLocale('en');
42
+			\Session::put('locale', 'all');
43
+			break;
44 44
 
45
-            default:
46
-            \App::setLocale('en');
47
-            \Session::put('locale', 'en');
48
-            break;
49
-        }
45
+			default:
46
+			\App::setLocale('en');
47
+			\Session::put('locale', 'en');
48
+			break;
49
+		}
50 50
         
51
-        $this->config              = \CoreConfig::getConfig();
52
-        $this->model               = property_exists($this, 'model') ? $this->model : false;
53
-        $this->validationRules     = property_exists($this, 'validationRules') ? $this->validationRules : false;
54
-        $this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
55
-        $this->skipLoginCheck      = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
56
-        $this->relations           = array_key_exists($this->model, $this->config['relations']) ? $this->config['relations'][$this->model] : false;
57
-        $route                     = explode('@',\Route::currentRouteAction())[1];
58
-        $this->checkPermission($route);
59
-    }
51
+		$this->config              = \CoreConfig::getConfig();
52
+		$this->model               = property_exists($this, 'model') ? $this->model : false;
53
+		$this->validationRules     = property_exists($this, 'validationRules') ? $this->validationRules : false;
54
+		$this->skipPermissionCheck = property_exists($this, 'skipPermissionCheck') ? $this->skipPermissionCheck : [];
55
+		$this->skipLoginCheck      = property_exists($this, 'skipLoginCheck') ? $this->skipLoginCheck : [];
56
+		$this->relations           = array_key_exists($this->model, $this->config['relations']) ? $this->config['relations'][$this->model] : false;
57
+		$route                     = explode('@',\Route::currentRouteAction())[1];
58
+		$this->checkPermission($route);
59
+	}
60 60
 
61
-    /**
62
-     * Fetch all records with relations from model repository.
63
-     * 
64
-     * @return \Illuminate\Http\Response
65
-     */
66
-    public function index() 
67
-    {
68
-        if ($this->model)
69
-        {
70
-            $relations = $this->relations && $this->relations['all'] ? $this->relations['all'] : [];
71
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->all($relations), 200);
72
-        }
73
-    }
61
+	/**
62
+	 * Fetch all records with relations from model repository.
63
+	 * 
64
+	 * @return \Illuminate\Http\Response
65
+	 */
66
+	public function index() 
67
+	{
68
+		if ($this->model)
69
+		{
70
+			$relations = $this->relations && $this->relations['all'] ? $this->relations['all'] : [];
71
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->all($relations), 200);
72
+		}
73
+	}
74 74
 
75
-    /**
76
-     * Fetch the single object with relations from model repository.
77
-     * 
78
-     * @param  integer $id
79
-     * @return \Illuminate\Http\Response
80
-     */
81
-    public function find($id) 
82
-    {
83
-        if ($this->model) 
84
-        {
85
-            $relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
86
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find($id, $relations), 200);
87
-        }
88
-    }
75
+	/**
76
+	 * Fetch the single object with relations from model repository.
77
+	 * 
78
+	 * @param  integer $id
79
+	 * @return \Illuminate\Http\Response
80
+	 */
81
+	public function find($id) 
82
+	{
83
+		if ($this->model) 
84
+		{
85
+			$relations = $this->relations && $this->relations['find'] ? $this->relations['find'] : [];
86
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->find($id, $relations), 200);
87
+		}
88
+	}
89 89
 
90
-    /**
91
-     * Paginate all records with relations from model repository
92
-     * that matche the given query.
93
-     * 
94
-     * @param  string  $query
95
-     * @param  integer $perPage
96
-     * @param  string  $sortBy
97
-     * @param  boolean $desc
98
-     * @return \Illuminate\Http\Response
99
-     */
100
-    public function search($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1) 
101
-    {
102
-        if ($this->model) 
103
-        {
104
-            $relations = $this->relations && $this->relations['search'] ? $this->relations['search'] : [];
105
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->search($query, $perPage, $relations, $sortBy, $desc), 200);
106
-        }
107
-    }
90
+	/**
91
+	 * Paginate all records with relations from model repository
92
+	 * that matche the given query.
93
+	 * 
94
+	 * @param  string  $query
95
+	 * @param  integer $perPage
96
+	 * @param  string  $sortBy
97
+	 * @param  boolean $desc
98
+	 * @return \Illuminate\Http\Response
99
+	 */
100
+	public function search($query = '', $perPage = 15, $sortBy = 'created_at', $desc = 1) 
101
+	{
102
+		if ($this->model) 
103
+		{
104
+			$relations = $this->relations && $this->relations['search'] ? $this->relations['search'] : [];
105
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->search($query, $perPage, $relations, $sortBy, $desc), 200);
106
+		}
107
+	}
108 108
 
109
-    /**
110
-     * Fetch records from the storage based on the given
111
-     * condition.
112
-     * 
113
-     * @param  \Illuminate\Http\Request  $request
114
-     * @param  string  $sortBy
115
-     * @param  boolean $desc
116
-     * @return \Illuminate\Http\Response
117
-     */
118
-    public function findby(Request $request, $sortBy = 'created_at', $desc = 1) 
119
-    {
120
-        if ($this->model) 
121
-        {
122
-            $relations = $this->relations && $this->relations['findBy'] ? $this->relations['findBy'] : [];
123
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->findBy($request->all(), $relations, $sortBy, $desc), 200);
124
-        }
125
-    }
109
+	/**
110
+	 * Fetch records from the storage based on the given
111
+	 * condition.
112
+	 * 
113
+	 * @param  \Illuminate\Http\Request  $request
114
+	 * @param  string  $sortBy
115
+	 * @param  boolean $desc
116
+	 * @return \Illuminate\Http\Response
117
+	 */
118
+	public function findby(Request $request, $sortBy = 'created_at', $desc = 1) 
119
+	{
120
+		if ($this->model) 
121
+		{
122
+			$relations = $this->relations && $this->relations['findBy'] ? $this->relations['findBy'] : [];
123
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->findBy($request->all(), $relations, $sortBy, $desc), 200);
124
+		}
125
+	}
126 126
 
127
-    /**
128
-     * Fetch the first record from the storage based on the given
129
-     * condition.
130
-     * 
131
-     * @param  \Illuminate\Http\Request  $request
132
-     * @return \Illuminate\Http\Response
133
-     */
134
-    public function first(Request $request) 
135
-    {
136
-        if ($this->model) 
137
-        {
138
-            $relations = $this->relations && $this->relations['first'] ? $this->relations['first'] : [];
139
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->first($request->all(), $relations), 200);
140
-        }
141
-    }
127
+	/**
128
+	 * Fetch the first record from the storage based on the given
129
+	 * condition.
130
+	 * 
131
+	 * @param  \Illuminate\Http\Request  $request
132
+	 * @return \Illuminate\Http\Response
133
+	 */
134
+	public function first(Request $request) 
135
+	{
136
+		if ($this->model) 
137
+		{
138
+			$relations = $this->relations && $this->relations['first'] ? $this->relations['first'] : [];
139
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->first($request->all(), $relations), 200);
140
+		}
141
+	}
142 142
 
143
-    /**
144
-     * Paginate all records with relations from model repository.
145
-     * 
146
-     * @param  integer $perPage
147
-     * @param  string  $sortBy
148
-     * @param  boolean $desc
149
-     * @return \Illuminate\Http\Response
150
-     */
151
-    public function paginate($perPage = 15, $sortBy = 'created_at', $desc = 1) 
152
-    {
153
-        if ($this->model) 
154
-        {
155
-            $relations = $this->relations && $this->relations['paginate'] ? $this->relations['paginate'] : [];
156
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->paginate($perPage, $relations, $sortBy, $desc), 200);
157
-        }
158
-    }
143
+	/**
144
+	 * Paginate all records with relations from model repository.
145
+	 * 
146
+	 * @param  integer $perPage
147
+	 * @param  string  $sortBy
148
+	 * @param  boolean $desc
149
+	 * @return \Illuminate\Http\Response
150
+	 */
151
+	public function paginate($perPage = 15, $sortBy = 'created_at', $desc = 1) 
152
+	{
153
+		if ($this->model) 
154
+		{
155
+			$relations = $this->relations && $this->relations['paginate'] ? $this->relations['paginate'] : [];
156
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->paginate($perPage, $relations, $sortBy, $desc), 200);
157
+		}
158
+	}
159 159
 
160
-    /**
161
-     * Fetch all records with relations based on
162
-     * the given condition from storage in pages.
163
-     * 
164
-     * @param  \Illuminate\Http\Request  $request
165
-     * @param  integer $perPage
166
-     * @param  string  $sortBy
167
-     * @param  boolean $desc
168
-     * @return \Illuminate\Http\Response
169
-     */
170
-    public function paginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
171
-    {
172
-        if ($this->model) 
173
-        {
174
-            $relations = $this->relations && $this->relations['paginateBy'] ? $this->relations['paginateBy'] : [];
175
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->paginateBy($request->all(), $perPage, $relations, $sortBy, $desc), 200);
176
-        }
177
-    }
160
+	/**
161
+	 * Fetch all records with relations based on
162
+	 * the given condition from storage in pages.
163
+	 * 
164
+	 * @param  \Illuminate\Http\Request  $request
165
+	 * @param  integer $perPage
166
+	 * @param  string  $sortBy
167
+	 * @param  boolean $desc
168
+	 * @return \Illuminate\Http\Response
169
+	 */
170
+	public function paginateby(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
171
+	{
172
+		if ($this->model) 
173
+		{
174
+			$relations = $this->relations && $this->relations['paginateBy'] ? $this->relations['paginateBy'] : [];
175
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->paginateBy($request->all(), $perPage, $relations, $sortBy, $desc), 200);
176
+		}
177
+	}
178 178
 
179
-    /**
180
-     * Save the given model to repository.
181
-     * 
182
-     * @param  \Illuminate\Http\Request  $request
183
-     * @return \Illuminate\Http\Response
184
-     */
185
-    public function save(Request $request) 
186
-    {
187
-        foreach ($this->validationRules as &$rule) 
188
-        {
189
-            if (strpos($rule, 'exists') && ! strpos($rule, 'deleted_at,NULL')) 
190
-            {
191
-                $rule .= ',deleted_at,NULL';
192
-            }
179
+	/**
180
+	 * Save the given model to repository.
181
+	 * 
182
+	 * @param  \Illuminate\Http\Request  $request
183
+	 * @return \Illuminate\Http\Response
184
+	 */
185
+	public function save(Request $request) 
186
+	{
187
+		foreach ($this->validationRules as &$rule) 
188
+		{
189
+			if (strpos($rule, 'exists') && ! strpos($rule, 'deleted_at,NULL')) 
190
+			{
191
+				$rule .= ',deleted_at,NULL';
192
+			}
193 193
 
194
-            if ($request->has('id')) 
195
-            {
196
-                $rule = str_replace('{id}', $request->get('id'), $rule);
197
-            }
198
-            else
199
-            {
200
-                $rule = str_replace(',{id}', '', $rule);
201
-            }
202
-        }
194
+			if ($request->has('id')) 
195
+			{
196
+				$rule = str_replace('{id}', $request->get('id'), $rule);
197
+			}
198
+			else
199
+			{
200
+				$rule = str_replace(',{id}', '', $rule);
201
+			}
202
+		}
203 203
         
204
-        $this->validate($request, $this->validationRules);
204
+		$this->validate($request, $this->validationRules);
205 205
 
206
-        if ($this->model) 
207
-        {
208
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->save($request->all()), 200);
209
-        }
210
-    }
206
+		if ($this->model) 
207
+		{
208
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->save($request->all()), 200);
209
+		}
210
+	}
211 211
 
212
-    /**
213
-     * Delete by the given id from model repository.
214
-     * 
215
-     * @param  integer  $id
216
-     * @return \Illuminate\Http\Response
217
-     */
218
-    public function delete($id) 
219
-    {
220
-        if ($this->model) 
221
-        {
222
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->delete($id), 200);
223
-        }
224
-    }
212
+	/**
213
+	 * Delete by the given id from model repository.
214
+	 * 
215
+	 * @param  integer  $id
216
+	 * @return \Illuminate\Http\Response
217
+	 */
218
+	public function delete($id) 
219
+	{
220
+		if ($this->model) 
221
+		{
222
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->delete($id), 200);
223
+		}
224
+	}
225 225
 
226
-    /**
227
-     * Return the deleted models in pages based on the given conditions.
228
-     *
229
-     * @param  \Illuminate\Http\Request  $request
230
-     * @param  integer $perPage
231
-     * @param  string  $sortBy
232
-     * @param  boolean $desc
233
-     * @return \Illuminate\Http\Response
234
-     */
235
-    public function deleted(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
236
-    {
237
-        return \Response::json(call_user_func_array("\Core::{$this->model}", [])->deleted($request->all(), $perPage, $sortBy, $desc), 200);
238
-    }
226
+	/**
227
+	 * Return the deleted models in pages based on the given conditions.
228
+	 *
229
+	 * @param  \Illuminate\Http\Request  $request
230
+	 * @param  integer $perPage
231
+	 * @param  string  $sortBy
232
+	 * @param  boolean $desc
233
+	 * @return \Illuminate\Http\Response
234
+	 */
235
+	public function deleted(Request $request, $perPage = 15, $sortBy = 'created_at', $desc = 1) 
236
+	{
237
+		return \Response::json(call_user_func_array("\Core::{$this->model}", [])->deleted($request->all(), $perPage, $sortBy, $desc), 200);
238
+	}
239 239
 
240
-    /**
241
-     * Restore the deleted model.
242
-     * 
243
-     * @param  integer  $id
244
-     * @return \Illuminate\Http\Response
245
-     */
246
-    public function restore($id) 
247
-    {
248
-        if ($this->model) 
249
-        {
250
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->restore($id), 200);
251
-        }
252
-    }
240
+	/**
241
+	 * Restore the deleted model.
242
+	 * 
243
+	 * @param  integer  $id
244
+	 * @return \Illuminate\Http\Response
245
+	 */
246
+	public function restore($id) 
247
+	{
248
+		if ($this->model) 
249
+		{
250
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->restore($id), 200);
251
+		}
252
+	}
253 253
 
254
-    /**
255
-     * Check if the logged in user can do the given permission.
256
-     * 
257
-     * @param  string $permission
258
-     * @return void
259
-     */
260
-    private function checkPermission($permission)
261
-    {
262
-        $permission = $permission !== 'index' ? $permission : 'list';
263
-        if ( ! in_array($permission, $this->skipLoginCheck)) 
264
-        {
265
-            $user = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->id);
266
-            if ($user->blocked)
267
-            {
268
-                \ErrorHandler::userIsBlocked();
269
-            }
254
+	/**
255
+	 * Check if the logged in user can do the given permission.
256
+	 * 
257
+	 * @param  string $permission
258
+	 * @return void
259
+	 */
260
+	private function checkPermission($permission)
261
+	{
262
+		$permission = $permission !== 'index' ? $permission : 'list';
263
+		if ( ! in_array($permission, $this->skipLoginCheck)) 
264
+		{
265
+			$user = \Core::users()->find(\JWTAuth::parseToken()->authenticate()->id);
266
+			if ($user->blocked)
267
+			{
268
+				\ErrorHandler::userIsBlocked();
269
+			}
270 270
             
271
-            if ( ! in_array($permission, $this->skipPermissionCheck) && ! \Core::users()->can($permission, $this->model))
272
-            {
273
-                \ErrorHandler::noPermissions();
274
-            }
275
-        }
276
-    }
271
+			if ( ! in_array($permission, $this->skipPermissionCheck) && ! \Core::users()->can($permission, $this->model))
272
+			{
273
+				\ErrorHandler::noPermissions();
274
+			}
275
+		}
276
+	}
277 277
 }
Please login to merge, or discard this patch.
Modules/V1/Notifications/ModelObservers/PushNotificationDeviceObserver.php 1 patch
Indentation   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -5,44 +5,44 @@
 block discarded – undo
5 5
  */
6 6
 class PushNotificationDeviceObserver {
7 7
 
8
-    public function saving($model)
9
-    {
10
-        //
11
-    }
12
-
13
-    public function saved($model)
14
-    {
15
-        //
16
-    }
17
-
18
-    public function creating($model)
19
-    {
20
-        //
21
-    }
22
-
23
-    public function created($model)
24
-    {
25
-        //
26
-    }
27
-
28
-    public function updating($model)
29
-    {
30
-        //
31
-    }
32
-
33
-    public function updated($model)
34
-    {
35
-        //
36
-    }
37
-
38
-    public function deleting($model)
39
-    {
40
-        //
41
-    }
42
-
43
-    public function deleted($model)
44
-    {
45
-        //
46
-    }
8
+	public function saving($model)
9
+	{
10
+		//
11
+	}
12
+
13
+	public function saved($model)
14
+	{
15
+		//
16
+	}
17
+
18
+	public function creating($model)
19
+	{
20
+		//
21
+	}
22
+
23
+	public function created($model)
24
+	{
25
+		//
26
+	}
27
+
28
+	public function updating($model)
29
+	{
30
+		//
31
+	}
32
+
33
+	public function updated($model)
34
+	{
35
+		//
36
+	}
37
+
38
+	public function deleting($model)
39
+	{
40
+		//
41
+	}
42
+
43
+	public function deleted($model)
44
+	{
45
+		//
46
+	}
47 47
 
48 48
 }
49 49
\ No newline at end of file
Please login to merge, or discard this patch.
Database/Migrations/2016_01_24_111942_push_notifications_devices.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -21,7 +21,7 @@
 block discarded – undo
21 21
 			$table->unique(array('device_token', 'device_type'));
22 22
 			$table->softDeletes();
23 23
 			$table->timestamps();
24
-        });
24
+		});
25 25
 	}
26 26
 
27 27
 	/**
Please login to merge, or discard this patch.
src/lang/en/notifications.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -2,8 +2,8 @@
 block discarded – undo
2 2
 
3 3
 return [
4 4
     
5
-    /**
6
-     * Here goes your notification messages.
7
-     */
5
+	/**
6
+	 * Here goes your notification messages.
7
+	 */
8 8
 
9 9
 ];
10 10
\ No newline at end of file
Please login to merge, or discard this patch.
src/Modules/V1/Acl/Repositories/GroupRepository.php 1 patch
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -29,6 +29,6 @@
 block discarded – undo
29 29
 			$group->permissions()->attach($permissionIds);
30 30
 		});
31 31
 
32
-        return $this->find($groupId);
32
+		return $this->find($groupId);
33 33
 	}
34 34
 }
Please login to merge, or discard this patch.