Completed
Push — master ( 21ebc1...3cae80 )
by Sherif
05:55
created
V1/Notifications/Database/Migrations/2016_01_24_111941_notifications.php 1 patch
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -15,14 +15,14 @@
 block discarded – undo
15 15
 		Schema::create('notifications', function (Blueprint $table) {
16 16
 			$table->increments('id');
17 17
 			$table->string('key', 100);
18
-            $table->text('data');
18
+			$table->text('data');
19 19
 			$table->string('item_name',100);
20 20
 			$table->string('item_type',100);
21 21
 			$table->integer('item_id');
22 22
 			$table->boolean('notified');
23 23
 			$table->softDeletes();
24 24
 			$table->timestamps();
25
-        });
25
+		});
26 26
 	}
27 27
 
28 28
 	/**
Please login to merge, or discard this patch.
src/Modules/V1/Notifications/Notification.php 1 patch
Indentation   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -5,48 +5,48 @@
 block discarded – undo
5 5
 
6 6
 class Notification extends Model{
7 7
 
8
-    use SoftDeletes;
9
-    protected $table    = 'notifications';
10
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
11
-    protected $hidden   = ['deleted_at', 'item_type', 'data'];
12
-    protected $guarded  = ['id'];
13
-    protected $fillable = ['key', 'data', 'item_name', 'item_type', 'item_id', 'notified'];
14
-    protected $appends  = ['description'];
15
-    public $searchable  = ['key', 'item_name', 'item_type'];
16
-
17
-    public function getCreatedAtAttribute($value)
18
-    {
19
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
20
-    }
21
-
22
-    public function getUpdatedAtAttribute($value)
23
-    {
24
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
25
-    }
26
-
27
-    public function getDeletedAtAttribute($value)
28
-    {
29
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
30
-    }
8
+	use SoftDeletes;
9
+	protected $table    = 'notifications';
10
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
11
+	protected $hidden   = ['deleted_at', 'item_type', 'data'];
12
+	protected $guarded  = ['id'];
13
+	protected $fillable = ['key', 'data', 'item_name', 'item_type', 'item_id', 'notified'];
14
+	protected $appends  = ['description'];
15
+	public $searchable  = ['key', 'item_name', 'item_type'];
16
+
17
+	public function getCreatedAtAttribute($value)
18
+	{
19
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
20
+	}
21
+
22
+	public function getUpdatedAtAttribute($value)
23
+	{
24
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
25
+	}
26
+
27
+	public function getDeletedAtAttribute($value)
28
+	{
29
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
30
+	}
31 31
     
32
-    public function item()
33
-    {
34
-        return $this->morphTo();
35
-    }
36
-
37
-    public function setDataAttribute($value)
38
-    {
39
-        $this->attributes['data'] = serialize($value);
40
-    }
41
-
42
-    public function getDescriptionAttribute()
43
-    {
44
-        return trans('notifications.' . $this->attributes['key'], unserialize($this->attributes['data']));
45
-    }
46
-
47
-    public static function boot()
48
-    {
49
-        parent::boot();
50
-        parent::observe(\App::make('App\Modules\V1\Notifications\ModelObservers\NotificationObserver'));
51
-    }
32
+	public function item()
33
+	{
34
+		return $this->morphTo();
35
+	}
36
+
37
+	public function setDataAttribute($value)
38
+	{
39
+		$this->attributes['data'] = serialize($value);
40
+	}
41
+
42
+	public function getDescriptionAttribute()
43
+	{
44
+		return trans('notifications.' . $this->attributes['key'], unserialize($this->attributes['data']));
45
+	}
46
+
47
+	public static function boot()
48
+	{
49
+		parent::boot();
50
+		parent::observe(\App::make('App\Modules\V1\Notifications\ModelObservers\NotificationObserver'));
51
+	}
52 52
 }
Please login to merge, or discard this patch.
src/Modules/V1/Acl/ModelObservers/AclGroupObserver.php 1 patch
Indentation   +50 added lines, -50 removed lines patch added patch discarded remove patch
@@ -5,62 +5,62 @@
 block discarded – undo
5 5
  */
6 6
 class AclGroupObserver {
7 7
 
8
-    public function saving($model)
9
-    {
10
-        //
11
-    }
8
+	public function saving($model)
9
+	{
10
+		//
11
+	}
12 12
 
13
-    public function saved($model)
14
-    {
15
-        //
16
-    }
13
+	public function saved($model)
14
+	{
15
+		//
16
+	}
17 17
 
18
-    public function creating($model)
19
-    {
20
-        //
21
-    }
18
+	public function creating($model)
19
+	{
20
+		//
21
+	}
22 22
 
23
-    public function created($model)
24
-    {
25
-        //
26
-    }
23
+	public function created($model)
24
+	{
25
+		//
26
+	}
27 27
 
28
-    /**
29
-     * Prevent updating of the admin group.
30
-     * 
31
-     * @param  object $model the model beign updated.
32
-     * @return void
33
-     */
34
-    public function updating($model)
35
-    {
36
-        if ($model->getOriginal('name') == 'Admin') 
37
-        {
38
-            \ErrorHandler::noPermissions();
39
-        }
40
-    }
28
+	/**
29
+	 * Prevent updating of the admin group.
30
+	 * 
31
+	 * @param  object $model the model beign updated.
32
+	 * @return void
33
+	 */
34
+	public function updating($model)
35
+	{
36
+		if ($model->getOriginal('name') == 'Admin') 
37
+		{
38
+			\ErrorHandler::noPermissions();
39
+		}
40
+	}
41 41
 
42
-    public function updated($model)
43
-    {
44
-        //
45
-    }
42
+	public function updated($model)
43
+	{
44
+		//
45
+	}
46 46
 
47
-    /**
48
-     * Prevent deleting the admin group.
49
-     * 
50
-     * @param  object $model the delted model.
51
-     * @return void
52
-     */
53
-    public function deleting($model)
54
-    {
55
-        if ($model->getOriginal('name') == 'Admin') 
56
-        {
57
-            \ErrorHandler::noPermissions();
58
-        }
59
-    }
47
+	/**
48
+	 * Prevent deleting the admin group.
49
+	 * 
50
+	 * @param  object $model the delted model.
51
+	 * @return void
52
+	 */
53
+	public function deleting($model)
54
+	{
55
+		if ($model->getOriginal('name') == 'Admin') 
56
+		{
57
+			\ErrorHandler::noPermissions();
58
+		}
59
+	}
60 60
 
61
-    public function deleted($model)
62
-    {
63
-        //
64
-    }
61
+	public function deleted($model)
62
+	{
63
+		//
64
+	}
65 65
 
66 66
 }
67 67
\ No newline at end of file
Please login to merge, or discard this patch.
src/Modules/V1/Acl/AclUser.php 1 patch
Indentation   +47 added lines, -47 removed lines patch added patch discarded remove patch
@@ -6,53 +6,53 @@
 block discarded – undo
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
-    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
+	public $searchable  = ['name', 'email'];
16 16
     
17
-    public function getCreatedAtAttribute($value)
18
-    {
19
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
20
-    }
21
-
22
-    public function getUpdatedAtAttribute($value)
23
-    {
24
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
25
-    }
26
-
27
-    public function getDeletedAtAttribute($value)
28
-    {
29
-        return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
30
-    }
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
-    }
42
-
43
-    public function logs()
44
-    {
45
-        return $this->hasMany('App\Modules\V1\Core\Log', 'user_id');
46
-    }
47
-
48
-    public function groups()
49
-    {
50
-        return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
51
-    }
17
+	public function getCreatedAtAttribute($value)
18
+	{
19
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
20
+	}
21
+
22
+	public function getUpdatedAtAttribute($value)
23
+	{
24
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
25
+	}
26
+
27
+	public function getDeletedAtAttribute($value)
28
+	{
29
+		return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString();
30
+	}
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
+	}
42
+
43
+	public function logs()
44
+	{
45
+		return $this->hasMany('App\Modules\V1\Core\Log', 'user_id');
46
+	}
47
+
48
+	public function groups()
49
+	{
50
+		return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
51
+	}
52 52
     
53
-    public static function boot()
54
-    {
55
-        parent::boot();
56
-        parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclUserObserver'));
57
-    }
53
+	public static function boot()
54
+	{
55
+		parent::boot();
56
+		parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclUserObserver'));
57
+	}
58 58
 }
Please login to merge, or discard this patch.
src/lang/ar/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/lang/en/auth.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 
3 3
 return [
4 4
 
5
-    /*
5
+	/*
6 6
     |--------------------------------------------------------------------------
7 7
     | Authentication Language Lines
8 8
     |--------------------------------------------------------------------------
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
     |
14 14
     */
15 15
 
16
-    'failed' => 'These credentials do not match our records.',
17
-    'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
16
+	'failed' => 'These credentials do not match our records.',
17
+	'throttle' => 'Too many login attempts. Please try again in :seconds seconds.',
18 18
 
19 19
 ];
Please login to merge, or discard this patch.
src/lang/en/validation.php 1 patch
Indentation   +75 added lines, -75 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 
3 3
 return [
4 4
 
5
-    /*
5
+	/*
6 6
     |--------------------------------------------------------------------------
7 7
     | Validation Language Lines
8 8
     |--------------------------------------------------------------------------
@@ -13,74 +13,74 @@  discard block
 block discarded – undo
13 13
     |
14 14
     */
15 15
 
16
-    'accepted'             => 'The :attribute must be accepted.',
17
-    'active_url'           => 'The :attribute is not a valid URL.',
18
-    'after'                => 'The :attribute must be a date after :date.',
19
-    'alpha'                => 'The :attribute may only contain letters.',
20
-    'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
21
-    'alpha_num'            => 'The :attribute may only contain letters and numbers.',
22
-    'array'                => 'The :attribute must be an array.',
23
-    'before'               => 'The :attribute must be a date before :date.',
24
-    'between'              => [
25
-        'numeric' => 'The :attribute must be between :min and :max.',
26
-        'file'    => 'The :attribute must be between :min and :max kilobytes.',
27
-        'string'  => 'The :attribute must be between :min and :max characters.',
28
-        'array'   => 'The :attribute must have between :min and :max items.',
29
-    ],
30
-    'boolean'              => 'The :attribute field must be true or false.',
31
-    'confirmed'            => 'The :attribute confirmation does not match.',
32
-    'date'                 => 'The :attribute is not a valid date.',
33
-    'date_format'          => 'The :attribute does not match the format :format.',
34
-    'different'            => 'The :attribute and :other must be different.',
35
-    'digits'               => 'The :attribute must be :digits digits.',
36
-    'digits_between'       => 'The :attribute must be between :min and :max digits.',
37
-    'distinct'             => 'The :attribute field has a duplicate value.',
38
-    'email'                => 'The :attribute must be a valid email address.',
39
-    'exists'               => 'The selected :attribute is invalid.',
40
-    'filled'               => 'The :attribute field is required.',
41
-    'image'                => 'The :attribute must be an image.',
42
-    'in'                   => 'The selected :attribute is invalid.',
43
-    'in_array'             => 'The :attribute field does not exist in :other.',
44
-    'integer'              => 'The :attribute must be an integer.',
45
-    'ip'                   => 'The :attribute must be a valid IP address.',
46
-    'json'                 => 'The :attribute must be a valid JSON string.',
47
-    'max'                  => [
48
-        'numeric' => 'The :attribute may not be greater than :max.',
49
-        'file'    => 'The :attribute may not be greater than :max kilobytes.',
50
-        'string'  => 'The :attribute may not be greater than :max characters.',
51
-        'array'   => 'The :attribute may not have more than :max items.',
52
-    ],
53
-    'mimes'                => 'The :attribute must be a file of type: :values.',
54
-    'min'                  => [
55
-        'numeric' => 'The :attribute must be at least :min.',
56
-        'file'    => 'The :attribute must be at least :min kilobytes.',
57
-        'string'  => 'The :attribute must be at least :min characters.',
58
-        'array'   => 'The :attribute must have at least :min items.',
59
-    ],
60
-    'not_in'               => 'The selected :attribute is invalid.',
61
-    'numeric'              => 'The :attribute must be a number.',
62
-    'present'              => 'The :attribute field must be present.',
63
-    'regex'                => 'The :attribute format is invalid.',
64
-    'required'             => 'The :attribute field is required.',
65
-    'required_if'          => 'The :attribute field is required when :other is :value.',
66
-    'required_unless'      => 'The :attribute field is required unless :other is in :values.',
67
-    'required_with'        => 'The :attribute field is required when :values is present.',
68
-    'required_with_all'    => 'The :attribute field is required when :values is present.',
69
-    'required_without'     => 'The :attribute field is required when :values is not present.',
70
-    'required_without_all' => 'The :attribute field is required when none of :values are present.',
71
-    'same'                 => 'The :attribute and :other must match.',
72
-    'size'                 => [
73
-        'numeric' => 'The :attribute must be :size.',
74
-        'file'    => 'The :attribute must be :size kilobytes.',
75
-        'string'  => 'The :attribute must be :size characters.',
76
-        'array'   => 'The :attribute must contain :size items.',
77
-    ],
78
-    'string'               => 'The :attribute must be a string.',
79
-    'timezone'             => 'The :attribute must be a valid zone.',
80
-    'unique'               => 'The :attribute has already been taken.',
81
-    'url'                  => 'The :attribute format is invalid.',
16
+	'accepted'             => 'The :attribute must be accepted.',
17
+	'active_url'           => 'The :attribute is not a valid URL.',
18
+	'after'                => 'The :attribute must be a date after :date.',
19
+	'alpha'                => 'The :attribute may only contain letters.',
20
+	'alpha_dash'           => 'The :attribute may only contain letters, numbers, and dashes.',
21
+	'alpha_num'            => 'The :attribute may only contain letters and numbers.',
22
+	'array'                => 'The :attribute must be an array.',
23
+	'before'               => 'The :attribute must be a date before :date.',
24
+	'between'              => [
25
+		'numeric' => 'The :attribute must be between :min and :max.',
26
+		'file'    => 'The :attribute must be between :min and :max kilobytes.',
27
+		'string'  => 'The :attribute must be between :min and :max characters.',
28
+		'array'   => 'The :attribute must have between :min and :max items.',
29
+	],
30
+	'boolean'              => 'The :attribute field must be true or false.',
31
+	'confirmed'            => 'The :attribute confirmation does not match.',
32
+	'date'                 => 'The :attribute is not a valid date.',
33
+	'date_format'          => 'The :attribute does not match the format :format.',
34
+	'different'            => 'The :attribute and :other must be different.',
35
+	'digits'               => 'The :attribute must be :digits digits.',
36
+	'digits_between'       => 'The :attribute must be between :min and :max digits.',
37
+	'distinct'             => 'The :attribute field has a duplicate value.',
38
+	'email'                => 'The :attribute must be a valid email address.',
39
+	'exists'               => 'The selected :attribute is invalid.',
40
+	'filled'               => 'The :attribute field is required.',
41
+	'image'                => 'The :attribute must be an image.',
42
+	'in'                   => 'The selected :attribute is invalid.',
43
+	'in_array'             => 'The :attribute field does not exist in :other.',
44
+	'integer'              => 'The :attribute must be an integer.',
45
+	'ip'                   => 'The :attribute must be a valid IP address.',
46
+	'json'                 => 'The :attribute must be a valid JSON string.',
47
+	'max'                  => [
48
+		'numeric' => 'The :attribute may not be greater than :max.',
49
+		'file'    => 'The :attribute may not be greater than :max kilobytes.',
50
+		'string'  => 'The :attribute may not be greater than :max characters.',
51
+		'array'   => 'The :attribute may not have more than :max items.',
52
+	],
53
+	'mimes'                => 'The :attribute must be a file of type: :values.',
54
+	'min'                  => [
55
+		'numeric' => 'The :attribute must be at least :min.',
56
+		'file'    => 'The :attribute must be at least :min kilobytes.',
57
+		'string'  => 'The :attribute must be at least :min characters.',
58
+		'array'   => 'The :attribute must have at least :min items.',
59
+	],
60
+	'not_in'               => 'The selected :attribute is invalid.',
61
+	'numeric'              => 'The :attribute must be a number.',
62
+	'present'              => 'The :attribute field must be present.',
63
+	'regex'                => 'The :attribute format is invalid.',
64
+	'required'             => 'The :attribute field is required.',
65
+	'required_if'          => 'The :attribute field is required when :other is :value.',
66
+	'required_unless'      => 'The :attribute field is required unless :other is in :values.',
67
+	'required_with'        => 'The :attribute field is required when :values is present.',
68
+	'required_with_all'    => 'The :attribute field is required when :values is present.',
69
+	'required_without'     => 'The :attribute field is required when :values is not present.',
70
+	'required_without_all' => 'The :attribute field is required when none of :values are present.',
71
+	'same'                 => 'The :attribute and :other must match.',
72
+	'size'                 => [
73
+		'numeric' => 'The :attribute must be :size.',
74
+		'file'    => 'The :attribute must be :size kilobytes.',
75
+		'string'  => 'The :attribute must be :size characters.',
76
+		'array'   => 'The :attribute must contain :size items.',
77
+	],
78
+	'string'               => 'The :attribute must be a string.',
79
+	'timezone'             => 'The :attribute must be a valid zone.',
80
+	'unique'               => 'The :attribute has already been taken.',
81
+	'url'                  => 'The :attribute format is invalid.',
82 82
 
83
-    /*
83
+	/*
84 84
     |--------------------------------------------------------------------------
85 85
     | Custom Validation Language Lines
86 86
     |--------------------------------------------------------------------------
@@ -91,13 +91,13 @@  discard block
 block discarded – undo
91 91
     |
92 92
     */
93 93
 
94
-    'custom' => [
95
-        'attribute-name' => [
96
-            'rule-name' => 'custom-message',
97
-        ],
98
-    ],
94
+	'custom' => [
95
+		'attribute-name' => [
96
+			'rule-name' => 'custom-message',
97
+		],
98
+	],
99 99
 
100
-    /*
100
+	/*
101 101
     |--------------------------------------------------------------------------
102 102
     | Custom Validation Attributes
103 103
     |--------------------------------------------------------------------------
@@ -108,6 +108,6 @@  discard block
 block discarded – undo
108 108
     |
109 109
     */
110 110
 
111
-    'attributes' => [],
111
+	'attributes' => [],
112 112
 
113 113
 ];
Please login to merge, or discard this patch.
src/lang/en/passwords.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 
3 3
 return [
4 4
 
5
-    /*
5
+	/*
6 6
     |--------------------------------------------------------------------------
7 7
     | Password Reset Language Lines
8 8
     |--------------------------------------------------------------------------
@@ -13,10 +13,10 @@  discard block
 block discarded – undo
13 13
     |
14 14
     */
15 15
 
16
-    'password' => 'Passwords must be at least six characters and match the confirmation.',
17
-    'reset' => 'Your password has been reset!',
18
-    'sent' => 'We have e-mailed your password reset link!',
19
-    'token' => 'This password reset token is invalid.',
20
-    'user' => "We can't find a user with that e-mail address.",
16
+	'password' => 'Passwords must be at least six characters and match the confirmation.',
17
+	'reset' => 'Your password has been reset!',
18
+	'sent' => 'We have e-mailed your password reset link!',
19
+	'token' => 'This password reset token is invalid.',
20
+	'user' => "We can't find a user with that e-mail address.",
21 21
 
22 22
 ];
Please login to merge, or discard this patch.
src/lang/en/pagination.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -2,7 +2,7 @@  discard block
 block discarded – undo
2 2
 
3 3
 return [
4 4
 
5
-    /*
5
+	/*
6 6
     |--------------------------------------------------------------------------
7 7
     | Pagination Language Lines
8 8
     |--------------------------------------------------------------------------
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
     |
14 14
     */
15 15
 
16
-    'previous' => '« Previous',
17
-    'next'     => 'Next »',
16
+	'previous' => '« Previous',
17
+	'next'     => 'Next »',
18 18
 
19 19
 ];
Please login to merge, or discard this patch.