diff --git a/app/Console/Commands/SendExpiredMembershipNotification.php b/app/Console/Commands/SendExpiredMembershipNotification.php index 92df7bd644b8ee318a4a04738c466b762decc5cf..12ceb7309d1ff2f39ae97136d47d95880963ece7 100644 --- a/app/Console/Commands/SendExpiredMembershipNotification.php +++ b/app/Console/Commands/SendExpiredMembershipNotification.php @@ -2,10 +2,10 @@ namespace App\Console\Commands; -use Illuminate\Console\Command; +use App\Notifications\ExpiredMembership; use App\VitalGym\Entities\Customer; use App\VitalGym\Entities\Membership; -use App\Notifications\ExpiredMembership; +use Illuminate\Console\Command; class SendExpiredMembershipNotification extends Command { diff --git a/app/Console/Commands/SendMembershipPaymentReminder.php b/app/Console/Commands/SendMembershipPaymentReminder.php index be89d853f1ffa05b63874ce2b258b8e6e41b5783..72f0703169cdc195880b23f9c2d12cf69f83c0d2 100644 --- a/app/Console/Commands/SendMembershipPaymentReminder.php +++ b/app/Console/Commands/SendMembershipPaymentReminder.php @@ -2,9 +2,9 @@ namespace App\Console\Commands; -use Illuminate\Console\Command; -use App\VitalGym\Entities\Membership; use App\Notifications\MembershipPaymentReminder; +use App\VitalGym\Entities\Membership; +use Illuminate\Console\Command; class SendMembershipPaymentReminder extends Command { diff --git a/app/Events/UserRequestedActivationEmail.php b/app/Events/UserRequestedActivationEmail.php index 5f94ea0f38587076659214cf9002912ac8028758..ad7b21cebd0fd50bd62ec396195bd61a8299a883 100644 --- a/app/Events/UserRequestedActivationEmail.php +++ b/app/Events/UserRequestedActivationEmail.php @@ -15,7 +15,8 @@ class UserRequestedActivationEmail /** * UserRequestedActivationEmail constructor. - * @param User $user + * + * @param User $user */ public function __construct(User $user) { diff --git a/app/Exports/CustomersExcelExport.php b/app/Exports/CustomersExcelExport.php index 81d750523fdd10566772dc1e9d7fdd199c33ccd7..bc11e4a0ddffd47b791256be2d6002a6a9c7dcba 100644 --- a/app/Exports/CustomersExcelExport.php +++ b/app/Exports/CustomersExcelExport.php @@ -4,15 +4,14 @@ namespace App\Exports; use App\VitalGym\Entities\Customer; use Maatwebsite\Excel\Concerns\FromQuery; -use Maatwebsite\Excel\Concerns\WithMapping; -use Maatwebsite\Excel\Concerns\WithHeadings; use Maatwebsite\Excel\Concerns\ShouldAutoSize; +use Maatwebsite\Excel\Concerns\WithHeadings; +use Maatwebsite\Excel\Concerns\WithMapping; class CustomersExcelExport implements FromQuery, WithMapping, WithHeadings, ShouldAutoSize { /** - * @param \App\VitalGym\Entities\Customer $customer - * + * @param \App\VitalGym\Entities\Customer $customer * @return array */ public function map($customer): array diff --git a/app/Exports/MembershipsExcelExport.php b/app/Exports/MembershipsExcelExport.php index 83f530524fe1b4141096d75ab43e977478394ce4..97a26e8770c871d462a55da03710ad167045f81b 100644 --- a/app/Exports/MembershipsExcelExport.php +++ b/app/Exports/MembershipsExcelExport.php @@ -4,17 +4,16 @@ namespace App\Exports; use App\VitalGym\Entities\Membership; use Maatwebsite\Excel\Concerns\FromQuery; -use Maatwebsite\Excel\Concerns\WithMapping; -use Maatwebsite\Excel\Concerns\WithHeadings; use Maatwebsite\Excel\Concerns\ShouldAutoSize; -use PhpOffice\PhpSpreadsheet\Style\NumberFormat; use Maatwebsite\Excel\Concerns\WithColumnFormatting; +use Maatwebsite\Excel\Concerns\WithHeadings; +use Maatwebsite\Excel\Concerns\WithMapping; +use PhpOffice\PhpSpreadsheet\Style\NumberFormat; class MembershipsExcelExport implements FromQuery, WithMapping, WithHeadings, ShouldAutoSize, WithColumnFormatting { /** - * @param mixed $membership - * + * @param mixed $membership * @return array */ public function map($membership): array diff --git a/app/Filters/Filter.php b/app/Filters/Filter.php index 6d510600a1d888d1b8f28670ff4e39778005b579..76099061b84d4ec6069602cb62e5acffabae7ffa 100644 --- a/app/Filters/Filter.php +++ b/app/Filters/Filter.php @@ -2,8 +2,8 @@ namespace App\Filters; -use Illuminate\Http\Request; use Illuminate\Database\Eloquent\Builder; +use Illuminate\Http\Request; abstract class Filter { @@ -24,7 +24,7 @@ abstract class Filter /** * Filter constructor. * - * @param Request $request + * @param Request $request */ public function __construct(Request $request) { @@ -34,7 +34,7 @@ abstract class Filter /** * Apply the filters on the query. * - * @param $builder + * @param $builder * @return Builder */ public function apply($builder) @@ -51,8 +51,9 @@ abstract class Filter /** * Fetch all relevant filters from the request. * - * @throws FiltersNotDefinedException * @return array + * + * @throws FiltersNotDefinedException */ protected function getFilters() { diff --git a/app/Filters/MembershipFilter.php b/app/Filters/MembershipFilter.php index 3a6c8f7fc6ad6925cfd9cddb5b0dbd7e476bd594..d62c7b5fea17833d31e087d3b0cc8a1cfc2038ed 100644 --- a/app/Filters/MembershipFilter.php +++ b/app/Filters/MembershipFilter.php @@ -2,8 +2,8 @@ namespace App\Filters; -use App\VitalGym\Entities\User; use App\VitalGym\Entities\Customer; +use App\VitalGym\Entities\User; class MembershipFilter extends Filter { diff --git a/app/Filters/Traits/Filterable.php b/app/Filters/Traits/Filterable.php index 12e63209b093babe7cedca5b79c21b88aeaab1be..7452a616823547610719bb48f7bd5f3ea44fafb8 100644 --- a/app/Filters/Traits/Filterable.php +++ b/app/Filters/Traits/Filterable.php @@ -10,8 +10,9 @@ trait Filterable /** * Apply all filters on the model. * - * @param Builder $query + * @param Builder $query * @return Builder + * * @throws Exception */ public function scopeFilter($query) diff --git a/app/Http/Controllers/Admin/AttendanceController.php b/app/Http/Controllers/Admin/AttendanceController.php index f75d7179a22916b0cea95c30abb7fa431a562bf4..5a8f95ab7b6fc9afb200fa9dcdede5b104df0eb8 100644 --- a/app/Http/Controllers/Admin/AttendanceController.php +++ b/app/Http/Controllers/Admin/AttendanceController.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers\Admin; -use App\VitalGym\Entities\Customer; use App\Http\Controllers\Controller; -use App\VitalGym\Entities\Attendance; use App\Http\Requests\CreateAttendanceFormRequest; +use App\VitalGym\Entities\Attendance; +use App\VitalGym\Entities\Customer; class AttendanceController extends Controller { diff --git a/app/Http/Controllers/Admin/CustomerController.php b/app/Http/Controllers/Admin/CustomerController.php index 37b09bb8a3ae2fce646d48f5cc87dec117edd4a3..48b161805cf809b28d2ad4c8d7ce20577b8adf34 100644 --- a/app/Http/Controllers/Admin/CustomerController.php +++ b/app/Http/Controllers/Admin/CustomerController.php @@ -2,15 +2,15 @@ namespace App\Http\Controllers\Admin; -use App\VitalGym\Entities\User; -use App\VitalGym\Entities\Level; -use App\Mail\CustomerWelcomeEmail; -use App\VitalGym\Entities\Routine; -use App\VitalGym\Entities\Customer; use App\Http\Controllers\Controller; -use Illuminate\Support\Facades\Mail; use App\Http\Requests\CreateCustomerFormRequest; use App\Http\Requests\UpdateCustomerFormRequest; +use App\Mail\CustomerWelcomeEmail; +use App\VitalGym\Entities\Customer; +use App\VitalGym\Entities\Level; +use App\VitalGym\Entities\Routine; +use App\VitalGym\Entities\User; +use Illuminate\Support\Facades\Mail; class CustomerController extends Controller { diff --git a/app/Http/Controllers/Admin/CustomerExportController.php b/app/Http/Controllers/Admin/CustomerExportController.php index a100cd482675716248b0448083c6f6422f5e5824..30402e40e7126249ddf4e706c1c8def9c62d73a1 100644 --- a/app/Http/Controllers/Admin/CustomerExportController.php +++ b/app/Http/Controllers/Admin/CustomerExportController.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers\Admin; -use Maatwebsite\Excel\Exporter; -use App\Http\Controllers\Controller; use App\Exports\CustomersExcelExport; +use App\Http\Controllers\Controller; +use Maatwebsite\Excel\Exporter; class CustomerExportController extends Controller { @@ -13,7 +13,7 @@ class CustomerExportController extends Controller */ private $excel; - public function __construct(Exporter $excel) + public function __construct(Exporter $excel) { $this->excel = $excel; } diff --git a/app/Http/Controllers/Admin/LevelController.php b/app/Http/Controllers/Admin/LevelController.php index 18a819a7874066b228b4d6e1f61cc25b9436b335..b3a0755cd4369ea4f5e42a6affb25e190292d583 100644 --- a/app/Http/Controllers/Admin/LevelController.php +++ b/app/Http/Controllers/Admin/LevelController.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers\Admin; -use Illuminate\Http\Request; -use App\VitalGym\Entities\Level; use App\Http\Controllers\Controller; +use App\VitalGym\Entities\Level; +use Illuminate\Http\Request; class LevelController extends Controller { diff --git a/app/Http/Controllers/Admin/MembershipController.php b/app/Http/Controllers/Admin/MembershipController.php index 0bc1014faf8b55f572f872b4a74dc073320ed331..9de11052c7cace2cb952a945a969945c0f9b128f 100644 --- a/app/Http/Controllers/Admin/MembershipController.php +++ b/app/Http/Controllers/Admin/MembershipController.php @@ -2,15 +2,15 @@ namespace App\Http\Controllers\Admin; -use App\VitalGym\Entities\Plan; -use App\VitalGym\Entities\Payment; -use App\VitalGym\Entities\Customer; use App\Http\Controllers\Controller; -use Illuminate\Support\Facades\Mail; -use App\VitalGym\Entities\Membership; -use App\Mail\MembershipOrderConfirmationEmail; use App\Http\Requests\CreateMembershipFormRequest; use App\Http\Requests\UpdateMembershipFormRequest; +use App\Mail\MembershipOrderConfirmationEmail; +use App\VitalGym\Entities\Customer; +use App\VitalGym\Entities\Membership; +use App\VitalGym\Entities\Payment; +use App\VitalGym\Entities\Plan; +use Illuminate\Support\Facades\Mail; class MembershipController extends Controller { diff --git a/app/Http/Controllers/Admin/MembershipExportController.php b/app/Http/Controllers/Admin/MembershipExportController.php index 63740769ebc99ea01ae434f40d192328a3f207fb..cf25830900a73bb3114385ee863854c5e97d99ff 100644 --- a/app/Http/Controllers/Admin/MembershipExportController.php +++ b/app/Http/Controllers/Admin/MembershipExportController.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers\Admin; +use App\Exports\MembershipsExcelExport; +use App\Http\Controllers\Controller; use Maatwebsite\Excel\Excel; use Maatwebsite\Excel\Exporter; -use App\Http\Controllers\Controller; -use App\Exports\MembershipsExcelExport; class MembershipExportController extends Controller { @@ -14,7 +14,7 @@ class MembershipExportController extends Controller */ private $excel; - public function __construct(Exporter $excel) + public function __construct(Exporter $excel) { $this->excel = $excel; } diff --git a/app/Http/Controllers/Admin/PaymentController.php b/app/Http/Controllers/Admin/PaymentController.php index 1cc0f7b8ee9da1e02c19aff701055b2542882a66..1fce2fbcda36f51f0381574631cbeeeea41c9d04 100644 --- a/app/Http/Controllers/Admin/PaymentController.php +++ b/app/Http/Controllers/Admin/PaymentController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers\Admin; -use App\VitalGym\Entities\Payment; use App\Http\Controllers\Controller; +use App\VitalGym\Entities\Payment; class PaymentController extends Controller { diff --git a/app/Http/Controllers/Admin/PlanController.php b/app/Http/Controllers/Admin/PlanController.php index 70ebad4c746b2dbb755a92d092cf69e4185df571..5da46cd168a9fd7e2f4130dfb42d2ee4871c626e 100644 --- a/app/Http/Controllers/Admin/PlanController.php +++ b/app/Http/Controllers/Admin/PlanController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers\Admin; -use App\VitalGym\Entities\Plan; use App\Http\Controllers\Controller; +use App\VitalGym\Entities\Plan; class PlanController extends Controller { @@ -43,9 +43,9 @@ class PlanController extends Controller public function update($planId) { $validatedData = request()->validate([ - 'name' => 'required|max:60', - 'price' => 'required|integer', - 'is_premium' => 'required|boolean', + 'name' => 'required|max:60', + 'price' => 'required|integer', + 'is_premium' => 'required|boolean', ]); $plan = Plan::findOrfail($planId); diff --git a/app/Http/Controllers/Admin/RoutineController.php b/app/Http/Controllers/Admin/RoutineController.php index 235e5403bcbe18dc5bfc91e268b5cfaa6d7ef9b8..37ad5f012330199cd03e793152cfef7954effe7d 100644 --- a/app/Http/Controllers/Admin/RoutineController.php +++ b/app/Http/Controllers/Admin/RoutineController.php @@ -2,13 +2,13 @@ namespace App\Http\Controllers\Admin; +use App\Http\Controllers\Controller; +use App\Http\Requests\CreateRoutineFormRequest; +use App\Http\Requests\UpdateRoutineFormRequest; use App\VitalGym\Entities\Level; use App\VitalGym\Entities\Routine; -use App\Http\Controllers\Controller; use Illuminate\Support\Facades\File; use Illuminate\Support\Facades\Storage; -use App\Http\Requests\CreateRoutineFormRequest; -use App\Http\Requests\UpdateRoutineFormRequest; class RoutineController extends Controller { diff --git a/app/Http/Controllers/Admin/UserController.php b/app/Http/Controllers/Admin/UserController.php index 09b61701bb5f5975442704efb8323f69e2fa1c21..7c3dff71544a0405f0ba1ff9fa5339dbd564e242 100644 --- a/app/Http/Controllers/Admin/UserController.php +++ b/app/Http/Controllers/Admin/UserController.php @@ -2,11 +2,11 @@ namespace App\Http\Controllers\Admin; -use App\VitalGym\Entities\User; use App\Http\Controllers\Controller; -use Illuminate\Support\Facades\Storage; use App\Http\Requests\CreateUserFormRequest; use App\Http\Requests\UpdateUserFormRequest; +use App\VitalGym\Entities\User; +use Illuminate\Support\Facades\Storage; class UserController extends Controller { diff --git a/app/Http/Controllers/Api/UserController.php b/app/Http/Controllers/Api/UserController.php index 7d7d032a8ea0b910aa87538ba427a3dafd7655b2..b8d431079e7dd3c62a1542c85f9c0a42522f8dc6 100644 --- a/app/Http/Controllers/Api/UserController.php +++ b/app/Http/Controllers/Api/UserController.php @@ -2,8 +2,8 @@ namespace App\Http\Controllers\Api; -use App\VitalGym\Entities\User; use App\Http\Controllers\Controller; +use App\VitalGym\Entities\User; class UserController extends Controller { @@ -14,15 +14,15 @@ class UserController extends Controller $users = User::filter(request())->orderBy($orderByField, $orderByDirection)->paginate(); $data = [ - 'total' => $users->total(), - 'per_page' => $users->perPage(), - 'current_page' => $users->currentPage(), - 'last_page' => $users->lastPage(), + 'total' => $users->total(), + 'per_page' => $users->perPage(), + 'current_page' => $users->currentPage(), + 'last_page' => $users->lastPage(), 'next_page_url' => $users->nextPageUrl(), 'prev_page_url' => $users->previousPageUrl(), - 'from' => $users->firstItem(), - 'to' => $users->lastItem(), - 'data' => $users->items(), + 'from' => $users->firstItem(), + 'to' => $users->lastItem(), + 'data' => $users->items(), ]; return $data; diff --git a/app/Http/Controllers/Auth/ActivationController.php b/app/Http/Controllers/Auth/ActivationController.php index 215628ab4bc4d8c4ecf0b6bb238b51184b1f8a21..5105182bc4eaade0caa260efe9d7a843930d94c0 100644 --- a/app/Http/Controllers/Auth/ActivationController.php +++ b/app/Http/Controllers/Auth/ActivationController.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers\Auth; -use App\VitalGym\Entities\User; +use App\Events\UserRequestedActivationEmail; use App\Http\Controllers\Controller; use App\VitalGym\Entities\ActivationToken; -use App\Events\UserRequestedActivationEmail; +use App\VitalGym\Entities\User; class ActivationController extends Controller { diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php index 2c5efa1cd509da17500a3f104d611e95004b940c..e3ed22c5e7eb3780aead1ce8d704e2a9c578fa20 100644 --- a/app/Http/Controllers/Auth/LoginController.php +++ b/app/Http/Controllers/Auth/LoginController.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers\Auth; -use Illuminate\Http\Request; use App\Http\Controllers\Controller; use Illuminate\Foundation\Auth\AuthenticatesUsers; +use Illuminate\Http\Request; class LoginController extends Controller { @@ -41,8 +41,9 @@ class LoginController extends Controller /** * The user has been authenticated. * - * @param Request $request + * @param Request $request * @return mixed + * * @internal param mixed $user */ protected function authenticated(Request $request, $user) diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 3d2f1067a00f60b96517ae0e5e56747aee9e5a2f..243d85e3e59a0e8e544813585fd567ce8a963a74 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers\Auth; -use App\VitalGym\Entities\User; use App\Http\Controllers\Controller; -use Illuminate\Support\Facades\Validator; +use App\VitalGym\Entities\User; use Illuminate\Foundation\Auth\RegistersUsers; +use Illuminate\Support\Facades\Validator; class RegisterController extends Controller { diff --git a/app/Http/Controllers/Auth/ResetPasswordController.php b/app/Http/Controllers/Auth/ResetPasswordController.php index 8bc99c2a5b39ccc0bdecbd6f5a1ba468b9d6035a..3323e3378f086d412855fd3ae8af485e9ee1f442 100644 --- a/app/Http/Controllers/Auth/ResetPasswordController.php +++ b/app/Http/Controllers/Auth/ResetPasswordController.php @@ -2,9 +2,9 @@ namespace App\Http\Controllers\Auth; -use Illuminate\Http\Request; use App\Http\Controllers\Controller; use Illuminate\Foundation\Auth\ResetsPasswords; +use Illuminate\Http\Request; class ResetPasswordController extends Controller { diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index 03e02a23e29174f0ade820fdb4cdfcec3abf8769..a0a2a8a34a6221e4dceb24a759ed14e911f74c57 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -2,10 +2,10 @@ namespace App\Http\Controllers; +use Illuminate\Foundation\Auth\Access\AuthorizesRequests; use Illuminate\Foundation\Bus\DispatchesJobs; -use Illuminate\Routing\Controller as BaseController; use Illuminate\Foundation\Validation\ValidatesRequests; -use Illuminate\Foundation\Auth\Access\AuthorizesRequests; +use Illuminate\Routing\Controller as BaseController; class Controller extends BaseController { diff --git a/app/Http/Middleware/TrustProxies.php b/app/Http/Middleware/TrustProxies.php index 3ce021445abe18479666ef87d5e40f1eb3c147ef..d88a69d7be65f2bf4ed9c8b9c79e2c9e672b1a26 100644 --- a/app/Http/Middleware/TrustProxies.php +++ b/app/Http/Middleware/TrustProxies.php @@ -2,8 +2,8 @@ namespace App\Http\Middleware; -use Illuminate\Http\Request; use Fideloper\Proxy\TrustProxies as Middleware; +use Illuminate\Http\Request; class TrustProxies extends Middleware { diff --git a/app/Http/Requests/CreateAttendanceFormRequest.php b/app/Http/Requests/CreateAttendanceFormRequest.php index eb5806387240937299f480fdb301b3e95b6cbe26..52d7db0f3c43a9d4a9fc41438fae4b8e7ef864e5 100644 --- a/app/Http/Requests/CreateAttendanceFormRequest.php +++ b/app/Http/Requests/CreateAttendanceFormRequest.php @@ -2,9 +2,9 @@ namespace App\Http\Requests; -use App\Rules\HasMembershipRule; -use App\Rules\dailyAttendanceRule; use App\Rules\ActiveMembershipRule; +use App\Rules\dailyAttendanceRule; +use App\Rules\HasMembershipRule; use Illuminate\Foundation\Http\FormRequest; class CreateAttendanceFormRequest extends FormRequest diff --git a/app/Http/Requests/CreateMembershipFormRequest.php b/app/Http/Requests/CreateMembershipFormRequest.php index a24282f2e61f21ac75e5a96dbcad6dd7f47e9617..ee397a74c6c72a97e9deba4556bcdd4c90a216c6 100644 --- a/app/Http/Requests/CreateMembershipFormRequest.php +++ b/app/Http/Requests/CreateMembershipFormRequest.php @@ -25,12 +25,12 @@ class CreateMembershipFormRequest extends FormRequest public function rules() { return [ - 'date_start' => 'required|date|date_format:Y-m-d|after_or_equal:today', - 'date_end' => 'required|date|date_format:Y-m-d|after_or_equal:date_start', - 'total_days' => optional(Plan::find($this->route('planId')))->is_premium + 'date_start' => 'required|date|date_format:Y-m-d|after_or_equal:today', + 'date_end' => 'required|date|date_format:Y-m-d|after_or_equal:date_start', + 'total_days' => optional(Plan::find($this->route('planId')))->is_premium ? 'required|integer|min:1' : '', - 'customer_id' => 'required|exists:customers,id', + 'customer_id' => 'required|exists:customers,id', 'membership_quantity' => 'required|integer|min:1', ]; } diff --git a/app/Http/Requests/CreateRoutineFormRequest.php b/app/Http/Requests/CreateRoutineFormRequest.php index 479787f47f224754b4e44a2e82bc740eb9e757e8..b23ceb8f1b4ee7ae8473688eb6448da7c34aa7c7 100644 --- a/app/Http/Requests/CreateRoutineFormRequest.php +++ b/app/Http/Requests/CreateRoutineFormRequest.php @@ -24,10 +24,10 @@ class CreateRoutineFormRequest extends FormRequest public function rules() { return [ - 'name' => 'required|min:3|max:20', - 'file' => 'required|max:2048|mimes:jpeg,png,jpg,doc,docx,pdf,xlsx', - 'description' => 'required|max:255', - 'level_id' => 'required|exists:levels,id', + 'name' => 'required|min:3|max:20', + 'file' => 'required|max:2048|mimes:jpeg,png,jpg,doc,docx,pdf,xlsx', + 'description' => 'required|max:255', + 'level_id' => 'required|exists:levels,id', ]; } } diff --git a/app/Http/Requests/UpdateCustomerFormRequest.php b/app/Http/Requests/UpdateCustomerFormRequest.php index 07fc164d3e6773240fc2e093c55364d050a3e131..67a9c5e458aaa0a72d73ecb95f8e95ffab6c17f2 100644 --- a/app/Http/Requests/UpdateCustomerFormRequest.php +++ b/app/Http/Requests/UpdateCustomerFormRequest.php @@ -2,9 +2,9 @@ namespace App\Http\Requests; -use Illuminate\Validation\Rule; use App\VitalGym\Entities\Customer; use Illuminate\Foundation\Http\FormRequest; +use Illuminate\Validation\Rule; class UpdateCustomerFormRequest extends FormRequest { diff --git a/app/Http/Requests/UpdateRoutineFormRequest.php b/app/Http/Requests/UpdateRoutineFormRequest.php index 84bd54fdb3fb2a7f776a1a62f72fc535ad56b64b..da64397e43cf8501f9c60dc4758ed1e2949af6ad 100644 --- a/app/Http/Requests/UpdateRoutineFormRequest.php +++ b/app/Http/Requests/UpdateRoutineFormRequest.php @@ -3,8 +3,8 @@ namespace App\Http\Requests; use App\VitalGym\Entities\Routine; -use Illuminate\Support\Facades\Storage; use Illuminate\Foundation\Http\FormRequest; +use Illuminate\Support\Facades\Storage; class UpdateRoutineFormRequest extends FormRequest { @@ -26,10 +26,10 @@ class UpdateRoutineFormRequest extends FormRequest public function rules() { return [ - 'name' => 'required|min:3|max:20', - 'file' => 'nullable|max:2048|mimes:jpeg,png,jpg,doc,docx,pdf,xlsx', - 'description' => 'required|max:255', - 'level_id' => 'required|exists:levels,id', + 'name' => 'required|min:3|max:20', + 'file' => 'nullable|max:2048|mimes:jpeg,png,jpg,doc,docx,pdf,xlsx', + 'description' => 'required|max:255', + 'level_id' => 'required|exists:levels,id', ]; } diff --git a/app/Http/Requests/UpdateUserFormRequest.php b/app/Http/Requests/UpdateUserFormRequest.php index f2fefc8bbafed5e774ebc9d26d2f276ea72a7173..ba4be05b5c6a3a3a00b6825c65f3016fcb64c156 100644 --- a/app/Http/Requests/UpdateUserFormRequest.php +++ b/app/Http/Requests/UpdateUserFormRequest.php @@ -3,8 +3,8 @@ namespace App\Http\Requests; use App\VitalGym\Entities\User; -use Illuminate\Validation\Rule; use Illuminate\Foundation\Http\FormRequest; +use Illuminate\Validation\Rule; class UpdateUserFormRequest extends FormRequest { diff --git a/app/Http/Requests/UpdateUserProfileFormRequest.php b/app/Http/Requests/UpdateUserProfileFormRequest.php index 1a27eb23fa262bdb9a948a0e001d445fbd72aada..d208cd6e4d8701eb59a0db16a759ac03f87c2229 100644 --- a/app/Http/Requests/UpdateUserProfileFormRequest.php +++ b/app/Http/Requests/UpdateUserProfileFormRequest.php @@ -2,8 +2,8 @@ namespace App\Http\Requests; -use Illuminate\Validation\Rule; use Illuminate\Foundation\Http\FormRequest; +use Illuminate\Validation\Rule; class UpdateUserProfileFormRequest extends FormRequest { diff --git a/app/Listeners/SendActivationEmail.php b/app/Listeners/SendActivationEmail.php index 6086b1b40be242f7e364532ee427a7f2b81bce1d..6cd592e480c8a551372c22ff7d70fa1f1ce35d0a 100644 --- a/app/Listeners/SendActivationEmail.php +++ b/app/Listeners/SendActivationEmail.php @@ -2,9 +2,9 @@ namespace App\Listeners; +use App\Events\UserRequestedActivationEmail; use App\Mail\SendActivationToken; use Illuminate\Support\Facades\Mail; -use App\Events\UserRequestedActivationEmail; class SendActivationEmail { diff --git a/app/Mail/CustomerWelcomeEmail.php b/app/Mail/CustomerWelcomeEmail.php index 1f568d250931c32bb8f3d352ab8926a63934e363..2bec146e10ba8d309a779a4495a07462e23f2993 100644 --- a/app/Mail/CustomerWelcomeEmail.php +++ b/app/Mail/CustomerWelcomeEmail.php @@ -2,11 +2,11 @@ namespace App\Mail; +use App\VitalGym\Entities\Customer; use Illuminate\Bus\Queueable; +use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; -use App\VitalGym\Entities\Customer; use Illuminate\Queue\SerializesModels; -use Illuminate\Contracts\Queue\ShouldQueue; class CustomerWelcomeEmail extends Mailable implements ShouldQueue { @@ -19,7 +19,7 @@ class CustomerWelcomeEmail extends Mailable implements ShouldQueue /** * Create a new message instance. * - * @param Customer $customer + * @param Customer $customer */ public function __construct(Customer $customer) { diff --git a/app/Mail/MembershipOrderConfirmationEmail.php b/app/Mail/MembershipOrderConfirmationEmail.php index ea057e5971ad29983a388f8646e5eaaaf66a4470..37f9aceaf7823f656d796762097b4d32018c9d74 100644 --- a/app/Mail/MembershipOrderConfirmationEmail.php +++ b/app/Mail/MembershipOrderConfirmationEmail.php @@ -3,9 +3,9 @@ namespace App\Mail; use Illuminate\Bus\Queueable; +use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; -use Illuminate\Contracts\Queue\ShouldQueue; class MembershipOrderConfirmationEmail extends Mailable implements ShouldQueue { @@ -15,7 +15,8 @@ class MembershipOrderConfirmationEmail extends Mailable implements ShouldQueue /** * MembershipOrderConfirmationEmail constructor. - * @param $membership + * + * @param $membership */ public function __construct($membership) { diff --git a/app/Mail/SendActivationToken.php b/app/Mail/SendActivationToken.php index bf4d0b61e4c4b49a5c53a6291777217b9fd8492f..f1982f4b691c46fcc8776195e59b13f89b93b43b 100644 --- a/app/Mail/SendActivationToken.php +++ b/app/Mail/SendActivationToken.php @@ -2,9 +2,9 @@ namespace App\Mail; +use App\VitalGym\Entities\ActivationToken; use Illuminate\Mail\Mailable; use Illuminate\Queue\SerializesModels; -use App\VitalGym\Entities\ActivationToken; class SendActivationToken extends Mailable { @@ -14,7 +14,8 @@ class SendActivationToken extends Mailable /** * SendActivationToken constructor. - * @param ActivationToken $token + * + * @param ActivationToken $token */ public function __construct(ActivationToken $token) { diff --git a/app/Notifications/ExpiredMembership.php b/app/Notifications/ExpiredMembership.php index 154469b0b6339458284e4bee4ffda164b29cd3b5..fd85d0f1f7719a96b62e72eb9fc6f43759fa4e27 100644 --- a/app/Notifications/ExpiredMembership.php +++ b/app/Notifications/ExpiredMembership.php @@ -2,11 +2,11 @@ namespace App\Notifications; -use Illuminate\Bus\Queueable; use App\VitalGym\Entities\Membership; -use Illuminate\Notifications\Notification; +use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Notifications\Messages\MailMessage; +use Illuminate\Notifications\Notification; class ExpiredMembership extends Notification implements ShouldQueue { @@ -19,7 +19,7 @@ class ExpiredMembership extends Notification implements ShouldQueue /** * Create a new notification instance. * - * @param Membership $membership + * @param Membership $membership */ public function __construct(Membership $membership) { diff --git a/app/Notifications/MembershipPaymentReminder.php b/app/Notifications/MembershipPaymentReminder.php index cdd786fa10b2dc4499f11679fb09d3fee9a32da8..131296670398cec364a9ae5021a6455df147d0e4 100644 --- a/app/Notifications/MembershipPaymentReminder.php +++ b/app/Notifications/MembershipPaymentReminder.php @@ -2,11 +2,11 @@ namespace App\Notifications; -use Illuminate\Bus\Queueable; use App\VitalGym\Entities\Membership; -use Illuminate\Notifications\Notification; +use Illuminate\Bus\Queueable; use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Notifications\Messages\MailMessage; +use Illuminate\Notifications\Notification; class MembershipPaymentReminder extends Notification implements ShouldQueue { @@ -19,7 +19,7 @@ class MembershipPaymentReminder extends Notification implements ShouldQueue /** * Create a new notification instance. * - * @param Membership $membership + * @param Membership $membership */ public function __construct(Membership $membership) { diff --git a/app/Notifications/ResetPasswordNotification.php b/app/Notifications/ResetPasswordNotification.php index b43adfd15b8732c4ce90d7a3d30579fa1cf9a1c3..8b7b8454ed10e45cc344ed5f968c8e6b9fd9bc4e 100644 --- a/app/Notifications/ResetPasswordNotification.php +++ b/app/Notifications/ResetPasswordNotification.php @@ -3,8 +3,8 @@ namespace App\Notifications; use Illuminate\Bus\Queueable; -use Illuminate\Notifications\Notification; use Illuminate\Notifications\Messages\MailMessage; +use Illuminate\Notifications\Notification; class ResetPasswordNotification extends Notification { @@ -17,7 +17,7 @@ class ResetPasswordNotification extends Notification /** * Create a new notification instance. * - * @param $token + * @param $token */ public function __construct($token) { diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 0c94e648f3b788b8bf8f94cf6023f5c98bdf4aed..f61bbb19946a0311572832600764996773f15013 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,9 +2,9 @@ namespace App\Providers; -use Laravel\Dusk\DuskServiceProvider; -use Illuminate\Support\ServiceProvider; use Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider; +use Illuminate\Support\ServiceProvider; +use Laravel\Dusk\DuskServiceProvider; class AppServiceProvider extends ServiceProvider { diff --git a/app/Providers/BroadcastServiceProvider.php b/app/Providers/BroadcastServiceProvider.php index 352cce44a3debcbb07fe36af93ec156cd6ed9a94..395c518bc47b94752d00b8dc7aeb7d241633e7cf 100644 --- a/app/Providers/BroadcastServiceProvider.php +++ b/app/Providers/BroadcastServiceProvider.php @@ -2,8 +2,8 @@ namespace App\Providers; -use Illuminate\Support\ServiceProvider; use Illuminate\Support\Facades\Broadcast; +use Illuminate\Support\ServiceProvider; class BroadcastServiceProvider extends ServiceProvider { diff --git a/app/Providers/EventServiceProvider.php b/app/Providers/EventServiceProvider.php index a5a3d28c13059cfb5ef5c57493520c6290aafadb..6c0197422ba71dc8e683b32dc90333792e71355a 100644 --- a/app/Providers/EventServiceProvider.php +++ b/app/Providers/EventServiceProvider.php @@ -2,8 +2,8 @@ namespace App\Providers; -use Illuminate\Support\Facades\Event; use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider; +use Illuminate\Support\Facades\Event; class EventServiceProvider extends ServiceProvider { diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 20ec6e449056019c7310e2612bfe6e8e12abefaa..0c8d61caf2aead5acc349986a6f353f7538d449a 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -2,8 +2,8 @@ namespace App\Providers; -use Illuminate\Support\Facades\Route; use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider; +use Illuminate\Support\Facades\Route; class RouteServiceProvider extends ServiceProvider { diff --git a/app/VitalGym/Entities/Customer.php b/app/VitalGym/Entities/Customer.php index 41f49e2e79ec994ae8f5afbd62e62dcb834f3356..9bc9f4d1acacce51ffdf5b21ef330af9b25dc49d 100644 --- a/app/VitalGym/Entities/Customer.php +++ b/app/VitalGym/Entities/Customer.php @@ -2,9 +2,9 @@ namespace App\VitalGym\Entities; -use App\Traits\PerPageTrait; use App\Filters\CustomerFilter; use App\Filters\Traits\Filterable; +use App\Traits\PerPageTrait; use Illuminate\Database\Eloquent\Model; use Illuminate\Notifications\Notifiable; diff --git a/app/VitalGym/Entities/Membership.php b/app/VitalGym/Entities/Membership.php index b43044d83eab6af9fcbe2ed00dd1a760a077d467..6ee9265330551d4fb2e9414278209363e7e757a1 100644 --- a/app/VitalGym/Entities/Membership.php +++ b/app/VitalGym/Entities/Membership.php @@ -2,9 +2,9 @@ namespace App\VitalGym\Entities; -use App\Traits\PerPageTrait; use App\Filters\MembershipFilter; use App\Filters\Traits\Filterable; +use App\Traits\PerPageTrait; use Illuminate\Database\Eloquent\Model; class Membership extends Model diff --git a/app/VitalGym/Entities/Plan.php b/app/VitalGym/Entities/Plan.php index 343aadba6c13fa9db4a8806e24ab8ed95905ec37..e6799ef8ca516a31368b8ebbcf2b4fab451fa82c 100644 --- a/app/VitalGym/Entities/Plan.php +++ b/app/VitalGym/Entities/Plan.php @@ -12,7 +12,7 @@ class Plan extends Model protected $guarded = []; protected $casts = [ - 'is_premium' => 'boolean', + 'is_premium' => 'boolean', ]; public function getPriceInDollarsAttribute() diff --git a/app/VitalGym/Entities/Routine.php b/app/VitalGym/Entities/Routine.php index 0c488505a8561418b1601755e8f16b1a58d0abac..2f5cc3ee679fe8f80e13178fa0eef05d3916cd2d 100644 --- a/app/VitalGym/Entities/Routine.php +++ b/app/VitalGym/Entities/Routine.php @@ -3,8 +3,8 @@ namespace App\VitalGym\Entities; use App\Filters\LevelFilter; -use App\Traits\PerPageTrait; use App\Filters\Traits\Filterable; +use App\Traits\PerPageTrait; use Illuminate\Database\Eloquent\Model; class Routine extends Model diff --git a/app/VitalGym/Entities/User.php b/app/VitalGym/Entities/User.php index e026ee3db264387b41f79a927c2c5d2da2ece975..44f4254ddd2442fe601eca4d42183010f85988f3 100644 --- a/app/VitalGym/Entities/User.php +++ b/app/VitalGym/Entities/User.php @@ -2,13 +2,13 @@ namespace App\VitalGym\Entities; +use App\Filters\Traits\Filterable; use App\Filters\UserFilter; +use App\Notifications\ResetPasswordNotification; use App\Traits\PerPageTrait; -use App\Filters\Traits\Filterable; -use Illuminate\Notifications\Notifiable; use Illuminate\Database\Eloquent\SoftDeletes; -use App\Notifications\ResetPasswordNotification; use Illuminate\Foundation\Auth\User as Authenticatable; +use Illuminate\Notifications\Notifiable; class User extends Authenticatable { diff --git a/config/excel.php b/config/excel.php index de58e65147875da1b7eeb0bf747973ddffe538c7..0403712834d51ac9e2f680b9175013245f9b55c1 100644 --- a/config/excel.php +++ b/config/excel.php @@ -3,7 +3,7 @@ use Maatwebsite\Excel\Excel; return [ - 'exports' => [ + 'exports' => [ /* |-------------------------------------------------------------------------- @@ -25,7 +25,7 @@ return [ | or downloading. Here you can customize that path. | */ - 'temp_path' => sys_get_temp_dir(), + 'temp_path' => sys_get_temp_dir(), /* |-------------------------------------------------------------------------- @@ -35,13 +35,13 @@ return [ | Configure e.g. delimiter, enclosure and line ending for CSV exports. | */ - 'csv' => [ - 'delimiter' => ',', - 'enclosure' => '"', - 'line_ending' => PHP_EOL, - 'use_bom' => false, + 'csv' => [ + 'delimiter' => ',', + 'enclosure' => '"', + 'line_ending' => PHP_EOL, + 'use_bom' => false, 'include_separator_line' => false, - 'excel_compatibility' => false, + 'excel_compatibility' => false, ], ], @@ -56,20 +56,20 @@ return [ | */ 'extension_detector' => [ - 'xlsx' => Excel::XLSX, - 'xlsm' => Excel::XLSX, - 'xltx' => Excel::XLSX, - 'xltm' => Excel::XLSX, - 'xls' => Excel::XLS, - 'xlt' => Excel::XLS, - 'ods' => Excel::ODS, - 'ots' => Excel::ODS, - 'slk' => Excel::SLK, - 'xml' => Excel::XML, + 'xlsx' => Excel::XLSX, + 'xlsm' => Excel::XLSX, + 'xltx' => Excel::XLSX, + 'xltm' => Excel::XLSX, + 'xls' => Excel::XLS, + 'xlt' => Excel::XLS, + 'ods' => Excel::ODS, + 'ots' => Excel::ODS, + 'slk' => Excel::SLK, + 'xml' => Excel::XML, 'gnumeric' => Excel::GNUMERIC, - 'htm' => Excel::HTML, - 'html' => Excel::HTML, - 'csv' => Excel::CSV, + 'htm' => Excel::HTML, + 'html' => Excel::HTML, + 'csv' => Excel::CSV, /* |-------------------------------------------------------------------------- @@ -81,6 +81,6 @@ return [ | Available options: Excel::MPDF | Excel::TCPDF | Excel::DOMPDF | */ - 'pdf' => Excel::DOMPDF, + 'pdf' => Excel::DOMPDF, ], ]; diff --git a/database/factories/AttendanceFactory.php b/database/factories/AttendanceFactory.php index c8a4a8cbb1f8d887e95e8a77095cb240844e6325..dfdd9baa8ad768e6d8b4c13e3c4a1d6fc3380afb 100644 --- a/database/factories/AttendanceFactory.php +++ b/database/factories/AttendanceFactory.php @@ -1,8 +1,8 @@ define(Attendance::class, function (Faker $faker) { return [ diff --git a/database/factories/CustomerFactory.php b/database/factories/CustomerFactory.php index e76333ee15f8833c1d2d9b80c1bc0a27754eb6aa..25981a5046dcc84bd2ec5e293e6de4bb563f7694 100644 --- a/database/factories/CustomerFactory.php +++ b/database/factories/CustomerFactory.php @@ -1,10 +1,10 @@ define(Customer::class, function (Faker $faker) { return [ diff --git a/database/factories/LevelFactory.php b/database/factories/LevelFactory.php index 8c251870fb674264351c5fc85954a4500e77f26e..47b2b60acaea36fe1f0df7cb1be1dec86d5ab0a9 100644 --- a/database/factories/LevelFactory.php +++ b/database/factories/LevelFactory.php @@ -1,7 +1,7 @@ define(Level::class, function (Faker $faker) { return [ diff --git a/database/factories/MembershipFactory.php b/database/factories/MembershipFactory.php index 7b5a0c17d0ef1b56d6f98e55cb58a9ab579384d9..62a6d08b067c96b555ff71f9a9d7cd13ed7697f7 100644 --- a/database/factories/MembershipFactory.php +++ b/database/factories/MembershipFactory.php @@ -1,11 +1,11 @@ define(Membership::class, function (Faker $faker) { return [ diff --git a/database/factories/PaymentFactory.php b/database/factories/PaymentFactory.php index 89ce789ce16bea45ef0f6c03c7f8434abd20c8df..7e1c1f813c82d253d817a7da5871c2b2bee1a373 100644 --- a/database/factories/PaymentFactory.php +++ b/database/factories/PaymentFactory.php @@ -1,9 +1,9 @@ define(Payment::class, function (Faker $faker) { return [ diff --git a/database/factories/PlanFactory.php b/database/factories/PlanFactory.php index acf62a8a550c56ebe36860bea2f171f834d59cfd..5b9dedb85186ab0bb787ec6444bf8773e066cf89 100644 --- a/database/factories/PlanFactory.php +++ b/database/factories/PlanFactory.php @@ -1,7 +1,7 @@ define(Plan::class, function (Faker $faker) { return [ @@ -11,4 +11,4 @@ $factory->define(Plan::class, function (Faker $faker) { ]; }); -$factory->state(Plan::class, 'premium', ['is_premium' =>true]); +$factory->state(Plan::class, 'premium', ['is_premium' => true]); diff --git a/database/factories/RoutineFactory.php b/database/factories/RoutineFactory.php index 0d209e6dcc5330029cc7c33e8f3466e48f81b621..633630d596f154296f8eeb48d9c5ced56edd6998 100644 --- a/database/factories/RoutineFactory.php +++ b/database/factories/RoutineFactory.php @@ -1,8 +1,8 @@ define(Routine::class, function (Faker $faker) { return [ diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php index fc429346a08ff3e3aea90b0a4284b02f57e75c5f..eca71a50f474455553c4f9da483c23ef1037f64e 100644 --- a/database/factories/UserFactory.php +++ b/database/factories/UserFactory.php @@ -1,7 +1,7 @@ define(User::class, function (Faker\Generator $faker) { static $password; return [ - 'name' => $faker->firstName, - 'last_name' => $faker->lastName, - 'avatar' => 'avatars/default-avatar.jpg', - 'email' => $faker->unique()->safeEmail, - 'phone' => $faker->phoneNumber, - 'cell_phone' => $faker->phoneNumber, - 'address' => $faker->address, - 'password' => $password ?: $password = bcrypt('secret'), - 'active' => $faker->randomElement([true, false, true]), - 'role' => $faker->randomElement(['admin', 'customer', 'customer']), + 'name' => $faker->firstName, + 'last_name' => $faker->lastName, + 'avatar' => 'avatars/default-avatar.jpg', + 'email' => $faker->unique()->safeEmail, + 'phone' => $faker->phoneNumber, + 'cell_phone' => $faker->phoneNumber, + 'address' => $faker->address, + 'password' => $password ?: $password = bcrypt('secret'), + 'active' => $faker->randomElement([true, false, true]), + 'role' => $faker->randomElement(['admin', 'customer', 'customer']), 'remember_token' => str_random(10), ]; }); @@ -46,7 +46,7 @@ $factory->state(User::class, 'active', [ $factory->define(ActivationToken::class, function (Faker\Generator $faker) { return [ - 'token' => str_random(128), + 'token' => str_random(128), 'user_id' => function () { return factory(User::class)->create()->id; }, diff --git a/database/migrations/2014_10_12_000000_create_users_table.php b/database/migrations/2014_10_12_000000_create_users_table.php index b9e4d93a9be17fd644d5f1e15a7c1d88fac9b10a..35c3e0c182261faa80d97d62187db2c6275b4067 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -1,8 +1,8 @@ '', 'pass' => '', - 'db' => '', + 'db' => '', 'host' => '', ]; diff --git a/resources/lang/en/pagination.php b/resources/lang/en/pagination.php index fcab34b253172b61762a9cb6a343299977cb564e..d48141187786931ec2cf8645e384be7878c7dc53 100644 --- a/resources/lang/en/pagination.php +++ b/resources/lang/en/pagination.php @@ -14,6 +14,6 @@ return [ */ 'previous' => '« Previous', - 'next' => 'Next »', + 'next' => 'Next »', ]; diff --git a/resources/lang/es/auth.php b/resources/lang/es/auth.php index 6d03049b2aa302e707abfc9a54a40ea5f134ceca..5030867c246729ffb7351f209d076c53ca869c5f 100644 --- a/resources/lang/es/auth.php +++ b/resources/lang/es/auth.php @@ -13,7 +13,7 @@ return [ | */ - 'failed' => 'Estas credenciales no coinciden con nuestros registros.', + 'failed' => 'Estas credenciales no coinciden con nuestros registros.', 'throttle' => 'Demasiados intentos de acceso. Por favor intente nuevamente en :seconds segundos.', ]; diff --git a/resources/lang/es/pagination.php b/resources/lang/es/pagination.php index 325916dc39b8c3ca3abbcabdf616d96243d8fc62..f8f044e19cbe20805ef58e3d49a4c98d899a2973 100644 --- a/resources/lang/es/pagination.php +++ b/resources/lang/es/pagination.php @@ -14,6 +14,6 @@ return [ */ 'previous' => '« Anterior', - 'next' => 'Siguiente »', + 'next' => 'Siguiente »', ]; diff --git a/resources/lang/es/passwords.php b/resources/lang/es/passwords.php index f4639e3d4bf4c7cec6a5b7cc0f5c5cec14df522e..802050d7299d362e3f7b35b04aca677c497348a1 100644 --- a/resources/lang/es/passwords.php +++ b/resources/lang/es/passwords.php @@ -14,9 +14,9 @@ return [ */ 'password' => 'Las contraseñas deben coincidir y contener al menos 6 caracteres', - 'reset' => '¡Tu contraseña ha sido restablecida!', - 'sent' => '¡Te hemos enviado por correo el enlace para restablecer tu contraseña!', - 'token' => 'El token de recuperación de contraseña es inválido.', - 'user' => 'No podemos encontrar ningún usuario con ese correo electrónico.', + 'reset' => '¡Tu contraseña ha sido restablecida!', + 'sent' => '¡Te hemos enviado por correo el enlace para restablecer tu contraseña!', + 'token' => 'El token de recuperación de contraseña es inválido.', + 'user' => 'No podemos encontrar ningún usuario con ese correo electrónico.', ]; diff --git a/resources/lang/es/validation.php b/resources/lang/es/validation.php index 45c9302a49d97fd8a6ad946ff3adcf7af39a0928..64df5b17a59cd8da23a0ea951e3f3405bc0cf265 100644 --- a/resources/lang/es/validation.php +++ b/resources/lang/es/validation.php @@ -13,106 +13,106 @@ return [ | */ - 'accepted' => ':attribute debe ser aceptado.', - 'active_url' => ':attribute no es una URL válida.', - 'after' => ':attribute debe ser una fecha posterior a :date.', - 'after_or_equal' => ':attribute debe ser una fecha posterior o igual a :date.', - 'alpha' => ':attribute sólo debe contener letras.', - 'alpha_dash' => ':attribute sólo debe contener letras, números y guiones.', - 'alpha_num' => ':attribute sólo debe contener letras y números.', - 'array' => ':attribute debe ser un conjunto.', - 'before' => ':attribute debe ser una fecha anterior a :date.', - 'before_or_equal' => ':attribute debe ser una fecha anterior o igual a :date.', - 'between' => [ + 'accepted' => ':attribute debe ser aceptado.', + 'active_url' => ':attribute no es una URL válida.', + 'after' => ':attribute debe ser una fecha posterior a :date.', + 'after_or_equal' => ':attribute debe ser una fecha posterior o igual a :date.', + 'alpha' => ':attribute sólo debe contener letras.', + 'alpha_dash' => ':attribute sólo debe contener letras, números y guiones.', + 'alpha_num' => ':attribute sólo debe contener letras y números.', + 'array' => ':attribute debe ser un conjunto.', + 'before' => ':attribute debe ser una fecha anterior a :date.', + 'before_or_equal' => ':attribute debe ser una fecha anterior o igual a :date.', + 'between' => [ 'numeric' => ':attribute tiene que estar entre :min - :max.', - 'file' => ':attribute debe pesar entre :min - :max kilobytes.', - 'string' => ':attribute tiene que tener entre :min - :max caracteres.', - 'array' => ':attribute tiene que tener entre :min - :max ítems.', + 'file' => ':attribute debe pesar entre :min - :max kilobytes.', + 'string' => ':attribute tiene que tener entre :min - :max caracteres.', + 'array' => ':attribute tiene que tener entre :min - :max ítems.', ], - 'boolean' => 'El campo :attribute debe tener un valor verdadero o falso.', - 'confirmed' => 'La confirmación de :attribute no coincide.', - 'date' => ':attribute no es una fecha válida.', - 'date_format' => ':attribute no corresponde al formato :format.', - 'different' => ':attribute y :other deben ser diferentes.', - 'digits' => ':attribute debe tener :digits dígitos.', - 'digits_between' => ':attribute debe tener entre :min y :max dígitos.', - 'dimensions' => 'Las dimensiones de la imagen :attribute no son válidas.', - 'distinct' => 'El campo :attribute contiene un valor duplicado.', - 'email' => ':attribute no es un correo válido', - 'exists' => ':attribute es inválido.', - 'file' => 'El campo :attribute debe ser un archivo.', - 'filled' => 'El campo :attribute es obligatorio.', - 'gt' => [ + 'boolean' => 'El campo :attribute debe tener un valor verdadero o falso.', + 'confirmed' => 'La confirmación de :attribute no coincide.', + 'date' => ':attribute no es una fecha válida.', + 'date_format' => ':attribute no corresponde al formato :format.', + 'different' => ':attribute y :other deben ser diferentes.', + 'digits' => ':attribute debe tener :digits dígitos.', + 'digits_between' => ':attribute debe tener entre :min y :max dígitos.', + 'dimensions' => 'Las dimensiones de la imagen :attribute no son válidas.', + 'distinct' => 'El campo :attribute contiene un valor duplicado.', + 'email' => ':attribute no es un correo válido', + 'exists' => ':attribute es inválido.', + 'file' => 'El campo :attribute debe ser un archivo.', + 'filled' => 'El campo :attribute es obligatorio.', + 'gt' => [ 'numeric' => 'El campo :attribute debe ser mayor que :value.', - 'file' => 'El campo :attribute debe tener más de :value kilobytes.', - 'string' => 'El campo :attribute debe tener más de :value caracteres.', - 'array' => 'El campo :attribute debe tener más de :value elementos.', + 'file' => 'El campo :attribute debe tener más de :value kilobytes.', + 'string' => 'El campo :attribute debe tener más de :value caracteres.', + 'array' => 'El campo :attribute debe tener más de :value elementos.', ], - 'gte' => [ + 'gte' => [ 'numeric' => 'El campo :attribute debe ser como mínimo :value.', - 'file' => 'El campo :attribute debe tener como mínimo :value kilobytes.', - 'string' => 'El campo :attribute debe tener como mínimo :value caracteres.', - 'array' => 'El campo :attribute debe tener como mínimo :value elementos.', + 'file' => 'El campo :attribute debe tener como mínimo :value kilobytes.', + 'string' => 'El campo :attribute debe tener como mínimo :value caracteres.', + 'array' => 'El campo :attribute debe tener como mínimo :value elementos.', ], - 'image' => ':attribute debe ser una imagen.', - 'in' => ':attribute es inválido.', - 'in_array' => 'El campo :attribute no existe en :other.', - 'integer' => ':attribute debe ser un número entero.', - 'ip' => ':attribute debe ser una dirección IP válida.', - 'ipv4' => ':attribute debe ser un dirección IPv4 válida', - 'ipv6' => ':attribute debe ser un dirección IPv6 válida.', - 'json' => 'El campo :attribute debe tener una cadena JSON válida.', - 'lt' => [ + 'image' => ':attribute debe ser una imagen.', + 'in' => ':attribute es inválido.', + 'in_array' => 'El campo :attribute no existe en :other.', + 'integer' => ':attribute debe ser un número entero.', + 'ip' => ':attribute debe ser una dirección IP válida.', + 'ipv4' => ':attribute debe ser un dirección IPv4 válida', + 'ipv6' => ':attribute debe ser un dirección IPv6 válida.', + 'json' => 'El campo :attribute debe tener una cadena JSON válida.', + 'lt' => [ 'numeric' => 'El campo :attribute debe ser menor que :value.', - 'file' => 'El campo :attribute debe tener menos de :value kilobytes.', - 'string' => 'El campo :attribute debe tener menos de :value caracteres.', - 'array' => 'El campo :attribute debe tener menos de :value elementos.', + 'file' => 'El campo :attribute debe tener menos de :value kilobytes.', + 'string' => 'El campo :attribute debe tener menos de :value caracteres.', + 'array' => 'El campo :attribute debe tener menos de :value elementos.', ], - 'lte' => [ + 'lte' => [ 'numeric' => 'El campo :attribute debe ser como máximo :value.', - 'file' => 'El campo :attribute debe tener como máximo :value kilobytes.', - 'string' => 'El campo :attribute debe tener como máximo :value caracteres.', - 'array' => 'El campo :attribute debe tener como máximo :value elementos.', + 'file' => 'El campo :attribute debe tener como máximo :value kilobytes.', + 'string' => 'El campo :attribute debe tener como máximo :value caracteres.', + 'array' => 'El campo :attribute debe tener como máximo :value elementos.', ], - 'max' => [ + 'max' => [ 'numeric' => ':attribute no debe ser mayor a :max.', - 'file' => ':attribute no debe ser mayor que :max kilobytes.', - 'string' => ':attribute no debe ser mayor que :max caracteres.', - 'array' => ':attribute no debe tener más de :max elementos.', + 'file' => ':attribute no debe ser mayor que :max kilobytes.', + 'string' => ':attribute no debe ser mayor que :max caracteres.', + 'array' => ':attribute no debe tener más de :max elementos.', ], - 'mimes' => ':attribute debe ser un archivo con formato: :values.', - 'mimetypes' => ':attribute debe ser un archivo con formato: :values.', - 'min' => [ + 'mimes' => ':attribute debe ser un archivo con formato: :values.', + 'mimetypes' => ':attribute debe ser un archivo con formato: :values.', + 'min' => [ 'numeric' => 'El tamaño de :attribute debe ser de al menos :min.', - 'file' => 'El tamaño de :attribute debe ser de al menos :min kilobytes.', - 'string' => ':attribute debe contener al menos :min caracteres.', - 'array' => ':attribute debe tener al menos :min elementos.', + 'file' => 'El tamaño de :attribute debe ser de al menos :min kilobytes.', + 'string' => ':attribute debe contener al menos :min caracteres.', + 'array' => ':attribute debe tener al menos :min elementos.', ], - 'not_in' => ':attribute es inválido.', - 'not_regex' => 'El formato del campo :attribute no es válido.', - 'numeric' => ':attribute debe ser numérico.', - 'present' => 'El campo :attribute debe estar presente.', - 'regex' => 'El formato de :attribute es inválido.', - 'required' => 'El campo :attribute es obligatorio.', - 'required_if' => 'El campo :attribute es obligatorio cuando :other es :value.', - 'required_unless' => 'El campo :attribute es obligatorio a menos que :other esté en :values.', - 'required_with' => 'El campo :attribute es obligatorio cuando :values está presente.', - 'required_with_all' => 'El campo :attribute es obligatorio cuando :values está presente.', - 'required_without' => 'El campo :attribute es obligatorio cuando :values no está presente.', + 'not_in' => ':attribute es inválido.', + 'not_regex' => 'El formato del campo :attribute no es válido.', + 'numeric' => ':attribute debe ser numérico.', + 'present' => 'El campo :attribute debe estar presente.', + 'regex' => 'El formato de :attribute es inválido.', + 'required' => 'El campo :attribute es obligatorio.', + 'required_if' => 'El campo :attribute es obligatorio cuando :other es :value.', + 'required_unless' => 'El campo :attribute es obligatorio a menos que :other esté en :values.', + 'required_with' => 'El campo :attribute es obligatorio cuando :values está presente.', + 'required_with_all' => 'El campo :attribute es obligatorio cuando :values está presente.', + 'required_without' => 'El campo :attribute es obligatorio cuando :values no está presente.', 'required_without_all' => 'El campo :attribute es obligatorio cuando ninguno de :values estén presentes.', - 'same' => ':attribute y :other deben coincidir.', - 'size' => [ + 'same' => ':attribute y :other deben coincidir.', + 'size' => [ 'numeric' => 'El tamaño de :attribute debe ser :size.', - 'file' => 'El tamaño de :attribute debe ser :size kilobytes.', - 'string' => ':attribute debe contener :size caracteres.', - 'array' => ':attribute debe contener :size elementos.', + 'file' => 'El tamaño de :attribute debe ser :size kilobytes.', + 'string' => ':attribute debe contener :size caracteres.', + 'array' => ':attribute debe contener :size elementos.', ], - 'string' => 'El campo :attribute debe ser una cadena de caracteres.', - 'timezone' => 'El :attribute debe ser una zona válida.', - 'unique' => ':attribute ya ha sido registrado.', - 'uploaded' => 'Subir :attribute ha fallado.', - 'url' => 'El formato :attribute es inválido.', - 'uuid' => 'El campo :attribute debe ser un UUID válido.', + 'string' => 'El campo :attribute debe ser una cadena de caracteres.', + 'timezone' => 'El :attribute debe ser una zona válida.', + 'unique' => ':attribute ya ha sido registrado.', + 'uploaded' => 'Subir :attribute ha fallado.', + 'url' => 'El formato :attribute es inválido.', + 'uuid' => 'El campo :attribute debe ser un UUID válido.', /* |-------------------------------------------------------------------------- @@ -123,9 +123,9 @@ return [ | */ - 'daily_membership' => 'El cliente ya fué registrado el día de hoy', - 'has_membership' => 'El cliente no tiene ninguna membresía asociada', - 'active_membership' => 'La membresía del cliente ha expirado, por favor adquirir una nueva', + 'daily_membership' => 'El cliente ya fué registrado el día de hoy', + 'has_membership' => 'El cliente no tiene ninguna membresía asociada', + 'active_membership' => 'La membresía del cliente ha expirado, por favor adquirir una nueva', /* |-------------------------------------------------------------------------- @@ -142,7 +142,7 @@ return [ 'password' => [ 'min' => 'La :attribute debe contener más de :min caracteres', ], - 'email' => [ + 'email' => [ 'unique' => 'El :attribute ya ha sido registrado.', ], ], @@ -158,36 +158,36 @@ return [ | */ - 'attributes' => [ - 'name' => 'nombre', - 'username' => 'usuario', - 'email' => 'correo electrónico', - 'first_name' => 'nombre', - 'last_name' => 'apellido', - 'password' => 'contraseña', + 'attributes' => [ + 'name' => 'nombre', + 'username' => 'usuario', + 'email' => 'correo electrónico', + 'first_name' => 'nombre', + 'last_name' => 'apellido', + 'password' => 'contraseña', 'password_confirmation' => 'confirmación de la contraseña', - 'city' => 'ciudad', - 'country' => 'país', - 'address' => 'dirección', - 'phone' => 'teléfono', - 'mobile' => 'móvil', - 'age' => 'edad', - 'sex' => 'sexo', - 'gender' => 'género', - 'year' => 'año', - 'month' => 'mes', - 'day' => 'día', - 'hour' => 'hora', - 'minute' => 'minuto', - 'second' => 'segundo', - 'title' => 'título', - 'body' => 'contenido', - 'description' => 'descripción', - 'excerpt' => 'extracto', - 'date' => 'fecha', - 'time' => 'hora', - 'subject' => 'asunto', - 'message' => 'mensaje', + 'city' => 'ciudad', + 'country' => 'país', + 'address' => 'dirección', + 'phone' => 'teléfono', + 'mobile' => 'móvil', + 'age' => 'edad', + 'sex' => 'sexo', + 'gender' => 'género', + 'year' => 'año', + 'month' => 'mes', + 'day' => 'día', + 'hour' => 'hora', + 'minute' => 'minuto', + 'second' => 'segundo', + 'title' => 'título', + 'body' => 'contenido', + 'description' => 'descripción', + 'excerpt' => 'extracto', + 'date' => 'fecha', + 'time' => 'hora', + 'subject' => 'asunto', + 'message' => 'mensaje', ], ]; diff --git a/routes/admin.php b/routes/admin.php index cb25c551649967981eaf2bf313f96a87d3a517db..64d4b4a97f5dbbf0630a9853f2a086693fea38a1 100644 --- a/routes/admin.php +++ b/routes/admin.php @@ -10,12 +10,12 @@ Route::delete('/users/{userId}', 'UserController@destroy')->name('admin.users.de //Levels Route::resource('levels', 'LevelController')->names([ - 'create' => 'admin.levels.create', - 'show' => 'admin.levels.show', - 'edit' => 'admin.levels.edit', - 'update' => 'admin.levels.update', - 'store' => 'admin.levels.store', - 'index' => 'admin.levels.index', + 'create' => 'admin.levels.create', + 'show' => 'admin.levels.show', + 'edit' => 'admin.levels.edit', + 'update' => 'admin.levels.update', + 'store' => 'admin.levels.store', + 'index' => 'admin.levels.index', 'destroy' => 'admin.levels.destroy', ]);