@@ -5,53 +5,53 @@ |
||
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 |
@@ -1,11 +1,11 @@ |
||
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 | }); |
@@ -1,12 +1,12 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | $factory->define(App\Modules\V1\Core\Log::class, function (Faker\Generator $faker) { |
4 | - return [ |
|
4 | + return [ |
|
5 | 5 | 'action' => $faker->randomElement(['create', 'delete', 'update']), |
6 | 6 | 'item_name ' => $faker->randomElement(['User', 'Settings', 'Group']), |
7 | 7 | 'item_id' => $faker->randomDigitNotNull(), |
8 | 8 | 'user_id' => $faker->randomDigitNotNull(), |
9 | 9 | 'created_at' => $faker->dateTimeBetween('-1 years', 'now'), |
10 | 10 | 'updated_at' => $faker->dateTimeBetween('-1 years', 'now') |
11 | - ]; |
|
11 | + ]; |
|
12 | 12 | }); |
13 | 13 | \ No newline at end of file |
@@ -6,20 +6,20 @@ discard block |
||
6 | 6 | |
7 | 7 | class AssignRelationsSeeder extends Seeder |
8 | 8 | { |
9 | - /** |
|
10 | - * Run the database seeds. |
|
11 | - * |
|
12 | - * @return void |
|
13 | - */ |
|
14 | - public function run() |
|
15 | - { |
|
16 | - $adminGroupId = \DB::table('groups')->where('name', 'admin')->select('id')->first()->id; |
|
9 | + /** |
|
10 | + * Run the database seeds. |
|
11 | + * |
|
12 | + * @return void |
|
13 | + */ |
|
14 | + public function run() |
|
15 | + { |
|
16 | + $adminGroupId = \DB::table('groups')->where('name', 'admin')->select('id')->first()->id; |
|
17 | 17 | |
18 | - /** |
|
19 | - * Assign the permissions to the admin group. |
|
20 | - */ |
|
21 | - \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['settings', 'logs'])->each(function ($permission) use ($adminGroupId) { |
|
22 | - \DB::table('groups_permissions')->insert( |
|
18 | + /** |
|
19 | + * Assign the permissions to the admin group. |
|
20 | + */ |
|
21 | + \DB::table('permissions')->orderBy('created_at', 'asc')->whereIn('model', ['settings', 'logs'])->each(function ($permission) use ($adminGroupId) { |
|
22 | + \DB::table('groups_permissions')->insert( |
|
23 | 23 | [ |
24 | 24 | 'permission_id' => $permission->id, |
25 | 25 | 'group_id' => $adminGroupId, |
@@ -27,6 +27,6 @@ discard block |
||
27 | 27 | 'updated_at' => \DB::raw('NOW()') |
28 | 28 | ] |
29 | 29 | ); |
30 | - }); |
|
31 | - } |
|
30 | + }); |
|
31 | + } |
|
32 | 32 | } |
@@ -5,53 +5,53 @@ |
||
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 | - } |
|
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 |
@@ -5,68 +5,68 @@ |
||
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 |
@@ -3,10 +3,10 @@ discard block |
||
3 | 3 | |
4 | 4 | class CoreConfig |
5 | 5 | { |
6 | - public function getConfig() |
|
7 | - { |
|
8 | - return [ |
|
9 | - 'resetLink' => '{{link_here}}', |
|
6 | + public function getConfig() |
|
7 | + { |
|
8 | + return [ |
|
9 | + 'resetLink' => '{{link_here}}', |
|
10 | 10 | /** |
11 | 11 | * Specify what relations should be used for every model. |
12 | 12 | */ |
@@ -180,5 +180,5 @@ discard block |
||
180 | 180 | ] |
181 | 181 | ] |
182 | 182 | ]; |
183 | - } |
|
183 | + } |
|
184 | 184 | } |
185 | 185 | \ No newline at end of file |
@@ -10,58 +10,58 @@ |
||
10 | 10 | |
11 | 11 | class PushNotifications implements ShouldQueue |
12 | 12 | { |
13 | - use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; |
|
13 | + use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; |
|
14 | 14 | |
15 | - protected $option; |
|
16 | - protected $notification; |
|
17 | - protected $data; |
|
18 | - protected $tokens; |
|
15 | + protected $option; |
|
16 | + protected $notification; |
|
17 | + protected $data; |
|
18 | + protected $tokens; |
|
19 | 19 | |
20 | - /** |
|
21 | - * Create a new job instance. |
|
22 | - * |
|
23 | - * @return void |
|
24 | - */ |
|
25 | - public function __construct($option, $notification, $data, $tokens) |
|
26 | - { |
|
27 | - $this->option = $option; |
|
28 | - $this->notification = $notification; |
|
29 | - $this->data = $data; |
|
30 | - $this->tokens = $tokens; |
|
31 | - } |
|
20 | + /** |
|
21 | + * Create a new job instance. |
|
22 | + * |
|
23 | + * @return void |
|
24 | + */ |
|
25 | + public function __construct($option, $notification, $data, $tokens) |
|
26 | + { |
|
27 | + $this->option = $option; |
|
28 | + $this->notification = $notification; |
|
29 | + $this->data = $data; |
|
30 | + $this->tokens = $tokens; |
|
31 | + } |
|
32 | 32 | |
33 | - /** |
|
34 | - * Execute the job. |
|
35 | - * |
|
36 | - * @return void |
|
37 | - */ |
|
38 | - public function handle() |
|
39 | - { |
|
40 | - $this->push($this->tokens); |
|
41 | - } |
|
33 | + /** |
|
34 | + * Execute the job. |
|
35 | + * |
|
36 | + * @return void |
|
37 | + */ |
|
38 | + public function handle() |
|
39 | + { |
|
40 | + $this->push($this->tokens); |
|
41 | + } |
|
42 | 42 | |
43 | - private function push($tokens) |
|
44 | - { |
|
45 | - $downstreamResponse = \FCM::sendTo($tokens, $this->option, $this->notification, $this->data); |
|
43 | + private function push($tokens) |
|
44 | + { |
|
45 | + $downstreamResponse = \FCM::sendTo($tokens, $this->option, $this->notification, $this->data); |
|
46 | 46 | |
47 | - \Core::pushNotificationDevices()->model->whereIn('device_token', $downstreamResponse->tokensToDelete())->forceDelete(); |
|
48 | - \Core::pushNotificationDevices()->model->whereIn('device_token', $downstreamResponse->tokensWithError())->forceDelete(); |
|
47 | + \Core::pushNotificationDevices()->model->whereIn('device_token', $downstreamResponse->tokensToDelete())->forceDelete(); |
|
48 | + \Core::pushNotificationDevices()->model->whereIn('device_token', $downstreamResponse->tokensWithError())->forceDelete(); |
|
49 | 49 | |
50 | - foreach ($downstreamResponse->tokensToModify() as $old => $new) |
|
51 | - { |
|
52 | - if ($oldDevice = \Core::pushNotificationDevices()->model->where('device_token', $old)->first()) |
|
53 | - { |
|
54 | - \Core::pushNotificationDevices()->save([ |
|
55 | - 'id' => $oldDevice->id, |
|
56 | - 'device_token' => $new |
|
57 | - ]); |
|
58 | - } |
|
59 | - } |
|
50 | + foreach ($downstreamResponse->tokensToModify() as $old => $new) |
|
51 | + { |
|
52 | + if ($oldDevice = \Core::pushNotificationDevices()->model->where('device_token', $old)->first()) |
|
53 | + { |
|
54 | + \Core::pushNotificationDevices()->save([ |
|
55 | + 'id' => $oldDevice->id, |
|
56 | + 'device_token' => $new |
|
57 | + ]); |
|
58 | + } |
|
59 | + } |
|
60 | 60 | |
61 | - $retry = $downstreamResponse->tokensToRetry(); |
|
62 | - if (count($retry)) |
|
63 | - { |
|
64 | - $this->push($retry); |
|
65 | - } |
|
66 | - } |
|
61 | + $retry = $downstreamResponse->tokensToRetry(); |
|
62 | + if (count($retry)) |
|
63 | + { |
|
64 | + $this->push($retry); |
|
65 | + } |
|
66 | + } |
|
67 | 67 | } |
@@ -5,37 +5,37 @@ |
||
5 | 5 | |
6 | 6 | class PushNotificationDevice extends Model{ |
7 | 7 | |
8 | - use SoftDeletes; |
|
9 | - protected $table = 'push_notifications_devices'; |
|
10 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
11 | - protected $hidden = ['deleted_at']; |
|
12 | - protected $guarded = ['id']; |
|
13 | - protected $fillable = ['device_token', 'user_id', 'active']; |
|
14 | - public $searchable = ['device_token']; |
|
8 | + use SoftDeletes; |
|
9 | + protected $table = 'push_notifications_devices'; |
|
10 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
11 | + protected $hidden = ['deleted_at']; |
|
12 | + protected $guarded = ['id']; |
|
13 | + protected $fillable = ['device_token', 'user_id', 'active']; |
|
14 | + public $searchable = ['device_token']; |
|
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 function user() |
|
32 | - { |
|
33 | - return $this->belongsTo('App\Modules\V1\Acl\AclUser'); |
|
34 | - } |
|
31 | + public function user() |
|
32 | + { |
|
33 | + return $this->belongsTo('App\Modules\V1\Acl\AclUser'); |
|
34 | + } |
|
35 | 35 | |
36 | - public static function boot() |
|
37 | - { |
|
38 | - parent::boot(); |
|
39 | - parent::observe(\App::make('App\Modules\V1\Notifications\ModelObservers\PushNotificationDeviceObserver')); |
|
40 | - } |
|
36 | + public static function boot() |
|
37 | + { |
|
38 | + parent::boot(); |
|
39 | + parent::observe(\App::make('App\Modules\V1\Notifications\ModelObservers\PushNotificationDeviceObserver')); |
|
40 | + } |
|
41 | 41 | } |