@@ -7,22 +7,22 @@ |
||
| 7 | 7 | |
| 8 | 8 | class PushNotificationsDevicesController extends BaseApiController |
| 9 | 9 | { |
| 10 | - /** |
|
| 11 | - * The name of the model that is used by the base api controller |
|
| 12 | - * to preform actions like (add, edit ... etc). |
|
| 13 | - * @var string |
|
| 14 | - */ |
|
| 15 | - protected $model = 'pushNotificationDevices'; |
|
| 10 | + /** |
|
| 11 | + * The name of the model that is used by the base api controller |
|
| 12 | + * to preform actions like (add, edit ... etc). |
|
| 13 | + * @var string |
|
| 14 | + */ |
|
| 15 | + protected $model = 'pushNotificationDevices'; |
|
| 16 | 16 | |
| 17 | - /** |
|
| 18 | - * The validations rules used by the base api controller |
|
| 19 | - * to check before add. |
|
| 20 | - * @var array |
|
| 21 | - */ |
|
| 22 | - protected $validationRules = [ |
|
| 23 | - 'device_token' => 'required|string|max:255', |
|
| 24 | - 'device_type' => 'required|in:android,ios', |
|
| 25 | - 'user_id' => 'required|exists:users,id', |
|
| 26 | - 'active' => 'boolean' |
|
| 27 | - ]; |
|
| 17 | + /** |
|
| 18 | + * The validations rules used by the base api controller |
|
| 19 | + * to check before add. |
|
| 20 | + * @var array |
|
| 21 | + */ |
|
| 22 | + protected $validationRules = [ |
|
| 23 | + 'device_token' => 'required|string|max:255', |
|
| 24 | + 'device_type' => 'required|in:android,ios', |
|
| 25 | + 'user_id' => 'required|exists:users,id', |
|
| 26 | + 'active' => 'boolean' |
|
| 27 | + ]; |
|
| 28 | 28 | } |
@@ -12,14 +12,14 @@ |
||
| 12 | 12 | * to preform actions like (add, edit ... etc). |
| 13 | 13 | * @var string |
| 14 | 14 | */ |
| 15 | - protected $model = 'pushNotificationDevices'; |
|
| 15 | + protected $model = 'pushNotificationDevices'; |
|
| 16 | 16 | |
| 17 | 17 | /** |
| 18 | 18 | * The validations rules used by the base api controller |
| 19 | 19 | * to check before add. |
| 20 | 20 | * @var array |
| 21 | 21 | */ |
| 22 | - protected $validationRules = [ |
|
| 22 | + protected $validationRules = [ |
|
| 23 | 23 | 'device_token' => 'required|string|max:255', |
| 24 | 24 | 'device_type' => 'required|in:android,ios', |
| 25 | 25 | 'user_id' => 'required|exists:users,id', |
@@ -12,134 +12,134 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - /** |
|
| 16 | - * Delete previous permissions. |
|
| 17 | - */ |
|
| 15 | + /** |
|
| 16 | + * Delete previous permissions. |
|
| 17 | + */ |
|
| 18 | 18 | DB::table('permissions')->whereIn('model', ['notifications'])->delete(); |
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | - * Insert the permissions related to this module. |
|
| 22 | - */ |
|
| 23 | - DB::table('permissions')->insert( |
|
| 24 | - [ |
|
| 25 | - /** |
|
| 26 | - * notifications model permissions. |
|
| 27 | - */ |
|
| 28 | - [ |
|
| 29 | - 'name' => 'find', |
|
| 30 | - 'model' => 'notifications', |
|
| 31 | - 'created_at' => \DB::raw('NOW()'), |
|
| 32 | - 'updated_at' => \DB::raw('NOW()') |
|
| 33 | - ], |
|
| 34 | - [ |
|
| 35 | - 'name' => 'search', |
|
| 36 | - 'model' => 'notifications', |
|
| 37 | - 'created_at' => \DB::raw('NOW()'), |
|
| 38 | - 'updated_at' => \DB::raw('NOW()') |
|
| 39 | - ], |
|
| 40 | - [ |
|
| 41 | - 'name' => 'list', |
|
| 42 | - 'model' => 'notifications', |
|
| 43 | - 'created_at' => \DB::raw('NOW()'), |
|
| 44 | - 'updated_at' => \DB::raw('NOW()') |
|
| 45 | - ], |
|
| 46 | - [ |
|
| 47 | - 'name' => 'findby', |
|
| 48 | - 'model' => 'notifications', |
|
| 49 | - 'created_at' => \DB::raw('NOW()'), |
|
| 50 | - 'updated_at' => \DB::raw('NOW()') |
|
| 51 | - ], |
|
| 52 | - [ |
|
| 53 | - 'name' => 'first', |
|
| 54 | - 'model' => 'notifications', |
|
| 55 | - 'created_at' => \DB::raw('NOW()'), |
|
| 56 | - 'updated_at' => \DB::raw('NOW()') |
|
| 57 | - ], |
|
| 58 | - [ |
|
| 59 | - 'name' => 'paginate', |
|
| 60 | - 'model' => 'notifications', |
|
| 61 | - 'created_at' => \DB::raw('NOW()'), |
|
| 62 | - 'updated_at' => \DB::raw('NOW()') |
|
| 63 | - ], |
|
| 64 | - [ |
|
| 65 | - 'name' => 'paginateby', |
|
| 66 | - 'model' => 'notifications', |
|
| 67 | - 'created_at' => \DB::raw('NOW()'), |
|
| 68 | - 'updated_at' => \DB::raw('NOW()') |
|
| 69 | - ], |
|
| 70 | - [ |
|
| 71 | - 'name' => 'notified', |
|
| 72 | - 'model' => 'notifications', |
|
| 73 | - 'created_at' => \DB::raw('NOW()'), |
|
| 74 | - 'updated_at' => \DB::raw('NOW()') |
|
| 75 | - ], |
|
| 76 | - [ |
|
| 77 | - 'name' => 'notifyall', |
|
| 78 | - 'model' => 'notifications', |
|
| 79 | - 'created_at' => \DB::raw('NOW()'), |
|
| 80 | - 'updated_at' => \DB::raw('NOW()') |
|
| 81 | - ], |
|
| 82 | - /** |
|
| 83 | - * pushNotificationDevices model permissions. |
|
| 84 | - */ |
|
| 85 | - [ |
|
| 86 | - 'name' => 'find', |
|
| 87 | - 'model' => 'pushNotificationDevices', |
|
| 88 | - 'created_at' => \DB::raw('NOW()'), |
|
| 89 | - 'updated_at' => \DB::raw('NOW()') |
|
| 90 | - ], |
|
| 91 | - [ |
|
| 92 | - 'name' => 'search', |
|
| 93 | - 'model' => 'pushNotificationDevices', |
|
| 94 | - 'created_at' => \DB::raw('NOW()'), |
|
| 95 | - 'updated_at' => \DB::raw('NOW()') |
|
| 96 | - ], |
|
| 97 | - [ |
|
| 98 | - 'name' => 'list', |
|
| 99 | - 'model' => 'pushNotificationDevices', |
|
| 100 | - 'created_at' => \DB::raw('NOW()'), |
|
| 101 | - 'updated_at' => \DB::raw('NOW()') |
|
| 102 | - ], |
|
| 103 | - [ |
|
| 104 | - 'name' => 'findby', |
|
| 105 | - 'model' => 'pushNotificationDevices', |
|
| 106 | - 'created_at' => \DB::raw('NOW()'), |
|
| 107 | - 'updated_at' => \DB::raw('NOW()') |
|
| 108 | - ], |
|
| 109 | - [ |
|
| 110 | - 'name' => 'first', |
|
| 111 | - 'model' => 'pushNotificationDevices', |
|
| 112 | - 'created_at' => \DB::raw('NOW()'), |
|
| 113 | - 'updated_at' => \DB::raw('NOW()') |
|
| 114 | - ], |
|
| 115 | - [ |
|
| 116 | - 'name' => 'paginate', |
|
| 117 | - 'model' => 'pushNotificationDevices', |
|
| 118 | - 'created_at' => \DB::raw('NOW()'), |
|
| 119 | - 'updated_at' => \DB::raw('NOW()') |
|
| 120 | - ], |
|
| 121 | - [ |
|
| 122 | - 'name' => 'paginateby', |
|
| 123 | - 'model' => 'pushNotificationDevices', |
|
| 124 | - 'created_at' => \DB::raw('NOW()'), |
|
| 125 | - 'updated_at' => \DB::raw('NOW()') |
|
| 126 | - ], |
|
| 127 | - [ |
|
| 128 | - 'name' => 'save', |
|
| 129 | - 'model' => 'pushNotificationDevices', |
|
| 130 | - 'created_at' => \DB::raw('NOW()'), |
|
| 131 | - 'updated_at' => \DB::raw('NOW()') |
|
| 132 | - ], |
|
| 133 | - [ |
|
| 134 | - 'name' => 'delete', |
|
| 135 | - 'model' => 'pushNotificationDevices', |
|
| 136 | - 'created_at' => \DB::raw('NOW()'), |
|
| 137 | - 'updated_at' => \DB::raw('NOW()') |
|
| 138 | - ], |
|
| 139 | - ] |
|
| 140 | - ); |
|
| 21 | + * Insert the permissions related to this module. |
|
| 22 | + */ |
|
| 23 | + DB::table('permissions')->insert( |
|
| 24 | + [ |
|
| 25 | + /** |
|
| 26 | + * notifications model permissions. |
|
| 27 | + */ |
|
| 28 | + [ |
|
| 29 | + 'name' => 'find', |
|
| 30 | + 'model' => 'notifications', |
|
| 31 | + 'created_at' => \DB::raw('NOW()'), |
|
| 32 | + 'updated_at' => \DB::raw('NOW()') |
|
| 33 | + ], |
|
| 34 | + [ |
|
| 35 | + 'name' => 'search', |
|
| 36 | + 'model' => 'notifications', |
|
| 37 | + 'created_at' => \DB::raw('NOW()'), |
|
| 38 | + 'updated_at' => \DB::raw('NOW()') |
|
| 39 | + ], |
|
| 40 | + [ |
|
| 41 | + 'name' => 'list', |
|
| 42 | + 'model' => 'notifications', |
|
| 43 | + 'created_at' => \DB::raw('NOW()'), |
|
| 44 | + 'updated_at' => \DB::raw('NOW()') |
|
| 45 | + ], |
|
| 46 | + [ |
|
| 47 | + 'name' => 'findby', |
|
| 48 | + 'model' => 'notifications', |
|
| 49 | + 'created_at' => \DB::raw('NOW()'), |
|
| 50 | + 'updated_at' => \DB::raw('NOW()') |
|
| 51 | + ], |
|
| 52 | + [ |
|
| 53 | + 'name' => 'first', |
|
| 54 | + 'model' => 'notifications', |
|
| 55 | + 'created_at' => \DB::raw('NOW()'), |
|
| 56 | + 'updated_at' => \DB::raw('NOW()') |
|
| 57 | + ], |
|
| 58 | + [ |
|
| 59 | + 'name' => 'paginate', |
|
| 60 | + 'model' => 'notifications', |
|
| 61 | + 'created_at' => \DB::raw('NOW()'), |
|
| 62 | + 'updated_at' => \DB::raw('NOW()') |
|
| 63 | + ], |
|
| 64 | + [ |
|
| 65 | + 'name' => 'paginateby', |
|
| 66 | + 'model' => 'notifications', |
|
| 67 | + 'created_at' => \DB::raw('NOW()'), |
|
| 68 | + 'updated_at' => \DB::raw('NOW()') |
|
| 69 | + ], |
|
| 70 | + [ |
|
| 71 | + 'name' => 'notified', |
|
| 72 | + 'model' => 'notifications', |
|
| 73 | + 'created_at' => \DB::raw('NOW()'), |
|
| 74 | + 'updated_at' => \DB::raw('NOW()') |
|
| 75 | + ], |
|
| 76 | + [ |
|
| 77 | + 'name' => 'notifyall', |
|
| 78 | + 'model' => 'notifications', |
|
| 79 | + 'created_at' => \DB::raw('NOW()'), |
|
| 80 | + 'updated_at' => \DB::raw('NOW()') |
|
| 81 | + ], |
|
| 82 | + /** |
|
| 83 | + * pushNotificationDevices model permissions. |
|
| 84 | + */ |
|
| 85 | + [ |
|
| 86 | + 'name' => 'find', |
|
| 87 | + 'model' => 'pushNotificationDevices', |
|
| 88 | + 'created_at' => \DB::raw('NOW()'), |
|
| 89 | + 'updated_at' => \DB::raw('NOW()') |
|
| 90 | + ], |
|
| 91 | + [ |
|
| 92 | + 'name' => 'search', |
|
| 93 | + 'model' => 'pushNotificationDevices', |
|
| 94 | + 'created_at' => \DB::raw('NOW()'), |
|
| 95 | + 'updated_at' => \DB::raw('NOW()') |
|
| 96 | + ], |
|
| 97 | + [ |
|
| 98 | + 'name' => 'list', |
|
| 99 | + 'model' => 'pushNotificationDevices', |
|
| 100 | + 'created_at' => \DB::raw('NOW()'), |
|
| 101 | + 'updated_at' => \DB::raw('NOW()') |
|
| 102 | + ], |
|
| 103 | + [ |
|
| 104 | + 'name' => 'findby', |
|
| 105 | + 'model' => 'pushNotificationDevices', |
|
| 106 | + 'created_at' => \DB::raw('NOW()'), |
|
| 107 | + 'updated_at' => \DB::raw('NOW()') |
|
| 108 | + ], |
|
| 109 | + [ |
|
| 110 | + 'name' => 'first', |
|
| 111 | + 'model' => 'pushNotificationDevices', |
|
| 112 | + 'created_at' => \DB::raw('NOW()'), |
|
| 113 | + 'updated_at' => \DB::raw('NOW()') |
|
| 114 | + ], |
|
| 115 | + [ |
|
| 116 | + 'name' => 'paginate', |
|
| 117 | + 'model' => 'pushNotificationDevices', |
|
| 118 | + 'created_at' => \DB::raw('NOW()'), |
|
| 119 | + 'updated_at' => \DB::raw('NOW()') |
|
| 120 | + ], |
|
| 121 | + [ |
|
| 122 | + 'name' => 'paginateby', |
|
| 123 | + 'model' => 'pushNotificationDevices', |
|
| 124 | + 'created_at' => \DB::raw('NOW()'), |
|
| 125 | + 'updated_at' => \DB::raw('NOW()') |
|
| 126 | + ], |
|
| 127 | + [ |
|
| 128 | + 'name' => 'save', |
|
| 129 | + 'model' => 'pushNotificationDevices', |
|
| 130 | + 'created_at' => \DB::raw('NOW()'), |
|
| 131 | + 'updated_at' => \DB::raw('NOW()') |
|
| 132 | + ], |
|
| 133 | + [ |
|
| 134 | + 'name' => 'delete', |
|
| 135 | + 'model' => 'pushNotificationDevices', |
|
| 136 | + 'created_at' => \DB::raw('NOW()'), |
|
| 137 | + 'updated_at' => \DB::raw('NOW()') |
|
| 138 | + ], |
|
| 139 | + ] |
|
| 140 | + ); |
|
| 141 | 141 | |
| 142 | - /** |
|
| 142 | + /** |
|
| 143 | 143 | * Assign the permissions to the admin group. |
| 144 | 144 | */ |
| 145 | 145 | $permissionIds = DB::table('permissions')->whereIn('model', ['notifications', 'pushNotificationDevices'])->select('id')->lists('id'); |
@@ -164,7 +164,7 @@ |
||
| 164 | 164 | */ |
| 165 | 165 | public function down() |
| 166 | 166 | { |
| 167 | - $permissions = DB::table('permissions')->whereIn('model', ['notifications', 'pushNotificationDevices']); |
|
| 167 | + $permissions = DB::table('permissions')->whereIn('model', ['notifications', 'pushNotificationDevices']); |
|
| 168 | 168 | DB::table('groups_permissions')->whereIn('permission_id', $permissions->lists('id'))->delete(); |
| 169 | 169 | $permissions->delete(); |
| 170 | 170 | } |
@@ -3,7 +3,7 @@ |
||
| 3 | 3 | use Illuminate\Database\Eloquent\Model; |
| 4 | 4 | use Illuminate\Database\Eloquent\SoftDeletes; |
| 5 | 5 | |
| 6 | -class PushNotificationDevice extends Model{ |
|
| 6 | +class PushNotificationDevice extends Model { |
|
| 7 | 7 | |
| 8 | 8 | use SoftDeletes; |
| 9 | 9 | protected $table = 'push_notifications_devices'; |
@@ -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', 'device_type', 'user_id', 'active']; |
|
| 14 | - public $searchable = ['device_token', 'device_type']; |
|
| 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', 'device_type', 'user_id', 'active']; |
|
| 14 | + public $searchable = ['device_token', 'device_type']; |
|
| 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 | } |
@@ -4,75 +4,75 @@ |
||
| 4 | 4 | |
| 5 | 5 | class PushNotificationDeviceRepository extends AbstractRepository |
| 6 | 6 | { |
| 7 | - /** |
|
| 8 | - * Return the model full namespace. |
|
| 9 | - * |
|
| 10 | - * @return string |
|
| 11 | - */ |
|
| 12 | - protected function getModel() |
|
| 13 | - { |
|
| 14 | - return 'App\Modules\V1\Notifications\PushNotificationDevice'; |
|
| 15 | - } |
|
| 7 | + /** |
|
| 8 | + * Return the model full namespace. |
|
| 9 | + * |
|
| 10 | + * @return string |
|
| 11 | + */ |
|
| 12 | + protected function getModel() |
|
| 13 | + { |
|
| 14 | + return 'App\Modules\V1\Notifications\PushNotificationDevice'; |
|
| 15 | + } |
|
| 16 | 16 | |
| 17 | - /** |
|
| 18 | - * Set the notification notified to all. |
|
| 19 | - * |
|
| 20 | - * @param array $users_ids |
|
| 21 | - * @param string $messageText |
|
| 22 | - * @return void |
|
| 23 | - */ |
|
| 24 | - public function broadcast($users_ids, $messageText) |
|
| 25 | - { |
|
| 26 | - $devicesArray = []; |
|
| 27 | - $devices = $this->model->whereIn('user_id', $users_ids)->get(); |
|
| 28 | - foreach ($devices as $device) |
|
| 29 | - { |
|
| 30 | - $devicesArray[$device->device_type][] = \PushNotification::Device($device->device_token); |
|
| 31 | - } |
|
| 17 | + /** |
|
| 18 | + * Set the notification notified to all. |
|
| 19 | + * |
|
| 20 | + * @param array $users_ids |
|
| 21 | + * @param string $messageText |
|
| 22 | + * @return void |
|
| 23 | + */ |
|
| 24 | + public function broadcast($users_ids, $messageText) |
|
| 25 | + { |
|
| 26 | + $devicesArray = []; |
|
| 27 | + $devices = $this->model->whereIn('user_id', $users_ids)->get(); |
|
| 28 | + foreach ($devices as $device) |
|
| 29 | + { |
|
| 30 | + $devicesArray[$device->device_type][] = \PushNotification::Device($device->device_token); |
|
| 31 | + } |
|
| 32 | 32 | |
| 33 | - if (array_key_exists('ios', $devicesArray)) |
|
| 34 | - { |
|
| 35 | - $message = $this->constructMessage($messageText, [ 'badge' => 15, 'sound' => 'default', 'content-available' => 1 ]); |
|
| 36 | - $iosDevices = \PushNotification::DeviceCollection($devicesArray['ios']); |
|
| 37 | - $this->push('ios', $iosDevices, $message); |
|
| 38 | - } |
|
| 33 | + if (array_key_exists('ios', $devicesArray)) |
|
| 34 | + { |
|
| 35 | + $message = $this->constructMessage($messageText, [ 'badge' => 15, 'sound' => 'default', 'content-available' => 1 ]); |
|
| 36 | + $iosDevices = \PushNotification::DeviceCollection($devicesArray['ios']); |
|
| 37 | + $this->push('ios', $iosDevices, $message); |
|
| 38 | + } |
|
| 39 | 39 | |
| 40 | - if (array_key_exists('android', $devicesArray)) |
|
| 41 | - { |
|
| 42 | - $message = $this->constructMessage($messageText); |
|
| 43 | - $androidDevices = \PushNotification::DeviceCollection($devicesArray['android']); |
|
| 44 | - $this->push('android', $androidDevices, $message); |
|
| 45 | - } |
|
| 46 | - } |
|
| 40 | + if (array_key_exists('android', $devicesArray)) |
|
| 41 | + { |
|
| 42 | + $message = $this->constructMessage($messageText); |
|
| 43 | + $androidDevices = \PushNotification::DeviceCollection($devicesArray['android']); |
|
| 44 | + $this->push('android', $androidDevices, $message); |
|
| 45 | + } |
|
| 46 | + } |
|
| 47 | 47 | |
| 48 | 48 | |
| 49 | - /** |
|
| 50 | - * Set the notification notified to true. |
|
| 51 | - * |
|
| 52 | - * @param string $type |
|
| 53 | - * @param colletion $devices |
|
| 54 | - * @param string $message |
|
| 55 | - * @return object |
|
| 56 | - */ |
|
| 57 | - public function push($type, $devices, $message) |
|
| 58 | - { |
|
| 59 | - $collection = \PushNotification::app($type)->to($devices)->send($message); |
|
| 60 | - foreach ($collection->pushManager as $push) |
|
| 61 | - { |
|
| 62 | - $response[] = $push->getAdapter()->getResponse(); |
|
| 63 | - } |
|
| 64 | - dd($response); |
|
| 65 | - } |
|
| 49 | + /** |
|
| 50 | + * Set the notification notified to true. |
|
| 51 | + * |
|
| 52 | + * @param string $type |
|
| 53 | + * @param colletion $devices |
|
| 54 | + * @param string $message |
|
| 55 | + * @return object |
|
| 56 | + */ |
|
| 57 | + public function push($type, $devices, $message) |
|
| 58 | + { |
|
| 59 | + $collection = \PushNotification::app($type)->to($devices)->send($message); |
|
| 60 | + foreach ($collection->pushManager as $push) |
|
| 61 | + { |
|
| 62 | + $response[] = $push->getAdapter()->getResponse(); |
|
| 63 | + } |
|
| 64 | + dd($response); |
|
| 65 | + } |
|
| 66 | 66 | |
| 67 | - /** |
|
| 68 | - * Construct the notification message. |
|
| 69 | - * |
|
| 70 | - * @param string $messageText |
|
| 71 | - * @param array $options |
|
| 72 | - * @return object |
|
| 73 | - */ |
|
| 74 | - protected function constructMessage($messageText, $options = []) |
|
| 75 | - { |
|
| 76 | - return \PushNotification::Message($messageText, $options); |
|
| 77 | - } |
|
| 67 | + /** |
|
| 68 | + * Construct the notification message. |
|
| 69 | + * |
|
| 70 | + * @param string $messageText |
|
| 71 | + * @param array $options |
|
| 72 | + * @return object |
|
| 73 | + */ |
|
| 74 | + protected function constructMessage($messageText, $options = []) |
|
| 75 | + { |
|
| 76 | + return \PushNotification::Message($messageText, $options); |
|
| 77 | + } |
|
| 78 | 78 | } |
@@ -32,7 +32,7 @@ |
||
| 32 | 32 | |
| 33 | 33 | if (array_key_exists('ios', $devicesArray)) |
| 34 | 34 | { |
| 35 | - $message = $this->constructMessage($messageText, [ 'badge' => 15, 'sound' => 'default', 'content-available' => 1 ]); |
|
| 35 | + $message = $this->constructMessage($messageText, ['badge' => 15, 'sound' => 'default', 'content-available' => 1]); |
|
| 36 | 36 | $iosDevices = \PushNotification::DeviceCollection($devicesArray['ios']); |
| 37 | 37 | $this->push('ios', $iosDevices, $message); |
| 38 | 38 | } |
@@ -5,32 +5,32 @@ |
||
| 5 | 5 | |
| 6 | 6 | class Report extends Model{ |
| 7 | 7 | |
| 8 | - use SoftDeletes; |
|
| 8 | + use SoftDeletes; |
|
| 9 | 9 | protected $table = 'reports'; |
| 10 | 10 | protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
| 11 | 11 | protected $hidden = ['deleted_at']; |
| 12 | 12 | protected $guarded = ['id']; |
| 13 | 13 | protected $fillable = ['report_name', 'view_name']; |
| 14 | - public $searchable = ['report_name', 'view_name']; |
|
| 14 | + public $searchable = ['report_name', 'view_name']; |
|
| 15 | 15 | |
| 16 | 16 | public function getCreatedAtAttribute($value) |
| 17 | - { |
|
| 18 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 19 | - } |
|
| 17 | + { |
|
| 18 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 19 | + } |
|
| 20 | 20 | |
| 21 | - public function getUpdatedAtAttribute($value) |
|
| 22 | - { |
|
| 23 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 24 | - } |
|
| 21 | + public function getUpdatedAtAttribute($value) |
|
| 22 | + { |
|
| 23 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 24 | + } |
|
| 25 | 25 | |
| 26 | - public function getDeletedAtAttribute($value) |
|
| 27 | - { |
|
| 28 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 29 | - } |
|
| 26 | + public function getDeletedAtAttribute($value) |
|
| 27 | + { |
|
| 28 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - public static function boot() |
|
| 32 | - { |
|
| 33 | - parent::boot(); |
|
| 34 | - parent::observe(\App::make('App\Modules\V1\Reporting\ModelObservers\ReprotObserver')); |
|
| 35 | - } |
|
| 31 | + public static function boot() |
|
| 32 | + { |
|
| 33 | + parent::boot(); |
|
| 34 | + parent::observe(\App::make('App\Modules\V1\Reporting\ModelObservers\ReprotObserver')); |
|
| 35 | + } |
|
| 36 | 36 | } |
@@ -3,7 +3,7 @@ discard block |
||
| 3 | 3 | use Illuminate\Database\Eloquent\Model; |
| 4 | 4 | use Illuminate\Database\Eloquent\SoftDeletes; |
| 5 | 5 | |
| 6 | -class Report extends Model{ |
|
| 6 | +class Report extends Model { |
|
| 7 | 7 | |
| 8 | 8 | use SoftDeletes; |
| 9 | 9 | protected $table = 'reports'; |
@@ -11,7 +11,7 @@ discard block |
||
| 11 | 11 | protected $hidden = ['deleted_at']; |
| 12 | 12 | protected $guarded = ['id']; |
| 13 | 13 | protected $fillable = ['report_name', 'view_name']; |
| 14 | - public $searchable = ['report_name', 'view_name']; |
|
| 14 | + public $searchable = ['report_name', 'view_name']; |
|
| 15 | 15 | |
| 16 | 16 | public function getCreatedAtAttribute($value) |
| 17 | 17 | { |
@@ -12,203 +12,203 @@ discard block |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - /** |
|
| 16 | - * Delete previous permissions. |
|
| 17 | - */ |
|
| 15 | + /** |
|
| 16 | + * Delete previous permissions. |
|
| 17 | + */ |
|
| 18 | 18 | DB::table('permissions')->whereIn('model', ['users', 'permissions', 'groups'])->delete(); |
| 19 | 19 | |
| 20 | 20 | /** |
| 21 | - * Insert the permissions related to this module. |
|
| 22 | - */ |
|
| 23 | - DB::table('permissions')->insert( |
|
| 24 | - [ |
|
| 25 | - /** |
|
| 26 | - * Users model permissions. |
|
| 27 | - */ |
|
| 28 | - [ |
|
| 29 | - 'name' => 'save', |
|
| 30 | - 'model' => 'users', |
|
| 31 | - 'created_at' => \DB::raw('NOW()'), |
|
| 32 | - 'updated_at' => \DB::raw('NOW()') |
|
| 33 | - ], |
|
| 34 | - [ |
|
| 35 | - 'name' => 'delete', |
|
| 36 | - 'model' => 'users', |
|
| 37 | - 'created_at' => \DB::raw('NOW()'), |
|
| 38 | - 'updated_at' => \DB::raw('NOW()') |
|
| 39 | - ], |
|
| 40 | - [ |
|
| 41 | - 'name' => 'find', |
|
| 42 | - 'model' => 'users', |
|
| 43 | - 'created_at' => \DB::raw('NOW()'), |
|
| 44 | - 'updated_at' => \DB::raw('NOW()') |
|
| 45 | - ], |
|
| 46 | - [ |
|
| 47 | - 'name' => 'list', |
|
| 48 | - 'model' => 'users', |
|
| 49 | - 'created_at' => \DB::raw('NOW()'), |
|
| 50 | - 'updated_at' => \DB::raw('NOW()') |
|
| 51 | - ], |
|
| 52 | - [ |
|
| 53 | - 'name' => 'search', |
|
| 54 | - 'model' => 'users', |
|
| 55 | - 'created_at' => \DB::raw('NOW()'), |
|
| 56 | - 'updated_at' => \DB::raw('NOW()') |
|
| 57 | - ], |
|
| 58 | - [ |
|
| 59 | - 'name' => 'findby', |
|
| 60 | - 'model' => 'users', |
|
| 61 | - 'created_at' => \DB::raw('NOW()'), |
|
| 62 | - 'updated_at' => \DB::raw('NOW()') |
|
| 63 | - ], |
|
| 64 | - [ |
|
| 65 | - 'name' => 'first', |
|
| 66 | - 'model' => 'users', |
|
| 67 | - 'created_at' => \DB::raw('NOW()'), |
|
| 68 | - 'updated_at' => \DB::raw('NOW()') |
|
| 69 | - ], |
|
| 70 | - [ |
|
| 71 | - 'name' => 'paginate', |
|
| 72 | - 'model' => 'users', |
|
| 73 | - 'created_at' => \DB::raw('NOW()'), |
|
| 74 | - 'updated_at' => \DB::raw('NOW()') |
|
| 75 | - ], |
|
| 76 | - [ |
|
| 77 | - 'name' => 'paginateby', |
|
| 78 | - 'model' => 'users', |
|
| 79 | - 'created_at' => \DB::raw('NOW()'), |
|
| 80 | - 'updated_at' => \DB::raw('NOW()') |
|
| 81 | - ], |
|
| 82 | - [ |
|
| 83 | - 'name' => 'assigngroups', |
|
| 84 | - 'model' => 'users', |
|
| 85 | - 'created_at' => \DB::raw('NOW()'), |
|
| 86 | - 'updated_at' => \DB::raw('NOW()') |
|
| 87 | - ], |
|
| 88 | - [ |
|
| 89 | - 'name' => 'block', |
|
| 90 | - 'model' => 'users', |
|
| 91 | - 'created_at' => \DB::raw('NOW()'), |
|
| 92 | - 'updated_at' => \DB::raw('NOW()') |
|
| 93 | - ], |
|
| 94 | - [ |
|
| 95 | - 'name' => 'unblock', |
|
| 96 | - 'model' => 'users', |
|
| 97 | - 'created_at' => \DB::raw('NOW()'), |
|
| 98 | - 'updated_at' => \DB::raw('NOW()') |
|
| 99 | - ], |
|
| 21 | + * Insert the permissions related to this module. |
|
| 22 | + */ |
|
| 23 | + DB::table('permissions')->insert( |
|
| 24 | + [ |
|
| 25 | + /** |
|
| 26 | + * Users model permissions. |
|
| 27 | + */ |
|
| 28 | + [ |
|
| 29 | + 'name' => 'save', |
|
| 30 | + 'model' => 'users', |
|
| 31 | + 'created_at' => \DB::raw('NOW()'), |
|
| 32 | + 'updated_at' => \DB::raw('NOW()') |
|
| 33 | + ], |
|
| 34 | + [ |
|
| 35 | + 'name' => 'delete', |
|
| 36 | + 'model' => 'users', |
|
| 37 | + 'created_at' => \DB::raw('NOW()'), |
|
| 38 | + 'updated_at' => \DB::raw('NOW()') |
|
| 39 | + ], |
|
| 40 | + [ |
|
| 41 | + 'name' => 'find', |
|
| 42 | + 'model' => 'users', |
|
| 43 | + 'created_at' => \DB::raw('NOW()'), |
|
| 44 | + 'updated_at' => \DB::raw('NOW()') |
|
| 45 | + ], |
|
| 46 | + [ |
|
| 47 | + 'name' => 'list', |
|
| 48 | + 'model' => 'users', |
|
| 49 | + 'created_at' => \DB::raw('NOW()'), |
|
| 50 | + 'updated_at' => \DB::raw('NOW()') |
|
| 51 | + ], |
|
| 52 | + [ |
|
| 53 | + 'name' => 'search', |
|
| 54 | + 'model' => 'users', |
|
| 55 | + 'created_at' => \DB::raw('NOW()'), |
|
| 56 | + 'updated_at' => \DB::raw('NOW()') |
|
| 57 | + ], |
|
| 58 | + [ |
|
| 59 | + 'name' => 'findby', |
|
| 60 | + 'model' => 'users', |
|
| 61 | + 'created_at' => \DB::raw('NOW()'), |
|
| 62 | + 'updated_at' => \DB::raw('NOW()') |
|
| 63 | + ], |
|
| 64 | + [ |
|
| 65 | + 'name' => 'first', |
|
| 66 | + 'model' => 'users', |
|
| 67 | + 'created_at' => \DB::raw('NOW()'), |
|
| 68 | + 'updated_at' => \DB::raw('NOW()') |
|
| 69 | + ], |
|
| 70 | + [ |
|
| 71 | + 'name' => 'paginate', |
|
| 72 | + 'model' => 'users', |
|
| 73 | + 'created_at' => \DB::raw('NOW()'), |
|
| 74 | + 'updated_at' => \DB::raw('NOW()') |
|
| 75 | + ], |
|
| 76 | + [ |
|
| 77 | + 'name' => 'paginateby', |
|
| 78 | + 'model' => 'users', |
|
| 79 | + 'created_at' => \DB::raw('NOW()'), |
|
| 80 | + 'updated_at' => \DB::raw('NOW()') |
|
| 81 | + ], |
|
| 82 | + [ |
|
| 83 | + 'name' => 'assigngroups', |
|
| 84 | + 'model' => 'users', |
|
| 85 | + 'created_at' => \DB::raw('NOW()'), |
|
| 86 | + 'updated_at' => \DB::raw('NOW()') |
|
| 87 | + ], |
|
| 88 | + [ |
|
| 89 | + 'name' => 'block', |
|
| 90 | + 'model' => 'users', |
|
| 91 | + 'created_at' => \DB::raw('NOW()'), |
|
| 92 | + 'updated_at' => \DB::raw('NOW()') |
|
| 93 | + ], |
|
| 94 | + [ |
|
| 95 | + 'name' => 'unblock', |
|
| 96 | + 'model' => 'users', |
|
| 97 | + 'created_at' => \DB::raw('NOW()'), |
|
| 98 | + 'updated_at' => \DB::raw('NOW()') |
|
| 99 | + ], |
|
| 100 | 100 | |
| 101 | - /** |
|
| 102 | - * Permissions model permissions. |
|
| 103 | - */ |
|
| 104 | - [ |
|
| 105 | - 'name' => 'find', |
|
| 106 | - 'model' => 'permissions', |
|
| 107 | - 'created_at' => \DB::raw('NOW()'), |
|
| 108 | - 'updated_at' => \DB::raw('NOW()') |
|
| 109 | - ], |
|
| 110 | - [ |
|
| 111 | - 'name' => 'search', |
|
| 112 | - 'model' => 'permissions', |
|
| 113 | - 'created_at' => \DB::raw('NOW()'), |
|
| 114 | - 'updated_at' => \DB::raw('NOW()') |
|
| 115 | - ], |
|
| 116 | - [ |
|
| 117 | - 'name' => 'list', |
|
| 118 | - 'model' => 'permissions', |
|
| 119 | - 'created_at' => \DB::raw('NOW()'), |
|
| 120 | - 'updated_at' => \DB::raw('NOW()') |
|
| 121 | - ], |
|
| 122 | - [ |
|
| 123 | - 'name' => 'findby', |
|
| 124 | - 'model' => 'permissions', |
|
| 125 | - 'created_at' => \DB::raw('NOW()'), |
|
| 126 | - 'updated_at' => \DB::raw('NOW()') |
|
| 127 | - ], |
|
| 128 | - [ |
|
| 129 | - 'name' => 'first', |
|
| 130 | - 'model' => 'permissions', |
|
| 131 | - 'created_at' => \DB::raw('NOW()'), |
|
| 132 | - 'updated_at' => \DB::raw('NOW()') |
|
| 133 | - ], |
|
| 134 | - [ |
|
| 135 | - 'name' => 'paginate', |
|
| 136 | - 'model' => 'permissions', |
|
| 137 | - 'created_at' => \DB::raw('NOW()'), |
|
| 138 | - 'updated_at' => \DB::raw('NOW()') |
|
| 139 | - ], |
|
| 140 | - [ |
|
| 141 | - 'name' => 'paginateby', |
|
| 142 | - 'model' => 'permissions', |
|
| 143 | - 'created_at' => \DB::raw('NOW()'), |
|
| 144 | - 'updated_at' => \DB::raw('NOW()') |
|
| 145 | - ], |
|
| 101 | + /** |
|
| 102 | + * Permissions model permissions. |
|
| 103 | + */ |
|
| 104 | + [ |
|
| 105 | + 'name' => 'find', |
|
| 106 | + 'model' => 'permissions', |
|
| 107 | + 'created_at' => \DB::raw('NOW()'), |
|
| 108 | + 'updated_at' => \DB::raw('NOW()') |
|
| 109 | + ], |
|
| 110 | + [ |
|
| 111 | + 'name' => 'search', |
|
| 112 | + 'model' => 'permissions', |
|
| 113 | + 'created_at' => \DB::raw('NOW()'), |
|
| 114 | + 'updated_at' => \DB::raw('NOW()') |
|
| 115 | + ], |
|
| 116 | + [ |
|
| 117 | + 'name' => 'list', |
|
| 118 | + 'model' => 'permissions', |
|
| 119 | + 'created_at' => \DB::raw('NOW()'), |
|
| 120 | + 'updated_at' => \DB::raw('NOW()') |
|
| 121 | + ], |
|
| 122 | + [ |
|
| 123 | + 'name' => 'findby', |
|
| 124 | + 'model' => 'permissions', |
|
| 125 | + 'created_at' => \DB::raw('NOW()'), |
|
| 126 | + 'updated_at' => \DB::raw('NOW()') |
|
| 127 | + ], |
|
| 128 | + [ |
|
| 129 | + 'name' => 'first', |
|
| 130 | + 'model' => 'permissions', |
|
| 131 | + 'created_at' => \DB::raw('NOW()'), |
|
| 132 | + 'updated_at' => \DB::raw('NOW()') |
|
| 133 | + ], |
|
| 134 | + [ |
|
| 135 | + 'name' => 'paginate', |
|
| 136 | + 'model' => 'permissions', |
|
| 137 | + 'created_at' => \DB::raw('NOW()'), |
|
| 138 | + 'updated_at' => \DB::raw('NOW()') |
|
| 139 | + ], |
|
| 140 | + [ |
|
| 141 | + 'name' => 'paginateby', |
|
| 142 | + 'model' => 'permissions', |
|
| 143 | + 'created_at' => \DB::raw('NOW()'), |
|
| 144 | + 'updated_at' => \DB::raw('NOW()') |
|
| 145 | + ], |
|
| 146 | 146 | |
| 147 | - /** |
|
| 148 | - * Groups model permissions. |
|
| 149 | - */ |
|
| 150 | - [ |
|
| 151 | - 'name' => 'save', |
|
| 152 | - 'model' => 'groups', |
|
| 153 | - 'created_at' => \DB::raw('NOW()'), |
|
| 154 | - 'updated_at' => \DB::raw('NOW()') |
|
| 155 | - ], |
|
| 156 | - [ |
|
| 157 | - 'name' => 'delete', |
|
| 158 | - 'model' => 'groups', |
|
| 159 | - 'created_at' => \DB::raw('NOW()'), |
|
| 160 | - 'updated_at' => \DB::raw('NOW()') |
|
| 161 | - ], |
|
| 162 | - [ |
|
| 163 | - 'name' => 'find', |
|
| 164 | - 'model' => 'groups', |
|
| 165 | - 'created_at' => \DB::raw('NOW()'), |
|
| 166 | - 'updated_at' => \DB::raw('NOW()') |
|
| 167 | - ], |
|
| 168 | - [ |
|
| 169 | - 'name' => 'search', |
|
| 170 | - 'model' => 'groups', |
|
| 171 | - 'created_at' => \DB::raw('NOW()'), |
|
| 172 | - 'updated_at' => \DB::raw('NOW()') |
|
| 173 | - ], |
|
| 174 | - [ |
|
| 175 | - 'name' => 'list', |
|
| 176 | - 'model' => 'groups', |
|
| 177 | - 'created_at' => \DB::raw('NOW()'), |
|
| 178 | - 'updated_at' => \DB::raw('NOW()') |
|
| 179 | - ], |
|
| 180 | - [ |
|
| 181 | - 'name' => 'findby', |
|
| 182 | - 'model' => 'groups', |
|
| 183 | - 'created_at' => \DB::raw('NOW()'), |
|
| 184 | - 'updated_at' => \DB::raw('NOW()') |
|
| 185 | - ], |
|
| 186 | - [ |
|
| 187 | - 'name' => 'first', |
|
| 188 | - 'model' => 'groups', |
|
| 189 | - 'created_at' => \DB::raw('NOW()'), |
|
| 190 | - 'updated_at' => \DB::raw('NOW()') |
|
| 191 | - ], |
|
| 192 | - [ |
|
| 193 | - 'name' => 'paginate', |
|
| 194 | - 'model' => 'groups', |
|
| 195 | - 'created_at' => \DB::raw('NOW()'), |
|
| 196 | - 'updated_at' => \DB::raw('NOW()') |
|
| 197 | - ], |
|
| 198 | - [ |
|
| 199 | - 'name' => 'paginateby', |
|
| 200 | - 'model' => 'groups', |
|
| 201 | - 'created_at' => \DB::raw('NOW()'), |
|
| 202 | - 'updated_at' => \DB::raw('NOW()') |
|
| 203 | - ], |
|
| 204 | - [ |
|
| 205 | - 'name' => 'assignpermissions', |
|
| 206 | - 'model' => 'groups', |
|
| 207 | - 'created_at' => \DB::raw('NOW()'), |
|
| 208 | - 'updated_at' => \DB::raw('NOW()') |
|
| 209 | - ], |
|
| 210 | - ] |
|
| 211 | - ); |
|
| 147 | + /** |
|
| 148 | + * Groups model permissions. |
|
| 149 | + */ |
|
| 150 | + [ |
|
| 151 | + 'name' => 'save', |
|
| 152 | + 'model' => 'groups', |
|
| 153 | + 'created_at' => \DB::raw('NOW()'), |
|
| 154 | + 'updated_at' => \DB::raw('NOW()') |
|
| 155 | + ], |
|
| 156 | + [ |
|
| 157 | + 'name' => 'delete', |
|
| 158 | + 'model' => 'groups', |
|
| 159 | + 'created_at' => \DB::raw('NOW()'), |
|
| 160 | + 'updated_at' => \DB::raw('NOW()') |
|
| 161 | + ], |
|
| 162 | + [ |
|
| 163 | + 'name' => 'find', |
|
| 164 | + 'model' => 'groups', |
|
| 165 | + 'created_at' => \DB::raw('NOW()'), |
|
| 166 | + 'updated_at' => \DB::raw('NOW()') |
|
| 167 | + ], |
|
| 168 | + [ |
|
| 169 | + 'name' => 'search', |
|
| 170 | + 'model' => 'groups', |
|
| 171 | + 'created_at' => \DB::raw('NOW()'), |
|
| 172 | + 'updated_at' => \DB::raw('NOW()') |
|
| 173 | + ], |
|
| 174 | + [ |
|
| 175 | + 'name' => 'list', |
|
| 176 | + 'model' => 'groups', |
|
| 177 | + 'created_at' => \DB::raw('NOW()'), |
|
| 178 | + 'updated_at' => \DB::raw('NOW()') |
|
| 179 | + ], |
|
| 180 | + [ |
|
| 181 | + 'name' => 'findby', |
|
| 182 | + 'model' => 'groups', |
|
| 183 | + 'created_at' => \DB::raw('NOW()'), |
|
| 184 | + 'updated_at' => \DB::raw('NOW()') |
|
| 185 | + ], |
|
| 186 | + [ |
|
| 187 | + 'name' => 'first', |
|
| 188 | + 'model' => 'groups', |
|
| 189 | + 'created_at' => \DB::raw('NOW()'), |
|
| 190 | + 'updated_at' => \DB::raw('NOW()') |
|
| 191 | + ], |
|
| 192 | + [ |
|
| 193 | + 'name' => 'paginate', |
|
| 194 | + 'model' => 'groups', |
|
| 195 | + 'created_at' => \DB::raw('NOW()'), |
|
| 196 | + 'updated_at' => \DB::raw('NOW()') |
|
| 197 | + ], |
|
| 198 | + [ |
|
| 199 | + 'name' => 'paginateby', |
|
| 200 | + 'model' => 'groups', |
|
| 201 | + 'created_at' => \DB::raw('NOW()'), |
|
| 202 | + 'updated_at' => \DB::raw('NOW()') |
|
| 203 | + ], |
|
| 204 | + [ |
|
| 205 | + 'name' => 'assignpermissions', |
|
| 206 | + 'model' => 'groups', |
|
| 207 | + 'created_at' => \DB::raw('NOW()'), |
|
| 208 | + 'updated_at' => \DB::raw('NOW()') |
|
| 209 | + ], |
|
| 210 | + ] |
|
| 211 | + ); |
|
| 212 | 212 | |
| 213 | 213 | /** |
| 214 | 214 | * Delete previous data. |
@@ -236,29 +236,29 @@ discard block |
||
| 236 | 236 | * Create Default users. |
| 237 | 237 | */ |
| 238 | 238 | $adminUserId = DB::table('users')->insertGetId( |
| 239 | - [ |
|
| 239 | + [ |
|
| 240 | 240 | 'email' => '[email protected]', |
| 241 | 241 | 'password' => bcrypt('123456'), |
| 242 | 242 | 'created_at' => \DB::raw('NOW()'), |
| 243 | 243 | 'updated_at' => \DB::raw('NOW()') |
| 244 | 244 | ] |
| 245 | - ); |
|
| 245 | + ); |
|
| 246 | 246 | |
| 247 | 247 | /** |
| 248 | 248 | * Assign users to groups. |
| 249 | 249 | */ |
| 250 | 250 | DB::table('users_groups')->insert( |
| 251 | - [ |
|
| 252 | - [ |
|
| 251 | + [ |
|
| 252 | + [ |
|
| 253 | 253 | 'user_id' => $adminUserId, |
| 254 | 254 | 'group_id' => $adminGroupId, |
| 255 | 255 | 'created_at' => \DB::raw('NOW()'), |
| 256 | 256 | 'updated_at' => \DB::raw('NOW()') |
| 257 | - ] |
|
| 258 | - ] |
|
| 259 | - ); |
|
| 257 | + ] |
|
| 258 | + ] |
|
| 259 | + ); |
|
| 260 | 260 | |
| 261 | - /** |
|
| 261 | + /** |
|
| 262 | 262 | * Assign the permissions to the admin group. |
| 263 | 263 | */ |
| 264 | 264 | $permissionIds = DB::table('permissions')->whereIn('model', ['users', 'permissions', 'groups'])->select('id')->lists('id'); |
@@ -5,44 +5,44 @@ |
||
| 5 | 5 | */ |
| 6 | 6 | class LogObserver { |
| 7 | 7 | |
| 8 | - public function saving($model) |
|
| 9 | - { |
|
| 10 | - // |
|
| 11 | - } |
|
| 12 | - |
|
| 13 | - public function saved($model) |
|
| 14 | - { |
|
| 15 | - // |
|
| 16 | - } |
|
| 17 | - |
|
| 18 | - public function creating($model) |
|
| 19 | - { |
|
| 20 | - // |
|
| 21 | - } |
|
| 22 | - |
|
| 23 | - public function created($model) |
|
| 24 | - { |
|
| 25 | - // |
|
| 26 | - } |
|
| 27 | - |
|
| 28 | - public function updating($model) |
|
| 29 | - { |
|
| 30 | - // |
|
| 31 | - } |
|
| 32 | - |
|
| 33 | - public function updated($model) |
|
| 34 | - { |
|
| 35 | - // |
|
| 36 | - } |
|
| 37 | - |
|
| 38 | - public function deleting($model) |
|
| 39 | - { |
|
| 40 | - // |
|
| 41 | - } |
|
| 42 | - |
|
| 43 | - public function deleted($model) |
|
| 44 | - { |
|
| 45 | - // |
|
| 46 | - } |
|
| 8 | + public function saving($model) |
|
| 9 | + { |
|
| 10 | + // |
|
| 11 | + } |
|
| 12 | + |
|
| 13 | + public function saved($model) |
|
| 14 | + { |
|
| 15 | + // |
|
| 16 | + } |
|
| 17 | + |
|
| 18 | + public function creating($model) |
|
| 19 | + { |
|
| 20 | + // |
|
| 21 | + } |
|
| 22 | + |
|
| 23 | + public function created($model) |
|
| 24 | + { |
|
| 25 | + // |
|
| 26 | + } |
|
| 27 | + |
|
| 28 | + public function updating($model) |
|
| 29 | + { |
|
| 30 | + // |
|
| 31 | + } |
|
| 32 | + |
|
| 33 | + public function updated($model) |
|
| 34 | + { |
|
| 35 | + // |
|
| 36 | + } |
|
| 37 | + |
|
| 38 | + public function deleting($model) |
|
| 39 | + { |
|
| 40 | + // |
|
| 41 | + } |
|
| 42 | + |
|
| 43 | + public function deleted($model) |
|
| 44 | + { |
|
| 45 | + // |
|
| 46 | + } |
|
| 47 | 47 | |
| 48 | 48 | } |
| 49 | 49 | \ No newline at end of file |
@@ -5,62 +5,62 @@ |
||
| 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 |
@@ -5,54 +5,54 @@ |
||
| 5 | 5 | */ |
| 6 | 6 | class AclUserObserver { |
| 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 | - /** |
|
| 39 | - * Soft delete user logs. |
|
| 40 | - * |
|
| 41 | - * @param object $model the delted model. |
|
| 42 | - * @return void |
|
| 43 | - */ |
|
| 44 | - public function deleting($model) |
|
| 45 | - { |
|
| 46 | - if ($model->getOriginal()['id'] == \JWTAuth::parseToken()->authenticate()->id) |
|
| 47 | - { |
|
| 48 | - \ErrorHandler::noPermissions(); |
|
| 49 | - } |
|
| 50 | - $model->logs()->delete(); |
|
| 51 | - } |
|
| 52 | - |
|
| 53 | - public function deleted($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 | + /** |
|
| 39 | + * Soft delete user logs. |
|
| 40 | + * |
|
| 41 | + * @param object $model the delted model. |
|
| 42 | + * @return void |
|
| 43 | + */ |
|
| 44 | + public function deleting($model) |
|
| 45 | + { |
|
| 46 | + if ($model->getOriginal()['id'] == \JWTAuth::parseToken()->authenticate()->id) |
|
| 47 | + { |
|
| 48 | + \ErrorHandler::noPermissions(); |
|
| 49 | + } |
|
| 50 | + $model->logs()->delete(); |
|
| 51 | + } |
|
| 52 | + |
|
| 53 | + public function deleted($model) |
|
| 54 | + { |
|
| 55 | + // |
|
| 56 | + } |
|
| 57 | 57 | |
| 58 | 58 | } |
| 59 | 59 | \ No newline at end of file |