@@ -6,53 +6,53 @@ |
||
6 | 6 | class ReportObserver |
7 | 7 | { |
8 | 8 | |
9 | - public function saving($model) |
|
10 | - { |
|
11 | - // |
|
12 | - } |
|
13 | - |
|
14 | - public function saved($model) |
|
15 | - { |
|
16 | - // |
|
17 | - } |
|
18 | - |
|
19 | - public function creating($model) |
|
20 | - { |
|
21 | - // |
|
22 | - } |
|
23 | - |
|
24 | - public function created($model) |
|
25 | - { |
|
26 | - // |
|
27 | - } |
|
28 | - |
|
29 | - public function updating($model) |
|
30 | - { |
|
31 | - // |
|
32 | - } |
|
33 | - |
|
34 | - public function updated($model) |
|
35 | - { |
|
36 | - // |
|
37 | - } |
|
38 | - |
|
39 | - public function deleting($model) |
|
40 | - { |
|
41 | - // |
|
42 | - } |
|
43 | - |
|
44 | - public function deleted($model) |
|
45 | - { |
|
46 | - // |
|
47 | - } |
|
48 | - |
|
49 | - public function restoring($model) |
|
50 | - { |
|
51 | - // |
|
52 | - } |
|
53 | - |
|
54 | - public function restored($model) |
|
55 | - { |
|
56 | - // |
|
57 | - } |
|
9 | + public function saving($model) |
|
10 | + { |
|
11 | + // |
|
12 | + } |
|
13 | + |
|
14 | + public function saved($model) |
|
15 | + { |
|
16 | + // |
|
17 | + } |
|
18 | + |
|
19 | + public function creating($model) |
|
20 | + { |
|
21 | + // |
|
22 | + } |
|
23 | + |
|
24 | + public function created($model) |
|
25 | + { |
|
26 | + // |
|
27 | + } |
|
28 | + |
|
29 | + public function updating($model) |
|
30 | + { |
|
31 | + // |
|
32 | + } |
|
33 | + |
|
34 | + public function updated($model) |
|
35 | + { |
|
36 | + // |
|
37 | + } |
|
38 | + |
|
39 | + public function deleting($model) |
|
40 | + { |
|
41 | + // |
|
42 | + } |
|
43 | + |
|
44 | + public function deleted($model) |
|
45 | + { |
|
46 | + // |
|
47 | + } |
|
48 | + |
|
49 | + public function restoring($model) |
|
50 | + { |
|
51 | + // |
|
52 | + } |
|
53 | + |
|
54 | + public function restored($model) |
|
55 | + { |
|
56 | + // |
|
57 | + } |
|
58 | 58 | } |
@@ -43,9 +43,9 @@ |
||
43 | 43 | /** |
44 | 44 | * Check report existance and permission. |
45 | 45 | */ |
46 | - if (! $report) { |
|
46 | + if ( ! $report) { |
|
47 | 47 | \Errors::notFound('report'); |
48 | - } elseif (! $skipPermission && ! $this->userService->can($report->view_name, 'report')) { |
|
48 | + } elseif ( ! $skipPermission && ! $this->userService->can($report->view_name, 'report')) { |
|
49 | 49 | \Errors::noPermissions(); |
50 | 50 | } |
51 | 51 |
@@ -8,49 +8,49 @@ |
||
8 | 8 | |
9 | 9 | class ReportService extends BaseService |
10 | 10 | { |
11 | - /** |
|
12 | - * @var UserService |
|
13 | - */ |
|
14 | - protected $userService; |
|
11 | + /** |
|
12 | + * @var UserService |
|
13 | + */ |
|
14 | + protected $userService; |
|
15 | 15 | |
16 | - /** |
|
17 | - * Init new object. |
|
18 | - * |
|
19 | - * @param ReportRepository $repo |
|
20 | - * @return void |
|
21 | - */ |
|
22 | - public function __construct(ReportRepository $repo, UserService $userService) |
|
23 | - { |
|
24 | - $this->userService = $userService; |
|
25 | - parent::__construct($repo); |
|
26 | - } |
|
16 | + /** |
|
17 | + * Init new object. |
|
18 | + * |
|
19 | + * @param ReportRepository $repo |
|
20 | + * @return void |
|
21 | + */ |
|
22 | + public function __construct(ReportRepository $repo, UserService $userService) |
|
23 | + { |
|
24 | + $this->userService = $userService; |
|
25 | + parent::__construct($repo); |
|
26 | + } |
|
27 | 27 | |
28 | - /** |
|
29 | - * Render the given report db view based on the given |
|
30 | - * condition. |
|
31 | - * |
|
32 | - * @param string $reportName |
|
33 | - * @param array $conditions |
|
34 | - * @param integer $perPage |
|
35 | - * @param boolean $skipPermission |
|
36 | - * @return object |
|
37 | - */ |
|
38 | - public function getReport($reportName, $conditions = [], $perPage = 0, $skipPermission = false) |
|
39 | - { |
|
40 | - /** |
|
41 | - * Fetch the report from db. |
|
42 | - */ |
|
43 | - $report = $this->repo->first(['report_name' => $reportName]); |
|
28 | + /** |
|
29 | + * Render the given report db view based on the given |
|
30 | + * condition. |
|
31 | + * |
|
32 | + * @param string $reportName |
|
33 | + * @param array $conditions |
|
34 | + * @param integer $perPage |
|
35 | + * @param boolean $skipPermission |
|
36 | + * @return object |
|
37 | + */ |
|
38 | + public function getReport($reportName, $conditions = [], $perPage = 0, $skipPermission = false) |
|
39 | + { |
|
40 | + /** |
|
41 | + * Fetch the report from db. |
|
42 | + */ |
|
43 | + $report = $this->repo->first(['report_name' => $reportName]); |
|
44 | 44 | |
45 | - /** |
|
46 | - * Check report existance and permission. |
|
47 | - */ |
|
48 | - if (! $report) { |
|
49 | - \Errors::notFound('report'); |
|
50 | - } elseif (! $skipPermission && ! $this->userService->can($report->view_name, 'report')) { |
|
51 | - \Errors::noPermissions(); |
|
52 | - } |
|
45 | + /** |
|
46 | + * Check report existance and permission. |
|
47 | + */ |
|
48 | + if (! $report) { |
|
49 | + \Errors::notFound('report'); |
|
50 | + } elseif (! $skipPermission && ! $this->userService->can($report->view_name, 'report')) { |
|
51 | + \Errors::noPermissions(); |
|
52 | + } |
|
53 | 53 | |
54 | - return $this->repo->renderReport($report, $conditions, $perPage); |
|
55 | - } |
|
54 | + return $this->repo->renderReport($report, $conditions, $perPage); |
|
55 | + } |
|
56 | 56 | } |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /* |
|
5 | + /* |
|
6 | 6 | |-------------------------------------------------------------------------- |
7 | 7 | | Password Reset Language Lines |
8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,10 +13,10 @@ discard block |
||
13 | 13 | | |
14 | 14 | */ |
15 | 15 | |
16 | - 'password' => 'Passwords must be at least six characters and match the confirmation.', |
|
17 | - 'reset' => 'Your password has been reset!', |
|
18 | - 'sent' => 'We have e-mailed your password reset link!', |
|
19 | - 'token' => 'This password reset token is invalid.', |
|
20 | - 'user' => "We can't find a user with that e-mail address.", |
|
16 | + 'password' => 'Passwords must be at least six characters and match the confirmation.', |
|
17 | + 'reset' => 'Your password has been reset!', |
|
18 | + 'sent' => 'We have e-mailed your password reset link!', |
|
19 | + 'token' => 'This password reset token is invalid.', |
|
20 | + 'user' => "We can't find a user with that e-mail address.", |
|
21 | 21 | |
22 | 22 | ]; |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /* |
|
5 | + /* |
|
6 | 6 | |-------------------------------------------------------------------------- |
7 | 7 | | Pagination Language Lines |
8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | | |
14 | 14 | */ |
15 | 15 | |
16 | - 'previous' => '« Previous', |
|
17 | - 'next' => 'Next »', |
|
16 | + 'previous' => '« Previous', |
|
17 | + 'next' => 'Next »', |
|
18 | 18 | |
19 | 19 | ]; |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /* |
|
5 | + /* |
|
6 | 6 | |-------------------------------------------------------------------------- |
7 | 7 | | Authentication Language Lines |
8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | | |
14 | 14 | */ |
15 | 15 | |
16 | - 'failed' => 'These credentials do not match our records.', |
|
17 | - 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', |
|
16 | + 'failed' => 'These credentials do not match our records.', |
|
17 | + 'throttle' => 'Too many login attempts. Please try again in :seconds seconds.', |
|
18 | 18 | |
19 | 19 | ]; |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /* |
|
5 | + /* |
|
6 | 6 | |-------------------------------------------------------------------------- |
7 | 7 | | Validation Language Lines |
8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,74 +13,74 @@ discard block |
||
13 | 13 | | |
14 | 14 | */ |
15 | 15 | |
16 | - 'accepted' => 'The :attribute must be accepted.', |
|
17 | - 'active_url' => 'The :attribute is not a valid URL.', |
|
18 | - 'after' => 'The :attribute must be a date after :date.', |
|
19 | - 'alpha' => 'The :attribute may only contain letters.', |
|
20 | - 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.', |
|
21 | - 'alpha_num' => 'The :attribute may only contain letters and numbers.', |
|
22 | - 'array' => 'The :attribute must be an array.', |
|
23 | - 'before' => 'The :attribute must be a date before :date.', |
|
24 | - 'between' => [ |
|
25 | - 'numeric' => 'The :attribute must be between :min and :max.', |
|
26 | - 'file' => 'The :attribute must be between :min and :max kilobytes.', |
|
27 | - 'string' => 'The :attribute must be between :min and :max characters.', |
|
28 | - 'array' => 'The :attribute must have between :min and :max items.', |
|
29 | - ], |
|
30 | - 'boolean' => 'The :attribute field must be true or false.', |
|
31 | - 'confirmed' => 'The :attribute confirmation does not match.', |
|
32 | - 'date' => 'The :attribute is not a valid date.', |
|
33 | - 'date_format' => 'The :attribute does not match the format :format.', |
|
34 | - 'different' => 'The :attribute and :other must be different.', |
|
35 | - 'digits' => 'The :attribute must be :digits digits.', |
|
36 | - 'digits_between' => 'The :attribute must be between :min and :max digits.', |
|
37 | - 'distinct' => 'The :attribute field has a duplicate value.', |
|
38 | - 'email' => 'The :attribute must be a valid email address.', |
|
39 | - 'exists' => 'The selected :attribute is invalid.', |
|
40 | - 'filled' => 'The :attribute field is required.', |
|
41 | - 'image' => 'The :attribute must be an image.', |
|
42 | - 'in' => 'The selected :attribute is invalid.', |
|
43 | - 'in_array' => 'The :attribute field does not exist in :other.', |
|
44 | - 'integer' => 'The :attribute must be an integer.', |
|
45 | - 'ip' => 'The :attribute must be a valid IP address.', |
|
46 | - 'json' => 'The :attribute must be a valid JSON string.', |
|
47 | - 'max' => [ |
|
48 | - 'numeric' => 'The :attribute may not be greater than :max.', |
|
49 | - 'file' => 'The :attribute may not be greater than :max kilobytes.', |
|
50 | - 'string' => 'The :attribute may not be greater than :max characters.', |
|
51 | - 'array' => 'The :attribute may not have more than :max items.', |
|
52 | - ], |
|
53 | - 'mimes' => 'The :attribute must be a file of type: :values.', |
|
54 | - 'min' => [ |
|
55 | - 'numeric' => 'The :attribute must be at least :min.', |
|
56 | - 'file' => 'The :attribute must be at least :min kilobytes.', |
|
57 | - 'string' => 'The :attribute must be at least :min characters.', |
|
58 | - 'array' => 'The :attribute must have at least :min items.', |
|
59 | - ], |
|
60 | - 'not_in' => 'The selected :attribute is invalid.', |
|
61 | - 'numeric' => 'The :attribute must be a number.', |
|
62 | - 'present' => 'The :attribute field must be present.', |
|
63 | - 'regex' => 'The :attribute format is invalid.', |
|
64 | - 'required' => 'The :attribute field is required.', |
|
65 | - 'required_if' => 'The :attribute field is required when :other is :value.', |
|
66 | - 'required_unless' => 'The :attribute field is required unless :other is in :values.', |
|
67 | - 'required_with' => 'The :attribute field is required when :values is present.', |
|
68 | - 'required_with_all' => 'The :attribute field is required when :values is present.', |
|
69 | - 'required_without' => 'The :attribute field is required when :values is not present.', |
|
70 | - 'required_without_all' => 'The :attribute field is required when none of :values are present.', |
|
71 | - 'same' => 'The :attribute and :other must match.', |
|
72 | - 'size' => [ |
|
73 | - 'numeric' => 'The :attribute must be :size.', |
|
74 | - 'file' => 'The :attribute must be :size kilobytes.', |
|
75 | - 'string' => 'The :attribute must be :size characters.', |
|
76 | - 'array' => 'The :attribute must contain :size items.', |
|
77 | - ], |
|
78 | - 'string' => 'The :attribute must be a string.', |
|
79 | - 'timezone' => 'The :attribute must be a valid zone.', |
|
80 | - 'unique' => 'The :attribute has already been taken.', |
|
81 | - 'url' => 'The :attribute format is invalid.', |
|
16 | + 'accepted' => 'The :attribute must be accepted.', |
|
17 | + 'active_url' => 'The :attribute is not a valid URL.', |
|
18 | + 'after' => 'The :attribute must be a date after :date.', |
|
19 | + 'alpha' => 'The :attribute may only contain letters.', |
|
20 | + 'alpha_dash' => 'The :attribute may only contain letters, numbers, and dashes.', |
|
21 | + 'alpha_num' => 'The :attribute may only contain letters and numbers.', |
|
22 | + 'array' => 'The :attribute must be an array.', |
|
23 | + 'before' => 'The :attribute must be a date before :date.', |
|
24 | + 'between' => [ |
|
25 | + 'numeric' => 'The :attribute must be between :min and :max.', |
|
26 | + 'file' => 'The :attribute must be between :min and :max kilobytes.', |
|
27 | + 'string' => 'The :attribute must be between :min and :max characters.', |
|
28 | + 'array' => 'The :attribute must have between :min and :max items.', |
|
29 | + ], |
|
30 | + 'boolean' => 'The :attribute field must be true or false.', |
|
31 | + 'confirmed' => 'The :attribute confirmation does not match.', |
|
32 | + 'date' => 'The :attribute is not a valid date.', |
|
33 | + 'date_format' => 'The :attribute does not match the format :format.', |
|
34 | + 'different' => 'The :attribute and :other must be different.', |
|
35 | + 'digits' => 'The :attribute must be :digits digits.', |
|
36 | + 'digits_between' => 'The :attribute must be between :min and :max digits.', |
|
37 | + 'distinct' => 'The :attribute field has a duplicate value.', |
|
38 | + 'email' => 'The :attribute must be a valid email address.', |
|
39 | + 'exists' => 'The selected :attribute is invalid.', |
|
40 | + 'filled' => 'The :attribute field is required.', |
|
41 | + 'image' => 'The :attribute must be an image.', |
|
42 | + 'in' => 'The selected :attribute is invalid.', |
|
43 | + 'in_array' => 'The :attribute field does not exist in :other.', |
|
44 | + 'integer' => 'The :attribute must be an integer.', |
|
45 | + 'ip' => 'The :attribute must be a valid IP address.', |
|
46 | + 'json' => 'The :attribute must be a valid JSON string.', |
|
47 | + 'max' => [ |
|
48 | + 'numeric' => 'The :attribute may not be greater than :max.', |
|
49 | + 'file' => 'The :attribute may not be greater than :max kilobytes.', |
|
50 | + 'string' => 'The :attribute may not be greater than :max characters.', |
|
51 | + 'array' => 'The :attribute may not have more than :max items.', |
|
52 | + ], |
|
53 | + 'mimes' => 'The :attribute must be a file of type: :values.', |
|
54 | + 'min' => [ |
|
55 | + 'numeric' => 'The :attribute must be at least :min.', |
|
56 | + 'file' => 'The :attribute must be at least :min kilobytes.', |
|
57 | + 'string' => 'The :attribute must be at least :min characters.', |
|
58 | + 'array' => 'The :attribute must have at least :min items.', |
|
59 | + ], |
|
60 | + 'not_in' => 'The selected :attribute is invalid.', |
|
61 | + 'numeric' => 'The :attribute must be a number.', |
|
62 | + 'present' => 'The :attribute field must be present.', |
|
63 | + 'regex' => 'The :attribute format is invalid.', |
|
64 | + 'required' => 'The :attribute field is required.', |
|
65 | + 'required_if' => 'The :attribute field is required when :other is :value.', |
|
66 | + 'required_unless' => 'The :attribute field is required unless :other is in :values.', |
|
67 | + 'required_with' => 'The :attribute field is required when :values is present.', |
|
68 | + 'required_with_all' => 'The :attribute field is required when :values is present.', |
|
69 | + 'required_without' => 'The :attribute field is required when :values is not present.', |
|
70 | + 'required_without_all' => 'The :attribute field is required when none of :values are present.', |
|
71 | + 'same' => 'The :attribute and :other must match.', |
|
72 | + 'size' => [ |
|
73 | + 'numeric' => 'The :attribute must be :size.', |
|
74 | + 'file' => 'The :attribute must be :size kilobytes.', |
|
75 | + 'string' => 'The :attribute must be :size characters.', |
|
76 | + 'array' => 'The :attribute must contain :size items.', |
|
77 | + ], |
|
78 | + 'string' => 'The :attribute must be a string.', |
|
79 | + 'timezone' => 'The :attribute must be a valid zone.', |
|
80 | + 'unique' => 'The :attribute has already been taken.', |
|
81 | + 'url' => 'The :attribute format is invalid.', |
|
82 | 82 | |
83 | - /* |
|
83 | + /* |
|
84 | 84 | |-------------------------------------------------------------------------- |
85 | 85 | | Custom Validation Language Lines |
86 | 86 | |-------------------------------------------------------------------------- |
@@ -91,13 +91,13 @@ discard block |
||
91 | 91 | | |
92 | 92 | */ |
93 | 93 | |
94 | - 'custom' => [ |
|
95 | - 'attribute-name' => [ |
|
96 | - 'rule-name' => 'custom-message', |
|
97 | - ], |
|
98 | - ], |
|
94 | + 'custom' => [ |
|
95 | + 'attribute-name' => [ |
|
96 | + 'rule-name' => 'custom-message', |
|
97 | + ], |
|
98 | + ], |
|
99 | 99 | |
100 | - /* |
|
100 | + /* |
|
101 | 101 | |-------------------------------------------------------------------------- |
102 | 102 | | Custom Validation Attributes |
103 | 103 | |-------------------------------------------------------------------------- |
@@ -108,6 +108,6 @@ discard block |
||
108 | 108 | | |
109 | 109 | */ |
110 | 110 | |
111 | - 'attributes' => [], |
|
111 | + 'attributes' => [], |
|
112 | 112 | |
113 | 113 | ]; |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /* |
|
5 | + /* |
|
6 | 6 | |-------------------------------------------------------------------------- |
7 | 7 | | Password Reminder Language Lines |
8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,10 +13,10 @@ discard block |
||
13 | 13 | | |
14 | 14 | */ |
15 | 15 | |
16 | - 'password' => 'يجب أن لا يقل طول كلمة السر عن ستة أحرف، كما يجب أن تتطابق مع حقل التأكيد', |
|
17 | - 'reset' => 'تمت إعادة تعيين كلمة السر', |
|
18 | - 'sent' => 'تم إرسال تفاصيل استعادة كلمة السر الخاصة بك إلى بريدك الإلكتروني', |
|
19 | - 'token' => '.رمز استعادة كلمة السر الذي أدخلته غير صحيح', |
|
20 | - 'user' => 'لم يتم العثور على أيّ حسابٍ بهذا العنوان الإلكتروني', |
|
16 | + 'password' => 'يجب أن لا يقل طول كلمة السر عن ستة أحرف، كما يجب أن تتطابق مع حقل التأكيد', |
|
17 | + 'reset' => 'تمت إعادة تعيين كلمة السر', |
|
18 | + 'sent' => 'تم إرسال تفاصيل استعادة كلمة السر الخاصة بك إلى بريدك الإلكتروني', |
|
19 | + 'token' => '.رمز استعادة كلمة السر الذي أدخلته غير صحيح', |
|
20 | + 'user' => 'لم يتم العثور على أيّ حسابٍ بهذا العنوان الإلكتروني', |
|
21 | 21 | |
22 | 22 | ]; |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /* |
|
5 | + /* |
|
6 | 6 | |-------------------------------------------------------------------------- |
7 | 7 | | Pagination Language Lines |
8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | | |
14 | 14 | */ |
15 | 15 | |
16 | - 'previous' => '« السابق', |
|
17 | - 'next' => 'التالي »', |
|
16 | + 'previous' => '« السابق', |
|
17 | + 'next' => 'التالي »', |
|
18 | 18 | |
19 | 19 | ]; |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | return [ |
4 | 4 | |
5 | - /* |
|
5 | + /* |
|
6 | 6 | |-------------------------------------------------------------------------- |
7 | 7 | | Authentication Language Lines |
8 | 8 | |-------------------------------------------------------------------------- |
@@ -13,7 +13,7 @@ discard block |
||
13 | 13 | | |
14 | 14 | */ |
15 | 15 | |
16 | - 'failed' => 'بيانات الاعتماد هذه غير متطابقة مع البيانات المسجلة لدينا.', |
|
17 | - 'throttle' => 'عدد كبير جدا من محاولات الدخول. يرجى المحاولة مرة أخرى بعد :seconds ثانية.', |
|
16 | + 'failed' => 'بيانات الاعتماد هذه غير متطابقة مع البيانات المسجلة لدينا.', |
|
17 | + 'throttle' => 'عدد كبير جدا من محاولات الدخول. يرجى المحاولة مرة أخرى بعد :seconds ثانية.', |
|
18 | 18 | |
19 | 19 | ]; |