@@ -4,66 +4,66 @@ |
||
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 | } |
@@ -7,33 +7,33 @@ |
||
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 | } |
@@ -6,67 +6,67 @@ |
||
6 | 6 | |
7 | 7 | class AclUser extends User { |
8 | 8 | |
9 | - use SoftDeletes; |
|
10 | - protected $table = 'users'; |
|
11 | - protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
12 | - protected $hidden = ['password', 'remember_token','deleted_at']; |
|
13 | - protected $guarded = ['id']; |
|
14 | - protected $fillable = ['name', 'email', 'password']; |
|
15 | - protected $appends = ['permissions']; |
|
16 | - public $searchable = ['name', 'email']; |
|
9 | + use SoftDeletes; |
|
10 | + protected $table = 'users'; |
|
11 | + protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
|
12 | + protected $hidden = ['password', 'remember_token','deleted_at']; |
|
13 | + protected $guarded = ['id']; |
|
14 | + protected $fillable = ['name', 'email', 'password']; |
|
15 | + protected $appends = ['permissions']; |
|
16 | + public $searchable = ['name', 'email']; |
|
17 | 17 | |
18 | - public function getCreatedAtAttribute($value) |
|
19 | - { |
|
20 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
21 | - } |
|
18 | + public function getCreatedAtAttribute($value) |
|
19 | + { |
|
20 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
21 | + } |
|
22 | 22 | |
23 | - public function getUpdatedAtAttribute($value) |
|
24 | - { |
|
25 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
26 | - } |
|
23 | + public function getUpdatedAtAttribute($value) |
|
24 | + { |
|
25 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
26 | + } |
|
27 | 27 | |
28 | - public function getDeletedAtAttribute($value) |
|
29 | - { |
|
30 | - return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
31 | - } |
|
28 | + public function getDeletedAtAttribute($value) |
|
29 | + { |
|
30 | + return \Carbon\Carbon::parse($value)->addHours(\Session::get('timeZoneDiff'))->toDateTimeString(); |
|
31 | + } |
|
32 | 32 | |
33 | - /** |
|
34 | - * Encrypt the password attribute before |
|
35 | - * saving it in the storage. |
|
36 | - * |
|
37 | - * @param string $value |
|
38 | - */ |
|
39 | - public function setPasswordAttribute($value) |
|
40 | - { |
|
41 | - $this->attributes['password'] = bcrypt($value); |
|
42 | - } |
|
33 | + /** |
|
34 | + * Encrypt the password attribute before |
|
35 | + * saving it in the storage. |
|
36 | + * |
|
37 | + * @param string $value |
|
38 | + */ |
|
39 | + public function setPasswordAttribute($value) |
|
40 | + { |
|
41 | + $this->attributes['password'] = bcrypt($value); |
|
42 | + } |
|
43 | 43 | |
44 | - public function logs() |
|
45 | - { |
|
46 | - return $this->hasMany('App\Modules\V1\Core\Log', 'user_id'); |
|
47 | - } |
|
44 | + public function logs() |
|
45 | + { |
|
46 | + return $this->hasMany('App\Modules\V1\Core\Log', 'user_id'); |
|
47 | + } |
|
48 | 48 | |
49 | - public function groups() |
|
50 | - { |
|
51 | - return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
52 | - } |
|
49 | + public function groups() |
|
50 | + { |
|
51 | + return $this->belongsToMany('\App\Modules\V1\Acl\AclGroup','users_groups','user_id','group_id')->whereNull('users_groups.deleted_at')->withTimestamps(); |
|
52 | + } |
|
53 | 53 | |
54 | - public function getPermissionsAttribute() |
|
55 | - { |
|
56 | - $permissions = []; |
|
57 | - foreach ($this->groups()->get() as $group) |
|
58 | - { |
|
59 | - $group->permissions->each(function ($permission) use (&$permissions){ |
|
60 | - $permissions[$permission->model][$permission->id] = $permission->name; |
|
61 | - }); |
|
62 | - } |
|
54 | + public function getPermissionsAttribute() |
|
55 | + { |
|
56 | + $permissions = []; |
|
57 | + foreach ($this->groups()->get() as $group) |
|
58 | + { |
|
59 | + $group->permissions->each(function ($permission) use (&$permissions){ |
|
60 | + $permissions[$permission->model][$permission->id] = $permission->name; |
|
61 | + }); |
|
62 | + } |
|
63 | 63 | |
64 | - return \Illuminate\Database\Eloquent\Collection::make($permissions); |
|
65 | - } |
|
64 | + return \Illuminate\Database\Eloquent\Collection::make($permissions); |
|
65 | + } |
|
66 | 66 | |
67 | - public static function boot() |
|
68 | - { |
|
69 | - parent::boot(); |
|
70 | - parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclUserObserver')); |
|
71 | - } |
|
67 | + public static function boot() |
|
68 | + { |
|
69 | + parent::boot(); |
|
70 | + parent::observe(\App::make('App\Modules\V1\Acl\ModelObservers\AclUserObserver')); |
|
71 | + } |
|
72 | 72 | } |