@@ -1,6 +1,5 @@ |
||
1 | 1 | <?php namespace App\Modules\Acl; |
2 | 2 | |
3 | -use Illuminate\Database\Eloquent\Model; |
|
4 | 3 | use App\User; |
5 | 4 | use Illuminate\Database\Eloquent\SoftDeletes; |
6 | 5 |
@@ -9,7 +9,7 @@ discard block |
||
9 | 9 | use SoftDeletes; |
10 | 10 | protected $table = 'users'; |
11 | 11 | protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
12 | - protected $hidden = ['password', 'remember_token','deleted_at']; |
|
12 | + protected $hidden = ['password', 'remember_token', 'deleted_at']; |
|
13 | 13 | protected $guarded = ['id']; |
14 | 14 | protected $fillable = ['first_name', 'last_name', 'user_name', 'address', 'email', 'password']; |
15 | 15 | protected $appends = ['permissions']; |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | |
48 | 48 | public function groups() |
49 | 49 | { |
50 | - return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
50 | + return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup', 'users_groups', 'user_id', 'group_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
51 | 51 | } |
52 | 52 | |
53 | 53 | public function getPermissionsAttribute() |
@@ -55,7 +55,7 @@ discard block |
||
55 | 55 | $permissions = []; |
56 | 56 | foreach ($this->groups as $group) |
57 | 57 | { |
58 | - $group->permissions->each(function ($permission) use (&$permissions){ |
|
58 | + $group->permissions->each(function($permission) use (&$permissions){ |
|
59 | 59 | $permissions[$permission->model][$permission->id] = $permission->name; |
60 | 60 | }); |
61 | 61 | } |
@@ -6,67 +6,67 @@ |
||
6 | 6 | |
7 | 7 | class AclUser extends User { |
8 | 8 | |
9 | - use SoftDeletes; |
|
10 | - protected $table = 'users'; |
|
11 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
12 | - protected $hidden = ['password', 'remember_token','deleted_at']; |
|
13 | - protected $guarded = ['id']; |
|
14 | - protected $fillable = ['name', 'email', 'password']; |
|
15 | - protected $appends = ['permissions']; |
|
16 | - public $searchable = ['name', 'email']; |
|
9 | + use SoftDeletes; |
|
10 | + protected $table = 'users'; |
|
11 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
12 | + protected $hidden = ['password', 'remember_token','deleted_at']; |
|
13 | + protected $guarded = ['id']; |
|
14 | + protected $fillable = ['name', 'email', 'password']; |
|
15 | + protected $appends = ['permissions']; |
|
16 | + public $searchable = ['name', 'email']; |
|
17 | 17 | |
18 | - public function getCreatedAtAttribute($value) |
|
19 | - { |
|
20 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
21 | - } |
|
18 | + public function getCreatedAtAttribute($value) |
|
19 | + { |
|
20 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
21 | + } |
|
22 | 22 | |
23 | - public function getUpdatedAtAttribute($value) |
|
24 | - { |
|
25 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
26 | - } |
|
23 | + public function getUpdatedAtAttribute($value) |
|
24 | + { |
|
25 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
26 | + } |
|
27 | 27 | |
28 | - public function getDeletedAtAttribute($value) |
|
29 | - { |
|
30 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
31 | - } |
|
28 | + public function getDeletedAtAttribute($value) |
|
29 | + { |
|
30 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
31 | + } |
|
32 | 32 | |
33 | - /** |
|
34 | - * Encrypt the password attribute before |
|
35 | - * saving it in the storage. |
|
36 | - * |
|
37 | - * @param string $value |
|
38 | - */ |
|
39 | - public function setPasswordAttribute($value) |
|
40 | - { |
|
41 | - $this->attributes['password'] = bcrypt($value); |
|
42 | - } |
|
33 | + /** |
|
34 | + * Encrypt the password attribute before |
|
35 | + * saving it in the storage. |
|
36 | + * |
|
37 | + * @param string $value |
|
38 | + */ |
|
39 | + public function setPasswordAttribute($value) |
|
40 | + { |
|
41 | + $this->attributes['password'] = bcrypt($value); |
|
42 | + } |
|
43 | 43 | |
44 | - public function logs() |
|
45 | - { |
|
46 | - return $this->hasMany('App\Modules\V1\Core\Log', 'user_id'); |
|
47 | - } |
|
44 | + public function logs() |
|
45 | + { |
|
46 | + return $this->hasMany('App\Modules\V1\Core\Log', 'user_id'); |
|
47 | + } |
|
48 | 48 | |
49 | - public function groups() |
|
50 | - { |
|
51 | - return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
52 | - } |
|
49 | + public function groups() |
|
50 | + { |
|
51 | + return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
52 | + } |
|
53 | 53 | |
54 | - public function getPermissionsAttribute() |
|
55 | - { |
|
56 | - $permissions = []; |
|
57 | - foreach ($this->groups as $group) |
|
58 | - { |
|
59 | - $group->permissions->each(function ($permission) use (&$permissions){ |
|
60 | - $permissions[$permission->model][$permission->id] = $permission->name; |
|
61 | - }); |
|
62 | - } |
|
54 | + public function getPermissionsAttribute() |
|
55 | + { |
|
56 | + $permissions = []; |
|
57 | + foreach ($this->groups as $group) |
|
58 | + { |
|
59 | + $group->permissions->each(function ($permission) use (&$permissions){ |
|
60 | + $permissions[$permission->model][$permission->id] = $permission->name; |
|
61 | + }); |
|
62 | + } |
|
63 | 63 | |
64 | - return \Illuminate\Database\Eloquent\Collection::make($permissions); |
|
65 | - } |
|
64 | + return \Illuminate\Database\Eloquent\Collection::make($permissions); |
|
65 | + } |
|
66 | 66 | |
67 | - public static function boot() |
|
68 | - { |
|
69 | - parent::boot(); |
|
70 | - parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclUserObserver')); |
|
71 | - } |
|
67 | + public static function boot() |
|
68 | + { |
|
69 | + parent::boot(); |
|
70 | + parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclUserObserver')); |
|
71 | + } |
|
72 | 72 | } |
@@ -46,7 +46,7 @@ |
||
46 | 46 | * |
47 | 47 | * @param array $conditions array of conditions |
48 | 48 | * @param array $relations |
49 | - * @param array $colunmns |
|
49 | + * @param array $columns |
|
50 | 50 | * @return object |
51 | 51 | */ |
52 | 52 | public function first($conditions, $relations = [], $columns = array('*')) |
@@ -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 | } |
@@ -2,14 +2,14 @@ discard block |
||
2 | 2 | |
3 | 3 | class CoreConfig |
4 | 4 | { |
5 | - public function getConfig() |
|
6 | - { |
|
7 | - $customSettings = []; |
|
8 | - Settings::get(['key', 'value'])->each(function ($setting) use (&$customSettings){ |
|
9 | - $customSettings[$setting['key']] = $setting['value']; |
|
10 | - }); |
|
5 | + public function getConfig() |
|
6 | + { |
|
7 | + $customSettings = []; |
|
8 | + Settings::get(['key', 'value'])->each(function ($setting) use (&$customSettings){ |
|
9 | + $customSettings[$setting['key']] = $setting['value']; |
|
10 | + }); |
|
11 | 11 | |
12 | - return array_merge($customSettings, [ |
|
12 | + return array_merge($customSettings, [ |
|
13 | 13 | /** |
14 | 14 | * Specify what relations should be used for every model. |
15 | 15 | */ |
@@ -56,5 +56,5 @@ discard block |
||
56 | 56 | ], |
57 | 57 | ] |
58 | 58 | ]); |
59 | - } |
|
59 | + } |
|
60 | 60 | } |
61 | 61 | \ No newline at end of file |
@@ -5,7 +5,7 @@ |
||
5 | 5 | public function getConfig() |
6 | 6 | { |
7 | 7 | $customSettings = []; |
8 | - Settings::get(['key', 'value'])->each(function ($setting) use (&$customSettings){ |
|
8 | + Settings::get(['key', 'value'])->each(function($setting) use (&$customSettings){ |
|
9 | 9 | $customSettings[$setting['key']] = $setting['value']; |
10 | 10 | }); |
11 | 11 |
@@ -3,7 +3,7 @@ |
||
3 | 3 | use Illuminate\Database\Eloquent\Model; |
4 | 4 | use Illuminate\Database\Eloquent\SoftDeletes; |
5 | 5 | |
6 | -class Log extends Model{ |
|
6 | +class Log extends Model { |
|
7 | 7 | |
8 | 8 | use SoftDeletes; |
9 | 9 | protected $table = 'logs'; |
@@ -5,42 +5,42 @@ |
||
5 | 5 | |
6 | 6 | class Log extends Model{ |
7 | 7 | |
8 | - use SoftDeletes; |
|
9 | - protected $table = 'logs'; |
|
10 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
11 | - protected $hidden = ['deleted_at', 'item_type']; |
|
12 | - protected $guarded = ['id']; |
|
13 | - protected $fillable = ['action', 'item_name', 'item_type', 'item_id', 'user_id']; |
|
14 | - public $searchable = ['action', 'item_name', 'item_type']; |
|
15 | - |
|
16 | - public function getCreatedAtAttribute($value) |
|
17 | - { |
|
18 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
19 | - } |
|
20 | - |
|
21 | - public function getUpdatedAtAttribute($value) |
|
22 | - { |
|
23 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
24 | - } |
|
25 | - |
|
26 | - public function getDeletedAtAttribute($value) |
|
27 | - { |
|
28 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
29 | - } |
|
8 | + use SoftDeletes; |
|
9 | + protected $table = 'logs'; |
|
10 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
11 | + protected $hidden = ['deleted_at', 'item_type']; |
|
12 | + protected $guarded = ['id']; |
|
13 | + protected $fillable = ['action', 'item_name', 'item_type', 'item_id', 'user_id']; |
|
14 | + public $searchable = ['action', 'item_name', 'item_type']; |
|
15 | + |
|
16 | + public function getCreatedAtAttribute($value) |
|
17 | + { |
|
18 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
19 | + } |
|
20 | + |
|
21 | + public function getUpdatedAtAttribute($value) |
|
22 | + { |
|
23 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
24 | + } |
|
25 | + |
|
26 | + public function getDeletedAtAttribute($value) |
|
27 | + { |
|
28 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
29 | + } |
|
30 | 30 | |
31 | - public function user() |
|
32 | - { |
|
33 | - return $this->belongsTo('App\Modules\V1\Acl\AclUser'); |
|
34 | - } |
|
35 | - |
|
36 | - public function item() |
|
37 | - { |
|
38 | - return $this->morphTo(); |
|
39 | - } |
|
40 | - |
|
41 | - public static function boot() |
|
42 | - { |
|
43 | - parent::boot(); |
|
44 | - parent::observe(\App::make('App\Modules\V1\Core\ModelObservers\LogObserver')); |
|
45 | - } |
|
31 | + public function user() |
|
32 | + { |
|
33 | + return $this->belongsTo('App\Modules\V1\Acl\AclUser'); |
|
34 | + } |
|
35 | + |
|
36 | + public function item() |
|
37 | + { |
|
38 | + return $this->morphTo(); |
|
39 | + } |
|
40 | + |
|
41 | + public static function boot() |
|
42 | + { |
|
43 | + parent::boot(); |
|
44 | + parent::observe(\App::make('App\Modules\V1\Core\ModelObservers\LogObserver')); |
|
45 | + } |
|
46 | 46 | } |
@@ -13,13 +13,13 @@ |
||
13 | 13 | public function up() |
14 | 14 | { |
15 | 15 | Schema::create('settings', function (Blueprint $table) { |
16 | - $table->increments('id'); |
|
17 | - $table->string('name',100); |
|
18 | - $table->string('key',100)->unique(); |
|
19 | - $table->string('value',100); |
|
20 | - $table->softDeletes(); |
|
21 | - $table->timestamps(); |
|
22 | - }); |
|
16 | + $table->increments('id'); |
|
17 | + $table->string('name',100); |
|
18 | + $table->string('key',100)->unique(); |
|
19 | + $table->string('value',100); |
|
20 | + $table->softDeletes(); |
|
21 | + $table->timestamps(); |
|
22 | + }); |
|
23 | 23 | } |
24 | 24 | |
25 | 25 | /** |
@@ -12,11 +12,11 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('settings', function (Blueprint $table) { |
|
15 | + Schema::create('settings', function(Blueprint $table) { |
|
16 | 16 | $table->increments('id'); |
17 | - $table->string('name',100); |
|
18 | - $table->string('key',100)->unique(); |
|
19 | - $table->string('value',100); |
|
17 | + $table->string('name', 100); |
|
18 | + $table->string('key', 100)->unique(); |
|
19 | + $table->string('value', 100); |
|
20 | 20 | $table->softDeletes(); |
21 | 21 | $table->timestamps(); |
22 | 22 | }); |
@@ -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 | /** |
@@ -12,11 +12,11 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - Schema::create('logs', function (Blueprint $table) { |
|
15 | + Schema::create('logs', function(Blueprint $table) { |
|
16 | 16 | $table->increments('id'); |
17 | - $table->string('action',100); |
|
18 | - $table->string('item_name',100); |
|
19 | - $table->string('item_type',100); |
|
17 | + $table->string('action', 100); |
|
18 | + $table->string('item_name', 100); |
|
19 | + $table->string('item_type', 100); |
|
20 | 20 | $table->integer('item_id'); |
21 | 21 | $table->integer('user_id'); |
22 | 22 | $table->softDeletes(); |
@@ -12,129 +12,129 @@ |
||
12 | 12 | */ |
13 | 13 | public function up() |
14 | 14 | { |
15 | - /** |
|
16 | - * Delete previous permissions. |
|
17 | - */ |
|
15 | + /** |
|
16 | + * Delete previous permissions. |
|
17 | + */ |
|
18 | 18 | DB::table('permissions')->whereIn('model', ['settings'])->delete(); |
19 | 19 | |
20 | 20 | /** |
21 | - * Insert the permissions related to this module. |
|
22 | - */ |
|
23 | - DB::table('permissions')->insert( |
|
24 | - [ |
|
25 | - /** |
|
26 | - * Users model permissions. |
|
27 | - */ |
|
28 | - [ |
|
29 | - 'name' => 'save', |
|
30 | - 'model' => 'settings', |
|
31 | - 'created_at' => \DB::raw('NOW()'), |
|
32 | - 'updated_at' => \DB::raw('NOW()') |
|
33 | - ], |
|
34 | - [ |
|
35 | - 'name' => 'find', |
|
36 | - 'model' => 'settings', |
|
37 | - 'created_at' => \DB::raw('NOW()'), |
|
38 | - 'updated_at' => \DB::raw('NOW()') |
|
39 | - ], |
|
40 | - [ |
|
41 | - 'name' => 'search', |
|
42 | - 'model' => 'settings', |
|
43 | - 'created_at' => \DB::raw('NOW()'), |
|
44 | - 'updated_at' => \DB::raw('NOW()') |
|
45 | - ], |
|
46 | - [ |
|
47 | - 'name' => 'list', |
|
48 | - 'model' => 'settings', |
|
49 | - 'created_at' => \DB::raw('NOW()'), |
|
50 | - 'updated_at' => \DB::raw('NOW()') |
|
51 | - ], |
|
52 | - [ |
|
53 | - 'name' => 'findby', |
|
54 | - 'model' => 'settings', |
|
55 | - 'created_at' => \DB::raw('NOW()'), |
|
56 | - 'updated_at' => \DB::raw('NOW()') |
|
57 | - ], |
|
58 | - [ |
|
59 | - 'name' => 'first', |
|
60 | - 'model' => 'settings', |
|
61 | - 'created_at' => \DB::raw('NOW()'), |
|
62 | - 'updated_at' => \DB::raw('NOW()') |
|
63 | - ], |
|
64 | - [ |
|
65 | - 'name' => 'paginate', |
|
66 | - 'model' => 'settings', |
|
67 | - 'created_at' => \DB::raw('NOW()'), |
|
68 | - 'updated_at' => \DB::raw('NOW()') |
|
69 | - ], |
|
70 | - [ |
|
71 | - 'name' => 'paginateby', |
|
72 | - 'model' => 'settings', |
|
73 | - 'created_at' => \DB::raw('NOW()'), |
|
74 | - 'updated_at' => \DB::raw('NOW()') |
|
75 | - ] |
|
76 | - ] |
|
77 | - ); |
|
21 | + * Insert the permissions related to this module. |
|
22 | + */ |
|
23 | + DB::table('permissions')->insert( |
|
24 | + [ |
|
25 | + /** |
|
26 | + * Users model permissions. |
|
27 | + */ |
|
28 | + [ |
|
29 | + 'name' => 'save', |
|
30 | + 'model' => 'settings', |
|
31 | + 'created_at' => \DB::raw('NOW()'), |
|
32 | + 'updated_at' => \DB::raw('NOW()') |
|
33 | + ], |
|
34 | + [ |
|
35 | + 'name' => 'find', |
|
36 | + 'model' => 'settings', |
|
37 | + 'created_at' => \DB::raw('NOW()'), |
|
38 | + 'updated_at' => \DB::raw('NOW()') |
|
39 | + ], |
|
40 | + [ |
|
41 | + 'name' => 'search', |
|
42 | + 'model' => 'settings', |
|
43 | + 'created_at' => \DB::raw('NOW()'), |
|
44 | + 'updated_at' => \DB::raw('NOW()') |
|
45 | + ], |
|
46 | + [ |
|
47 | + 'name' => 'list', |
|
48 | + 'model' => 'settings', |
|
49 | + 'created_at' => \DB::raw('NOW()'), |
|
50 | + 'updated_at' => \DB::raw('NOW()') |
|
51 | + ], |
|
52 | + [ |
|
53 | + 'name' => 'findby', |
|
54 | + 'model' => 'settings', |
|
55 | + 'created_at' => \DB::raw('NOW()'), |
|
56 | + 'updated_at' => \DB::raw('NOW()') |
|
57 | + ], |
|
58 | + [ |
|
59 | + 'name' => 'first', |
|
60 | + 'model' => 'settings', |
|
61 | + 'created_at' => \DB::raw('NOW()'), |
|
62 | + 'updated_at' => \DB::raw('NOW()') |
|
63 | + ], |
|
64 | + [ |
|
65 | + 'name' => 'paginate', |
|
66 | + 'model' => 'settings', |
|
67 | + 'created_at' => \DB::raw('NOW()'), |
|
68 | + 'updated_at' => \DB::raw('NOW()') |
|
69 | + ], |
|
70 | + [ |
|
71 | + 'name' => 'paginateby', |
|
72 | + 'model' => 'settings', |
|
73 | + 'created_at' => \DB::raw('NOW()'), |
|
74 | + 'updated_at' => \DB::raw('NOW()') |
|
75 | + ] |
|
76 | + ] |
|
77 | + ); |
|
78 | 78 | |
79 | - /** |
|
80 | - * Delete previous permissions. |
|
81 | - */ |
|
79 | + /** |
|
80 | + * Delete previous permissions. |
|
81 | + */ |
|
82 | 82 | DB::table('permissions')->whereIn('model', ['logs'])->delete(); |
83 | 83 | |
84 | 84 | /** |
85 | - * Insert the permissions related to this module. |
|
86 | - */ |
|
87 | - DB::table('permissions')->insert( |
|
88 | - [ |
|
89 | - /** |
|
90 | - * Logs model permissions. |
|
91 | - */ |
|
92 | - [ |
|
93 | - 'name' => 'find', |
|
94 | - 'model' => 'logs', |
|
95 | - 'created_at' => \DB::raw('NOW()'), |
|
96 | - 'updated_at' => \DB::raw('NOW()') |
|
97 | - ], |
|
98 | - [ |
|
99 | - 'name' => 'search', |
|
100 | - 'model' => 'logs', |
|
101 | - 'created_at' => \DB::raw('NOW()'), |
|
102 | - 'updated_at' => \DB::raw('NOW()') |
|
103 | - ], |
|
104 | - [ |
|
105 | - 'name' => 'list', |
|
106 | - 'model' => 'logs', |
|
107 | - 'created_at' => \DB::raw('NOW()'), |
|
108 | - 'updated_at' => \DB::raw('NOW()') |
|
109 | - ], |
|
110 | - [ |
|
111 | - 'name' => 'findby', |
|
112 | - 'model' => 'logs', |
|
113 | - 'created_at' => \DB::raw('NOW()'), |
|
114 | - 'updated_at' => \DB::raw('NOW()') |
|
115 | - ], |
|
116 | - [ |
|
117 | - 'name' => 'first', |
|
118 | - 'model' => 'logs', |
|
119 | - 'created_at' => \DB::raw('NOW()'), |
|
120 | - 'updated_at' => \DB::raw('NOW()') |
|
121 | - ], |
|
122 | - [ |
|
123 | - 'name' => 'paginate', |
|
124 | - 'model' => 'logs', |
|
125 | - 'created_at' => \DB::raw('NOW()'), |
|
126 | - 'updated_at' => \DB::raw('NOW()') |
|
127 | - ], |
|
128 | - [ |
|
129 | - 'name' => 'paginateby', |
|
130 | - 'model' => 'logs', |
|
131 | - 'created_at' => \DB::raw('NOW()'), |
|
132 | - 'updated_at' => \DB::raw('NOW()') |
|
133 | - ], |
|
134 | - ] |
|
135 | - ); |
|
85 | + * Insert the permissions related to this module. |
|
86 | + */ |
|
87 | + DB::table('permissions')->insert( |
|
88 | + [ |
|
89 | + /** |
|
90 | + * Logs model permissions. |
|
91 | + */ |
|
92 | + [ |
|
93 | + 'name' => 'find', |
|
94 | + 'model' => 'logs', |
|
95 | + 'created_at' => \DB::raw('NOW()'), |
|
96 | + 'updated_at' => \DB::raw('NOW()') |
|
97 | + ], |
|
98 | + [ |
|
99 | + 'name' => 'search', |
|
100 | + 'model' => 'logs', |
|
101 | + 'created_at' => \DB::raw('NOW()'), |
|
102 | + 'updated_at' => \DB::raw('NOW()') |
|
103 | + ], |
|
104 | + [ |
|
105 | + 'name' => 'list', |
|
106 | + 'model' => 'logs', |
|
107 | + 'created_at' => \DB::raw('NOW()'), |
|
108 | + 'updated_at' => \DB::raw('NOW()') |
|
109 | + ], |
|
110 | + [ |
|
111 | + 'name' => 'findby', |
|
112 | + 'model' => 'logs', |
|
113 | + 'created_at' => \DB::raw('NOW()'), |
|
114 | + 'updated_at' => \DB::raw('NOW()') |
|
115 | + ], |
|
116 | + [ |
|
117 | + 'name' => 'first', |
|
118 | + 'model' => 'logs', |
|
119 | + 'created_at' => \DB::raw('NOW()'), |
|
120 | + 'updated_at' => \DB::raw('NOW()') |
|
121 | + ], |
|
122 | + [ |
|
123 | + 'name' => 'paginate', |
|
124 | + 'model' => 'logs', |
|
125 | + 'created_at' => \DB::raw('NOW()'), |
|
126 | + 'updated_at' => \DB::raw('NOW()') |
|
127 | + ], |
|
128 | + [ |
|
129 | + 'name' => 'paginateby', |
|
130 | + 'model' => 'logs', |
|
131 | + 'created_at' => \DB::raw('NOW()'), |
|
132 | + 'updated_at' => \DB::raw('NOW()') |
|
133 | + ], |
|
134 | + ] |
|
135 | + ); |
|
136 | 136 | |
137 | - /** |
|
137 | + /** |
|
138 | 138 | * Assign the permissions to the admin group. |
139 | 139 | */ |
140 | 140 | $permissionIds = DB::table('permissions')->whereIn('model', ['settings', 'logs'])->select('id')->lists('id'); |
@@ -159,7 +159,7 @@ |
||
159 | 159 | */ |
160 | 160 | public function down() |
161 | 161 | { |
162 | - $permissions = DB::table('permissions')->whereIn('model', ['settings']); |
|
162 | + $permissions = DB::table('permissions')->whereIn('model', ['settings']); |
|
163 | 163 | DB::table('groups_permissions')->whereIn('permission_id', $permissions->lists('id'))->delete(); |
164 | 164 | $permissions->delete(); |
165 | 165 | } |
@@ -3,14 +3,14 @@ |
||
3 | 3 | use Illuminate\Database\Eloquent\Model; |
4 | 4 | use Illuminate\Database\Eloquent\SoftDeletes; |
5 | 5 | |
6 | -class Settings extends Model{ |
|
6 | +class Settings extends Model { |
|
7 | 7 | |
8 | 8 | use SoftDeletes; |
9 | 9 | protected $table = 'settings'; |
10 | 10 | protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
11 | 11 | protected $hidden = ['deleted_at']; |
12 | 12 | protected $guarded = ['id', 'key']; |
13 | - protected $fillable = ['name','value']; |
|
13 | + protected $fillable = ['name', 'value']; |
|
14 | 14 | |
15 | 15 | public function getCreatedAtAttribute($value) |
16 | 16 | { |
@@ -5,32 +5,32 @@ |
||
5 | 5 | |
6 | 6 | class Settings extends Model{ |
7 | 7 | |
8 | - use SoftDeletes; |
|
9 | - protected $table = 'settings'; |
|
10 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
11 | - protected $hidden = ['deleted_at']; |
|
12 | - protected $guarded = ['id', 'key']; |
|
13 | - protected $fillable = ['name','value']; |
|
14 | - public $searchable = ['name', 'value', 'key']; |
|
8 | + use SoftDeletes; |
|
9 | + protected $table = 'settings'; |
|
10 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
11 | + protected $hidden = ['deleted_at']; |
|
12 | + protected $guarded = ['id', 'key']; |
|
13 | + protected $fillable = ['name','value']; |
|
14 | + public $searchable = ['name', 'value', 'key']; |
|
15 | 15 | |
16 | - public function getCreatedAtAttribute($value) |
|
17 | - { |
|
18 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
19 | - } |
|
16 | + public function getCreatedAtAttribute($value) |
|
17 | + { |
|
18 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
19 | + } |
|
20 | 20 | |
21 | - public function getUpdatedAtAttribute($value) |
|
22 | - { |
|
23 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
24 | - } |
|
21 | + public function getUpdatedAtAttribute($value) |
|
22 | + { |
|
23 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
24 | + } |
|
25 | 25 | |
26 | - public function getDeletedAtAttribute($value) |
|
27 | - { |
|
28 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
29 | - } |
|
26 | + public function getDeletedAtAttribute($value) |
|
27 | + { |
|
28 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
29 | + } |
|
30 | 30 | |
31 | - public static function boot() |
|
32 | - { |
|
33 | - parent::boot(); |
|
34 | - parent::observe(\App::make('App\Modules\V1\Core\ModelObservers\SettingsObserver')); |
|
35 | - } |
|
31 | + public static function boot() |
|
32 | + { |
|
33 | + parent::boot(); |
|
34 | + parent::observe(\App::make('App\Modules\V1\Core\ModelObservers\SettingsObserver')); |
|
35 | + } |
|
36 | 36 | } |
@@ -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 |