Completed
Push — master ( 174227...634be5 )
by Sherif
05:26
created
Database/Migrations/2016_01_24_123631_initialize_notifications.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -164,7 +164,7 @@
 block discarded – undo
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
 	}
Please login to merge, or discard this patch.
Indentation   +121 added lines, -121 removed lines patch added patch discarded remove patch
@@ -13,128 +13,128 @@
 block discarded – undo
13 13
 	public function up()
14 14
 	{
15 15
 		/**
16
-         * Insert the permissions related to this module.
17
-         */
18
-        DB::table('permissions')->insert(
19
-        	[
20
-        		/**
21
-        		 * notifications model permissions.
22
-        		 */
23
-	        	[
24
-	        	'name'       => 'find',
25
-	        	'model'      => 'notifications',
26
-	        	'created_at' => \DB::raw('NOW()'),
27
-	        	'updated_at' => \DB::raw('NOW()')
28
-	        	],
29
-	        	[
30
-	        	'name'       => 'search',
31
-	        	'model'      => 'notifications',
32
-	        	'created_at' => \DB::raw('NOW()'),
33
-	        	'updated_at' => \DB::raw('NOW()')
34
-	        	],
35
-	        	[
36
-	        	'name'       => 'list',
37
-	        	'model'      => 'notifications',
38
-	        	'created_at' => \DB::raw('NOW()'),
39
-	        	'updated_at' => \DB::raw('NOW()')
40
-	        	],
41
-	        	[
42
-	        	'name'       => 'findby',
43
-	        	'model'      => 'notifications',
44
-	        	'created_at' => \DB::raw('NOW()'),
45
-	        	'updated_at' => \DB::raw('NOW()')
46
-	        	],
47
-	        	[
48
-	        	'name'       => 'first',
49
-	        	'model'      => 'notifications',
50
-	        	'created_at' => \DB::raw('NOW()'),
51
-	        	'updated_at' => \DB::raw('NOW()')
52
-	        	],
53
-	        	[
54
-	        	'name'       => 'paginate',
55
-	        	'model'      => 'notifications',
56
-	        	'created_at' => \DB::raw('NOW()'),
57
-	        	'updated_at' => \DB::raw('NOW()')
58
-	        	],
59
-	        	[
60
-	        	'name'       => 'paginateby',
61
-	        	'model'      => 'notifications',
62
-	        	'created_at' => \DB::raw('NOW()'),
63
-	        	'updated_at' => \DB::raw('NOW()')
64
-	        	],
65
-	        	[
66
-	        	'name'       => 'notified',
67
-	        	'model'      => 'notifications',
68
-	        	'created_at' => \DB::raw('NOW()'),
69
-	        	'updated_at' => \DB::raw('NOW()')
70
-	        	],
71
-	        	[
72
-	        	'name'       => 'notifyall',
73
-	        	'model'      => 'notifications',
74
-	        	'created_at' => \DB::raw('NOW()'),
75
-	        	'updated_at' => \DB::raw('NOW()')
76
-	        	],
77
-	        	/**
78
-        		 * pushNotificationDevices model permissions.
79
-        		 */
80
-	        	[
81
-	        	'name'       => 'find',
82
-	        	'model'      => 'pushNotificationDevices',
83
-	        	'created_at' => \DB::raw('NOW()'),
84
-	        	'updated_at' => \DB::raw('NOW()')
85
-	        	],
86
-	        	[
87
-	        	'name'       => 'search',
88
-	        	'model'      => 'pushNotificationDevices',
89
-	        	'created_at' => \DB::raw('NOW()'),
90
-	        	'updated_at' => \DB::raw('NOW()')
91
-	        	],
92
-	        	[
93
-	        	'name'       => 'list',
94
-	        	'model'      => 'pushNotificationDevices',
95
-	        	'created_at' => \DB::raw('NOW()'),
96
-	        	'updated_at' => \DB::raw('NOW()')
97
-	        	],
98
-	        	[
99
-	        	'name'       => 'findby',
100
-	        	'model'      => 'pushNotificationDevices',
101
-	        	'created_at' => \DB::raw('NOW()'),
102
-	        	'updated_at' => \DB::raw('NOW()')
103
-	        	],
104
-	        	[
105
-	        	'name'       => 'first',
106
-	        	'model'      => 'pushNotificationDevices',
107
-	        	'created_at' => \DB::raw('NOW()'),
108
-	        	'updated_at' => \DB::raw('NOW()')
109
-	        	],
110
-	        	[
111
-	        	'name'       => 'paginate',
112
-	        	'model'      => 'pushNotificationDevices',
113
-	        	'created_at' => \DB::raw('NOW()'),
114
-	        	'updated_at' => \DB::raw('NOW()')
115
-	        	],
116
-	        	[
117
-	        	'name'       => 'paginateby',
118
-	        	'model'      => 'pushNotificationDevices',
119
-	        	'created_at' => \DB::raw('NOW()'),
120
-	        	'updated_at' => \DB::raw('NOW()')
121
-	        	],
122
-	        	[
123
-	        	'name'       => 'save',
124
-	        	'model'      => 'pushNotificationDevices',
125
-	        	'created_at' => \DB::raw('NOW()'),
126
-	        	'updated_at' => \DB::raw('NOW()')
127
-	        	],
128
-	        	[
129
-	        	'name'       => 'delete',
130
-	        	'model'      => 'pushNotificationDevices',
131
-	        	'created_at' => \DB::raw('NOW()'),
132
-	        	'updated_at' => \DB::raw('NOW()')
133
-	        	],
134
-        	]
135
-        );
16
+		 * Insert the permissions related to this module.
17
+		 */
18
+		DB::table('permissions')->insert(
19
+			[
20
+				/**
21
+				 * notifications model permissions.
22
+				 */
23
+				[
24
+				'name'       => 'find',
25
+				'model'      => 'notifications',
26
+				'created_at' => \DB::raw('NOW()'),
27
+				'updated_at' => \DB::raw('NOW()')
28
+				],
29
+				[
30
+				'name'       => 'search',
31
+				'model'      => 'notifications',
32
+				'created_at' => \DB::raw('NOW()'),
33
+				'updated_at' => \DB::raw('NOW()')
34
+				],
35
+				[
36
+				'name'       => 'list',
37
+				'model'      => 'notifications',
38
+				'created_at' => \DB::raw('NOW()'),
39
+				'updated_at' => \DB::raw('NOW()')
40
+				],
41
+				[
42
+				'name'       => 'findby',
43
+				'model'      => 'notifications',
44
+				'created_at' => \DB::raw('NOW()'),
45
+				'updated_at' => \DB::raw('NOW()')
46
+				],
47
+				[
48
+				'name'       => 'first',
49
+				'model'      => 'notifications',
50
+				'created_at' => \DB::raw('NOW()'),
51
+				'updated_at' => \DB::raw('NOW()')
52
+				],
53
+				[
54
+				'name'       => 'paginate',
55
+				'model'      => 'notifications',
56
+				'created_at' => \DB::raw('NOW()'),
57
+				'updated_at' => \DB::raw('NOW()')
58
+				],
59
+				[
60
+				'name'       => 'paginateby',
61
+				'model'      => 'notifications',
62
+				'created_at' => \DB::raw('NOW()'),
63
+				'updated_at' => \DB::raw('NOW()')
64
+				],
65
+				[
66
+				'name'       => 'notified',
67
+				'model'      => 'notifications',
68
+				'created_at' => \DB::raw('NOW()'),
69
+				'updated_at' => \DB::raw('NOW()')
70
+				],
71
+				[
72
+				'name'       => 'notifyall',
73
+				'model'      => 'notifications',
74
+				'created_at' => \DB::raw('NOW()'),
75
+				'updated_at' => \DB::raw('NOW()')
76
+				],
77
+				/**
78
+				 * pushNotificationDevices model permissions.
79
+				 */
80
+				[
81
+				'name'       => 'find',
82
+				'model'      => 'pushNotificationDevices',
83
+				'created_at' => \DB::raw('NOW()'),
84
+				'updated_at' => \DB::raw('NOW()')
85
+				],
86
+				[
87
+				'name'       => 'search',
88
+				'model'      => 'pushNotificationDevices',
89
+				'created_at' => \DB::raw('NOW()'),
90
+				'updated_at' => \DB::raw('NOW()')
91
+				],
92
+				[
93
+				'name'       => 'list',
94
+				'model'      => 'pushNotificationDevices',
95
+				'created_at' => \DB::raw('NOW()'),
96
+				'updated_at' => \DB::raw('NOW()')
97
+				],
98
+				[
99
+				'name'       => 'findby',
100
+				'model'      => 'pushNotificationDevices',
101
+				'created_at' => \DB::raw('NOW()'),
102
+				'updated_at' => \DB::raw('NOW()')
103
+				],
104
+				[
105
+				'name'       => 'first',
106
+				'model'      => 'pushNotificationDevices',
107
+				'created_at' => \DB::raw('NOW()'),
108
+				'updated_at' => \DB::raw('NOW()')
109
+				],
110
+				[
111
+				'name'       => 'paginate',
112
+				'model'      => 'pushNotificationDevices',
113
+				'created_at' => \DB::raw('NOW()'),
114
+				'updated_at' => \DB::raw('NOW()')
115
+				],
116
+				[
117
+				'name'       => 'paginateby',
118
+				'model'      => 'pushNotificationDevices',
119
+				'created_at' => \DB::raw('NOW()'),
120
+				'updated_at' => \DB::raw('NOW()')
121
+				],
122
+				[
123
+				'name'       => 'save',
124
+				'model'      => 'pushNotificationDevices',
125
+				'created_at' => \DB::raw('NOW()'),
126
+				'updated_at' => \DB::raw('NOW()')
127
+				],
128
+				[
129
+				'name'       => 'delete',
130
+				'model'      => 'pushNotificationDevices',
131
+				'created_at' => \DB::raw('NOW()'),
132
+				'updated_at' => \DB::raw('NOW()')
133
+				],
134
+			]
135
+		);
136 136
 
137
-        /**
137
+		/**
138 138
 		 * Assign the permissions to the admin group.
139 139
 		 */
140 140
 		$permissionIds = DB::table('permissions')->whereIn('model', ['notifications', 'pushNotificationDevices'])->select('id')->lists('id');
Please login to merge, or discard this patch.
src/Modules/V1/Notifications/PushNotificationDevice.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
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';
Please login to merge, or discard this patch.
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -5,37 +5,37 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
Modules/V1/Notifications/Repositories/PushNotificationDeviceRepository.php 2 patches
Indentation   +65 added lines, -65 removed lines patch added patch discarded remove patch
@@ -4,75 +4,75 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -32,7 +32,7 @@
 block discarded – undo
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
         }
Please login to merge, or discard this patch.
src/Modules/V1/Reporting/Report.php 2 patches
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -5,32 +5,32 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
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
 block discarded – undo
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
     {
Please login to merge, or discard this patch.
src/Modules/V1/Acl/ModelObservers/AclPermissionObserver.php 1 patch
Indentation   +39 added lines, -39 removed lines patch added patch discarded remove patch
@@ -5,44 +5,44 @@
 block discarded – undo
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
Please login to merge, or discard this patch.
src/Modules/V1/Core/Interfaces/RepositoryInterface.php 1 patch
Indentation   +106 added lines, -106 removed lines patch added patch discarded remove patch
@@ -2,119 +2,119 @@
 block discarded – undo
2 2
 
3 3
 interface RepositoryInterface
4 4
 {
5
-    /**
6
-     * Fetch all records with relations from the storage.
7
-     * 
8
-     * @param  array  $relations
9
-     * @param  array  $sortBy
10
-     * @param  array  $desc
11
-     * @param  array  $columns
12
-     * @return collection
13
-     */
14
-    public function all($relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
5
+	/**
6
+	 * Fetch all records with relations from the storage.
7
+	 * 
8
+	 * @param  array  $relations
9
+	 * @param  array  $sortBy
10
+	 * @param  array  $desc
11
+	 * @param  array  $columns
12
+	 * @return collection
13
+	 */
14
+	public function all($relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
15 15
     
16
-    /**
17
-     * Fetch all records with relations from storage in pages 
18
-     * that matche the given query.
19
-     * 
20
-     * @param  string  $query
21
-     * @param  integer $perPage
22
-     * @param  array   $relations
23
-     * @param  array   $sortBy
24
-     * @param  array   $desc
25
-     * @param  array   $columns
26
-     * @return collection
27
-     */
28
-    public function search($query, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
16
+	/**
17
+	 * Fetch all records with relations from storage in pages 
18
+	 * that matche the given query.
19
+	 * 
20
+	 * @param  string  $query
21
+	 * @param  integer $perPage
22
+	 * @param  array   $relations
23
+	 * @param  array   $sortBy
24
+	 * @param  array   $desc
25
+	 * @param  array   $columns
26
+	 * @return collection
27
+	 */
28
+	public function search($query, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
29 29
 
30
-    /**
31
-     * Fetch all records with relations from storage in pages.
32
-     * 
33
-     * @param  integer $perPage
34
-     * @param  array   $relations
35
-     * @param  array   $sortBy
36
-     * @param  array   $desc
37
-     * @param  array   $columns
38
-     * @return collection
39
-     */
40
-    public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
30
+	/**
31
+	 * Fetch all records with relations from storage in pages.
32
+	 * 
33
+	 * @param  integer $perPage
34
+	 * @param  array   $relations
35
+	 * @param  array   $sortBy
36
+	 * @param  array   $desc
37
+	 * @param  array   $columns
38
+	 * @return collection
39
+	 */
40
+	public function paginate($perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
41 41
     
42
-    /**
43
-     * Fetch all records with relations based on
44
-     * the given condition from storage in pages.
45
-     * 
46
-     * @param  array   $conditions array of conditions
47
-     * @param  integer $perPage
48
-     * @param  array   $relations
49
-     * @param  array   $sortBy
50
-     * @param  array   $desc
51
-     * @param  array   $columns
52
-     * @return collection
53
-     */
54
-    public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
42
+	/**
43
+	 * Fetch all records with relations based on
44
+	 * the given condition from storage in pages.
45
+	 * 
46
+	 * @param  array   $conditions array of conditions
47
+	 * @param  integer $perPage
48
+	 * @param  array   $relations
49
+	 * @param  array   $sortBy
50
+	 * @param  array   $desc
51
+	 * @param  array   $columns
52
+	 * @return collection
53
+	 */
54
+	public function paginateBy($conditions, $perPage = 15, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
55 55
 
56
-     /**
57
-     * Save the given model/models to the storage.
58
-     * 
59
-     * @param  array   $data
60
-     * @param  boolean $saveLog
61
-     * @return object
62
-     */
63
-    public function save(array $data, $saveLog = true);
56
+	 /**
57
+	  * Save the given model/models to the storage.
58
+	  * 
59
+	  * @param  array   $data
60
+	  * @param  boolean $saveLog
61
+	  * @return object
62
+	  */
63
+	public function save(array $data, $saveLog = true);
64 64
 
65
-    /**
66
-     * Update record in the storage based on the given
67
-     * condition.
68
-     * 
69
-     * @param  var     $value condition value
70
-     * @param  array   $data
71
-     * @param  string  $attribute condition column name
72
-     * @return integer affected rows
73
-     */
74
-    public function update($value, array $data, $attribute = 'id');
65
+	/**
66
+	 * Update record in the storage based on the given
67
+	 * condition.
68
+	 * 
69
+	 * @param  var     $value condition value
70
+	 * @param  array   $data
71
+	 * @param  string  $attribute condition column name
72
+	 * @return integer affected rows
73
+	 */
74
+	public function update($value, array $data, $attribute = 'id');
75 75
 
76
-    /**
77
-     * Delete record from the storage based on the given
78
-     * condition.
79
-     * 
80
-     * @param  var     $value condition value
81
-     * @param  string  $attribute condition column name
82
-     * @return integer affected rows
83
-     */
84
-    public function delete($value, $attribute = 'id');
76
+	/**
77
+	 * Delete record from the storage based on the given
78
+	 * condition.
79
+	 * 
80
+	 * @param  var     $value condition value
81
+	 * @param  string  $attribute condition column name
82
+	 * @return integer affected rows
83
+	 */
84
+	public function delete($value, $attribute = 'id');
85 85
     
86
-    /**
87
-     * Fetch records from the storage based on the given
88
-     * id.
89
-     * 
90
-     * @param  integer $id
91
-     * @param  array   $relations
92
-     * @param  array   $columns
93
-     * @return object
94
-     */
95
-    public function find($id, $relations = [], $columns = array('*'));
86
+	/**
87
+	 * Fetch records from the storage based on the given
88
+	 * id.
89
+	 * 
90
+	 * @param  integer $id
91
+	 * @param  array   $relations
92
+	 * @param  array   $columns
93
+	 * @return object
94
+	 */
95
+	public function find($id, $relations = [], $columns = array('*'));
96 96
     
97
-    /**
98
-     * Fetch records from the storage based on the given
99
-     * condition.
100
-     * 
101
-     * @param  array   $conditions array of conditions
102
-     * @param  array   $relations
103
-     * @param  array   $sortBy
104
-     * @param  array   $desc
105
-     * @param  array   $columns
106
-     * @return collection
107
-     */
108
-    public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
97
+	/**
98
+	 * Fetch records from the storage based on the given
99
+	 * condition.
100
+	 * 
101
+	 * @param  array   $conditions array of conditions
102
+	 * @param  array   $relations
103
+	 * @param  array   $sortBy
104
+	 * @param  array   $desc
105
+	 * @param  array   $columns
106
+	 * @return collection
107
+	 */
108
+	public function findBy($conditions, $relations = [], $sortBy = 'created_at', $desc = 0, $columns = array('*'));
109 109
 
110
-    /**
111
-     * Fetch the first record fro the storage based on the given
112
-     * condition.
113
-     * 
114
-     * @param  array   $conditions array of conditions
115
-     * @param  array   $relations
116
-     * @param  array   $columns
117
-     * @return object
118
-     */
119
-    public function first($conditions, $relations = [], $columns = array('*'));
110
+	/**
111
+	 * Fetch the first record fro the storage based on the given
112
+	 * condition.
113
+	 * 
114
+	 * @param  array   $conditions array of conditions
115
+	 * @param  array   $relations
116
+	 * @param  array   $columns
117
+	 * @return object
118
+	 */
119
+	public function first($conditions, $relations = [], $columns = array('*'));
120 120
 }
121 121
\ No newline at end of file
Please login to merge, or discard this patch.
src/Modules/V1/Notifications/Repositories/NotificationRepository.php 1 patch
Indentation   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -15,23 +15,23 @@
 block discarded – undo
15 15
 	}
16 16
 
17 17
 	/**
18
-     * Set the notification notified to true.
19
-     * 
20
-     * @param  integer  $id
21
-     * @return object
22
-     */
23
-    public function notified($id)
24
-    {
25
-        return $this->save(['id' => $id, 'notified' => 1]);
26
-    }
18
+	 * Set the notification notified to true.
19
+	 * 
20
+	 * @param  integer  $id
21
+	 * @return object
22
+	 */
23
+	public function notified($id)
24
+	{
25
+		return $this->save(['id' => $id, 'notified' => 1]);
26
+	}
27 27
 
28
-    /**
29
-     * Set the notification notified to all.
30
-     * 
31
-     * @return void
32
-     */
33
-    public function notifyAll()
34
-    {
35
-        $this->update(false, ['notified' => 1], 'notified');
36
-    }
28
+	/**
29
+	 * Set the notification notified to all.
30
+	 * 
31
+	 * @return void
32
+	 */
33
+	public function notifyAll()
34
+	{
35
+		$this->update(false, ['notified' => 1], 'notified');
36
+	}
37 37
 }
Please login to merge, or discard this patch.
src/Modules/V1/Acl/Http/Controllers/UsersController.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
      * to preform actions like (add, edit ... etc).
13 13
      * @var string
14 14
      */
15
-    protected $model               = 'users';
15
+    protected $model = 'users';
16 16
 
17 17
     /**
18 18
      * List of all route actions that the base api controller
@@ -26,14 +26,14 @@  discard block
 block discarded – undo
26 26
      * will skip login check for them.
27 27
      * @var array
28 28
      */
29
-    protected $skipLoginCheck      = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword', 'refreshtoken'];
29
+    protected $skipLoginCheck = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword', 'refreshtoken'];
30 30
 
31 31
     /**
32 32
      * The validations rules used by the base api controller
33 33
      * to check before add.
34 34
      * @var array
35 35
      */
36
-    protected $validationRules     = [
36
+    protected $validationRules = [
37 37
     'email'    => 'required|email|unique:users,email,{id}',
38 38
     'password' => 'min:6'
39 39
     ];
Please login to merge, or discard this patch.
Indentation   +218 added lines, -218 removed lines patch added patch discarded remove patch
@@ -7,222 +7,222 @@
 block discarded – undo
7 7
 
8 8
 class UsersController 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               = 'users';
16
-
17
-    /**
18
-     * List of all route actions that the base api controller
19
-     * will skip permissions check for them.
20
-     * @var array
21
-     */
22
-    protected $skipPermissionCheck = ['account', 'logout', 'sendreset'];
23
-
24
-    /**
25
-     * List of all route actions that the base api controller
26
-     * will skip login check for them.
27
-     * @var array
28
-     */
29
-    protected $skipLoginCheck      = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword', 'refreshtoken'];
30
-
31
-    /**
32
-     * The validations rules used by the base api controller
33
-     * to check before add.
34
-     * @var array
35
-     */
36
-    protected $validationRules     = [
37
-        'full_name'     => 'string|max:100', 
38
-        'user_name'     => 'string|unique:users,user_name,{id}', 
39
-        'email'         => 'required|email|unique:users,email,{id}', 
40
-        'mobile_number' => 'string|unique:users,mobile_number,{id}', 
41
-        'password'      => 'required|min:6'
42
-    ];
43
-
44
-    /**
45
-     * Return the logged in user account.
46
-     * 
47
-     * @return \Illuminate\Http\Response
48
-     */
49
-    public function account()
50
-    {
51
-        $relations = $this->relations && $this->relations['account'] ? $this->relations['account'] : [];
52
-        return \Response::json(\Core::users()->account($relations), 200);
53
-    }
54
-
55
-    /**
56
-     * Block the user.
57
-     *
58
-     * @param  integer  $id
59
-     * @return \Illuminate\Http\Response
60
-     */
61
-    public function block($id)
62
-    {
63
-        return \Response::json(\Core::users()->block($id), 200);
64
-    }
65
-
66
-    /**
67
-     * Unblock the user.
68
-     *
69
-     * @param  integer  $id
70
-     * @return \Illuminate\Http\Response
71
-     */
72
-    public function unblock($id)
73
-    {
74
-        return \Response::json(\Core::users()->unblock($id), 200);
75
-    }
76
-
77
-    /**
78
-     * Logout the user.
79
-     * 
80
-     * @return \Illuminate\Http\Response
81
-     */
82
-    public function logout()
83
-    {
84
-        return \Response::json(\Core::users()->logout(), 200);
85
-    }
86
-
87
-    /**
88
-     * Handle a registration request.
89
-     *
90
-     * @param  \Illuminate\Http\Request  $request
91
-     * @return \Illuminate\Http\Response
92
-     */
93
-    public function register(Request $request)
94
-    {
95
-        $this->validate($request, [
96
-            'full_name'     => 'string|max:100', 
97
-            'user_name'     => 'string|unique:users,user_name,{id}', 
98
-            'email'         => 'required|email|unique:users,email,{id}', 
99
-            'mobile_number' => 'string|unique:users,mobile_number,{id}', 
100
-            'password'      => 'required|min:6'
101
-            ]);
102
-
103
-        return \Response::json(\Core::users()->register($request->only('email', 'password')), 200);
104
-    }
105
-
106
-    /**
107
-     * Handle a login request of the none admin to the application.
108
-     *
109
-     * @param  \Illuminate\Http\Request  $request
110
-     * @return \Illuminate\Http\Response
111
-     */
112
-    public function login(Request $request)
113
-    {
114
-        $this->validate($request, [
115
-            'email'    => 'required|email', 
116
-            'password' => 'required|min:6',
117
-            'admin'    => 'boolean'
118
-            ]);
119
-
120
-        return \Response::json(\Core::users()->login($request->only('email', 'password'), $request->get('admin')), 200);
121
-    }
122
-
123
-    /**
124
-     * Handle a social login request of the none admin to the application.
125
-     *
126
-     * @param  \Illuminate\Http\Request  $request
127
-     * @return \Illuminate\Http\Response
128
-     */
129
-    public function loginSocial(Request $request)
130
-    {
131
-        $this->validate($request, [
132
-            'auth_code'    => 'required_without:access_token',
133
-            'access_token' => 'required_without:auth_code',
134
-            'type'         => 'required|in:facebook,google'
135
-            ]);
136
-
137
-        return \Response::json(\Core::users()->loginSocial($request->only('auth_code', 'access_token', 'type')), 200);
138
-    }
139
-
140
-    /**
141
-     * Handle an assign groups to user request.
142
-     *
143
-     * @param  \Illuminate\Http\Request  $request
144
-     * @return \Illuminate\Http\Response
145
-     */
146
-    public function assigngroups(Request $request)
147
-    {
148
-        $this->validate($request, [
149
-            'group_ids' => 'required|exists:groups,id', 
150
-            'user_id'   => 'required|exists:users,id'
151
-            ]);
152
-
153
-        return \Response::json(\Core::users()->assignGroups($request->get('user_id'), $request->get('group_ids')), 200);
154
-    }
155
-
156
-    /**
157
-     * Send a reset link to the given user.
158
-     *
159
-     * @param  \Illuminate\Http\Request  $request
160
-     * @return \Illuminate\Http\Response
161
-     */
162
-    public function sendreset(Request $request)
163
-    {
164
-        $this->validate($request, ['email' => 'required|email', 'url' => 'required|url']);
165
-
166
-        return \Response::json(\Core::users()->sendReset($request->only('email'), $request->get('url')), 200);
167
-    }
168
-
169
-    /**
170
-     * Reset the given user's password.
171
-     *
172
-     * @param  \Illuminate\Http\Request  $request
173
-     * @return \Illuminate\Http\Response
174
-     */
175
-    public function resetpassword(Request $request)
176
-    {
177
-        $this->validate($request, [
178
-            'token'                 => 'required',
179
-            'email'                 => 'required|email',
180
-            'password'              => 'required|confirmed|min:6',
181
-            'password_confirmation' => 'required',
182
-        ]);
183
-
184
-        return \Response::json(\Core::users()->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')), 200);
185
-    }
186
-
187
-    /**
188
-     * Change the logged in user password.
189
-     *
190
-     * @param  \Illuminate\Http\Request  $request
191
-     * @return \Illuminate\Http\Response
192
-     */
193
-    public function changePassword(Request $request)
194
-    {
195
-        $this->validate($request, [
196
-            'old_password'          => 'required',
197
-            'password'              => 'required|confirmed|min:6',
198
-            'password_confirmation' => 'required',
199
-        ]);
200
-
201
-        return \Response::json(\Core::users()->changePassword($request->only('old_password', 'password', 'password_confirmation')), 200);
202
-    }
203
-
204
-    /**
205
-     * Refresh the expired login token.
206
-     *
207
-     * @return \Illuminate\Http\Response
208
-     */
209
-    public function refreshtoken()
210
-    {
211
-        return \Response::json(\Core::users()->refreshtoken(), 200);
212
-    }
213
-
214
-    /**
215
-     * Paginate all users with inthe given group.
216
-     * 
217
-     * @param  string $groupName
218
-     * @param  integer $perPage
219
-     * @param  string  $sortBy
220
-     * @param  boolean $desc
221
-     * @return \Illuminate\Http\Response
222
-     */
223
-    public function group($groupName, $perPage = 15, $sortBy = 'created_at', $desc = 1)
224
-    {
225
-        $relations = $this->relations && $this->relations['group'] ? $this->relations['group'] : [];
226
-        return \Response::json(\Core::users()->group($groupName, $relations, $perPage, $sortBy, $desc), 200);
227
-    }
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               = 'users';
16
+
17
+	/**
18
+	 * List of all route actions that the base api controller
19
+	 * will skip permissions check for them.
20
+	 * @var array
21
+	 */
22
+	protected $skipPermissionCheck = ['account', 'logout', 'sendreset'];
23
+
24
+	/**
25
+	 * List of all route actions that the base api controller
26
+	 * will skip login check for them.
27
+	 * @var array
28
+	 */
29
+	protected $skipLoginCheck      = ['login', 'loginSocial', 'register', 'sendreset', 'resetpassword', 'refreshtoken'];
30
+
31
+	/**
32
+	 * The validations rules used by the base api controller
33
+	 * to check before add.
34
+	 * @var array
35
+	 */
36
+	protected $validationRules     = [
37
+		'full_name'     => 'string|max:100', 
38
+		'user_name'     => 'string|unique:users,user_name,{id}', 
39
+		'email'         => 'required|email|unique:users,email,{id}', 
40
+		'mobile_number' => 'string|unique:users,mobile_number,{id}', 
41
+		'password'      => 'required|min:6'
42
+	];
43
+
44
+	/**
45
+	 * Return the logged in user account.
46
+	 * 
47
+	 * @return \Illuminate\Http\Response
48
+	 */
49
+	public function account()
50
+	{
51
+		$relations = $this->relations && $this->relations['account'] ? $this->relations['account'] : [];
52
+		return \Response::json(\Core::users()->account($relations), 200);
53
+	}
54
+
55
+	/**
56
+	 * Block the user.
57
+	 *
58
+	 * @param  integer  $id
59
+	 * @return \Illuminate\Http\Response
60
+	 */
61
+	public function block($id)
62
+	{
63
+		return \Response::json(\Core::users()->block($id), 200);
64
+	}
65
+
66
+	/**
67
+	 * Unblock the user.
68
+	 *
69
+	 * @param  integer  $id
70
+	 * @return \Illuminate\Http\Response
71
+	 */
72
+	public function unblock($id)
73
+	{
74
+		return \Response::json(\Core::users()->unblock($id), 200);
75
+	}
76
+
77
+	/**
78
+	 * Logout the user.
79
+	 * 
80
+	 * @return \Illuminate\Http\Response
81
+	 */
82
+	public function logout()
83
+	{
84
+		return \Response::json(\Core::users()->logout(), 200);
85
+	}
86
+
87
+	/**
88
+	 * Handle a registration request.
89
+	 *
90
+	 * @param  \Illuminate\Http\Request  $request
91
+	 * @return \Illuminate\Http\Response
92
+	 */
93
+	public function register(Request $request)
94
+	{
95
+		$this->validate($request, [
96
+			'full_name'     => 'string|max:100', 
97
+			'user_name'     => 'string|unique:users,user_name,{id}', 
98
+			'email'         => 'required|email|unique:users,email,{id}', 
99
+			'mobile_number' => 'string|unique:users,mobile_number,{id}', 
100
+			'password'      => 'required|min:6'
101
+			]);
102
+
103
+		return \Response::json(\Core::users()->register($request->only('email', 'password')), 200);
104
+	}
105
+
106
+	/**
107
+	 * Handle a login request of the none admin to the application.
108
+	 *
109
+	 * @param  \Illuminate\Http\Request  $request
110
+	 * @return \Illuminate\Http\Response
111
+	 */
112
+	public function login(Request $request)
113
+	{
114
+		$this->validate($request, [
115
+			'email'    => 'required|email', 
116
+			'password' => 'required|min:6',
117
+			'admin'    => 'boolean'
118
+			]);
119
+
120
+		return \Response::json(\Core::users()->login($request->only('email', 'password'), $request->get('admin')), 200);
121
+	}
122
+
123
+	/**
124
+	 * Handle a social login request of the none admin to the application.
125
+	 *
126
+	 * @param  \Illuminate\Http\Request  $request
127
+	 * @return \Illuminate\Http\Response
128
+	 */
129
+	public function loginSocial(Request $request)
130
+	{
131
+		$this->validate($request, [
132
+			'auth_code'    => 'required_without:access_token',
133
+			'access_token' => 'required_without:auth_code',
134
+			'type'         => 'required|in:facebook,google'
135
+			]);
136
+
137
+		return \Response::json(\Core::users()->loginSocial($request->only('auth_code', 'access_token', 'type')), 200);
138
+	}
139
+
140
+	/**
141
+	 * Handle an assign groups to user request.
142
+	 *
143
+	 * @param  \Illuminate\Http\Request  $request
144
+	 * @return \Illuminate\Http\Response
145
+	 */
146
+	public function assigngroups(Request $request)
147
+	{
148
+		$this->validate($request, [
149
+			'group_ids' => 'required|exists:groups,id', 
150
+			'user_id'   => 'required|exists:users,id'
151
+			]);
152
+
153
+		return \Response::json(\Core::users()->assignGroups($request->get('user_id'), $request->get('group_ids')), 200);
154
+	}
155
+
156
+	/**
157
+	 * Send a reset link to the given user.
158
+	 *
159
+	 * @param  \Illuminate\Http\Request  $request
160
+	 * @return \Illuminate\Http\Response
161
+	 */
162
+	public function sendreset(Request $request)
163
+	{
164
+		$this->validate($request, ['email' => 'required|email', 'url' => 'required|url']);
165
+
166
+		return \Response::json(\Core::users()->sendReset($request->only('email'), $request->get('url')), 200);
167
+	}
168
+
169
+	/**
170
+	 * Reset the given user's password.
171
+	 *
172
+	 * @param  \Illuminate\Http\Request  $request
173
+	 * @return \Illuminate\Http\Response
174
+	 */
175
+	public function resetpassword(Request $request)
176
+	{
177
+		$this->validate($request, [
178
+			'token'                 => 'required',
179
+			'email'                 => 'required|email',
180
+			'password'              => 'required|confirmed|min:6',
181
+			'password_confirmation' => 'required',
182
+		]);
183
+
184
+		return \Response::json(\Core::users()->resetPassword($request->only('email', 'password', 'password_confirmation', 'token')), 200);
185
+	}
186
+
187
+	/**
188
+	 * Change the logged in user password.
189
+	 *
190
+	 * @param  \Illuminate\Http\Request  $request
191
+	 * @return \Illuminate\Http\Response
192
+	 */
193
+	public function changePassword(Request $request)
194
+	{
195
+		$this->validate($request, [
196
+			'old_password'          => 'required',
197
+			'password'              => 'required|confirmed|min:6',
198
+			'password_confirmation' => 'required',
199
+		]);
200
+
201
+		return \Response::json(\Core::users()->changePassword($request->only('old_password', 'password', 'password_confirmation')), 200);
202
+	}
203
+
204
+	/**
205
+	 * Refresh the expired login token.
206
+	 *
207
+	 * @return \Illuminate\Http\Response
208
+	 */
209
+	public function refreshtoken()
210
+	{
211
+		return \Response::json(\Core::users()->refreshtoken(), 200);
212
+	}
213
+
214
+	/**
215
+	 * Paginate all users with inthe given group.
216
+	 * 
217
+	 * @param  string $groupName
218
+	 * @param  integer $perPage
219
+	 * @param  string  $sortBy
220
+	 * @param  boolean $desc
221
+	 * @return \Illuminate\Http\Response
222
+	 */
223
+	public function group($groupName, $perPage = 15, $sortBy = 'created_at', $desc = 1)
224
+	{
225
+		$relations = $this->relations && $this->relations['group'] ? $this->relations['group'] : [];
226
+		return \Response::json(\Core::users()->group($groupName, $relations, $perPage, $sortBy, $desc), 200);
227
+	}
228 228
 }
Please login to merge, or discard this patch.
src/Modules/V1/Reporting/Repositories/ReportRepository.php 2 patches
Indentation   +59 added lines, -59 removed lines patch added patch discarded remove patch
@@ -4,66 +4,66 @@
 block discarded – undo
4 4
 
5 5
 class ReportRepository 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\Reporting\Report';
15
-    }
7
+	/**
8
+	 * Return the model full namespace.
9
+	 * 
10
+	 * @return string
11
+	 */
12
+	protected function getModel()
13
+	{
14
+		return 'App\Modules\V1\Reporting\Report';
15
+	}
16 16
 
17
-    /**
18
-     * Render the given report db view based on the given
19
-     * condition.
20
-     *
21
-     * @param  string  $reportName
22
-     * @param  array   $conditions array of conditions
23
-     * @param  integer $perPage
24
-     * @param  array   $relations
25
-     * @return object
26
-     */
27
-    public function getReport($reportName, $conditions = false, $perPage = 0, $relations = [])
28
-    {
29
-        /**
30
-         * Fetch the report from db.
31
-         */
32
-        $reportConditions = $this->constructConditions(['report_name' => $reportName]);
33
-        $report           = call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($reportConditions['conditionString'], $reportConditions['conditionValues'])->first();
17
+	/**
18
+	 * Render the given report db view based on the given
19
+	 * condition.
20
+	 *
21
+	 * @param  string  $reportName
22
+	 * @param  array   $conditions array of conditions
23
+	 * @param  integer $perPage
24
+	 * @param  array   $relations
25
+	 * @return object
26
+	 */
27
+	public function getReport($reportName, $conditions = false, $perPage = 0, $relations = [])
28
+	{
29
+		/**
30
+		 * Fetch the report from db.
31
+		 */
32
+		$reportConditions = $this->constructConditions(['report_name' => $reportName]);
33
+		$report           = call_user_func_array("{$this->getModel()}::with", array($relations))->whereRaw($reportConditions['conditionString'], $reportConditions['conditionValues'])->first();
34 34
         
35
-        /**
36
-         * Check report existance and permission.
37
-         */
38
-        if ( ! $report) 
39
-        {
40
-            \ErrorHandler::notFound('report');
41
-        }
42
-        else if ( ! \Core::users()->can($report->view_name, 'reports'))
43
-        {
44
-            \ErrorHandler::noPermissions();
45
-        }
35
+		/**
36
+		 * Check report existance and permission.
37
+		 */
38
+		if ( ! $report) 
39
+		{
40
+			\ErrorHandler::notFound('report');
41
+		}
42
+		else if ( ! \Core::users()->can($report->view_name, 'reports'))
43
+		{
44
+			\ErrorHandler::noPermissions();
45
+		}
46 46
 
47
-        /**
48
-         * Fetch data from the report based on the given conditions.
49
-         */
50
-        $report = \DB::table($report->view_name);
51
-        unset($conditions['page']);
52
-        if (count($conditions))
53
-        {
54
-            $conditions = $this->constructConditions($conditions);
55
-            $report->whereRaw($conditions['conditionString'], $conditions['conditionValues']);   
56
-        }
57
-        /**
58
-         * Paginate or all data.
59
-         */
60
-        if ($perPage) 
61
-        {
62
-            return $report->paginate($perPage);
63
-        }
64
-        else
65
-        {
66
-            return $report->get();  
67
-        }
68
-    }
47
+		/**
48
+		 * Fetch data from the report based on the given conditions.
49
+		 */
50
+		$report = \DB::table($report->view_name);
51
+		unset($conditions['page']);
52
+		if (count($conditions))
53
+		{
54
+			$conditions = $this->constructConditions($conditions);
55
+			$report->whereRaw($conditions['conditionString'], $conditions['conditionValues']);   
56
+		}
57
+		/**
58
+		 * Paginate or all data.
59
+		 */
60
+		if ($perPage) 
61
+		{
62
+			return $report->paginate($perPage);
63
+		}
64
+		else
65
+		{
66
+			return $report->get();  
67
+		}
68
+	}
69 69
 }
Please login to merge, or discard this patch.
Braces   +2 added lines, -4 removed lines patch added patch discarded remove patch
@@ -38,8 +38,7 @@  discard block
 block discarded – undo
38 38
         if ( ! $report) 
39 39
         {
40 40
             \ErrorHandler::notFound('report');
41
-        }
42
-        else if ( ! \Core::users()->can($report->view_name, 'reports'))
41
+        } else if ( ! \Core::users()->can($report->view_name, 'reports'))
43 42
         {
44 43
             \ErrorHandler::noPermissions();
45 44
         }
@@ -60,8 +59,7 @@  discard block
 block discarded – undo
60 59
         if ($perPage) 
61 60
         {
62 61
             return $report->paginate($perPage);
63
-        }
64
-        else
62
+        } else
65 63
         {
66 64
             return $report->get();  
67 65
         }
Please login to merge, or discard this patch.