@@ -8,35 +8,35 @@ |
||
| 8 | 8 | |
| 9 | 9 | class GroupsController extends BaseApiController |
| 10 | 10 | { |
| 11 | - /** |
|
| 12 | - * The name of the model that is used by the base api controller |
|
| 13 | - * to preform actions like (add, edit ... etc). |
|
| 14 | - * @var string |
|
| 15 | - */ |
|
| 16 | - protected $model = 'groups'; |
|
| 11 | + /** |
|
| 12 | + * The name of the model that is used by the base api controller |
|
| 13 | + * to preform actions like (add, edit ... etc). |
|
| 14 | + * @var string |
|
| 15 | + */ |
|
| 16 | + protected $model = 'groups'; |
|
| 17 | 17 | |
| 18 | - /** |
|
| 19 | - * The validations rules used by the base api controller |
|
| 20 | - * to check before add. |
|
| 21 | - * @var array |
|
| 22 | - */ |
|
| 23 | - protected $validationRules = [ |
|
| 24 | - 'name' => 'required|string|max:100|unique:groups,name,{id}' |
|
| 25 | - ]; |
|
| 18 | + /** |
|
| 19 | + * The validations rules used by the base api controller |
|
| 20 | + * to check before add. |
|
| 21 | + * @var array |
|
| 22 | + */ |
|
| 23 | + protected $validationRules = [ |
|
| 24 | + 'name' => 'required|string|max:100|unique:groups,name,{id}' |
|
| 25 | + ]; |
|
| 26 | 26 | |
| 27 | - /** |
|
| 28 | - * Handle an assign permissions to group request. |
|
| 29 | - * |
|
| 30 | - * @param \Illuminate\Http\Request $request |
|
| 31 | - * @return \Illuminate\Http\Response |
|
| 32 | - */ |
|
| 33 | - public function assignpermissions(Request $request) |
|
| 34 | - { |
|
| 35 | - $this->validate($request, [ |
|
| 36 | - 'permission_ids' => 'required|exists:permissions,id', |
|
| 37 | - 'group_id' => 'required|exists:groups,id' |
|
| 38 | - ]); |
|
| 27 | + /** |
|
| 28 | + * Handle an assign permissions to group request. |
|
| 29 | + * |
|
| 30 | + * @param \Illuminate\Http\Request $request |
|
| 31 | + * @return \Illuminate\Http\Response |
|
| 32 | + */ |
|
| 33 | + public function assignpermissions(Request $request) |
|
| 34 | + { |
|
| 35 | + $this->validate($request, [ |
|
| 36 | + 'permission_ids' => 'required|exists:permissions,id', |
|
| 37 | + 'group_id' => 'required|exists:groups,id' |
|
| 38 | + ]); |
|
| 39 | 39 | |
| 40 | - return \Response::json(\Core::groups()->assignPermissions($request->get('group_id'), $request->get('permission_ids')), 200); |
|
| 41 | - } |
|
| 40 | + return \Response::json(\Core::groups()->assignPermissions($request->get('group_id'), $request->get('permission_ids')), 200); |
|
| 41 | + } |
|
| 42 | 42 | } |
@@ -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 |
@@ -18,7 +18,7 @@ |
||
| 18 | 18 | $table->string('view_name',100); |
| 19 | 19 | $table->softDeletes(); |
| 20 | 20 | $table->timestamps(); |
| 21 | - }); |
|
| 21 | + }); |
|
| 22 | 22 | } |
| 23 | 23 | |
| 24 | 24 | /** |
@@ -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,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'); |
@@ -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 Notification extends Model{ |
| 7 | 7 | |
| 8 | - use SoftDeletes; |
|
| 9 | - protected $table = 'notifications'; |
|
| 10 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
| 11 | - protected $hidden = ['deleted_at', 'item_type']; |
|
| 12 | - protected $guarded = ['id']; |
|
| 13 | - protected $fillable = ['name', 'description', 'item_name', 'item_type', 'item_id', 'notified']; |
|
| 14 | - public $searchable = ['name', 'description', 'item_name', 'item_type']; |
|
| 8 | + use SoftDeletes; |
|
| 9 | + protected $table = 'notifications'; |
|
| 10 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
| 11 | + protected $hidden = ['deleted_at', 'item_type']; |
|
| 12 | + protected $guarded = ['id']; |
|
| 13 | + protected $fillable = ['name', 'description', 'item_name', 'item_type', 'item_id', 'notified']; |
|
| 14 | + public $searchable = ['name', 'description', 'item_name', 'item_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 item() |
|
| 32 | - { |
|
| 33 | - return $this->morphTo(); |
|
| 34 | - } |
|
| 31 | + public function item() |
|
| 32 | + { |
|
| 33 | + return $this->morphTo(); |
|
| 34 | + } |
|
| 35 | 35 | |
| 36 | - public static function boot() |
|
| 37 | - { |
|
| 38 | - parent::boot(); |
|
| 39 | - parent::observe(\App::make('App\Modules\V1\Notifications\ModelObservers\NotificationObserver')); |
|
| 40 | - } |
|
| 36 | + public static function boot() |
|
| 37 | + { |
|
| 38 | + parent::boot(); |
|
| 39 | + parent::observe(\App::make('App\Modules\V1\Notifications\ModelObservers\NotificationObserver')); |
|
| 40 | + } |
|
| 41 | 41 | } |
@@ -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 | } |