@@ -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 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,8 +2,8 @@ |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - /** |
|
| 6 | - * Here goes your notification messages. |
|
| 7 | - */ |
|
| 5 | + /** |
|
| 6 | + * Here goes your notification messages. |
|
| 7 | + */ |
|
| 8 | 8 | |
| 9 | 9 | ]; |
| 10 | 10 | \ No newline at end of file |
@@ -2,27 +2,27 @@ |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - /** |
|
| 6 | - * List of error messages used in core module. |
|
| 7 | - */ |
|
| 8 | - 'unAuthorized' => 'من فضلك قم بتسجيل الدخول', |
|
| 9 | - 'invalidRefreshToken' => 'رمز التحديث غير صالح', |
|
| 10 | - 'noPermissions' => 'لا توجد صلاحية', |
|
| 11 | - 'loginFailed' => 'خطأ في البريد لاكتروني او كلمة المرور', |
|
| 12 | - 'noSocialEmail' => 'لا يمكن الحصول علي تابريد الاكتروني', |
|
| 13 | - 'userAlreadyRegistered' => 'المستخد مسجل بالفعل.سجل الدخول بالبريد الاكتروني و كلمة السر', |
|
| 14 | - 'connectionError' => 'خطأ في الاتصال', |
|
| 15 | - 'redisNotRunning' => 'سيرفير الاشعارات لايعمل', |
|
| 16 | - 'dbQueryError' => 'خطا في البيانات', |
|
| 17 | - 'cannotCreateSetting' => 'لا يمكن اضافة اعدادات', |
|
| 18 | - 'cannotUpdateSettingKey' => 'لا يمكن تعديل اعدادات', |
|
| 19 | - 'userIsBlocked' => 'لقد تم حظرك', |
|
| 20 | - 'invalidResetToken' => 'رمز تعديل كلمة المرور خطا', |
|
| 21 | - 'invalidResetPassword' => 'خطا في نعديل كلمة المرور', |
|
| 22 | - 'invalidOldPassword' => 'كلمة السر القديمه خطا', |
|
| 23 | - 'notFound' => 'ال :replace المطلوب غير موجود', |
|
| 24 | - 'generalError' => 'حدث خطا ما', |
|
| 25 | - 'emailNotConfirmed' => 'بريدك الاكتروني غير مفعل', |
|
| 26 | - 'emailAlreadyConfirmed' => 'البريد الاكتروني مفع بالقعل' |
|
| 5 | + /** |
|
| 6 | + * List of error messages used in core module. |
|
| 7 | + */ |
|
| 8 | + 'unAuthorized' => 'من فضلك قم بتسجيل الدخول', |
|
| 9 | + 'invalidRefreshToken' => 'رمز التحديث غير صالح', |
|
| 10 | + 'noPermissions' => 'لا توجد صلاحية', |
|
| 11 | + 'loginFailed' => 'خطأ في البريد لاكتروني او كلمة المرور', |
|
| 12 | + 'noSocialEmail' => 'لا يمكن الحصول علي تابريد الاكتروني', |
|
| 13 | + 'userAlreadyRegistered' => 'المستخد مسجل بالفعل.سجل الدخول بالبريد الاكتروني و كلمة السر', |
|
| 14 | + 'connectionError' => 'خطأ في الاتصال', |
|
| 15 | + 'redisNotRunning' => 'سيرفير الاشعارات لايعمل', |
|
| 16 | + 'dbQueryError' => 'خطا في البيانات', |
|
| 17 | + 'cannotCreateSetting' => 'لا يمكن اضافة اعدادات', |
|
| 18 | + 'cannotUpdateSettingKey' => 'لا يمكن تعديل اعدادات', |
|
| 19 | + 'userIsBlocked' => 'لقد تم حظرك', |
|
| 20 | + 'invalidResetToken' => 'رمز تعديل كلمة المرور خطا', |
|
| 21 | + 'invalidResetPassword' => 'خطا في نعديل كلمة المرور', |
|
| 22 | + 'invalidOldPassword' => 'كلمة السر القديمه خطا', |
|
| 23 | + 'notFound' => 'ال :replace المطلوب غير موجود', |
|
| 24 | + 'generalError' => 'حدث خطا ما', |
|
| 25 | + 'emailNotConfirmed' => 'بريدك الاكتروني غير مفعل', |
|
| 26 | + 'emailAlreadyConfirmed' => 'البريد الاكتروني مفع بالقعل' |
|
| 27 | 27 | |
| 28 | 28 | ]; |
| 29 | 29 | \ No newline at end of file |
@@ -2,27 +2,27 @@ |
||
| 2 | 2 | |
| 3 | 3 | return [ |
| 4 | 4 | |
| 5 | - /** |
|
| 6 | - * List of error messages used in core module. |
|
| 7 | - */ |
|
| 8 | - 'unAuthorized' => 'Please login before any action', |
|
| 9 | - 'invalidRefreshToken' => 'Invalid refresh token', |
|
| 10 | - 'noPermissions' => 'No permissions', |
|
| 11 | - 'loginFailed' => 'Wrong mail or password', |
|
| 12 | - 'noSocialEmail' => 'Couldn\'t retrieve email', |
|
| 13 | - 'userAlreadyRegistered' => 'User already registered. Please login using email and password', |
|
| 14 | - 'connectionError' => 'Connection error', |
|
| 15 | - 'redisNotRunning' => 'Your redis notification server is\'t running', |
|
| 16 | - 'dbQueryError' => 'Please check the given inputes', |
|
| 17 | - 'cannotCreateSetting' => 'Can\'t create setting', |
|
| 18 | - 'cannotUpdateSettingKey' => 'Can\'t update setting key', |
|
| 19 | - 'userIsBlocked' => 'You have been blocked', |
|
| 20 | - 'invalidResetToken' => 'Reset password token is invalid', |
|
| 21 | - 'invalidResetPassword' => 'Reset password is invalid', |
|
| 22 | - 'invalidOldPassword' => 'Old password is invalid', |
|
| 23 | - 'notFound' => 'The requested :replace not found', |
|
| 24 | - 'generalError' => 'Something went wrong', |
|
| 25 | - 'emailNotConfirmed' => 'Your email isn\'t confirmed', |
|
| 26 | - 'emailAlreadyConfirmed' => 'Your email is already confirmed' |
|
| 5 | + /** |
|
| 6 | + * List of error messages used in core module. |
|
| 7 | + */ |
|
| 8 | + 'unAuthorized' => 'Please login before any action', |
|
| 9 | + 'invalidRefreshToken' => 'Invalid refresh token', |
|
| 10 | + 'noPermissions' => 'No permissions', |
|
| 11 | + 'loginFailed' => 'Wrong mail or password', |
|
| 12 | + 'noSocialEmail' => 'Couldn\'t retrieve email', |
|
| 13 | + 'userAlreadyRegistered' => 'User already registered. Please login using email and password', |
|
| 14 | + 'connectionError' => 'Connection error', |
|
| 15 | + 'redisNotRunning' => 'Your redis notification server is\'t running', |
|
| 16 | + 'dbQueryError' => 'Please check the given inputes', |
|
| 17 | + 'cannotCreateSetting' => 'Can\'t create setting', |
|
| 18 | + 'cannotUpdateSettingKey' => 'Can\'t update setting key', |
|
| 19 | + 'userIsBlocked' => 'You have been blocked', |
|
| 20 | + 'invalidResetToken' => 'Reset password token is invalid', |
|
| 21 | + 'invalidResetPassword' => 'Reset password is invalid', |
|
| 22 | + 'invalidOldPassword' => 'Old password is invalid', |
|
| 23 | + 'notFound' => 'The requested :replace not found', |
|
| 24 | + 'generalError' => 'Something went wrong', |
|
| 25 | + 'emailNotConfirmed' => 'Your email isn\'t confirmed', |
|
| 26 | + 'emailAlreadyConfirmed' => 'Your email is already confirmed' |
|
| 27 | 27 | |
| 28 | 28 | ]; |
| 29 | 29 | \ No newline at end of file |
@@ -5,32 +5,32 @@ |
||
| 5 | 5 | |
| 6 | 6 | class Report extends Model{ |
| 7 | 7 | |
| 8 | - use SoftDeletes; |
|
| 8 | + use SoftDeletes; |
|
| 9 | 9 | protected $table = 'reports'; |
| 10 | 10 | protected $dates = ['created_at', 'updated_at', 'deleted_at']; |
| 11 | 11 | protected $hidden = ['deleted_at']; |
| 12 | 12 | protected $guarded = ['id']; |
| 13 | 13 | protected $fillable = ['report_name', 'view_name']; |
| 14 | - public $searchable = ['report_name', 'view_name']; |
|
| 14 | + public $searchable = ['report_name', 'view_name']; |
|
| 15 | 15 | |
| 16 | 16 | public function getCreatedAtAttribute($value) |
| 17 | - { |
|
| 18 | - return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString(); |
|
| 19 | - } |
|
| 17 | + { |
|
| 18 | + return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString(); |
|
| 19 | + } |
|
| 20 | 20 | |
| 21 | - public function getUpdatedAtAttribute($value) |
|
| 22 | - { |
|
| 23 | - return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString(); |
|
| 24 | - } |
|
| 21 | + public function getUpdatedAtAttribute($value) |
|
| 22 | + { |
|
| 23 | + return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString(); |
|
| 24 | + } |
|
| 25 | 25 | |
| 26 | - public function getDeletedAtAttribute($value) |
|
| 27 | - { |
|
| 28 | - return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString(); |
|
| 29 | - } |
|
| 26 | + public function getDeletedAtAttribute($value) |
|
| 27 | + { |
|
| 28 | + return \Carbon\Carbon::parse($value)->tz(\Session::get('time-zone'))->toDateTimeString(); |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - public static function boot() |
|
| 32 | - { |
|
| 33 | - parent::boot(); |
|
| 34 | - parent::observe(\App::make('App\Modules\Reporting\ModelObservers\ReprotObserver')); |
|
| 35 | - } |
|
| 31 | + public static function boot() |
|
| 32 | + { |
|
| 33 | + parent::boot(); |
|
| 34 | + parent::observe(\App::make('App\Modules\Reporting\ModelObservers\ReprotObserver')); |
|
| 35 | + } |
|
| 36 | 36 | } |
@@ -8,72 +8,72 @@ |
||
| 8 | 8 | class RouteServiceProvider extends ServiceProvider |
| 9 | 9 | { |
| 10 | 10 | /** |
| 11 | - * This namespace is applied to your controller routes. |
|
| 12 | - * |
|
| 13 | - * In addition, it is set as the URL generator's root namespace. |
|
| 14 | - * |
|
| 15 | - * @var string |
|
| 16 | - */ |
|
| 17 | - protected $namespace = 'App\Modules\Reporting\Http\Controllers'; |
|
| 11 | + * This namespace is applied to your controller routes. |
|
| 12 | + * |
|
| 13 | + * In addition, it is set as the URL generator's root namespace. |
|
| 14 | + * |
|
| 15 | + * @var string |
|
| 16 | + */ |
|
| 17 | + protected $namespace = 'App\Modules\Reporting\Http\Controllers'; |
|
| 18 | 18 | |
| 19 | - /** |
|
| 20 | - * Define your route model bindings, pattern filters, etc. |
|
| 21 | - * |
|
| 22 | - * @return void |
|
| 23 | - */ |
|
| 24 | - public function boot() |
|
| 25 | - { |
|
| 26 | - // |
|
| 19 | + /** |
|
| 20 | + * Define your route model bindings, pattern filters, etc. |
|
| 21 | + * |
|
| 22 | + * @return void |
|
| 23 | + */ |
|
| 24 | + public function boot() |
|
| 25 | + { |
|
| 26 | + // |
|
| 27 | 27 | |
| 28 | - parent::boot(); |
|
| 29 | - } |
|
| 28 | + parent::boot(); |
|
| 29 | + } |
|
| 30 | 30 | |
| 31 | - /** |
|
| 32 | - * Define the routes for the module. |
|
| 33 | - * |
|
| 34 | - * @return void |
|
| 35 | - */ |
|
| 36 | - public function map() |
|
| 37 | - { |
|
| 38 | - $this->mapWebRoutes(); |
|
| 31 | + /** |
|
| 32 | + * Define the routes for the module. |
|
| 33 | + * |
|
| 34 | + * @return void |
|
| 35 | + */ |
|
| 36 | + public function map() |
|
| 37 | + { |
|
| 38 | + $this->mapWebRoutes(); |
|
| 39 | 39 | |
| 40 | - $this->mapApiRoutes(); |
|
| 40 | + $this->mapApiRoutes(); |
|
| 41 | 41 | |
| 42 | - // |
|
| 43 | - } |
|
| 42 | + // |
|
| 43 | + } |
|
| 44 | 44 | |
| 45 | - /** |
|
| 46 | - * Define the "web" routes for the module. |
|
| 47 | - * |
|
| 48 | - * These routes all receive session state, CSRF protection, etc. |
|
| 49 | - * |
|
| 50 | - * @return void |
|
| 51 | - */ |
|
| 52 | - protected function mapWebRoutes() |
|
| 53 | - { |
|
| 54 | - Route::group([ |
|
| 55 | - 'middleware' => 'web', |
|
| 56 | - 'namespace' => $this->namespace, |
|
| 57 | - ], function ($router) { |
|
| 58 | - require module_path('reporting', 'Routes/web.php'); |
|
| 59 | - }); |
|
| 60 | - } |
|
| 45 | + /** |
|
| 46 | + * Define the "web" routes for the module. |
|
| 47 | + * |
|
| 48 | + * These routes all receive session state, CSRF protection, etc. |
|
| 49 | + * |
|
| 50 | + * @return void |
|
| 51 | + */ |
|
| 52 | + protected function mapWebRoutes() |
|
| 53 | + { |
|
| 54 | + Route::group([ |
|
| 55 | + 'middleware' => 'web', |
|
| 56 | + 'namespace' => $this->namespace, |
|
| 57 | + ], function ($router) { |
|
| 58 | + require module_path('reporting', 'Routes/web.php'); |
|
| 59 | + }); |
|
| 60 | + } |
|
| 61 | 61 | |
| 62 | - /** |
|
| 63 | - * Define the "api" routes for the module. |
|
| 64 | - * |
|
| 65 | - * These routes are typically stateless. |
|
| 66 | - * |
|
| 67 | - * @return void |
|
| 68 | - */ |
|
| 69 | - protected function mapApiRoutes() |
|
| 70 | - { |
|
| 71 | - Route::group([ |
|
| 72 | - 'middleware' => 'api', |
|
| 73 | - 'namespace' => $this->namespace, |
|
| 74 | - 'prefix' => 'api', |
|
| 75 | - ], function ($router) { |
|
| 76 | - require module_path('reporting', 'Routes/api.php'); |
|
| 77 | - }); |
|
| 78 | - } |
|
| 62 | + /** |
|
| 63 | + * Define the "api" routes for the module. |
|
| 64 | + * |
|
| 65 | + * These routes are typically stateless. |
|
| 66 | + * |
|
| 67 | + * @return void |
|
| 68 | + */ |
|
| 69 | + protected function mapApiRoutes() |
|
| 70 | + { |
|
| 71 | + Route::group([ |
|
| 72 | + 'middleware' => 'api', |
|
| 73 | + 'namespace' => $this->namespace, |
|
| 74 | + 'prefix' => 'api', |
|
| 75 | + ], function ($router) { |
|
| 76 | + require module_path('reporting', 'Routes/api.php'); |
|
| 77 | + }); |
|
| 78 | + } |
|
| 79 | 79 | } |
@@ -7,26 +7,26 @@ |
||
| 7 | 7 | class ModuleServiceProvider extends ServiceProvider |
| 8 | 8 | { |
| 9 | 9 | /** |
| 10 | - * Bootstrap the module services. |
|
| 11 | - * |
|
| 12 | - * @return void |
|
| 13 | - */ |
|
| 14 | - public function boot() |
|
| 15 | - { |
|
| 16 | - $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'reporting'); |
|
| 17 | - $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'reporting'); |
|
| 10 | + * Bootstrap the module services. |
|
| 11 | + * |
|
| 12 | + * @return void |
|
| 13 | + */ |
|
| 14 | + public function boot() |
|
| 15 | + { |
|
| 16 | + $this->loadTranslationsFrom(__DIR__.'/../Resources/Lang', 'reporting'); |
|
| 17 | + $this->loadViewsFrom(__DIR__.'/../Resources/Views', 'reporting'); |
|
| 18 | 18 | |
| 19 | - $factory = app('Illuminate\Database\Eloquent\Factory'); |
|
| 20 | - $factory->load(__DIR__.'/../Database/Factories'); |
|
| 21 | - } |
|
| 19 | + $factory = app('Illuminate\Database\Eloquent\Factory'); |
|
| 20 | + $factory->load(__DIR__.'/../Database/Factories'); |
|
| 21 | + } |
|
| 22 | 22 | |
| 23 | - /** |
|
| 24 | - * Register the module services. |
|
| 25 | - * |
|
| 26 | - * @return void |
|
| 27 | - */ |
|
| 28 | - public function register() |
|
| 29 | - { |
|
| 30 | - $this->app->register(RouteServiceProvider::class); |
|
| 31 | - } |
|
| 23 | + /** |
|
| 24 | + * Register the module services. |
|
| 25 | + * |
|
| 26 | + * @return void |
|
| 27 | + */ |
|
| 28 | + public function register() |
|
| 29 | + { |
|
| 30 | + $this->app->register(RouteServiceProvider::class); |
|
| 31 | + } |
|
| 32 | 32 | } |