@@ -6,30 +6,30 @@ |
||
| 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__.'/Exceptions' => app_path('Exceptions'), |
|
| 18 | - __DIR__.'/Modules' => app_path('Modules'), |
|
| 19 | - __DIR__.'/notifications' => app_path('notifications'), |
|
| 20 | - __DIR__.'/Kernel.php' => app_path('Http/Kernel.php'), |
|
| 9 | + /** |
|
| 10 | + * Perform post-registration booting of services. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function boot() |
|
| 15 | + { |
|
| 16 | + $this->publishes([ |
|
| 17 | + __DIR__.'/Exceptions' => app_path('Exceptions'), |
|
| 18 | + __DIR__.'/Modules' => app_path('Modules'), |
|
| 19 | + __DIR__.'/notifications' => app_path('notifications'), |
|
| 20 | + __DIR__.'/Kernel.php' => app_path('Http/Kernel.php'), |
|
| 21 | 21 | |
| 22 | - ]); |
|
| 22 | + ]); |
|
| 23 | 23 | |
| 24 | - } |
|
| 24 | + } |
|
| 25 | 25 | |
| 26 | - /** |
|
| 27 | - * Register any package services. |
|
| 28 | - * |
|
| 29 | - * @return void |
|
| 30 | - */ |
|
| 31 | - public function register() |
|
| 32 | - { |
|
| 33 | - // |
|
| 34 | - } |
|
| 26 | + /** |
|
| 27 | + * Register any package services. |
|
| 28 | + * |
|
| 29 | + * @return void |
|
| 30 | + */ |
|
| 31 | + public function register() |
|
| 32 | + { |
|
| 33 | + // |
|
| 34 | + } |
|
| 35 | 35 | } |
| 36 | 36 | \ No newline at end of file |
@@ -10,56 +10,56 @@ |
||
| 10 | 10 | |
| 11 | 11 | class Handler extends ExceptionHandler |
| 12 | 12 | { |
| 13 | - /** |
|
| 14 | - * A list of the exception types that should not be reported. |
|
| 15 | - * |
|
| 16 | - * @var array |
|
| 17 | - */ |
|
| 18 | - protected $dontReport = [ |
|
| 19 | - HttpException::class, |
|
| 20 | - ModelNotFoundException::class, |
|
| 21 | - ]; |
|
| 13 | + /** |
|
| 14 | + * A list of the exception types that should not be reported. |
|
| 15 | + * |
|
| 16 | + * @var array |
|
| 17 | + */ |
|
| 18 | + protected $dontReport = [ |
|
| 19 | + HttpException::class, |
|
| 20 | + ModelNotFoundException::class, |
|
| 21 | + ]; |
|
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * Report or log an exception. |
|
| 25 | - * |
|
| 26 | - * This is a great spot to send exceptions to Sentry, Bugsnag, etc. |
|
| 27 | - * |
|
| 28 | - * @param \Exception $e |
|
| 29 | - * @return void |
|
| 30 | - */ |
|
| 31 | - public function report(Exception $e) |
|
| 32 | - { |
|
| 33 | - return parent::report($e); |
|
| 34 | - } |
|
| 23 | + /** |
|
| 24 | + * Report or log an exception. |
|
| 25 | + * |
|
| 26 | + * This is a great spot to send exceptions to Sentry, Bugsnag, etc. |
|
| 27 | + * |
|
| 28 | + * @param \Exception $e |
|
| 29 | + * @return void |
|
| 30 | + */ |
|
| 31 | + public function report(Exception $e) |
|
| 32 | + { |
|
| 33 | + return parent::report($e); |
|
| 34 | + } |
|
| 35 | 35 | |
| 36 | - /** |
|
| 37 | - * Render an exception into an HTTP response. |
|
| 38 | - * |
|
| 39 | - * @param \Illuminate\Http\Request $request |
|
| 40 | - * @param \Exception $e |
|
| 41 | - * @return \Illuminate\Http\Response |
|
| 42 | - */ |
|
| 43 | - public function render($request, Exception $e) |
|
| 44 | - { |
|
| 45 | - if ($e instanceof ModelNotFoundException) { |
|
| 46 | - $e = new NotFoundHttpException($e->getMessage(), $e); |
|
| 47 | - } |
|
| 36 | + /** |
|
| 37 | + * Render an exception into an HTTP response. |
|
| 38 | + * |
|
| 39 | + * @param \Illuminate\Http\Request $request |
|
| 40 | + * @param \Exception $e |
|
| 41 | + * @return \Illuminate\Http\Response |
|
| 42 | + */ |
|
| 43 | + public function render($request, Exception $e) |
|
| 44 | + { |
|
| 45 | + if ($e instanceof ModelNotFoundException) { |
|
| 46 | + $e = new NotFoundHttpException($e->getMessage(), $e); |
|
| 47 | + } |
|
| 48 | 48 | |
| 49 | - if ($request->wantsJson()) |
|
| 50 | - { |
|
| 51 | - if ($e instanceof \Illuminate\Database\QueryException) |
|
| 52 | - { |
|
| 53 | - return \Response::json('Please check the given inputes', '400'); |
|
| 54 | - } |
|
| 55 | - else if ($e instanceof \predis\connection\connectionexception) |
|
| 56 | - { |
|
| 57 | - return \Response::json('Your redis notification server isn\'t running', '400'); |
|
| 58 | - } |
|
| 49 | + if ($request->wantsJson()) |
|
| 50 | + { |
|
| 51 | + if ($e instanceof \Illuminate\Database\QueryException) |
|
| 52 | + { |
|
| 53 | + return \Response::json('Please check the given inputes', '400'); |
|
| 54 | + } |
|
| 55 | + else if ($e instanceof \predis\connection\connectionexception) |
|
| 56 | + { |
|
| 57 | + return \Response::json('Your redis notification server isn\'t running', '400'); |
|
| 58 | + } |
|
| 59 | 59 | |
| 60 | - return \Response::json($e->getMessage(), $e->getStatusCode()); |
|
| 61 | - } |
|
| 60 | + return \Response::json($e->getMessage(), $e->getStatusCode()); |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | - return parent::render($request, $e); |
|
| 64 | - } |
|
| 63 | + return parent::render($request, $e); |
|
| 64 | + } |
|
| 65 | 65 | } |
@@ -5,47 +5,47 @@ |
||
| 5 | 5 | |
| 6 | 6 | class AclGroup extends Model{ |
| 7 | 7 | |
| 8 | - use SoftDeletes; |
|
| 9 | - protected $table = 'groups'; |
|
| 10 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
| 11 | - protected $hidden = ['deleted_at']; |
|
| 12 | - protected $guarded = ['id']; |
|
| 13 | - protected $fillable = ['name']; |
|
| 14 | - |
|
| 15 | - public function getCreatedAtAttribute($value) |
|
| 16 | - { |
|
| 17 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 18 | - } |
|
| 19 | - |
|
| 20 | - public function getUpdatedAtAttribute($value) |
|
| 21 | - { |
|
| 22 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 23 | - } |
|
| 24 | - |
|
| 25 | - public function getDeletedAtAttribute($value) |
|
| 26 | - { |
|
| 27 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 28 | - } |
|
| 29 | - |
|
| 30 | - public function users() |
|
| 31 | - { |
|
| 32 | - return $this->belongsToMany('\App\Modules\Acl\AclUser','users_groups','group_id','user_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
| 33 | - } |
|
| 34 | - |
|
| 35 | - public function permissions() |
|
| 36 | - { |
|
| 37 | - return $this->belongsToMany('\App\Modules\Acl\AclPermission','groups_permissions','group_id','permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
| 38 | - } |
|
| 39 | - |
|
| 40 | - public static function boot() |
|
| 41 | - { |
|
| 42 | - parent::boot(); |
|
| 43 | - |
|
| 44 | - AclGroup::deleting(function($group) |
|
| 45 | - { |
|
| 46 | - \DB::table('groups_permissions') |
|
| 47 | - ->where('group_id', $group->id) |
|
| 48 | - ->update(array('deleted_at' => \DB::raw('NOW()'))); |
|
| 49 | - }); |
|
| 50 | - } |
|
| 8 | + use SoftDeletes; |
|
| 9 | + protected $table = 'groups'; |
|
| 10 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
| 11 | + protected $hidden = ['deleted_at']; |
|
| 12 | + protected $guarded = ['id']; |
|
| 13 | + protected $fillable = ['name']; |
|
| 14 | + |
|
| 15 | + public function getCreatedAtAttribute($value) |
|
| 16 | + { |
|
| 17 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 18 | + } |
|
| 19 | + |
|
| 20 | + public function getUpdatedAtAttribute($value) |
|
| 21 | + { |
|
| 22 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 23 | + } |
|
| 24 | + |
|
| 25 | + public function getDeletedAtAttribute($value) |
|
| 26 | + { |
|
| 27 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 28 | + } |
|
| 29 | + |
|
| 30 | + public function users() |
|
| 31 | + { |
|
| 32 | + return $this->belongsToMany('\App\Modules\Acl\AclUser','users_groups','group_id','user_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
| 33 | + } |
|
| 34 | + |
|
| 35 | + public function permissions() |
|
| 36 | + { |
|
| 37 | + return $this->belongsToMany('\App\Modules\Acl\AclPermission','groups_permissions','group_id','permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
| 38 | + } |
|
| 39 | + |
|
| 40 | + public static function boot() |
|
| 41 | + { |
|
| 42 | + parent::boot(); |
|
| 43 | + |
|
| 44 | + AclGroup::deleting(function($group) |
|
| 45 | + { |
|
| 46 | + \DB::table('groups_permissions') |
|
| 47 | + ->where('group_id', $group->id) |
|
| 48 | + ->update(array('deleted_at' => \DB::raw('NOW()'))); |
|
| 49 | + }); |
|
| 50 | + } |
|
| 51 | 51 | } |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | use Illuminate\Database\Eloquent\Model; |
| 4 | 4 | use Illuminate\Database\Eloquent\SoftDeletes; |
| 5 | 5 | |
| 6 | -class AclGroup extends Model{ |
|
| 6 | +class AclGroup extends Model { |
|
| 7 | 7 | |
| 8 | 8 | use SoftDeletes; |
| 9 | 9 | protected $table = 'groups'; |
@@ -29,12 +29,12 @@ discard block |
||
| 29 | 29 | |
| 30 | 30 | public function users() |
| 31 | 31 | { |
| 32 | - return $this->belongsToMany('\App\Modules\Acl\AclUser','users_groups','group_id','user_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
| 32 | + return $this->belongsToMany('\App\Modules\Acl\AclUser', 'users_groups', 'group_id', 'user_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | public function permissions() |
| 36 | 36 | { |
| 37 | - return $this->belongsToMany('\App\Modules\Acl\AclPermission','groups_permissions','group_id','permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
| 37 | + return $this->belongsToMany('\App\Modules\Acl\AclPermission', 'groups_permissions', 'group_id', 'permission_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
| 38 | 38 | } |
| 39 | 39 | |
| 40 | 40 | public static function boot() |
@@ -13,17 +13,17 @@ |
||
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | 15 | Schema::create('users', function (Blueprint $table) { |
| 16 | - $table->increments('id'); |
|
| 17 | - $table->string('first_name',100)->nullable(); |
|
| 18 | - $table->string('last_name',100)->nullable(); |
|
| 19 | - $table->string('user_name',100)->nullable(); |
|
| 20 | - $table->text('address')->nullable(); |
|
| 21 | - $table->string('email')->unique(); |
|
| 22 | - $table->string('password', 60); |
|
| 23 | - $table->softDeletes(); |
|
| 24 | - $table->rememberToken(); |
|
| 25 | - $table->timestamps(); |
|
| 26 | - }); |
|
| 16 | + $table->increments('id'); |
|
| 17 | + $table->string('first_name',100)->nullable(); |
|
| 18 | + $table->string('last_name',100)->nullable(); |
|
| 19 | + $table->string('user_name',100)->nullable(); |
|
| 20 | + $table->text('address')->nullable(); |
|
| 21 | + $table->string('email')->unique(); |
|
| 22 | + $table->string('password', 60); |
|
| 23 | + $table->softDeletes(); |
|
| 24 | + $table->rememberToken(); |
|
| 25 | + $table->timestamps(); |
|
| 26 | + }); |
|
| 27 | 27 | } |
| 28 | 28 | |
| 29 | 29 | /** |
@@ -12,11 +12,11 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('users', function (Blueprint $table) { |
|
| 15 | + Schema::create('users', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | - $table->string('first_name',100)->nullable(); |
|
| 18 | - $table->string('last_name',100)->nullable(); |
|
| 19 | - $table->string('user_name',100)->nullable(); |
|
| 17 | + $table->string('first_name', 100)->nullable(); |
|
| 18 | + $table->string('last_name', 100)->nullable(); |
|
| 19 | + $table->string('user_name', 100)->nullable(); |
|
| 20 | 20 | $table->text('address')->nullable(); |
| 21 | 21 | $table->string('email')->unique(); |
| 22 | 22 | $table->string('password', 60); |
@@ -12,21 +12,21 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('permissions', function (Blueprint $table) { |
|
| 16 | - $table->increments('id'); |
|
| 17 | - $table->string('name',100); |
|
| 18 | - $table->string('model',100); |
|
| 19 | - $table->softDeletes(); |
|
| 20 | - $table->timestamps(); |
|
| 21 | - $table->unique(array('name', 'model')); |
|
| 22 | - }); |
|
| 23 | - Schema::create('groups_permissions', function (Blueprint $table) { |
|
| 24 | - $table->increments('id'); |
|
| 25 | - $table->integer('group_id'); |
|
| 26 | - $table->integer('permission_id'); |
|
| 27 | - $table->softDeletes(); |
|
| 28 | - $table->timestamps(); |
|
| 29 | - }); |
|
| 15 | + Schema::create('permissions', function (Blueprint $table) { |
|
| 16 | + $table->increments('id'); |
|
| 17 | + $table->string('name',100); |
|
| 18 | + $table->string('model',100); |
|
| 19 | + $table->softDeletes(); |
|
| 20 | + $table->timestamps(); |
|
| 21 | + $table->unique(array('name', 'model')); |
|
| 22 | + }); |
|
| 23 | + Schema::create('groups_permissions', function (Blueprint $table) { |
|
| 24 | + $table->increments('id'); |
|
| 25 | + $table->integer('group_id'); |
|
| 26 | + $table->integer('permission_id'); |
|
| 27 | + $table->softDeletes(); |
|
| 28 | + $table->timestamps(); |
|
| 29 | + }); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | /** |
@@ -12,15 +12,15 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('permissions', function (Blueprint $table) { |
|
| 15 | + Schema::create('permissions', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | - $table->string('name',100); |
|
| 18 | - $table->string('model',100); |
|
| 17 | + $table->string('name', 100); |
|
| 18 | + $table->string('model', 100); |
|
| 19 | 19 | $table->softDeletes(); |
| 20 | 20 | $table->timestamps(); |
| 21 | 21 | $table->unique(array('name', 'model')); |
| 22 | 22 | }); |
| 23 | - Schema::create('groups_permissions', function (Blueprint $table) { |
|
| 23 | + Schema::create('groups_permissions', function(Blueprint $table) { |
|
| 24 | 24 | $table->increments('id'); |
| 25 | 25 | $table->integer('group_id'); |
| 26 | 26 | $table->integer('permission_id'); |
@@ -13,19 +13,19 @@ |
||
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | 15 | Schema::create('groups', function (Blueprint $table) { |
| 16 | - $table->increments('id'); |
|
| 17 | - $table->string('name',100)->unique(); |
|
| 18 | - $table->softDeletes(); |
|
| 19 | - $table->timestamps(); |
|
| 20 | - }); |
|
| 16 | + $table->increments('id'); |
|
| 17 | + $table->string('name',100)->unique(); |
|
| 18 | + $table->softDeletes(); |
|
| 19 | + $table->timestamps(); |
|
| 20 | + }); |
|
| 21 | 21 | |
| 22 | - Schema::create('users_groups', function (Blueprint $table) { |
|
| 23 | - $table->increments('id'); |
|
| 24 | - $table->integer('user_id'); |
|
| 25 | - $table->integer('group_id'); |
|
| 26 | - $table->softDeletes(); |
|
| 27 | - $table->timestamps(); |
|
| 28 | - }); |
|
| 22 | + Schema::create('users_groups', function (Blueprint $table) { |
|
| 23 | + $table->increments('id'); |
|
| 24 | + $table->integer('user_id'); |
|
| 25 | + $table->integer('group_id'); |
|
| 26 | + $table->softDeletes(); |
|
| 27 | + $table->timestamps(); |
|
| 28 | + }); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | /** |
@@ -12,14 +12,14 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('groups', function (Blueprint $table) { |
|
| 15 | + Schema::create('groups', function(Blueprint $table) { |
|
| 16 | 16 | $table->increments('id'); |
| 17 | - $table->string('name',100)->unique(); |
|
| 17 | + $table->string('name', 100)->unique(); |
|
| 18 | 18 | $table->softDeletes(); |
| 19 | 19 | $table->timestamps(); |
| 20 | 20 | }); |
| 21 | 21 | |
| 22 | - Schema::create('users_groups', function (Blueprint $table) { |
|
| 22 | + Schema::create('users_groups', function(Blueprint $table) { |
|
| 23 | 23 | $table->increments('id'); |
| 24 | 24 | $table->integer('user_id'); |
| 25 | 25 | $table->integer('group_id'); |
@@ -5,42 +5,42 @@ |
||
| 5 | 5 | |
| 6 | 6 | class AclPermission extends Model { |
| 7 | 7 | |
| 8 | - use SoftDeletes; |
|
| 9 | - protected $table = 'permissions'; |
|
| 10 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
| 11 | - protected $hidden = ['deleted_at']; |
|
| 12 | - protected $guarded = ['id']; |
|
| 13 | - protected $fillable = ['name', 'model']; |
|
| 14 | - |
|
| 15 | - public function getCreatedAtAttribute($value) |
|
| 16 | - { |
|
| 17 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 18 | - } |
|
| 19 | - |
|
| 20 | - public function getUpdatedAtAttribute($value) |
|
| 21 | - { |
|
| 22 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 23 | - } |
|
| 24 | - |
|
| 25 | - public function getDeletedAtAttribute($value) |
|
| 26 | - { |
|
| 27 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 28 | - } |
|
| 8 | + use SoftDeletes; |
|
| 9 | + protected $table = 'permissions'; |
|
| 10 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
| 11 | + protected $hidden = ['deleted_at']; |
|
| 12 | + protected $guarded = ['id']; |
|
| 13 | + protected $fillable = ['name', 'model']; |
|
| 14 | + |
|
| 15 | + public function getCreatedAtAttribute($value) |
|
| 16 | + { |
|
| 17 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 18 | + } |
|
| 19 | + |
|
| 20 | + public function getUpdatedAtAttribute($value) |
|
| 21 | + { |
|
| 22 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 23 | + } |
|
| 24 | + |
|
| 25 | + public function getDeletedAtAttribute($value) |
|
| 26 | + { |
|
| 27 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 28 | + } |
|
| 29 | 29 | |
| 30 | - public function groups() |
|
| 31 | - { |
|
| 32 | - return $this->belongsToMany('\App\Modules\Acl\AclGroup','groups_permissions','permission_id','group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
| 33 | - } |
|
| 34 | - |
|
| 35 | - public static function boot() |
|
| 36 | - { |
|
| 37 | - parent::boot(); |
|
| 38 | - |
|
| 39 | - AclPermission::deleting(function($permission) |
|
| 40 | - { |
|
| 41 | - \DB::table('groups_permissions') |
|
| 42 | - ->where('permission_id', $permission->id) |
|
| 43 | - ->update(array('deleted_at' => \DB::raw('NOW()'))); |
|
| 44 | - }); |
|
| 45 | - } |
|
| 30 | + public function groups() |
|
| 31 | + { |
|
| 32 | + return $this->belongsToMany('\App\Modules\Acl\AclGroup','groups_permissions','permission_id','group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
| 33 | + } |
|
| 34 | + |
|
| 35 | + public static function boot() |
|
| 36 | + { |
|
| 37 | + parent::boot(); |
|
| 38 | + |
|
| 39 | + AclPermission::deleting(function($permission) |
|
| 40 | + { |
|
| 41 | + \DB::table('groups_permissions') |
|
| 42 | + ->where('permission_id', $permission->id) |
|
| 43 | + ->update(array('deleted_at' => \DB::raw('NOW()'))); |
|
| 44 | + }); |
|
| 45 | + } |
|
| 46 | 46 | } |
@@ -29,7 +29,7 @@ |
||
| 29 | 29 | |
| 30 | 30 | public function groups() |
| 31 | 31 | { |
| 32 | - return $this->belongsToMany('\App\Modules\Acl\AclGroup','groups_permissions','permission_id','group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
| 32 | + return $this->belongsToMany('\App\Modules\Acl\AclGroup', 'groups_permissions', 'permission_id', 'group_id')->whereNull('groups_permissions.deleted_at')->withTimestamps(); |
|
| 33 | 33 | } |
| 34 | 34 | |
| 35 | 35 | public static function boot() |
@@ -6,74 +6,74 @@ |
||
| 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 = ['first_name', 'last_name', 'user_name', 'address', 'email', 'password']; |
|
| 15 | - protected $appends = ['permissions']; |
|
| 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 = ['first_name', 'last_name', 'user_name', 'address', 'email', 'password']; |
|
| 15 | + protected $appends = ['permissions']; |
|
| 16 | 16 | |
| 17 | - public function getCreatedAtAttribute($value) |
|
| 18 | - { |
|
| 19 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 20 | - } |
|
| 17 | + public function getCreatedAtAttribute($value) |
|
| 18 | + { |
|
| 19 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 20 | + } |
|
| 21 | 21 | |
| 22 | - public function getUpdatedAtAttribute($value) |
|
| 23 | - { |
|
| 24 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 25 | - } |
|
| 22 | + public function getUpdatedAtAttribute($value) |
|
| 23 | + { |
|
| 24 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 25 | + } |
|
| 26 | 26 | |
| 27 | - public function getDeletedAtAttribute($value) |
|
| 28 | - { |
|
| 29 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 30 | - } |
|
| 27 | + public function getDeletedAtAttribute($value) |
|
| 28 | + { |
|
| 29 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 30 | + } |
|
| 31 | 31 | |
| 32 | - /** |
|
| 33 | - * Encrypt the password attribute before |
|
| 34 | - * saving it in the storage. |
|
| 35 | - * |
|
| 36 | - * @param string $value |
|
| 37 | - */ |
|
| 38 | - public function setPasswordAttribute($value) |
|
| 39 | - { |
|
| 40 | - $this->attributes['password'] = bcrypt($value); |
|
| 41 | - } |
|
| 32 | + /** |
|
| 33 | + * Encrypt the password attribute before |
|
| 34 | + * saving it in the storage. |
|
| 35 | + * |
|
| 36 | + * @param string $value |
|
| 37 | + */ |
|
| 38 | + public function setPasswordAttribute($value) |
|
| 39 | + { |
|
| 40 | + $this->attributes['password'] = bcrypt($value); |
|
| 41 | + } |
|
| 42 | 42 | |
| 43 | - public function logs() |
|
| 44 | - { |
|
| 45 | - return $this->hasMany('App\Modules\Logging\Log', 'user_id'); |
|
| 46 | - } |
|
| 43 | + public function logs() |
|
| 44 | + { |
|
| 45 | + return $this->hasMany('App\Modules\Logging\Log', 'user_id'); |
|
| 46 | + } |
|
| 47 | 47 | |
| 48 | - public function groups() |
|
| 49 | - { |
|
| 50 | - return $this->belongsToMany('\App\Modules\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
| 51 | - } |
|
| 48 | + public function groups() |
|
| 49 | + { |
|
| 50 | + return $this->belongsToMany('\App\Modules\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
| 51 | + } |
|
| 52 | 52 | |
| 53 | - public function getPermissionsAttribute() |
|
| 54 | - { |
|
| 55 | - $permissions = []; |
|
| 56 | - foreach ($this->groups as $group) |
|
| 57 | - { |
|
| 58 | - $group->permissions->each(function ($permission) use (&$permissions){ |
|
| 59 | - $permissions[$permission->model][$permission->id] = $permission->name; |
|
| 60 | - }); |
|
| 61 | - } |
|
| 53 | + public function getPermissionsAttribute() |
|
| 54 | + { |
|
| 55 | + $permissions = []; |
|
| 56 | + foreach ($this->groups as $group) |
|
| 57 | + { |
|
| 58 | + $group->permissions->each(function ($permission) use (&$permissions){ |
|
| 59 | + $permissions[$permission->model][$permission->id] = $permission->name; |
|
| 60 | + }); |
|
| 61 | + } |
|
| 62 | 62 | |
| 63 | - return \Illuminate\Database\Eloquent\Collection::make($permissions); |
|
| 64 | - } |
|
| 63 | + return \Illuminate\Database\Eloquent\Collection::make($permissions); |
|
| 64 | + } |
|
| 65 | 65 | |
| 66 | - public static function boot() |
|
| 67 | - { |
|
| 68 | - parent::boot(); |
|
| 66 | + public static function boot() |
|
| 67 | + { |
|
| 68 | + parent::boot(); |
|
| 69 | 69 | |
| 70 | - AclUser::deleting(function($user) |
|
| 71 | - { |
|
| 72 | - \DB::table('users_groups') |
|
| 73 | - ->where('user_id', $user->id) |
|
| 74 | - ->update(array('deleted_at' => \DB::raw('NOW()'))); |
|
| 70 | + AclUser::deleting(function($user) |
|
| 71 | + { |
|
| 72 | + \DB::table('users_groups') |
|
| 73 | + ->where('user_id', $user->id) |
|
| 74 | + ->update(array('deleted_at' => \DB::raw('NOW()'))); |
|
| 75 | 75 | |
| 76 | - $user->logs()->delete(); |
|
| 77 | - }); |
|
| 78 | - } |
|
| 76 | + $user->logs()->delete(); |
|
| 77 | + }); |
|
| 78 | + } |
|
| 79 | 79 | } |
@@ -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\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
| 50 | + return $this->belongsToMany('\App\Modules\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 | } |
@@ -5,45 +5,45 @@ |
||
| 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']; |
|
| 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 | 14 | |
| 15 | - public function getCreatedAtAttribute($value) |
|
| 16 | - { |
|
| 17 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 18 | - } |
|
| 19 | - |
|
| 20 | - public function getUpdatedAtAttribute($value) |
|
| 21 | - { |
|
| 22 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 23 | - } |
|
| 24 | - |
|
| 25 | - public function getDeletedAtAttribute($value) |
|
| 26 | - { |
|
| 27 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 28 | - } |
|
| 29 | - |
|
| 30 | - public static function boot() |
|
| 31 | - { |
|
| 32 | - parent::boot(); |
|
| 33 | - |
|
| 34 | - Settings::creating(function($setting) |
|
| 35 | - { |
|
| 36 | - $error = \ErrorHandler::cannotCreateSetting(); |
|
| 37 | - abort($error['status'], $error['message']); |
|
| 38 | - }); |
|
| 39 | - |
|
| 40 | - Settings::updating(function($setting) |
|
| 41 | - { |
|
| 42 | - if ($setting->original['key'] !== $setting->key) |
|
| 43 | - { |
|
| 44 | - $error = \ErrorHandler::cannotUpdateSettingKey(); |
|
| 45 | - abort($error['status'], $error['message']); |
|
| 46 | - } |
|
| 47 | - }); |
|
| 48 | - } |
|
| 15 | + public function getCreatedAtAttribute($value) |
|
| 16 | + { |
|
| 17 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 18 | + } |
|
| 19 | + |
|
| 20 | + public function getUpdatedAtAttribute($value) |
|
| 21 | + { |
|
| 22 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 23 | + } |
|
| 24 | + |
|
| 25 | + public function getDeletedAtAttribute($value) |
|
| 26 | + { |
|
| 27 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 28 | + } |
|
| 29 | + |
|
| 30 | + public static function boot() |
|
| 31 | + { |
|
| 32 | + parent::boot(); |
|
| 33 | + |
|
| 34 | + Settings::creating(function($setting) |
|
| 35 | + { |
|
| 36 | + $error = \ErrorHandler::cannotCreateSetting(); |
|
| 37 | + abort($error['status'], $error['message']); |
|
| 38 | + }); |
|
| 39 | + |
|
| 40 | + Settings::updating(function($setting) |
|
| 41 | + { |
|
| 42 | + if ($setting->original['key'] !== $setting->key) |
|
| 43 | + { |
|
| 44 | + $error = \ErrorHandler::cannotUpdateSettingKey(); |
|
| 45 | + abort($error['status'], $error['message']); |
|
| 46 | + } |
|
| 47 | + }); |
|
| 48 | + } |
|
| 49 | 49 | } |
@@ -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 | { |