Completed
Push — master ( 2c4876...f9862b )
by Sherif
10:06
created
src/Modules/V1/Reporting/ModelObservers/ReprotObserver.php 1 patch
Indentation   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -5,53 +5,53 @@
 block discarded – undo
5 5
  */
6 6
 class ReprotObserver {
7 7
 
8
-    public function saving($model)
9
-    {
10
-        //
11
-    }
12
-
13
-    public function saved($model)
14
-    {
15
-        //
16
-    }
17
-
18
-    public function creating($model)
19
-    {
20
-        //
21
-    }
22
-
23
-    public function created($model)
24
-    {
25
-        //
26
-    }
27
-
28
-    public function updating($model)
29
-    {
30
-        //
31
-    }
32
-
33
-    public function updated($model)
34
-    {
35
-        //
36
-    }
37
-
38
-    public function deleting($model)
39
-    {
40
-        //
41
-    }
42
-
43
-    public function deleted($model)
44
-    {
45
-        //
46
-    }
47
-
48
-    public function restoring($model)
49
-    {
50
-        //
51
-    }
52
-
53
-    public function restored($model)
54
-    {
55
-        //
56
-    }
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
+
48
+	public function restoring($model)
49
+	{
50
+		//
51
+	}
52
+
53
+	public function restored($model)
54
+	{
55
+		//
56
+	}
57 57
 }
58 58
\ No newline at end of file
Please login to merge, or discard this patch.
Modules/V1/Notifications/ModelObservers/PushNotificationDeviceObserver.php 1 patch
Indentation   +49 added lines, -49 removed lines patch added patch discarded remove patch
@@ -5,53 +5,53 @@
 block discarded – undo
5 5
  */
6 6
 class PushNotificationDeviceObserver {
7 7
 
8
-    public function saving($model)
9
-    {
10
-        //
11
-    }
12
-
13
-    public function saved($model)
14
-    {
15
-        //
16
-    }
17
-
18
-    public function creating($model)
19
-    {
20
-        //
21
-    }
22
-
23
-    public function created($model)
24
-    {
25
-        //
26
-    }
27
-
28
-    public function updating($model)
29
-    {
30
-        //
31
-    }
32
-
33
-    public function updated($model)
34
-    {
35
-        //
36
-    }
37
-
38
-    public function deleting($model)
39
-    {
40
-        //
41
-    }
42
-
43
-    public function deleted($model)
44
-    {
45
-        //
46
-    }
47
-
48
-    public function restoring($model)
49
-    {
50
-        //
51
-    }
52
-
53
-    public function restored($model)
54
-    {
55
-        //
56
-    }
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
+
48
+	public function restoring($model)
49
+	{
50
+		//
51
+	}
52
+
53
+	public function restored($model)
54
+	{
55
+		//
56
+	}
57 57
 }
58 58
\ No newline at end of file
Please login to merge, or discard this patch.
src/Modules/V1/Core/Decorators/CachingDecorator.php 3 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -64,7 +64,7 @@
 block discarded – undo
64 64
         if ($this->cacheConfig && $this->cacheConfig == 'cache') 
65 65
         {
66 66
             $page     = \Request::get('page') !== null ? \Request::get('page') : '1';
67
-            $cacheKey = $name . $page . \Session::get('locale') . serialize($arguments);
67
+            $cacheKey = $name.$page.\Session::get('locale').serialize($arguments);
68 68
             return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function() use ($arguments, $name) {
69 69
                 return call_user_func_array([$this->repo, $name], $arguments);
70 70
             });
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -68,8 +68,7 @@  discard block
 block discarded – undo
68 68
             return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function() use ($arguments, $name) {
69 69
                 return call_user_func_array([$this->repo, $name], $arguments);
70 70
             });
71
-        }
72
-        else if ($this->cacheConfig)
71
+        } else if ($this->cacheConfig)
73 72
         {
74 73
             $this->cache->tags($this->cacheConfig)->flush();
75 74
             return call_user_func_array([$this->repo, $name], $arguments);
@@ -93,8 +92,7 @@  discard block
 block discarded – undo
93 92
         if ($cacheConfig && in_array($name, $cacheConfig['cache']))
94 93
         {
95 94
             $this->cacheConfig = 'cache';
96
-        }
97
-        else if ($cacheConfig && isset($cacheConfig['clear'][$name]))
95
+        } else if ($cacheConfig && isset($cacheConfig['clear'][$name]))
98 96
         {
99 97
             $this->cacheConfig = $cacheConfig['clear'][$name];
100 98
         }
Please login to merge, or discard this patch.
Indentation   +101 added lines, -101 removed lines patch added patch discarded remove patch
@@ -2,117 +2,117 @@
 block discarded – undo
2 2
 
3 3
 class CachingDecorator
4 4
 {
5
-    /**
6
-     * The repo implementation.
7
-     * 
8
-     * @var string
9
-     */
10
-    public $repo;
5
+	/**
6
+	 * The repo implementation.
7
+	 * 
8
+	 * @var string
9
+	 */
10
+	public $repo;
11 11
 
12
-    /**
13
-     * The cache implementation.
14
-     * 
15
-     * @var object
16
-     */
17
-    protected $cache;
12
+	/**
13
+	 * The cache implementation.
14
+	 * 
15
+	 * @var object
16
+	 */
17
+	protected $cache;
18 18
 
19
-    /**
20
-     * The modelKey implementation.
21
-     * 
22
-     * @var string
23
-     */
24
-    public $modelKey;
19
+	/**
20
+	 * The modelKey implementation.
21
+	 * 
22
+	 * @var string
23
+	 */
24
+	public $modelKey;
25 25
 
26
-    /**
27
-     * The model implementation.
28
-     * 
29
-     * @var string
30
-     */
31
-    public $model;
26
+	/**
27
+	 * The model implementation.
28
+	 * 
29
+	 * @var string
30
+	 */
31
+	public $model;
32 32
 
33
-    /**
34
-     * The modelClass implementation.
35
-     * 
36
-     * @var string
37
-     */
38
-    public $modelClass;
33
+	/**
34
+	 * The modelClass implementation.
35
+	 * 
36
+	 * @var string
37
+	 */
38
+	public $modelClass;
39 39
 
40
-    /**
41
-     * The cacheConfig implementation.
42
-     * 
43
-     * @var array
44
-     */
45
-    public $cacheConfig;
40
+	/**
41
+	 * The cacheConfig implementation.
42
+	 * 
43
+	 * @var array
44
+	 */
45
+	public $cacheConfig;
46 46
 
47
-    /**
48
-     * The cacheTag implementation.
49
-     * 
50
-     * @var string
51
-     */
52
-    public $cacheTag;
47
+	/**
48
+	 * The cacheTag implementation.
49
+	 * 
50
+	 * @var string
51
+	 */
52
+	public $cacheTag;
53 53
     
54
-    /**
55
-     * Create new CachingDecorator instance.
56
-     */
57
-    public function __construct($repo, $cache)
58
-    {   
59
-        $this->repo       = $repo;
60
-        $this->cache      = $cache;
61
-        $this->model      = $this->repo->model;
62
-        $this->modelClass = get_class($this->model);
63
-        $repoClass        = explode('\\', get_class($this->repo));
64
-        $repoName         = end($repoClass);
65
-        $this->cacheTag   = str_plural(lcfirst(substr($repoName, 0, strpos($repoName, 'Repository'))));
66
-    }
54
+	/**
55
+	 * Create new CachingDecorator instance.
56
+	 */
57
+	public function __construct($repo, $cache)
58
+	{   
59
+		$this->repo       = $repo;
60
+		$this->cache      = $cache;
61
+		$this->model      = $this->repo->model;
62
+		$this->modelClass = get_class($this->model);
63
+		$repoClass        = explode('\\', get_class($this->repo));
64
+		$repoName         = end($repoClass);
65
+		$this->cacheTag   = str_plural(lcfirst(substr($repoName, 0, strpos($repoName, 'Repository'))));
66
+	}
67 67
 
68
-    /**
69
-     * Handle the cache mechanism for the called method
70
-     * based the configurations.
71
-     * 
72
-     * @param  string $name the called method name
73
-     * @param  array  $arguments the method arguments
74
-     * @return object
75
-     */
76
-    public function __call($name, $arguments)
77
-    {
78
-        $this->setCacheConfig($name);
68
+	/**
69
+	 * Handle the cache mechanism for the called method
70
+	 * based the configurations.
71
+	 * 
72
+	 * @param  string $name the called method name
73
+	 * @param  array  $arguments the method arguments
74
+	 * @return object
75
+	 */
76
+	public function __call($name, $arguments)
77
+	{
78
+		$this->setCacheConfig($name);
79 79
 
80
-        if ($this->cacheConfig && $this->cacheConfig == 'cache') 
81
-        {
82
-            $page     = \Request::get('page') !== null ? \Request::get('page') : '1';
83
-            $cacheKey = $name . $page . \Session::get('locale') . serialize($arguments);
84
-            return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function() use ($arguments, $name) {
85
-                return call_user_func_array([$this->repo, $name], $arguments);
86
-            });
87
-        }
88
-        else if ($this->cacheConfig)
89
-        {
90
-            $this->cache->tags($this->cacheConfig)->flush();
91
-            return call_user_func_array([$this->repo, $name], $arguments);
92
-        }
80
+		if ($this->cacheConfig && $this->cacheConfig == 'cache') 
81
+		{
82
+			$page     = \Request::get('page') !== null ? \Request::get('page') : '1';
83
+			$cacheKey = $name . $page . \Session::get('locale') . serialize($arguments);
84
+			return $this->cache->tags([$this->cacheTag])->rememberForever($cacheKey, function() use ($arguments, $name) {
85
+				return call_user_func_array([$this->repo, $name], $arguments);
86
+			});
87
+		}
88
+		else if ($this->cacheConfig)
89
+		{
90
+			$this->cache->tags($this->cacheConfig)->flush();
91
+			return call_user_func_array([$this->repo, $name], $arguments);
92
+		}
93 93
 
94
-        return call_user_func_array([$this->repo, $name], $arguments);
95
-    }
94
+		return call_user_func_array([$this->repo, $name], $arguments);
95
+	}
96 96
 
97
-    /**
98
-     * Set cache config based on the called method.
99
-     * 
100
-     * @param  string $name
101
-     * @return void
102
-     */
103
-    private function setCacheConfig($name)
104
-    {   
105
-        $config            = \CoreConfig::getConfig();
106
-        $cacheConfig       = array_key_exists($this->cacheTag, $config['cacheConfig']) ? $config['cacheConfig'][$this->cacheTag] : false;
107
-        $this->cacheConfig = false;
97
+	/**
98
+	 * Set cache config based on the called method.
99
+	 * 
100
+	 * @param  string $name
101
+	 * @return void
102
+	 */
103
+	private function setCacheConfig($name)
104
+	{   
105
+		$config            = \CoreConfig::getConfig();
106
+		$cacheConfig       = array_key_exists($this->cacheTag, $config['cacheConfig']) ? $config['cacheConfig'][$this->cacheTag] : false;
107
+		$this->cacheConfig = false;
108 108
 
109
-        if ($cacheConfig && in_array($name, $cacheConfig['cache']))
110
-        {
111
-            $this->cacheConfig = 'cache';
112
-        }
113
-        else if ($cacheConfig && isset($cacheConfig['clear'][$name]))
114
-        {
115
-            $this->cacheConfig = $cacheConfig['clear'][$name];
116
-        }
117
-    }
109
+		if ($cacheConfig && in_array($name, $cacheConfig['cache']))
110
+		{
111
+			$this->cacheConfig = 'cache';
112
+		}
113
+		else if ($cacheConfig && isset($cacheConfig['clear'][$name]))
114
+		{
115
+			$this->cacheConfig = $cacheConfig['clear'][$name];
116
+		}
117
+	}
118 118
 }
119 119
\ No newline at end of file
Please login to merge, or discard this patch.
src/Modules/V1/Core/Database/Factories/SettingFactory.php 2 patches
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 $factory->define(App\Modules\V1\Core\Settings::class, function (Faker\Generator $faker) {
4
-    return [
4
+	return [
5 5
 		'name'       => $faker->randomElement(['Company Name', 'Title', 'Header Image']),
6 6
 		'value'      => $faker->word(),
7 7
 		'key'        => $faker->word(),
8 8
 		'created_at' => $faker->dateTimeBetween('-1 years', 'now'),
9 9
 		'updated_at' => $faker->dateTimeBetween('-1 years', 'now')
10
-    ];
10
+	];
11 11
 });
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-$factory->define(App\Modules\V1\Core\Settings::class, function (Faker\Generator $faker) {
3
+$factory->define(App\Modules\V1\Core\Settings::class, function(Faker\Generator $faker) {
4 4
     return [
5 5
 		'name'       => $faker->randomElement(['Company Name', 'Title', 'Header Image']),
6 6
 		'value'      => $faker->word(),
Please login to merge, or discard this patch.
src/Modules/V1/Core/ModelObservers/SettingsObserver.php 1 patch
Indentation   +55 added lines, -55 removed lines patch added patch discarded remove patch
@@ -5,68 +5,68 @@
 block discarded – undo
5 5
  */
6 6
 class SettingsObserver {
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
-    /**
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
-    }
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 28
 
29
-    public function created($model)
30
-    {
31
-        //
32
-    }
29
+	public function created($model)
30
+	{
31
+		//
32
+	}
33 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
-    }
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 47
 
48
-    public function updated($model)
49
-    {
50
-        //
51
-    }
48
+	public function updated($model)
49
+	{
50
+		//
51
+	}
52 52
 
53
-    public function deleting($model)
54
-    {
55
-        //
56
-    }
53
+	public function deleting($model)
54
+	{
55
+		//
56
+	}
57 57
 
58
-    public function deleted($model)
59
-    {
60
-        //
61
-    }
58
+	public function deleted($model)
59
+	{
60
+		//
61
+	}
62 62
 
63
-    public function restoring($model)
64
-    {
65
-        //
66
-    }
63
+	public function restoring($model)
64
+	{
65
+		//
66
+	}
67 67
 
68
-    public function restored($model)
69
-    {
70
-        //
71
-    }
68
+	public function restored($model)
69
+	{
70
+		//
71
+	}
72 72
 }
73 73
\ No newline at end of file
Please login to merge, or discard this patch.
V1/Notifications/Database/Factories/PushNotificationDeviceFactory.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php
2 2
 
3
-$factory->define(App\Modules\V1\Notifications\PushNotificationDevice::class, function (Faker\Generator $faker) {
3
+$factory->define(App\Modules\V1\Notifications\PushNotificationDevice::class, function(Faker\Generator $faker) {
4 4
     return [
5 5
 		'device_token' => $faker->sha1(),
6 6
 		'user_id'      => $faker->randomDigitNotNull(),
Please login to merge, or discard this patch.
Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <?php
2 2
 
3 3
 $factory->define(App\Modules\V1\Notifications\PushNotificationDevice::class, function (Faker\Generator $faker) {
4
-    return [
4
+	return [
5 5
 		'device_token' => $faker->sha1(),
6 6
 		'user_id'      => $faker->randomDigitNotNull(),
7 7
 		'created_at'   => $faker->dateTimeBetween('-1 years', 'now'),
8 8
 		'updated_at'   => $faker->dateTimeBetween('-1 years', 'now')
9
-    ];
9
+	];
10 10
 });
11 11
\ No newline at end of file
Please login to merge, or discard this patch.
Database/Migrations/2016_01_24_111942_push_notifications_devices.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -20,7 +20,7 @@
 block discarded – undo
20 20
 			$table->unique(array('device_token', 'user_id'));
21 21
 			$table->softDeletes();
22 22
 			$table->timestamps();
23
-        });
23
+		});
24 24
 	}
25 25
 
26 26
 	/**
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
 	 */
13 13
 	public function up()
14 14
 	{
15
-		Schema::create('push_notifications_devices', function (Blueprint $table) {
15
+		Schema::create('push_notifications_devices', function(Blueprint $table) {
16 16
 			$table->increments('id');
17 17
 			$table->string('device_token');
18 18
 			$table->integer('user_id');
Please login to merge, or discard this patch.
Notifications/Database/Migrations/2017_10_26_154804_create_jobs_table.php 2 patches
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -6,33 +6,33 @@
 block discarded – undo
6 6
 
7 7
 class CreateJobsTable extends Migration
8 8
 {
9
-    /**
10
-     * Run the migrations.
11
-     *
12
-     * @return void
13
-     */
14
-    public function up()
15
-    {
16
-        Schema::create('jobs', function (Blueprint $table) {
17
-            $table->bigIncrements('id');
18
-            $table->string('queue');
19
-            $table->longText('payload');
20
-            $table->tinyInteger('attempts')->unsigned();
21
-            $table->unsignedInteger('reserved_at')->nullable();
22
-            $table->unsignedInteger('available_at');
23
-            $table->unsignedInteger('created_at');
9
+	/**
10
+	 * Run the migrations.
11
+	 *
12
+	 * @return void
13
+	 */
14
+	public function up()
15
+	{
16
+		Schema::create('jobs', function (Blueprint $table) {
17
+			$table->bigIncrements('id');
18
+			$table->string('queue');
19
+			$table->longText('payload');
20
+			$table->tinyInteger('attempts')->unsigned();
21
+			$table->unsignedInteger('reserved_at')->nullable();
22
+			$table->unsignedInteger('available_at');
23
+			$table->unsignedInteger('created_at');
24 24
 
25
-            $table->index(['queue', 'reserved_at']);
26
-        });
27
-    }
25
+			$table->index(['queue', 'reserved_at']);
26
+		});
27
+	}
28 28
 
29
-    /**
30
-     * Reverse the migrations.
31
-     *
32
-     * @return void
33
-     */
34
-    public function down()
35
-    {
36
-        Schema::dropIfExists('jobs');
37
-    }
29
+	/**
30
+	 * Reverse the migrations.
31
+	 *
32
+	 * @return void
33
+	 */
34
+	public function down()
35
+	{
36
+		Schema::dropIfExists('jobs');
37
+	}
38 38
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -13,7 +13,7 @@
 block discarded – undo
13 13
      */
14 14
     public function up()
15 15
     {
16
-        Schema::create('jobs', function (Blueprint $table) {
16
+        Schema::create('jobs', function(Blueprint $table) {
17 17
             $table->bigIncrements('id');
18 18
             $table->string('queue');
19 19
             $table->longText('payload');
Please login to merge, or discard this patch.
src/Modules/V1/Acl/AclUser.php 4 patches
Unused Use Statements   -1 removed lines patch added patch discarded remove patch
@@ -2,7 +2,6 @@
 block discarded – undo
2 2
 
3 3
 use App\User;
4 4
 use Illuminate\Database\Eloquent\SoftDeletes;
5
-use Illuminate\Notifications\Notifiable;
6 5
 use Laravel\Passport\HasApiTokens;
7 6
 
8 7
 class AclUser extends User {
Please login to merge, or discard this patch.
Braces   +1 added lines, -2 removed lines patch added patch discarded remove patch
@@ -67,8 +67,7 @@
 block discarded – undo
67 67
                 }
68 68
 
69 69
                 $tokens[] = $device->device_token;
70
-            } 
71
-            catch (\Exception $e) 
70
+            } catch (\Exception $e) 
72 71
             {
73 72
                 $device->forceDelete();
74 73
             }
Please login to merge, or discard this patch.
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
     use SoftDeletes, HasApiTokens;
11 11
     protected $table    = 'users';
12 12
     protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
13
-    protected $hidden   = ['password', 'remember_token','deleted_at', 'two_factor_code'];
13
+    protected $hidden   = ['password', 'remember_token', 'deleted_at', 'two_factor_code'];
14 14
     protected $guarded  = ['id'];
15 15
     protected $fillable = ['profile_picture', 'name', 'email', 'password'];
16 16
     public $searchable  = ['name', 'email'];
@@ -67,7 +67,7 @@  discard block
 block discarded – undo
67 67
 
68 68
     public function groups()
69 69
     {
70
-        return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
70
+        return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup', 'users_groups', 'user_id', 'group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
71 71
     }
72 72
 
73 73
     public function oauthClients()
@@ -114,7 +114,7 @@  discard block
 block discarded – undo
114 114
      */
115 115
     public function receivesBroadcastNotificationsOn()
116 116
     {
117
-        return 'users.' . $this->id;
117
+        return 'users.'.$this->id;
118 118
     }
119 119
     
120 120
     public static function boot()
Please login to merge, or discard this patch.
Indentation   +113 added lines, -113 removed lines patch added patch discarded remove patch
@@ -7,119 +7,119 @@
 block discarded – undo
7 7
 
8 8
 class AclUser extends User {
9 9
 
10
-    use SoftDeletes, HasApiTokens;
11
-    protected $table    = 'users';
12
-    protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
13
-    protected $hidden   = ['password', 'remember_token','deleted_at', 'two_factor_code'];
14
-    protected $guarded  = ['id'];
15
-    protected $fillable = ['profile_picture', 'name', 'email', 'password'];
16
-    public $searchable  = ['name', 'email'];
10
+	use SoftDeletes, HasApiTokens;
11
+	protected $table    = 'users';
12
+	protected $dates    = ['created_at', 'updated_at', 'deleted_at'];
13
+	protected $hidden   = ['password', 'remember_token','deleted_at', 'two_factor_code'];
14
+	protected $guarded  = ['id'];
15
+	protected $fillable = ['profile_picture', 'name', 'email', 'password'];
16
+	public $searchable  = ['name', 'email'];
17 17
     
18
-    public function getCreatedAtAttribute($value)
19
-    {
20
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
21
-    }
22
-
23
-    public function getUpdatedAtAttribute($value)
24
-    {
25
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
26
-    }
27
-
28
-    public function getDeletedAtAttribute($value)
29
-    {
30
-        return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
31
-    }
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
-    }
43
-
44
-    /**
45
-     * Get the entity's notifications.
46
-     */
47
-    public function notifications()
48
-    {
49
-        return $this->morphMany('\App\Modules\V1\Notifications\Notification', 'notifiable')->orderBy('created_at', 'desc');
50
-    }
51
-
52
-    /**
53
-     * Get the entity's read notifications.
54
-     */
55
-    public function readNotifications()
56
-    {
57
-        return $this->notifications()->whereNotNull('read_at');
58
-    }
59
-
60
-    /**
61
-     * Get the entity's unread notifications.
62
-     */
63
-    public function unreadNotifications()
64
-    {
65
-        return $this->notifications()->whereNull('read_at');
66
-    }
67
-
68
-    public function groups()
69
-    {
70
-        return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
71
-    }
72
-
73
-    public function oauthClients()
74
-    {
75
-        return $this->hasMany('App\Modules\V1\Acl\OauthClient', 'user_id');
76
-    }
77
-
78
-    /**
79
-     * Return fcm device tokens that will be used in sending fcm notifications.
80
-     * 
81
-     * @return array
82
-     */
83
-    public function routeNotificationForFCM()
84
-    {
85
-        $devices = \Core::pushNotificationsDevices()->findBy(['user_id' => $this->id]);
86
-        $tokens  = [];
87
-
88
-        foreach ($devices as $device) 
89
-        {
90
-            $accessToken = decrypt($device->access_token);
91
-
92
-            try
93
-            {
94
-                if (\Core::users()->accessTokenExpiredOrRevoked($accessToken)) 
95
-                {
96
-                    continue;
97
-                }
98
-
99
-                $tokens[] = $device->device_token;
100
-            } 
101
-            catch (\Exception $e) 
102
-            {
103
-                $device->forceDelete();
104
-            }
105
-        }
106
-
107
-        return $tokens;
108
-    }
109
-
110
-    /**
111
-     * The channels the user receives notification broadcasts on.
112
-     *
113
-     * @return string
114
-     */
115
-    public function receivesBroadcastNotificationsOn()
116
-    {
117
-        return 'users.' . $this->id;
118
-    }
18
+	public function getCreatedAtAttribute($value)
19
+	{
20
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
21
+	}
22
+
23
+	public function getUpdatedAtAttribute($value)
24
+	{
25
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
26
+	}
27
+
28
+	public function getDeletedAtAttribute($value)
29
+	{
30
+		return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString();
31
+	}
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
+	}
43
+
44
+	/**
45
+	 * Get the entity's notifications.
46
+	 */
47
+	public function notifications()
48
+	{
49
+		return $this->morphMany('\App\Modules\V1\Notifications\Notification', 'notifiable')->orderBy('created_at', 'desc');
50
+	}
51
+
52
+	/**
53
+	 * Get the entity's read notifications.
54
+	 */
55
+	public function readNotifications()
56
+	{
57
+		return $this->notifications()->whereNotNull('read_at');
58
+	}
59
+
60
+	/**
61
+	 * Get the entity's unread notifications.
62
+	 */
63
+	public function unreadNotifications()
64
+	{
65
+		return $this->notifications()->whereNull('read_at');
66
+	}
67
+
68
+	public function groups()
69
+	{
70
+		return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps();
71
+	}
72
+
73
+	public function oauthClients()
74
+	{
75
+		return $this->hasMany('App\Modules\V1\Acl\OauthClient', 'user_id');
76
+	}
77
+
78
+	/**
79
+	 * Return fcm device tokens that will be used in sending fcm notifications.
80
+	 * 
81
+	 * @return array
82
+	 */
83
+	public function routeNotificationForFCM()
84
+	{
85
+		$devices = \Core::pushNotificationsDevices()->findBy(['user_id' => $this->id]);
86
+		$tokens  = [];
87
+
88
+		foreach ($devices as $device) 
89
+		{
90
+			$accessToken = decrypt($device->access_token);
91
+
92
+			try
93
+			{
94
+				if (\Core::users()->accessTokenExpiredOrRevoked($accessToken)) 
95
+				{
96
+					continue;
97
+				}
98
+
99
+				$tokens[] = $device->device_token;
100
+			} 
101
+			catch (\Exception $e) 
102
+			{
103
+				$device->forceDelete();
104
+			}
105
+		}
106
+
107
+		return $tokens;
108
+	}
109
+
110
+	/**
111
+	 * The channels the user receives notification broadcasts on.
112
+	 *
113
+	 * @return string
114
+	 */
115
+	public function receivesBroadcastNotificationsOn()
116
+	{
117
+		return 'users.' . $this->id;
118
+	}
119 119
     
120
-    public static function boot()
121
-    {
122
-        parent::boot();
123
-        parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclUserObserver'));
124
-    }
120
+	public static function boot()
121
+	{
122
+		parent::boot();
123
+		parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclUserObserver'));
124
+	}
125 125
 }
Please login to merge, or discard this patch.