@@ -13,15 +13,15 @@ |
||
13 | 13 | public function up() |
14 | 14 | { |
15 | 15 | Schema::create('users', function (Blueprint $table) { |
16 | - $table->increments('id'); |
|
17 | - $table->string('name',100)->nullable(); |
|
18 | - $table->string('email')->unique(); |
|
19 | - $table->string('password', 60); |
|
20 | - $table->boolean('blocked', 0); |
|
21 | - $table->softDeletes(); |
|
22 | - $table->rememberToken(); |
|
23 | - $table->timestamps(); |
|
24 | - }); |
|
16 | + $table->increments('id'); |
|
17 | + $table->string('name',100)->nullable(); |
|
18 | + $table->string('email')->unique(); |
|
19 | + $table->string('password', 60); |
|
20 | + $table->boolean('blocked', 0); |
|
21 | + $table->softDeletes(); |
|
22 | + $table->rememberToken(); |
|
23 | + $table->timestamps(); |
|
24 | + }); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | /** |
@@ -6,26 +6,26 @@ |
||
6 | 6 | |
7 | 7 | class ApiSkeletonServiceProvider extends ServiceProvider |
8 | 8 | { |
9 | - /** |
|
10 | - * Perform post-registration booting of services. |
|
11 | - * |
|
12 | - * @return void |
|
13 | - */ |
|
14 | - public function boot() |
|
15 | - { |
|
16 | - $this->publishes([ |
|
17 | - __DIR__.'/Modules' => app_path('Modules'), |
|
18 | - __DIR__.'/Modules/V1/Acl/emails' => base_path('resources/views/auth/emails'), |
|
19 | - ]); |
|
20 | - } |
|
9 | + /** |
|
10 | + * Perform post-registration booting of services. |
|
11 | + * |
|
12 | + * @return void |
|
13 | + */ |
|
14 | + public function boot() |
|
15 | + { |
|
16 | + $this->publishes([ |
|
17 | + __DIR__.'/Modules' => app_path('Modules'), |
|
18 | + __DIR__.'/Modules/V1/Acl/emails' => base_path('resources/views/auth/emails'), |
|
19 | + ]); |
|
20 | + } |
|
21 | 21 | |
22 | - /** |
|
23 | - * Register any package services. |
|
24 | - * |
|
25 | - * @return void |
|
26 | - */ |
|
27 | - public function register() |
|
28 | - { |
|
29 | - // |
|
30 | - } |
|
22 | + /** |
|
23 | + * Register any package services. |
|
24 | + * |
|
25 | + * @return void |
|
26 | + */ |
|
27 | + public function register() |
|
28 | + { |
|
29 | + // |
|
30 | + } |
|
31 | 31 | } |
32 | 32 | \ No newline at end of file |
@@ -5,59 +5,59 @@ |
||
5 | 5 | */ |
6 | 6 | class SettingsObserver { |
7 | 7 | |
8 | - public function saving($model) |
|
9 | - { |
|
10 | - // |
|
11 | - } |
|
12 | - |
|
13 | - public function saved($model) |
|
14 | - { |
|
15 | - // |
|
16 | - } |
|
17 | - |
|
18 | - /** |
|
19 | - * Prevent the creating of the settings. |
|
20 | - * |
|
21 | - * @param object $model the model beign created. |
|
22 | - * @return void |
|
23 | - */ |
|
24 | - public function creating($model) |
|
25 | - { |
|
26 | - \ErrorHandler::cannotCreateSetting(); |
|
27 | - } |
|
28 | - |
|
29 | - public function created($model) |
|
30 | - { |
|
31 | - // |
|
32 | - } |
|
33 | - |
|
34 | - /** |
|
35 | - * Prevent updating of the setting key. |
|
36 | - * |
|
37 | - * @param object $model the model beign updated. |
|
38 | - * @return void |
|
39 | - */ |
|
40 | - public function updating($model) |
|
41 | - { |
|
42 | - if ($model->getOriginal()['key'] !== $model->key) |
|
43 | - { |
|
44 | - \ErrorHandler::cannotUpdateSettingKey(); |
|
45 | - } |
|
46 | - } |
|
47 | - |
|
48 | - public function updated($model) |
|
49 | - { |
|
50 | - // |
|
51 | - } |
|
52 | - |
|
53 | - public function deleting($model) |
|
54 | - { |
|
55 | - // |
|
56 | - } |
|
57 | - |
|
58 | - public function deleted($model) |
|
59 | - { |
|
60 | - // |
|
61 | - } |
|
8 | + public function saving($model) |
|
9 | + { |
|
10 | + // |
|
11 | + } |
|
12 | + |
|
13 | + public function saved($model) |
|
14 | + { |
|
15 | + // |
|
16 | + } |
|
17 | + |
|
18 | + /** |
|
19 | + * Prevent the creating of the settings. |
|
20 | + * |
|
21 | + * @param object $model the model beign created. |
|
22 | + * @return void |
|
23 | + */ |
|
24 | + public function creating($model) |
|
25 | + { |
|
26 | + \ErrorHandler::cannotCreateSetting(); |
|
27 | + } |
|
28 | + |
|
29 | + public function created($model) |
|
30 | + { |
|
31 | + // |
|
32 | + } |
|
33 | + |
|
34 | + /** |
|
35 | + * Prevent updating of the setting key. |
|
36 | + * |
|
37 | + * @param object $model the model beign updated. |
|
38 | + * @return void |
|
39 | + */ |
|
40 | + public function updating($model) |
|
41 | + { |
|
42 | + if ($model->getOriginal()['key'] !== $model->key) |
|
43 | + { |
|
44 | + \ErrorHandler::cannotUpdateSettingKey(); |
|
45 | + } |
|
46 | + } |
|
47 | + |
|
48 | + public function updated($model) |
|
49 | + { |
|
50 | + // |
|
51 | + } |
|
52 | + |
|
53 | + public function deleting($model) |
|
54 | + { |
|
55 | + // |
|
56 | + } |
|
57 | + |
|
58 | + public function deleted($model) |
|
59 | + { |
|
60 | + // |
|
61 | + } |
|
62 | 62 | |
63 | 63 | } |
64 | 64 | \ No newline at end of file |
@@ -2,17 +2,17 @@ |
||
2 | 2 | |
3 | 3 | class Logging |
4 | 4 | { |
5 | - public function saveLog($action, $item_name, $item_type, $item_id) |
|
6 | - { |
|
7 | - if (\Core::logs() && $item_name !== 'Log') |
|
8 | - { |
|
9 | - \Core::logs()->save([ |
|
10 | - 'action' => $action, |
|
11 | - 'item_name' => $item_name, |
|
12 | - 'item_type' => $item_type, |
|
13 | - 'item_id' => $item_id, |
|
14 | - 'user_id' => \JWTAuth::parseToken()->authenticate()->id, |
|
15 | - ], false, false); |
|
16 | - } |
|
17 | - } |
|
5 | + public function saveLog($action, $item_name, $item_type, $item_id) |
|
6 | + { |
|
7 | + if (\Core::logs() && $item_name !== 'Log') |
|
8 | + { |
|
9 | + \Core::logs()->save([ |
|
10 | + 'action' => $action, |
|
11 | + 'item_name' => $item_name, |
|
12 | + 'item_type' => $item_type, |
|
13 | + 'item_id' => $item_id, |
|
14 | + 'user_id' => \JWTAuth::parseToken()->authenticate()->id, |
|
15 | + ], false, false); |
|
16 | + } |
|
17 | + } |
|
18 | 18 | } |
19 | 19 | \ No newline at end of file |
@@ -15,54 +15,54 @@ |
||
15 | 15 | } |
16 | 16 | |
17 | 17 | /** |
18 | - * Render the given report db view. |
|
19 | - * |
|
20 | - * @param integer $id |
|
21 | - * @param array $relations |
|
22 | - * @param array $columns |
|
23 | - * @return object |
|
24 | - */ |
|
25 | - public function find($id, $relations = [], $columns = array('*')) |
|
26 | - { |
|
18 | + * Render the given report db view. |
|
19 | + * |
|
20 | + * @param integer $id |
|
21 | + * @param array $relations |
|
22 | + * @param array $columns |
|
23 | + * @return object |
|
24 | + */ |
|
25 | + public function find($id, $relations = [], $columns = array('*')) |
|
26 | + { |
|
27 | 27 | $report = call_user_func_array("{$this->getModel()}::with", array($relations))->find($id, $columns); |
28 | 28 | |
29 | - if ( ! $report) |
|
30 | - { |
|
31 | - \ErrorHandler::notFound('report'); |
|
32 | - } |
|
29 | + if ( ! $report) |
|
30 | + { |
|
31 | + \ErrorHandler::notFound('report'); |
|
32 | + } |
|
33 | 33 | |
34 | - if ( ! \Core::users()->can($report->view_name, 'reports')) |
|
35 | - { |
|
36 | - \ErrorHandler::noPermissions(); |
|
37 | - } |
|
34 | + if ( ! \Core::users()->can($report->view_name, 'reports')) |
|
35 | + { |
|
36 | + \ErrorHandler::noPermissions(); |
|
37 | + } |
|
38 | 38 | |
39 | - return \DB::table($report->view_name)->get(); |
|
40 | - } |
|
39 | + return \DB::table($report->view_name)->get(); |
|
40 | + } |
|
41 | 41 | |
42 | - /** |
|
43 | - * Render the given report db view based on the given |
|
44 | - * condition. |
|
45 | - * |
|
46 | - * @param array $conditions array of conditions |
|
47 | - * @param array $relations |
|
48 | - * @param array $colunmns |
|
49 | - * @return object |
|
50 | - */ |
|
51 | - public function first($conditions, $relations = [], $columns = array('*')) |
|
52 | - { |
|
42 | + /** |
|
43 | + * Render the given report db view based on the given |
|
44 | + * condition. |
|
45 | + * |
|
46 | + * @param array $conditions array of conditions |
|
47 | + * @param array $relations |
|
48 | + * @param array $colunmns |
|
49 | + * @return object |
|
50 | + */ |
|
51 | + public function first($conditions, $relations = [], $columns = array('*')) |
|
52 | + { |
|
53 | 53 | $conditions = $this->constructConditions($conditions); |
54 | 54 | $report = call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($conditions['conditionString'], $conditions['conditionValues'])->first($columns); |
55 | 55 | |
56 | - if ( ! $report) |
|
57 | - { |
|
58 | - \ErrorHandler::notFound('report'); |
|
59 | - } |
|
56 | + if ( ! $report) |
|
57 | + { |
|
58 | + \ErrorHandler::notFound('report'); |
|
59 | + } |
|
60 | 60 | |
61 | - if ( ! \Core::users()->can($report->view_name, 'reports')) |
|
62 | - { |
|
63 | - \ErrorHandler::noPermissions(); |
|
64 | - } |
|
61 | + if ( ! \Core::users()->can($report->view_name, 'reports')) |
|
62 | + { |
|
63 | + \ErrorHandler::noPermissions(); |
|
64 | + } |
|
65 | 65 | |
66 | - return \DB::table($report->view_name)->get(); |
|
67 | - } |
|
66 | + return \DB::table($report->view_name)->get(); |
|
67 | + } |
|
68 | 68 | } |
@@ -8,30 +8,30 @@ |
||
8 | 8 | class NotificationsController extends BaseApiController |
9 | 9 | { |
10 | 10 | /** |
11 | - * The name of the model that is used by the base api controller |
|
12 | - * to preform actions like (add, edit ... etc). |
|
13 | - * @var string |
|
14 | - */ |
|
15 | - protected $model = 'notifications'; |
|
11 | + * The name of the model that is used by the base api controller |
|
12 | + * to preform actions like (add, edit ... etc). |
|
13 | + * @var string |
|
14 | + */ |
|
15 | + protected $model = 'notifications'; |
|
16 | 16 | |
17 | - /** |
|
18 | - * Set the notification notified to true. |
|
19 | - * |
|
20 | - * @param integer $id |
|
21 | - * @return \Illuminate\Http\Response |
|
22 | - */ |
|
23 | - public function notified($id) |
|
24 | - { |
|
25 | - return \Response::json(\Core::notifications()->notified($id), 200); |
|
26 | - } |
|
17 | + /** |
|
18 | + * Set the notification notified to true. |
|
19 | + * |
|
20 | + * @param integer $id |
|
21 | + * @return \Illuminate\Http\Response |
|
22 | + */ |
|
23 | + public function notified($id) |
|
24 | + { |
|
25 | + return \Response::json(\Core::notifications()->notified($id), 200); |
|
26 | + } |
|
27 | 27 | |
28 | - /** |
|
29 | - * Set the notification notified to all. |
|
30 | - * |
|
31 | - * @return \Illuminate\Http\Response |
|
32 | - */ |
|
33 | - public function notifyall() |
|
34 | - { |
|
35 | - return \Response::json(\Core::notifications()->notifyAll(), 200); |
|
36 | - } |
|
28 | + /** |
|
29 | + * Set the notification notified to all. |
|
30 | + * |
|
31 | + * @return \Illuminate\Http\Response |
|
32 | + */ |
|
33 | + public function notifyall() |
|
34 | + { |
|
35 | + return \Response::json(\Core::notifications()->notifyAll(), 200); |
|
36 | + } |
|
37 | 37 | } |
@@ -5,44 +5,44 @@ |
||
5 | 5 | */ |
6 | 6 | class LogObserver { |
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 |
@@ -18,7 +18,7 @@ |
||
18 | 18 | $table->string('view_name',100); |
19 | 19 | $table->softDeletes(); |
20 | 20 | $table->timestamps(); |
21 | - }); |
|
21 | + }); |
|
22 | 22 | } |
23 | 23 | |
24 | 24 | /** |
@@ -7,22 +7,22 @@ |
||
7 | 7 | |
8 | 8 | class PushNotificationsDevicesController extends BaseApiController |
9 | 9 | { |
10 | - /** |
|
11 | - * The name of the model that is used by the base api controller |
|
12 | - * to preform actions like (add, edit ... etc). |
|
13 | - * @var string |
|
14 | - */ |
|
15 | - protected $model = 'pushNotificationDevices'; |
|
10 | + /** |
|
11 | + * The name of the model that is used by the base api controller |
|
12 | + * to preform actions like (add, edit ... etc). |
|
13 | + * @var string |
|
14 | + */ |
|
15 | + protected $model = 'pushNotificationDevices'; |
|
16 | 16 | |
17 | - /** |
|
18 | - * The validations rules used by the base api controller |
|
19 | - * to check before add. |
|
20 | - * @var array |
|
21 | - */ |
|
22 | - protected $validationRules = [ |
|
23 | - 'device_token' => 'required|string|max:255', |
|
24 | - 'device_type' => 'required|in:android,ios', |
|
25 | - 'user_id' => 'required|exists:users,id', |
|
26 | - 'active' => 'boolean' |
|
27 | - ]; |
|
17 | + /** |
|
18 | + * The validations rules used by the base api controller |
|
19 | + * to check before add. |
|
20 | + * @var array |
|
21 | + */ |
|
22 | + protected $validationRules = [ |
|
23 | + 'device_token' => 'required|string|max:255', |
|
24 | + 'device_type' => 'required|in:android,ios', |
|
25 | + 'user_id' => 'required|exists:users,id', |
|
26 | + 'active' => 'boolean' |
|
27 | + ]; |
|
28 | 28 | } |