Completed
Push — master ( 02d451...2ce496 )
by Sherif
02:39
created
V1/Notifications/Http/Controllers/PushNotificationsDevicesController.php 2 patches
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -7,22 +7,22 @@
 block discarded – undo
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
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -12,14 +12,14 @@
 block discarded – undo
12 12
      * to preform actions like (add, edit ... etc).
13 13
      * @var string
14 14
      */
15
-    protected $model            = 'pushNotificationDevices';
15
+    protected $model = 'pushNotificationDevices';
16 16
 
17 17
     /**
18 18
      * The validations rules used by the base api controller
19 19
      * to check before add.
20 20
      * @var array
21 21
      */
22
-    protected $validationRules  = [
22
+    protected $validationRules = [
23 23
     'device_token' => 'required|string|max:255',
24 24
     'device_type'  => 'required|in:android,ios',
25 25
     'user_id'      => 'required|exists:users,id',
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/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/Reporting/Repositories/ReportRepository.php 2 patches
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.
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], $this->model);
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], $this->model);
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, $this->model);
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, $this->model);
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.
src/Modules/V1/Reporting/Http/Controllers/ReportsController.php 2 patches
Indentation   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -7,33 +7,33 @@
 block discarded – undo
7 7
 
8 8
 class ReportsController 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               = 'reports';
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               = 'reports';
16 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 = ['getReport'];
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 = ['getReport'];
23 23
 
24
-    /**
25
-     * Render the total income report db view between the given two dates.
26
-     *
27
-     * @param  \Illuminate\Http\Request  $request
28
-     * @param  string  $reportName
29
-     * @param  integer $perPage
30
-     * @return \Illuminate\Http\Response
31
-     */
32
-    public function getReport(Request $request, $reportName, $perPage = 0) 
33
-    {
34
-        if ($this->model) 
35
-        {
36
-            return \Response::json(call_user_func_array("\Core::{$this->model}", [])->getReport($reportName, $request->all(), $perPage), 200);
37
-        }
38
-    }
24
+	/**
25
+	 * Render the total income report db view between the given two dates.
26
+	 *
27
+	 * @param  \Illuminate\Http\Request  $request
28
+	 * @param  string  $reportName
29
+	 * @param  integer $perPage
30
+	 * @return \Illuminate\Http\Response
31
+	 */
32
+	public function getReport(Request $request, $reportName, $perPage = 0) 
33
+	{
34
+		if ($this->model) 
35
+		{
36
+			return \Response::json(call_user_func_array("\Core::{$this->model}", [])->getReport($reportName, $request->all(), $perPage), 200);
37
+		}
38
+	}
39 39
 }
Please login to merge, or discard this patch.
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -12,7 +12,7 @@
 block discarded – undo
12 12
      * to preform actions like (add, edit ... etc).
13 13
      * @var string
14 14
      */
15
-    protected $model               = 'reports';
15
+    protected $model = 'reports';
16 16
 
17 17
     /**
18 18
      * List of all route actions that the base api controller
Please login to merge, or discard this patch.
src/ApiSkeletonServiceProvider.php 1 patch
Indentation   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -6,27 +6,27 @@
 block discarded – undo
6 6
 
7 7
 class ApiSkeletonServiceProvider extends ServiceProvider
8 8
 {
9
-    /**
10
-     * Perform post-registration booting of services.
11
-     *
12
-     * @return void
13
-     */
14
-    public function boot()
15
-    {
16
-        $this->publishes([
17
-            __DIR__.'/Modules'               => app_path('Modules'),
18
-            __DIR__.'/Modules/V1/Acl/emails' => base_path('resources/views/auth/emails'),
19
-            __DIR__.'/lang'                  => base_path('resources/lang'),
20
-            ]);
21
-    }
9
+	/**
10
+	 * Perform post-registration booting of services.
11
+	 *
12
+	 * @return void
13
+	 */
14
+	public function boot()
15
+	{
16
+		$this->publishes([
17
+			__DIR__.'/Modules'               => app_path('Modules'),
18
+			__DIR__.'/Modules/V1/Acl/emails' => base_path('resources/views/auth/emails'),
19
+			__DIR__.'/lang'                  => base_path('resources/lang'),
20
+			]);
21
+	}
22 22
 
23
-    /**
24
-     * Register any package services.
25
-     *
26
-     * @return void
27
-     */
28
-    public function register()
29
-    {
30
-        //
31
-    }
23
+	/**
24
+	 * Register any package services.
25
+	 *
26
+	 * @return void
27
+	 */
28
+	public function register()
29
+	{
30
+		//
31
+	}
32 32
 }
33 33
\ No newline at end of file
Please login to merge, or discard this patch.