@@ -13,19 +13,19 @@ |
||
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | 15 | Schema::create('groups', function (Blueprint $table) { |
| 16 | - $table->increments('id'); |
|
| 17 | - $table->string('name',100)->unique(); |
|
| 18 | - $table->softDeletes(); |
|
| 19 | - $table->timestamps(); |
|
| 20 | - }); |
|
| 16 | + $table->increments('id'); |
|
| 17 | + $table->string('name',100)->unique(); |
|
| 18 | + $table->softDeletes(); |
|
| 19 | + $table->timestamps(); |
|
| 20 | + }); |
|
| 21 | 21 | |
| 22 | - Schema::create('users_groups', function (Blueprint $table) { |
|
| 23 | - $table->increments('id'); |
|
| 24 | - $table->integer('user_id'); |
|
| 25 | - $table->integer('group_id'); |
|
| 26 | - $table->softDeletes(); |
|
| 27 | - $table->timestamps(); |
|
| 28 | - }); |
|
| 22 | + Schema::create('users_groups', function (Blueprint $table) { |
|
| 23 | + $table->increments('id'); |
|
| 24 | + $table->integer('user_id'); |
|
| 25 | + $table->integer('group_id'); |
|
| 26 | + $table->softDeletes(); |
|
| 27 | + $table->timestamps(); |
|
| 28 | + }); |
|
| 29 | 29 | } |
| 30 | 30 | |
| 31 | 31 | /** |
@@ -12,21 +12,21 @@ |
||
| 12 | 12 | */ |
| 13 | 13 | public function up() |
| 14 | 14 | { |
| 15 | - Schema::create('permissions', function (Blueprint $table) { |
|
| 16 | - $table->increments('id'); |
|
| 17 | - $table->string('name',100); |
|
| 18 | - $table->string('model',100); |
|
| 19 | - $table->softDeletes(); |
|
| 20 | - $table->timestamps(); |
|
| 21 | - $table->unique(array('name', 'model')); |
|
| 22 | - }); |
|
| 23 | - Schema::create('groups_permissions', function (Blueprint $table) { |
|
| 24 | - $table->increments('id'); |
|
| 25 | - $table->integer('group_id'); |
|
| 26 | - $table->integer('permission_id'); |
|
| 27 | - $table->softDeletes(); |
|
| 28 | - $table->timestamps(); |
|
| 29 | - }); |
|
| 15 | + Schema::create('permissions', function (Blueprint $table) { |
|
| 16 | + $table->increments('id'); |
|
| 17 | + $table->string('name',100); |
|
| 18 | + $table->string('model',100); |
|
| 19 | + $table->softDeletes(); |
|
| 20 | + $table->timestamps(); |
|
| 21 | + $table->unique(array('name', 'model')); |
|
| 22 | + }); |
|
| 23 | + Schema::create('groups_permissions', function (Blueprint $table) { |
|
| 24 | + $table->increments('id'); |
|
| 25 | + $table->integer('group_id'); |
|
| 26 | + $table->integer('permission_id'); |
|
| 27 | + $table->softDeletes(); |
|
| 28 | + $table->timestamps(); |
|
| 29 | + }); |
|
| 30 | 30 | } |
| 31 | 31 | |
| 32 | 32 | /** |
@@ -7,10 +7,10 @@ |
||
| 7 | 7 | |
| 8 | 8 | class PermissionsController 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 = 'permissions'; |
|
| 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 = 'permissions'; |
|
| 16 | 16 | } |
@@ -2,17 +2,17 @@ |
||
| 2 | 2 | |
| 3 | 3 | class Logging |
| 4 | 4 | { |
| 5 | - public function saveLog($action, $item_name, $item_type, $item_id) |
|
| 6 | - { |
|
| 7 | - if (\Core::logs() && $item_name !== 'Log') |
|
| 8 | - { |
|
| 9 | - \Core::logs()->save([ |
|
| 10 | - 'action' => $action, |
|
| 11 | - 'item_name' => $item_name, |
|
| 12 | - 'item_type' => $item_type, |
|
| 13 | - 'item_id' => $item_id, |
|
| 14 | - 'user_id' => \JWTAuth::parseToken()->authenticate()->id, |
|
| 15 | - ], false, false); |
|
| 16 | - } |
|
| 17 | - } |
|
| 5 | + public function saveLog($action, $item_name, $item_type, $item_id) |
|
| 6 | + { |
|
| 7 | + if (\Core::logs() && $item_name !== 'Log') |
|
| 8 | + { |
|
| 9 | + \Core::logs()->save([ |
|
| 10 | + 'action' => $action, |
|
| 11 | + 'item_name' => $item_name, |
|
| 12 | + 'item_type' => $item_type, |
|
| 13 | + 'item_id' => $item_id, |
|
| 14 | + 'user_id' => \JWTAuth::parseToken()->authenticate()->id, |
|
| 15 | + ], false, false); |
|
| 16 | + } |
|
| 17 | + } |
|
| 18 | 18 | } |
| 19 | 19 | \ No newline at end of file |
@@ -8,30 +8,30 @@ |
||
| 8 | 8 | class NotificationsController extends BaseApiController |
| 9 | 9 | { |
| 10 | 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 = 'notifications'; |
|
| 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 = 'notifications'; |
|
| 16 | 16 | |
| 17 | - /** |
|
| 18 | - * Set the notification notified to true. |
|
| 19 | - * |
|
| 20 | - * @param integer $id |
|
| 21 | - * @return \Illuminate\Http\Response |
|
| 22 | - */ |
|
| 23 | - public function notified($id) |
|
| 24 | - { |
|
| 25 | - return \Response::json(\Core::notifications()->notified($id), 200); |
|
| 26 | - } |
|
| 17 | + /** |
|
| 18 | + * Set the notification notified to true. |
|
| 19 | + * |
|
| 20 | + * @param integer $id |
|
| 21 | + * @return \Illuminate\Http\Response |
|
| 22 | + */ |
|
| 23 | + public function notified($id) |
|
| 24 | + { |
|
| 25 | + return \Response::json(\Core::notifications()->notified($id), 200); |
|
| 26 | + } |
|
| 27 | 27 | |
| 28 | - /** |
|
| 29 | - * Set the notification notified to all. |
|
| 30 | - * |
|
| 31 | - * @return \Illuminate\Http\Response |
|
| 32 | - */ |
|
| 33 | - public function notifyall() |
|
| 34 | - { |
|
| 35 | - return \Response::json(\Core::notifications()->notifyAll(), 200); |
|
| 36 | - } |
|
| 28 | + /** |
|
| 29 | + * Set the notification notified to all. |
|
| 30 | + * |
|
| 31 | + * @return \Illuminate\Http\Response |
|
| 32 | + */ |
|
| 33 | + public function notifyall() |
|
| 34 | + { |
|
| 35 | + return \Response::json(\Core::notifications()->notifyAll(), 200); |
|
| 36 | + } |
|
| 37 | 37 | } |
@@ -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 | } |
@@ -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 | } |
@@ -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 | } |
@@ -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 | } |