diff --git a/app/Enums/ActivityLogs/ActivityLogsEventEnum.php b/app/Enums/ActivityLogs/ActivityLogsEventEnum.php index ebb098c..7689de4 100644 --- a/app/Enums/ActivityLogs/ActivityLogsEventEnum.php +++ b/app/Enums/ActivityLogs/ActivityLogsEventEnum.php @@ -2,7 +2,7 @@ namespace App\Enums\ActivityLogs; -use App\Traits\Enums\BaseEnum; +use Uwil\LaravelCommon\Traits\Enums\BaseEnum; enum ActivityLogsEventEnum: int { diff --git a/app/Enums/ApiError.php b/app/Enums/ApiError.php index bbaa3d3..828a1d7 100644 --- a/app/Enums/ApiError.php +++ b/app/Enums/ApiError.php @@ -2,7 +2,7 @@ namespace App\Enums; -use App\Traits\Enums\BaseEnum; +use Uwil\LaravelCommon\Traits\Enums\BaseEnum; enum ApiError: int { diff --git a/app/Enums/ApiStatus.php b/app/Enums/ApiStatus.php index 8405e3f..94ef2a5 100644 --- a/app/Enums/ApiStatus.php +++ b/app/Enums/ApiStatus.php @@ -2,7 +2,7 @@ namespace App\Enums; -use App\Traits\Enums\BaseEnum; +use Uwil\LaravelCommon\Traits\Enums\BaseEnum; enum ApiStatus: int { diff --git a/app/Enums/ArcadiaMailType.php b/app/Enums/ArcadiaMailType.php index 01d6254..4617e4b 100644 --- a/app/Enums/ArcadiaMailType.php +++ b/app/Enums/ArcadiaMailType.php @@ -2,7 +2,7 @@ namespace App\Enums; -use App\Traits\Enums\BaseEnum; +use Uwil\LaravelCommon\Traits\Enums\BaseEnum; enum ArcadiaMailType: int { diff --git a/app/Enums/ArcadiaOrderType.php b/app/Enums/ArcadiaOrderType.php index 2785ae2..aa4eda2 100644 --- a/app/Enums/ArcadiaOrderType.php +++ b/app/Enums/ArcadiaOrderType.php @@ -2,7 +2,7 @@ namespace App\Enums; -use App\Traits\Enums\BaseEnum; +use Uwil\LaravelCommon\Traits\Enums\BaseEnum; enum ArcadiaOrderType: int { diff --git a/app/Enums/Claims/ClaimMessageType.php b/app/Enums/Claims/ClaimMessageType.php index 3b2e965..1115cb2 100644 --- a/app/Enums/Claims/ClaimMessageType.php +++ b/app/Enums/Claims/ClaimMessageType.php @@ -2,7 +2,7 @@ namespace App\Enums\Claims; -use App\Traits\Enums\BaseEnum; +use Uwil\LaravelCommon\Traits\Enums\BaseEnum; enum ClaimMessageType: int { diff --git a/app/Enums/Claims/ClaimResponseType.php b/app/Enums/Claims/ClaimResponseType.php index c8575eb..20646b7 100644 --- a/app/Enums/Claims/ClaimResponseType.php +++ b/app/Enums/Claims/ClaimResponseType.php @@ -2,7 +2,7 @@ namespace App\Enums\Claims; -use App\Traits\Enums\BaseEnum; +use Uwil\LaravelCommon\Traits\Enums\BaseEnum; enum ClaimResponseType: int { diff --git a/app/Enums/Claims/ClaimStatus.php b/app/Enums/Claims/ClaimStatus.php index 29ca37b..53d2c64 100644 --- a/app/Enums/Claims/ClaimStatus.php +++ b/app/Enums/Claims/ClaimStatus.php @@ -2,7 +2,7 @@ namespace App\Enums\Claims; -use App\Traits\Enums\BaseEnum; +use Uwil\LaravelCommon\Traits\Enums\BaseEnum; enum ClaimStatus: int { diff --git a/app/Enums/Claims/ClaimType.php b/app/Enums/Claims/ClaimType.php index bab2dca..96edd54 100644 --- a/app/Enums/Claims/ClaimType.php +++ b/app/Enums/Claims/ClaimType.php @@ -2,7 +2,7 @@ namespace App\Enums\Claims; -use App\Traits\Enums\BaseEnum; +use Uwil\LaravelCommon\Traits\Enums\BaseEnum; enum ClaimType: int { diff --git a/app/Enums/Country.php b/app/Enums/Country.php index 2a6928d..df157cc 100644 --- a/app/Enums/Country.php +++ b/app/Enums/Country.php @@ -2,7 +2,7 @@ namespace App\Enums; -use App\Traits\Enums\BaseEnum; +use Uwil\LaravelCommon\Traits\Enums\BaseEnum; enum Country: int { diff --git a/app/Enums/CustomerExportType.php b/app/Enums/CustomerExportType.php index 73a18b5..4e6770a 100644 --- a/app/Enums/CustomerExportType.php +++ b/app/Enums/CustomerExportType.php @@ -2,7 +2,7 @@ namespace App\Enums; -use App\Traits\Enums\BaseEnum; +use Uwil\LaravelCommon\Traits\Enums\BaseEnum; enum CustomerExportType: int { diff --git a/app/Enums/Pagination/ItemsPerPaginationEnum.php b/app/Enums/Pagination/ItemsPerPaginationEnum.php index b1682f8..7c66cee 100644 --- a/app/Enums/Pagination/ItemsPerPaginationEnum.php +++ b/app/Enums/Pagination/ItemsPerPaginationEnum.php @@ -2,7 +2,7 @@ namespace App\Enums\Pagination; -use App\Traits\Enums\BaseEnum; +use Uwil\LaravelCommon\Traits\Enums\BaseEnum; enum ItemsPerPaginationEnum: int { diff --git a/app/Enums/QuestionType.php b/app/Enums/QuestionType.php index 86f4be6..6ebb821 100644 --- a/app/Enums/QuestionType.php +++ b/app/Enums/QuestionType.php @@ -2,7 +2,7 @@ namespace App\Enums; -use App\Traits\Enums\BaseEnum; +use Uwil\LaravelCommon\Traits\Enums\BaseEnum; enum QuestionType: int { diff --git a/app/Enums/Theme/BootstrapThemeEnum.php b/app/Enums/Theme/BootstrapThemeEnum.php index f1f3725..4ee8c33 100644 --- a/app/Enums/Theme/BootstrapThemeEnum.php +++ b/app/Enums/Theme/BootstrapThemeEnum.php @@ -2,7 +2,7 @@ namespace App\Enums\Theme; -use App\Traits\Enums\BaseEnum; +use Uwil\LaravelCommon\Traits\Enums\BaseEnum; enum BootstrapThemeEnum: int { diff --git a/app/Enums/Users/RoleEnum.php b/app/Enums/Users/RoleEnum.php index b72f1cb..2c11a29 100644 --- a/app/Enums/Users/RoleEnum.php +++ b/app/Enums/Users/RoleEnum.php @@ -2,7 +2,7 @@ namespace App\Enums\Users; -use App\Traits\Enums\BaseEnum; +use Uwil\LaravelCommon\Traits\Enums\BaseEnum; enum RoleEnum: int { diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php index cfebc70..e4b94d2 100644 --- a/app/Exceptions/Handler.php +++ b/app/Exceptions/Handler.php @@ -155,7 +155,7 @@ class Handler extends ExceptionHandler // @codeCoverageIgnoreStart if (config('app.env') === 'testing') { // phpcs:ignore Squiz.PHP.DiscouragedFunctions.Found - print_r((string)$e); + print_r((string) $e); } return $this->getReponse($request, 500, \intval($e->getCode()), $e->getMessage()); // @codeCoverageIgnoreEnd @@ -181,12 +181,12 @@ class Handler extends ExceptionHandler if (Helper::isRequestForApiV2($request)) { return (new V2ApiResponse( ApiStatus::KO, - (object)array_merge($data, ['message' => $message, 'code' => $apiCode]), + (object) array_merge($data, ['message' => $message, 'code' => $apiCode]), ))->toResponse($request)->setStatusCode($httpCode); } return (new V4ApiResponse( ApiStatus::KO, - (object)array_merge($data, ['message' => $message, 'code' => $apiCode]), + (object) array_merge($data, ['message' => $message, 'code' => $apiCode]), ))->toResponse($request)->setStatusCode($httpCode); } } diff --git a/app/Http/Controllers/Api/V2/CustomerController.php b/app/Http/Controllers/Api/V2/CustomerController.php index c6ba58e..e5a3e7e 100644 --- a/app/Http/Controllers/Api/V2/CustomerController.php +++ b/app/Http/Controllers/Api/V2/CustomerController.php @@ -34,7 +34,7 @@ class CustomerController extends Controller */ public function store(StoreCustomerRequest $request, Service $service): JsonResource { - $data = (object)$request->validated(); + $data = (object) $request->validated(); /** @var \App\Models\Customer */ $customer = Customer::query()->where('email', $data->email)->firstOrCreate([ diff --git a/app/Http/Controllers/Api/V4/ClaimController.php b/app/Http/Controllers/Api/V4/ClaimController.php index 1742216..784127c 100644 --- a/app/Http/Controllers/Api/V4/ClaimController.php +++ b/app/Http/Controllers/Api/V4/ClaimController.php @@ -8,6 +8,7 @@ use App\Http\Requests\Api\V4\SendClaimRequest; use App\Models\Claim; use App\Models\Service; use Illuminate\Support\Arr; +use Uwil\LaravelCommon\Helpers\FileHelper; class ClaimController extends Controller { @@ -22,8 +23,8 @@ class ClaimController extends Controller public function store(SendClaimRequest $request, Service $service): \Illuminate\Http\JsonResponse { $claimModel = (new Claim())->fill(Arr::except($request->validated(), 'file')); - if ($request->hasFile('file')) { - $claimModel->file = $request->file('file')->store('claims/files'); + if ($request->filled('file')) { + $claimModel->file = FileHelper::storeBase64File('claim', $request->file); } if (!$claimModel->saveOrFail()) { diff --git a/app/Http/Controllers/Api/V4/CustomerController.php b/app/Http/Controllers/Api/V4/CustomerController.php index c58ec24..4b2f1e3 100644 --- a/app/Http/Controllers/Api/V4/CustomerController.php +++ b/app/Http/Controllers/Api/V4/CustomerController.php @@ -34,7 +34,7 @@ class CustomerController extends Controller */ public function store(StoreCustomerRequest $request, Service $service): JsonResource { - $data = (object)$request->validated(); + $data = (object) $request->validated(); /** @var \App\Models\Customer */ $customer = Customer::query()->where('email', $data->email)->firstOrCreate([ diff --git a/app/Http/Controllers/Bo/ActivityLogsController.php b/app/Http/Controllers/Bo/ActivityLogsController.php index a88b9ef..5591797 100644 --- a/app/Http/Controllers/Bo/ActivityLogsController.php +++ b/app/Http/Controllers/Bo/ActivityLogsController.php @@ -51,7 +51,7 @@ class ActivityLogsController extends Controller $this->sortQuery($query); /** Custom pagination */ - $activitylogModels = $this->paginate($query); + $activitylogModels = $query->paginate($this->getPagination()); return view('bo.pages.activity_logs.index', compact('activitylogModels', 'search', 'searchFields')); } diff --git a/app/Http/Controllers/Bo/AnswerController.php b/app/Http/Controllers/Bo/AnswerController.php index aa4ba09..e93a74f 100644 --- a/app/Http/Controllers/Bo/AnswerController.php +++ b/app/Http/Controllers/Bo/AnswerController.php @@ -32,22 +32,22 @@ class AnswerController extends Controller /** @var \App\Models\Question $questionModel */ $questionModel = $request->question; - /** @var \Illuminate\Database\Eloquent\Builder $answers */ - $answers = Answer::query()->where('question_id', $questionModel->id); + /** @var \Illuminate\Database\Eloquent\Builder $query */ + $query = Answer::query()->where('question_id', $questionModel->id); if ($request->search) { $this->searchQuery( - $answers, + $query, $request->search, null, 'answer', ); } - $this->sortQuery($answers); + $this->sortQuery($query); $searchFields = trans('Réponse'); - $answerModels = $this->paginate($answers); + $answerModels = $this->paginate($this->getPagination()); return view('bo.pages.answers.index', compact('answerModels', 'questionModel', 'searchFields')); } @@ -65,8 +65,8 @@ class AnswerController extends Controller $questionModel = $request->question; return view('bo.pages.answers.create', [ - 'answerModel' => $answer, - 'questionModel' => $questionModel + 'answerModel' => $answer, + 'questionModel' => $questionModel, ]); } @@ -81,9 +81,11 @@ class AnswerController extends Controller return DB::transaction(function () use ($request) { $answer = new Answer(); $answer->fill($request->validated()); + $questionModel = $request->route()->parameter('question'); + $answer->question()->associate($questionModel->getKey()); if ($answer->saveOrFail()) { return redirect() - ->route('bo.answers.edit', $answer) + ->route('bo.questions.answers.edit', ['question' => $questionModel, 'answer' => $answer]) ->with('success', trans( ':model a été créé.', ['model' => Str::singular(trans('models.classes.answers'))] @@ -108,8 +110,8 @@ class AnswerController extends Controller public function edit(Question $question, Answer $answers): \Illuminate\Contracts\View\View { return view('bo.pages.answers.edit', [ - 'answerModel' => $answers, - 'questionModel' => $question + 'answerModel' => $answers, + 'questionModel' => $question, ]); } diff --git a/app/Http/Controllers/Bo/BrandController.php b/app/Http/Controllers/Bo/BrandController.php index fc666af..2ccbe38 100644 --- a/app/Http/Controllers/Bo/BrandController.php +++ b/app/Http/Controllers/Bo/BrandController.php @@ -50,7 +50,7 @@ class BrandController extends Controller $q->where('opt_in', true); }]); - $brandModels = $this->paginate($query); + $brandModels = $query->paginate($this->getPagination()); return view('bo.pages.brands.index', compact('brandModels', 'searchFields')); } @@ -148,7 +148,7 @@ class BrandController extends Controller $models = CollectionHelper::paginateManually( Brand::getUserAssociatedBrands(), $this->jsonItemPerPagination, - (int)$request->validated('page'), + (int) $request->validated('page'), ); return \response()->json($models); } diff --git a/app/Http/Controllers/Bo/ClaimController.php b/app/Http/Controllers/Bo/ClaimController.php index b405b9b..a6586bc 100644 --- a/app/Http/Controllers/Bo/ClaimController.php +++ b/app/Http/Controllers/Bo/ClaimController.php @@ -45,8 +45,8 @@ class ClaimController extends Controller /** @var \App\Models\User $userModel */ $userModel = auth('backend')->user(); - /** @var \Illuminate\Database\Eloquent\Builder $claimModels */ - $claimModels = Claim::query() + /** @var \Illuminate\Database\Eloquent\Builder $query */ + $query = Claim::query() ->when( $request->filled('brand'), fn($q) => $q->whereHas('brand', fn($q) => $q->where('id', $request->brand)) @@ -59,7 +59,7 @@ class ClaimController extends Controller $search = $request->search; if ($search) { $this->searchQuery( - $claimModels, + $query, $search, null, 'reference', @@ -76,10 +76,10 @@ class ClaimController extends Controller ]); /** Sort columns with a query */ - $this->sortQuery($claimModels); + $this->sortQuery($query); /** Custom pagination */ - $claimModels = $this->paginate($claimModels); + $claimModels = $query->simplePaginate($this->getPagination()); return view('bo.pages.claims.index', compact('claimModels', 'search', 'searchFields')); } diff --git a/app/Http/Controllers/Bo/ClaimMailTemplateController.php b/app/Http/Controllers/Bo/ClaimMailTemplateController.php index 6dc0571..a79bc7c 100644 --- a/app/Http/Controllers/Bo/ClaimMailTemplateController.php +++ b/app/Http/Controllers/Bo/ClaimMailTemplateController.php @@ -55,7 +55,7 @@ class ClaimMailTemplateController extends Controller $this->sortQuery($query); $searchFields = trans('validation.custom.label'); - $claimMailTemplateModels = $this->paginate($query); + $claimMailTemplateModels = $query->paginate($this->getPagination()); return view('bo.pages.claim_mail_templates.index', compact('claimMailTemplateModels', 'searchFields')); } diff --git a/app/Http/Controllers/Bo/ClaimSubjectController.php b/app/Http/Controllers/Bo/ClaimSubjectController.php index 9a0c0d6..d4355c2 100644 --- a/app/Http/Controllers/Bo/ClaimSubjectController.php +++ b/app/Http/Controllers/Bo/ClaimSubjectController.php @@ -47,7 +47,7 @@ class ClaimSubjectController extends Controller $this->sortQuery($query); $searchFields = trans('validation.custom.label'); - $claimSubjectModels = $this->paginate($query); + $claimSubjectModels = $query->paginate($this->getPagination()); return view('bo.pages.claim_subjects.index', compact('claimSubjectModels', 'searchFields')); } diff --git a/app/Http/Controllers/Bo/CustomerController.php b/app/Http/Controllers/Bo/CustomerController.php index a211f67..edaf4e3 100644 --- a/app/Http/Controllers/Bo/CustomerController.php +++ b/app/Http/Controllers/Bo/CustomerController.php @@ -42,10 +42,11 @@ class CustomerController extends Controller */ public function index(Request $request): \Illuminate\Contracts\View\View { - $modelClass = Customer::class; - $modelTable = (new Customer())->getTable(); - $brands = Brand::select('id', 'name')->get(); - $columns = ['customer_infos.lastname', 'customer_infos.firstname']; + $modelClass = Customer::class; + $modelTable = (new Customer())->getTable(); + $questionModels = null; + $answerModels = null; + $searchFields = trans('Email, Prénom, Nom'); // Reset session sorts. if ($request->rstSrts) { @@ -56,27 +57,26 @@ class CustomerController extends Controller $this->resetSessionFilters($modelTable); } - $query = $this->buildCustomerQuery(); + if ($request->filled('search') || Session::get("crud.$modelTable.search")) { + $columns = ['customer_infos.lastname', 'customer_infos.firstname']; + $query = $this->buildCustomerQuery(); - // Apply filters. - $questionModels = null; - $answerModels = null; - $this->applyBrandFilter($request, $query, $modelTable, $questionModels, $answerModels); - $this->applySearchFilter($request, $query, $modelTable, $columns); - $this->applySort($request, $query, $modelTable); + // Apply filters. + $this->applyBrandFilter($request, $query, $modelTable, $questionModels, $answerModels); + $this->applySearchFilter($request, $query, $modelTable, $columns); + $this->applySort($request, $query, $modelTable); - $customerModels = $this->paginate($query->with(['customer', 'brand'])); - $searchFields = trans('Email, Prénom, Nom'); + $customerModels = $query->with(['customer', 'brand'])->simplePaginate($this->getPagination()); + } //end if - return view('bo.pages.customers.index', compact( - 'modelClass', - 'modelTable', - 'customerModels', - 'brands', - 'searchFields', - 'questionModels', - 'answerModels', - )); + return view('bo.pages.customers.index', [ + 'modelClass' => $modelClass, + 'modelTable' => $modelTable, + 'customerModels' => $customerModels ?? collect(), + 'searchFields' => $searchFields, + 'questionModels' => $questionModels, + 'answerModels' => $answerModels, + ]); } /** @@ -330,34 +330,35 @@ class CustomerController extends Controller ?Collection &$questionModels, ?Collection &$answerModels ): void { - if ($request->filled('brand') || Session::has("crud.$table.brand")) { - $brand = $request->brand ?? Session::get("crud.$table.brand"); - Session::put("crud.$table.brand", $brand); - $query->where('customer_infos.brand_id', $brand); + $brand = $request->brand ?? Session::get("crud.$table.brand"); + if (!(int) $brand) { + return; + } + Session::put("crud.$table.brand", $brand); + $query->where('customer_infos.brand_id', $brand); - $questionModels = Question::getAllModelsFromBrand($brand); + $questionModels = Question::getAllModelsFromBrand($brand); - if (($request->filled('question') || Session::has("crud.$table.question")) && $questionModels->count()) { - $question = $request->question ?? Session::get("crud.$table.question"); - Session::put("crud.$table.question", $question); + if (($request->filled('question') || Session::has("crud.$table.question")) && $questionModels->count()) { + $question = $request->question ?? Session::get("crud.$table.question"); + Session::put("crud.$table.question", $question); - $answerModels = Answer::getAllAnswersFromQuestion($question); - $questionAnswers = Question::find($question)?->answers->modelKeys() ?? []; + $answerModels = Answer::getAllAnswersFromQuestion($question); + $questionAnswers = Question::find($question)?->answers->modelKeys() ?? []; - $query->whereHas('customer.answers', fn($q) => $q->whereIn('answer_id', $questionAnswers)); + $query->whereHas('customer.answers', fn($q) => $q->whereIn('answer_id', $questionAnswers)); - if ( - ($request->filled('answer') || Session::has("crud.$table.answer")) - && $questionModels->count() - && $answerModels->count() - ) { - $answer = $request->answer ?? Session::get("crud.$table.answer"); - Session::put("crud.$table.answer", $answer); + if ( + ($request->filled('answer') || Session::has("crud.$table.answer")) + && $questionModels->count() + && $answerModels->count() + ) { + $answer = $request->answer ?? Session::get("crud.$table.answer"); + Session::put("crud.$table.answer", $answer); - $query->whereHas('customer.answers', fn($q) => $q->whereKey($answer)); - } + $query->whereHas('customer.answers', fn($q) => $q->whereKey($answer)); } - } //end if + } } /** @@ -371,19 +372,17 @@ class CustomerController extends Controller */ private function applySearchFilter(Request $request, Builder &$query, string $table, array $columns): void { - if ($request->filled('search') || Session::has("crud.$table.search")) { - $search = $request->search ?? Session::get("crud.$table.search"); - Session::put("crud.$table.search", $search); + $search = $request->search ?? Session::get("crud.$table.search"); + Session::put("crud.$table.search", $search); - $query->where(function ($q) use ($columns, $search) { - foreach ($columns as $column) { - $q->orWhere($column, 'LIKE', "%$search%"); - } + $query->where(function ($q) use ($columns, $search) { + foreach ($columns as $column) { + $q->orWhere($column, 'LIKE', "%$search%"); + } - $q->orWhere('customers.email', 'LIKE', "%$search%") - ->orWhere('customer_logins.last_connection', 'LIKE', "%$search%"); - }); - } + $q->orWhere('customers.email', 'LIKE', "%$search%") + ->orWhere('customer_logins.last_connection', 'LIKE', "%$search%"); + }); } /** diff --git a/app/Http/Controllers/Bo/QuestionController.php b/app/Http/Controllers/Bo/QuestionController.php index 184ccc6..9c82fcd 100644 --- a/app/Http/Controllers/Bo/QuestionController.php +++ b/app/Http/Controllers/Bo/QuestionController.php @@ -55,7 +55,7 @@ class QuestionController extends Controller $query->with(['brand', 'answers']); /** @var \Illuminate\Pagination\AbstractPaginator */ - $questionModels = $this->paginate($query); + $questionModels = $query->paginate($this->getPagination()); return view('bo.pages.questions.index', compact('questionModels', 'searchFields')); } diff --git a/app/Http/Controllers/Bo/ServiceController.php b/app/Http/Controllers/Bo/ServiceController.php index dcf47da..a1e1245 100644 --- a/app/Http/Controllers/Bo/ServiceController.php +++ b/app/Http/Controllers/Bo/ServiceController.php @@ -54,7 +54,7 @@ class ServiceController extends Controller $query->with(['brand']); - $serviceModels = $this->paginate($query); + $serviceModels = $query->paginate($this->getPagination()); return view('bo.pages.services.index', compact('serviceModels', 'searchFields')); } diff --git a/app/Http/Controllers/Bo/SingleOptinController.php b/app/Http/Controllers/Bo/SingleOptinController.php index 59b75db..4cd0a3a 100644 --- a/app/Http/Controllers/Bo/SingleOptinController.php +++ b/app/Http/Controllers/Bo/SingleOptinController.php @@ -29,20 +29,23 @@ class SingleOptinController extends Controller */ public function index(Request $request): \Illuminate\Contracts\View\View { - $query = SingleOptin::query(); $questionModels = null; $answerModels = null; + $searchFields = trans('E-mail'); - $this->applyBrandAndAnswerFilters($request, $query, $questionModels, $answerModels); - $this->applySearch($request, $query); - $this->sortQuery($query); + if ($request->filled('search')) { + $query = SingleOptin::query(); - $query->with('brand'); - $singleoptinModels = $this->paginate($query); - $searchFields = trans('E-mail'); + $this->applyBrandAndAnswerFilters($request, $query, $questionModels, $answerModels); + $this->applySearch($request, $query); + $this->sortQuery($query); + + $query->with('brand'); + $singleoptinModels = $query->simplePaginate($this->getPagination()); + } return view('bo.pages.singleoptins.index', [ - 'singleoptinModels' => $singleoptinModels, + 'singleoptinModels' => $singleoptinModels ?? collect(), 'searchFields' => $searchFields, 'questionModels' => $questionModels, 'answerModels' => $answerModels, @@ -88,7 +91,7 @@ class SingleOptinController extends Controller ?Collection &$questionModels, ?Collection &$answerModels ): void { - if (!$request->filled('brand')) { + if (!$request->filled('brand') || !(int) $request->brand) { return; } diff --git a/app/Http/Controllers/Bo/StatsController.php b/app/Http/Controllers/Bo/StatsController.php index b7b7afc..7cd7a46 100644 --- a/app/Http/Controllers/Bo/StatsController.php +++ b/app/Http/Controllers/Bo/StatsController.php @@ -70,7 +70,7 @@ class StatsController extends Controller } $w->insertOne($cols); } - return response((string)$w, 200, [ + return response((string) $w, 200, [ 'Content-Encoding' => 'none', 'Content-Type' => 'text/csv; charset=UTF-8', // phpcs:ignore Generic.Files.LineLength.TooLong @@ -135,7 +135,7 @@ class StatsController extends Controller $dayAnswers->values()->all() )); } - return response((string)$w, 200, [ + return response((string) $w, 200, [ 'Content-Encoding' => 'none', 'Content-Type' => 'text/csv; charset=UTF-8', // phpcs:ignore Generic.Files.LineLength.TooLong diff --git a/app/Http/Controllers/Bo/UserController.php b/app/Http/Controllers/Bo/UserController.php index 28f3722..d0d2ffa 100644 --- a/app/Http/Controllers/Bo/UserController.php +++ b/app/Http/Controllers/Bo/UserController.php @@ -33,14 +33,14 @@ class UserController extends Controller */ public function index(Request $request): \Illuminate\Contracts\View\View { - /** @var \Illuminate\Database\Eloquent\Builder $userModels */ - $userModels = User::query(); + /** @var \Illuminate\Database\Eloquent\Builder $query */ + $query = User::query(); /** @var string $search Search field */ $search = $request->search; if ($search) { $this->searchQuery( - $userModels, + $query, $search, null, 'first_name', @@ -57,10 +57,10 @@ class UserController extends Controller ]); /** Sort columns with a query */ - $this->sortQuery($userModels); + $this->sortQuery($query); /** Custom pagination */ - $userModels = $this->paginate($userModels); + $userModels = $query->paginate($this->getPagination()); return view('bo.pages.users.index', compact('userModels', 'search', 'searchFields')); } diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index cb0a5bf..d9d2e5b 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -189,16 +189,13 @@ class Controller extends BaseController } /** - * Customize pagination with cache or config (default). + * Get the number of items per page. * - * @param \Illuminate\Database\Eloquent\Builder $query * @param \App\Enums\Pagination\ItemsPerPaginationEnum|null $pagination - * @return \Illuminate\Contracts\Pagination\LengthAwarePaginator + * @return integer */ - protected function paginate( - Builder $query, - ItemsPerPaginationEnum $pagination = null - ): \Illuminate\Contracts\Pagination\LengthAwarePaginator { + protected function getPagination(ItemsPerPaginationEnum $pagination = null): int + { $currentRoutePath = Str::slug(request()->route()->getName()); $cacheKey = "pagination.{$currentRoutePath}"; $pagination = $pagination ?? ItemsPerPaginationEnum::twelve; @@ -210,8 +207,7 @@ class Controller extends BaseController if (Cache::get($cacheKey) !== $pagination) { Cache::put($cacheKey, $pagination); } - $query = $query->paginate($pagination); - return $query; + return $pagination; } /** diff --git a/app/Http/Middleware/ApiResponse.php b/app/Http/Middleware/ApiResponse.php index 568bdd8..6e8398b 100644 --- a/app/Http/Middleware/ApiResponse.php +++ b/app/Http/Middleware/ApiResponse.php @@ -57,8 +57,8 @@ class ApiResponse $status = intval($response->getStatusCode() / 100) == 2 ? ApiStatus::OK : ApiStatus::KO; if (Helper::isRequestForApiV2($request)) { - return $response->setData(new V2ApiResponse($status, (object)$data)); + return $response->setData(new V2ApiResponse($status, (object) $data)); } - return $response->setData(new V4ApiResponse($status, (object)$data)); + return $response->setData(new V4ApiResponse($status, (object) $data)); } } diff --git a/app/Http/Requests/Bo/UpdateMiniCrudRequest.php b/app/Http/Requests/Bo/UpdateMiniCrudRequest.php index f845c96..d483c90 100644 --- a/app/Http/Requests/Bo/UpdateMiniCrudRequest.php +++ b/app/Http/Requests/Bo/UpdateMiniCrudRequest.php @@ -100,11 +100,11 @@ abstract class UpdateMiniCrudRequest extends FormRequest }) : $input['dimensions']; // * Adapt dimensions - $sizes = (object)[ + $sizes = (object) [ 'minHeight' => $dim['height'], 'maxHeight' => $dim['height'], - 'minWith' => $dim['width'], - 'maxWith' => $dim['width'], + 'minWith' => $dim['width'], + 'maxWith' => $dim['width'], ]; $rules = array_merge($rules, [ "data.$iptName.value" => [ diff --git a/app/Http/Resources/Api/V2/ApiResponse.php b/app/Http/Resources/Api/V2/ApiResponse.php index 5209420..a84880e 100644 --- a/app/Http/Resources/Api/V2/ApiResponse.php +++ b/app/Http/Resources/Api/V2/ApiResponse.php @@ -37,7 +37,7 @@ class ApiResponse extends JsonResource //phpcs:enable return [ 'status' => $this->status->value(), - 'data' => (array)($this->data ?? []), + 'data' => (array) ($this->data ?? []), 'version' => '3.0.6' ]; } diff --git a/app/Http/Resources/Api/V4/ApiResponse.php b/app/Http/Resources/Api/V4/ApiResponse.php index 1c1ca23..80b2dc2 100644 --- a/app/Http/Resources/Api/V4/ApiResponse.php +++ b/app/Http/Resources/Api/V4/ApiResponse.php @@ -37,7 +37,7 @@ class ApiResponse extends JsonResource //phpcs:enable return [ 'status' => $this->status->value(), - 'data' => (array)($this->data ?? []), + 'data' => (array) ($this->data ?? []), 'version' => config('api.version') ]; } diff --git a/app/Lib/Helpers/ToolboxHelper.php b/app/Lib/Helpers/ToolboxHelper.php index b520a65..21b9e24 100644 --- a/app/Lib/Helpers/ToolboxHelper.php +++ b/app/Lib/Helpers/ToolboxHelper.php @@ -369,7 +369,7 @@ class ToolboxHelper { // Only process if it's an object or array being passed to the function. if (is_object($input) or is_array($input)) { - $ret = (array)$input; + $ret = (array) $input; foreach ($ret as &$item) { // Recursively process EACH element only if not scalar. $item = (is_object($item) or is_array($item)) ? @@ -392,7 +392,7 @@ class ToolboxHelper { // Only process if it's an object or array being passed to the function. if (is_object($input) or is_array($input)) { - $ret = (object)$input; + $ret = (object) $input; foreach ($ret as &$item) { // Recursively process EACH element only if not scalar. $item = (is_object($item) or is_array($item)) ? diff --git a/app/Providers/ViewServiceProvider.php b/app/Providers/ViewServiceProvider.php index aa4ffb7..87a5180 100644 --- a/app/Providers/ViewServiceProvider.php +++ b/app/Providers/ViewServiceProvider.php @@ -32,7 +32,8 @@ class ViewServiceProvider extends ServiceProvider // * FORCE BOOTSTRAP PAGINATOR (or custom if in front) // Early boot, request wont be filled as expected. if (collect(explode('/', \request()->getPathInfo()))->get(1) === 'bo') { - Paginator::defaultView('bo.modules.pagination'); + Paginator::defaultView('bo.modules.pagination.default'); + Paginator::defaultSimpleView('bo.modules.pagination.simple'); } else { Paginator::useBootstrapFive(); } diff --git a/app/Traits/Enums/BaseEnum.php b/app/Traits/Enums/BaseEnum.php deleted file mode 100644 index 753c898..0000000 --- a/app/Traits/Enums/BaseEnum.php +++ /dev/null @@ -1,310 +0,0 @@ -name]; - } - - /** - * Get enum label. - * - * @return string - */ - public function label(): string - { - return self::toLabels()[$this->name]; - } - - /** - * Get enum name. - * - * @return string - */ - public function name(): string - { - return $this->name; - } - - // * STATIC FETCH METHODS - - /** - * Get enum labels. - * - * @return array - */ - public static function toLabels(): array - { - if (empty(self::getCache('labels'))) { - $labels = self::getLabelsConstant(); - $array = []; - \array_map(function ($enum) use (&$array, $labels) { - if (!\is_null($labels) and !isset($labels[$enum->name])) { - throw new \Error('Missing definition label ' . self::class . " for {$enum->name}"); - } - $array = array_merge($array, [$enum->name => __( - !\is_null($labels) ? $labels[$enum->name] : ucfirst($enum->name) - )]); - }, self::cases()); - self::setCache('labels', $array); - } - return self::getCache('labels'); - } - - /** - * Get enum values. - * - * @return array - */ - public static function toValues(): array - { - if (empty(self::getCache('values'))) { - $array = []; - \array_map(function ($enum) use (&$array) { - $array = array_merge($array, [$enum->name => $enum->value]); - }, self::cases()); - self::setCache('values', $array); - } - return self::getCache('values'); - } - - /** - * Get enums. - * - * @return array - */ - public static function all(): array - { - return self::cases(); - } - - /** - * Get enums. - * - * @return array - */ - public static function toArray(): array - { - if (empty(self::getCache('enums'))) { - $definitions = self::getCustomDefinitions(); - $array = []; - $inflector = InflectorFactory::create()->build(); - \array_map(function ($enum) use (&$array, $definitions, $inflector) { - $baseArray = [ - 'name' => $enum->name, - 'label' => $enum->label(), - 'value' => $enum->value, - ]; - foreach ($definitions as $index => $elements) { - $index = $inflector->singularize(strtolower($index)); - if (!isset($elements[$enum->name])) { - throw new \Error("Missing definition {$index} " . self::class . " for {$enum->name}"); - } - $baseArray[$index] = $elements[$enum->name]; - } - $array = array_merge($array, [$enum->name => (object)$baseArray]); - }, self::cases()); - self::setCache('enums', $array); - } //end if - return self::getCache('enums'); - } - - /** - * Fetch enum using value. - * - * @param \App\Traits\Enums\BaseEnum|integer|string $value - * @param string $field - * @return \App\Traits\Enums\BaseEnum|null - */ - public static function make(self|int|string $value, string $field = 'value'): self|null - { - return !\is_object($value) ? self::cases()[array_search($value, array_column(self::cases(), $field))] : $value; - } - - /** - * Test if 2 enum are equals. - * - * @param object ...$others - * @return boolean - * @throws \Error If provided element are not enums taht extends BaseEnum. - */ - public function equals(object ...$others): bool - { - foreach ($others as $other) { - if (!\in_array(BaseEnum::class, $this->classUsesRecursive($other))) { - throw new \Error(__METHOD__ . - ' requires $enum to use ' . BaseEnum::class); - } - if ( - get_class($this) === get_class($other) - && $this->value === $other->value - ) { - return true; - } - } - return false; - } - - /** - * Serialize to json. - * - * @return mixed - */ - public function jsonSerialize(): mixed - { - return $this->value; - } - - - // * CACHE - - /** - * Get cache array. - * - * @param string $index - * @return array - */ - private static function getCache(string $index): array - { - self::initCache(); - if (!isset($GLOBALS[self::class]['props'][$index])) { - $GLOBALS[self::class]['props'][$index] = []; - } - return $GLOBALS[self::class]['props'][$index]; - } - - /** - * Set cache array. - * - * @param string $index - * @param array $items - * @return void - */ - private static function setCache(string $index, array $items): void - { - self::initCache(); - if (!isset($GLOBALS[self::class]['props'][$index])) { - $GLOBALS[self::class]['props'][$index] = []; - } - $GLOBALS[self::class]['props'][$index] = $items; - } - - /** - * Init cache if needed. - * - * @return void - */ - private static function initCache(): void - { - if (!isset($GLOBALS[self::class])) { - $GLOBALS[self::class] = [ - 'props' => [ - 'enums' => [], - 'values' => [], - 'labels' => [] - ], - 'customProps' => null - ]; - } - } - - // * PRIVATE - - /** - * Fetch the LABELS constant if exists. - * - * @return array|null - */ - private static function getLabelsConstant(): array|null - { - $class_name = self::class; - try { - $constant_reflex = new \ReflectionClassConstant($class_name, 'LABELS'); - return $constant_reflex->getValue(); - } catch (\ReflectionException $e) { - return null; - } - } - - /** - * Get custom constants. - * - * @return array - */ - private static function getCustomDefinitions(): array - { - // ? Has custom props in cache ? - if (!isset($GLOBALS[self::class]) or \is_null($GLOBALS[self::class]['customProps'])) { - $names = []; - \array_map(function (self $enum) use (&$names) { - $names = array_merge($names, [$enum->name => $enum]); - }, self::cases()); - - $GLOBALS[self::class]['customProps'] = \array_filter( - (new \ReflectionClass(self::class))->getConstants(), - function (mixed $constant, string $key) use ($names) { - if ($key === 'LABELS' or !\is_array($constant)) { - return false; - } - return count(\array_filter( - array_flip($constant), - function (string $name) use ($names) { - return array_key_exists($name, $names); - } - )); - }, - ARRAY_FILTER_USE_BOTH - ); - } //end if - return $GLOBALS[self::class]['customProps']; - } - - /** - * Returns all traits used by a class, its parent classes and trait of their traits. - * - * @param object|string $class - * @return array - */ - private function classUsesRecursive($class) - { - if (is_object($class)) { - $class = get_class($class); - } - - $results = []; - - foreach (array_reverse(class_parents($class) ?: []) + [$class => $class] as $class) { - $results += $this->traitUsesRecursive($class); - } - - return array_unique($results); - } - - /** - * Returns all traits used by a trait and its traits. - * - * @param object|string $trait - * @return array - */ - private function traitUsesRecursive($trait) - { - $traits = class_uses($trait) ?: []; - - foreach ($traits as $trait) { - $traits += $this->traitUsesRecursive($trait); - } - - return $traits; - } -} diff --git a/composer.json b/composer.json index 5a3d658..5ecae06 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "ldc/ldccrm", - "version": "4.1.4", + "version": "4.1.5", "type": "project", "description": "LDC CRM", "license": "MIT", @@ -41,7 +41,7 @@ "sentry/sentry-laravel": "^4.10", "uwil/admin-secure-laravel": "^3.0", "uwil/k8s-laravel": "^1.4", - "uwil/laravel-common": "^3.4" + "uwil/laravel-common": "^4.1.0" }, "require-dev": { "brianium/paratest": "^7.2", diff --git a/composer.lock b/composer.lock index 265ed59..f8df817 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "ee8bdd66e3ddef5e410f2b2a7d852c2b", + "content-hash": "0009b353976d02e41558711de87179a6", "packages": [ { "name": "24slides/laravel-saml2", @@ -7859,16 +7859,16 @@ }, { "name": "uwil/laravel-common", - "version": "3.4.3", + "version": "4.1.0", "source": { "type": "git", "url": "git@lab.s-web.fr:ldc-web/projets/laravel-common.git", - "reference": "e4d69be567729f0e32379b4ed1ed8cd0dc3746df" + "reference": "01af52e206e690d511752e9f6a52c8b2c537ca8a" }, "dist": { "type": "zip", - "url": "https://lab.s-web.fr/api/v4/projects/215/packages/composer/archives/uwil/laravel-common.zip?sha=e4d69be567729f0e32379b4ed1ed8cd0dc3746df", - "reference": "e4d69be567729f0e32379b4ed1ed8cd0dc3746df", + "url": "https://lab.s-web.fr/api/v4/projects/215/packages/composer/archives/uwil/laravel-common.zip?sha=01af52e206e690d511752e9f6a52c8b2c537ca8a", + "reference": "01af52e206e690d511752e9f6a52c8b2c537ca8a", "shasum": "" }, "require": { @@ -7876,7 +7876,7 @@ "kwaadpepper/image-resizer": "^3.0", "laravel/framework": "~11|~12", "mews/purifier": "^3.4", - "php": "~8.3", + "php": "^8.3", "sentry/sentry-laravel": "^4.10" }, "require-dev": { diff --git a/config/app.php b/config/app.php index aa7f33f..6072907 100644 --- a/config/app.php +++ b/config/app.php @@ -41,7 +41,7 @@ return [ | */ - 'debug' => (bool)env('APP_DEBUG', false), + 'debug' => (bool) env('APP_DEBUG', false), /* |-------------------------------------------------------------------------- diff --git a/config/sentry.php b/config/sentry.php index 29627fe..2e47564 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -55,7 +55,7 @@ return [ 'send_default_pii' => env('SENTRY_SEND_DEFAULT_PII', false), // @see: https://docs.sentry.io/platforms/php/guides/laravel/configuration/options/#traces-sample-rate. - 'traces_sample_rate' => env('SENTRY_TRACES_SAMPLE_RATE') === null ? null : (float)env('SENTRY_TRACES_SAMPLE_RATE'), + 'traces_sample_rate' => env('SENTRY_TRACES_SAMPLE_RATE') === null ? null : (float) env('SENTRY_TRACES_SAMPLE_RATE'), 'before_send' => [\App\Lib\Helpers\ExceptionsHelper::class, 'sentryEventHandler'], ]; 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 51015b6..d74887c 100644 --- a/database/migrations/2014_10_12_000000_create_users_table.php +++ b/database/migrations/2014_10_12_000000_create_users_table.php @@ -4,14 +4,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateUsersTable extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::create('users', function (Blueprint $table) { $table->id(); @@ -29,8 +29,8 @@ class CreateUsersTable extends Migration * * @return void */ - public function down() + public function down(): void { Schema::dropIfExists('users'); } -} +}; diff --git a/database/migrations/2019_08_19_000000_create_failed_jobs_table.php b/database/migrations/2019_08_19_000000_create_failed_jobs_table.php index 69b2335..db96e7d 100644 --- a/database/migrations/2019_08_19_000000_create_failed_jobs_table.php +++ b/database/migrations/2019_08_19_000000_create_failed_jobs_table.php @@ -4,15 +4,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -// phpcs:ignore PSR1.Classes.ClassDeclaration.MissingNamespace -class CreateFailedJobsTable extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::create('failed_jobs', function (Blueprint $table) { $table->id(); @@ -30,8 +29,8 @@ class CreateFailedJobsTable extends Migration * * @return void */ - public function down() + public function down(): void { Schema::dropIfExists('failed_jobs'); } -} +}; diff --git a/database/migrations/2020_11_26_152638_create_customers.php b/database/migrations/2020_11_26_152638_create_customers.php index 015ce55..9020139 100644 --- a/database/migrations/2020_11_26_152638_create_customers.php +++ b/database/migrations/2020_11_26_152638_create_customers.php @@ -4,15 +4,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -// phpcs:ignore PSR1.Classes.ClassDeclaration.MissingNamespace -class CreateCustomers extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::create('customers', function (Blueprint $table) { $table->id(); @@ -26,8 +25,8 @@ class CreateCustomers extends Migration * * @return void */ - public function down() + public function down(): void { Schema::dropIfExists('customers'); } -} +}; diff --git a/database/migrations/2020_11_26_152901_create_brands.php b/database/migrations/2020_11_26_152901_create_brands.php index caa88c6..4d2fe22 100644 --- a/database/migrations/2020_11_26_152901_create_brands.php +++ b/database/migrations/2020_11_26_152901_create_brands.php @@ -4,15 +4,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -// phpcs:ignore PSR1.Classes.ClassDeclaration.MissingNamespace -class CreateBrands extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::create('brands', function (Blueprint $table) { $table->id(); @@ -26,8 +25,8 @@ class CreateBrands extends Migration * * @return void */ - public function down() + public function down(): void { Schema::dropIfExists('brands'); } -} +}; diff --git a/database/migrations/2020_11_26_152941_create_customer_infos.php b/database/migrations/2020_11_26_152941_create_customer_infos.php index 8c69232..2de9ac3 100644 --- a/database/migrations/2020_11_26_152941_create_customer_infos.php +++ b/database/migrations/2020_11_26_152941_create_customer_infos.php @@ -4,15 +4,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -// phpcs:ignore PSR1.Classes.ClassDeclaration.MissingNamespace -class CreateCustomerInfos extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::create('customer_infos', function (Blueprint $table) { $table->id(); @@ -38,8 +37,8 @@ class CreateCustomerInfos extends Migration * * @return void */ - public function down() + public function down(): void { Schema::dropIfExists('customer_infos'); } -} +}; diff --git a/database/migrations/2020_11_26_153521_create_customer_login.php b/database/migrations/2020_11_26_153521_create_customer_login.php index 1b95593..38c13a2 100644 --- a/database/migrations/2020_11_26_153521_create_customer_login.php +++ b/database/migrations/2020_11_26_153521_create_customer_login.php @@ -4,15 +4,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -// phpcs:ignore PSR1.Classes.ClassDeclaration.MissingNamespace -class CreateCustomerLogin extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::create('customer_login', function (Blueprint $table) { $table->id(); @@ -30,8 +29,8 @@ class CreateCustomerLogin extends Migration * * @return void */ - public function down() + public function down(): void { Schema::dropIfExists('customer_login'); } -} +}; diff --git a/database/migrations/2020_11_26_153929_create_single_optin.php b/database/migrations/2020_11_26_153929_create_single_optin.php index cbbbc44..419fd4c 100644 --- a/database/migrations/2020_11_26_153929_create_single_optin.php +++ b/database/migrations/2020_11_26_153929_create_single_optin.php @@ -4,15 +4,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -// phpcs:ignore PSR1.Classes.ClassDeclaration.MissingNamespace -class CreateSingleOptin extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::create('single_optin', function (Blueprint $table) { $table->id(); @@ -27,8 +26,8 @@ class CreateSingleOptin extends Migration * * @return void */ - public function down() + public function down(): void { Schema::dropIfExists('single_optin'); } -} +}; diff --git a/database/migrations/2020_11_26_154226_create_customer_opt_in_history.php b/database/migrations/2020_11_26_154226_create_customer_opt_in_history.php index 2f8a5c4..f6e5b66 100644 --- a/database/migrations/2020_11_26_154226_create_customer_opt_in_history.php +++ b/database/migrations/2020_11_26_154226_create_customer_opt_in_history.php @@ -4,15 +4,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -// phpcs:ignore PSR1.Classes.ClassDeclaration.MissingNamespace -class CreateCustomerOptInHistory extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::create('customer_opt_in_history', function (Blueprint $table) { $table->id(); @@ -28,8 +27,8 @@ class CreateCustomerOptInHistory extends Migration * * @return void */ - public function down() + public function down(): void { Schema::dropIfExists('customer_opt_in_history'); } -} +}; diff --git a/database/migrations/2020_11_27_122842_create_services.php b/database/migrations/2020_11_27_122842_create_services.php index ec8e280..eec36eb 100644 --- a/database/migrations/2020_11_27_122842_create_services.php +++ b/database/migrations/2020_11_27_122842_create_services.php @@ -4,15 +4,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -// phpcs:ignore PSR1.Classes.ClassDeclaration.MissingNamespace -class CreateServices extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::create('services', function (Blueprint $table) { $table->id(); @@ -29,8 +28,8 @@ class CreateServices extends Migration * * @return void */ - public function down() + public function down(): void { Schema::dropIfExists('services'); } -} +}; diff --git a/database/migrations/2020_12_01_145010_create_services_stats.php b/database/migrations/2020_12_01_145010_create_services_stats.php index c61231d..dc3c27a 100644 --- a/database/migrations/2020_12_01_145010_create_services_stats.php +++ b/database/migrations/2020_12_01_145010_create_services_stats.php @@ -4,15 +4,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -// phpcs:ignore PSR1.Classes.ClassDeclaration.MissingNamespace -class CreateServicesStats extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::create('services_stats', function (Blueprint $table) { $table->id(); @@ -29,8 +28,8 @@ class CreateServicesStats extends Migration * * @return void */ - public function down() + public function down(): void { Schema::dropIfExists('services_stats'); } -} +}; diff --git a/database/migrations/2021_02_28_101342_rename_services_stats_table_to_service_stats.php b/database/migrations/2021_02_28_101342_rename_services_stats_table_to_service_stats.php index d1fb129..07bb658 100644 --- a/database/migrations/2021_02_28_101342_rename_services_stats_table_to_service_stats.php +++ b/database/migrations/2021_02_28_101342_rename_services_stats_table_to_service_stats.php @@ -1,18 +1,16 @@ renameColumn('api_token', 'bearer_token'); @@ -25,11 +24,11 @@ class RenameApiTokenOnServicesTable extends Migration * * @return void */ - public function down() + public function down(): void { Schema::table('services', function (Blueprint $table) { $table->renameColumn('bearer_token', 'api_token'); $table->renameColumn('bearer_token_date', 'api_token_date'); }); } -} +}; diff --git a/database/migrations/2021_03_15_073250_re_add_api_token_to_services_table.php b/database/migrations/2021_03_15_073250_re_add_api_token_to_services_table.php index e603114..f2fafad 100644 --- a/database/migrations/2021_03_15_073250_re_add_api_token_to_services_table.php +++ b/database/migrations/2021_03_15_073250_re_add_api_token_to_services_table.php @@ -2,18 +2,16 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; -use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Schema; -// phpcs:ignore PSR1.Classes.ClassDeclaration.MissingNamespace -class ReAddApiTokenToServicesTable extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::table('services', function (Blueprint $table) { $table->string('api_token')->nullable()->after('bearer_token_date'); @@ -26,7 +24,7 @@ class ReAddApiTokenToServicesTable extends Migration * * @return void */ - public function down() + public function down(): void { Schema::table('services', function (Blueprint $table) { $table->dropColumn('api_token'); @@ -35,4 +33,4 @@ class ReAddApiTokenToServicesTable extends Migration $table->dropColumn('api_token_date'); }); } -} +}; diff --git a/database/migrations/2021_08_02_103828_add_bearer_pwd_to_services_table.php b/database/migrations/2021_08_02_103828_add_bearer_pwd_to_services_table.php index 70ff424..3a3fb85 100644 --- a/database/migrations/2021_08_02_103828_add_bearer_pwd_to_services_table.php +++ b/database/migrations/2021_08_02_103828_add_bearer_pwd_to_services_table.php @@ -4,14 +4,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class AddBearerPwdToServicesTable extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::table('services', function (Blueprint $table) { $table->string('bearer_pwd')->after('bearer_token'); @@ -23,10 +23,10 @@ class AddBearerPwdToServicesTable extends Migration * * @return void */ - public function down() + public function down(): void { Schema::table('services', function (Blueprint $table) { $table->dropColumn('bearer_pwd'); }); } -} +}; diff --git a/database/migrations/2021_08_03_163527_add_newcountry_column_to_customer_infos_table.php b/database/migrations/2021_08_03_163527_add_newcountry_column_to_customer_infos_table.php index d11403a..2f64d36 100644 --- a/database/migrations/2021_08_03_163527_add_newcountry_column_to_customer_infos_table.php +++ b/database/migrations/2021_08_03_163527_add_newcountry_column_to_customer_infos_table.php @@ -4,14 +4,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class AddNewcountryColumnToCustomerInfosTable extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::table('customer_infos', function (Blueprint $table) { $table->smallInteger('newcountry')->default(76)->after('country'); @@ -23,10 +23,10 @@ class AddNewcountryColumnToCustomerInfosTable extends Migration * * @return void */ - public function down() + public function down(): void { Schema::table('customer_infos', function (Blueprint $table) { $table->dropColumn('newcountry'); }); } -} +}; diff --git a/database/migrations/2021_08_10_103745_create_questions_table.php b/database/migrations/2021_08_10_103745_create_questions_table.php index 90ec94e..5eaf085 100644 --- a/database/migrations/2021_08_10_103745_create_questions_table.php +++ b/database/migrations/2021_08_10_103745_create_questions_table.php @@ -4,19 +4,20 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateQuestionsTable extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::create('questions', function (Blueprint $table) { $table->id(); $table->text('question'); - $table->tinyInteger('type'); // QuestionType + // QuestionType. + $table->tinyInteger('type'); $table->foreignId('brand_id')->constrained('brands'); $table->timestamps(); }); @@ -27,8 +28,8 @@ class CreateQuestionsTable extends Migration * * @return void */ - public function down() + public function down(): void { Schema::dropIfExists('questions'); } -} +}; diff --git a/database/migrations/2021_08_10_103757_create_answers_table.php b/database/migrations/2021_08_10_103757_create_answers_table.php index 79d038b..bf3ec7c 100644 --- a/database/migrations/2021_08_10_103757_create_answers_table.php +++ b/database/migrations/2021_08_10_103757_create_answers_table.php @@ -4,14 +4,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateAnswersTable extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::create('answers', function (Blueprint $table) { $table->id(); @@ -26,8 +26,8 @@ class CreateAnswersTable extends Migration * * @return void */ - public function down() + public function down(): void { Schema::dropIfExists('answers'); } -} +}; diff --git a/database/migrations/2021_08_10_104859_create_customer_answer_table.php b/database/migrations/2021_08_10_104859_create_customer_answer_table.php index 6f092c5..20c1a45 100644 --- a/database/migrations/2021_08_10_104859_create_customer_answer_table.php +++ b/database/migrations/2021_08_10_104859_create_customer_answer_table.php @@ -4,14 +4,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateCustomerAnswerTable extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::create('customer_answer', function (Blueprint $table) { $table->foreignId('answer_id')->constrained('answers'); @@ -25,8 +25,8 @@ class CreateCustomerAnswerTable extends Migration * * @return void */ - public function down() + public function down(): void { Schema::dropIfExists('customer_answer'); } -} +}; diff --git a/database/migrations/2021_08_12_152220_hash_api_keys_in_services_table.php b/database/migrations/2021_08_12_152220_hash_api_keys_in_services_table.php index 2e683c4..193946b 100644 --- a/database/migrations/2021_08_12_152220_hash_api_keys_in_services_table.php +++ b/database/migrations/2021_08_12_152220_hash_api_keys_in_services_table.php @@ -4,14 +4,14 @@ use App\Models\Service; use Illuminate\Database\Migrations\Migration; use Illuminate\Support\Facades\Hash; -class HashApiKeysInServicesTable extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { foreach (Service::all() as $service) { $service->bearer_token = Hash::make($service->bearer_token); @@ -24,7 +24,8 @@ class HashApiKeysInServicesTable extends Migration * * @return void */ - public function down() + public function down(): void { + // Do nothing. } -} +}; diff --git a/database/migrations/2021_08_23_180427_create_jobs_table.php b/database/migrations/2021_08_23_180427_create_jobs_table.php index 1be9e8a..560ae54 100644 --- a/database/migrations/2021_08_23_180427_create_jobs_table.php +++ b/database/migrations/2021_08_23_180427_create_jobs_table.php @@ -4,14 +4,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateJobsTable extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::create('jobs', function (Blueprint $table) { $table->bigIncrements('id'); @@ -29,8 +29,8 @@ class CreateJobsTable extends Migration * * @return void */ - public function down() + public function down(): void { Schema::dropIfExists('jobs'); } -} +}; diff --git a/database/migrations/2021_10_29_110018_create_brand_stats_table.php b/database/migrations/2021_10_29_110018_create_brand_stats_table.php index 57e53c6..fe28f98 100644 --- a/database/migrations/2021_10_29_110018_create_brand_stats_table.php +++ b/database/migrations/2021_10_29_110018_create_brand_stats_table.php @@ -4,32 +4,32 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CreateBrandStatsTable extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::create('brand_stats', function (Blueprint $table) { - // Le nombre de comptes actifs (dernière connexion inférieure à 6 mois) + // Le nombre de comptes actifs (dernière connexion inférieure à 6 mois). $table->unsignedInteger('active'); - // Le nombre de comptes inactifs (dernière connexion supérieure à 6 mois) + // Le nombre de comptes inactifs (dernière connexion supérieure à 6 mois). $table->unsignedInteger('inactive'); - // Le nombre d’anciens comptes (date de création supérieure à 6 mois + // Le nombre d’anciens comptes (date de création supérieure à 6 mois. $table->unsignedInteger('old_accounts'); - // Le nombre de nouveaux comptes (date de création inférieure à 6 mois) + // Le nombre de nouveaux comptes (date de création inférieure à 6 mois). $table->unsignedInteger('new_accounts'); - // Le nombre de comptes total + // Le nombre de comptes total. $table->unsignedInteger('total_accounts'); - // Le nombre d’optins (single optin compris) + // Le nombre d’optins (single optin compris). $table->unsignedInteger('total_opt_in'); $table->timestamp('created_at')->nullable(); @@ -45,8 +45,8 @@ class CreateBrandStatsTable extends Migration * * @return void */ - public function down() + public function down(): void { Schema::dropIfExists('brand_stats'); } -} +}; diff --git a/database/migrations/2021_10_29_160416_repair_stats_jobs.php b/database/migrations/2021_10_29_160416_repair_stats_jobs.php index a1a900b..d33ef82 100644 --- a/database/migrations/2021_10_29_160416_repair_stats_jobs.php +++ b/database/migrations/2021_10_29_160416_repair_stats_jobs.php @@ -6,14 +6,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\DB; -class RepairStatsJobs extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { $jobIDS = []; $page = 1; @@ -44,8 +44,8 @@ class RepairStatsJobs extends Migration } $serviceStat->nb_calls += 1; $serviceStat->saveOrFail(); - } - } + } //end if + } //end foreach DB::table('jobs')->whereIn('id', $jobIDS) ->delete(); $jobIDS = []; @@ -57,8 +57,8 @@ class RepairStatsJobs extends Migration * * @return void */ - public function down() + public function down(): void { - // + // Do nothing. } -} +}; diff --git a/database/migrations/2021_12_07_203437_drop_api_token_from_services.php b/database/migrations/2021_12_07_203437_drop_api_token_from_services.php index 9068601..b32814d 100644 --- a/database/migrations/2021_12_07_203437_drop_api_token_from_services.php +++ b/database/migrations/2021_12_07_203437_drop_api_token_from_services.php @@ -4,14 +4,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class DropApiTokenFromServices extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::table('services', function (Blueprint $table) { $table->dropColumn('api_token'); @@ -24,11 +24,11 @@ class DropApiTokenFromServices extends Migration * * @return void */ - public function down() + public function down(): void { Schema::table('services', function (Blueprint $table) { $table->string('api_token')->nullable()->after('bearer_token_date'); $table->timestamp('api_token_date')->after('api_token')->useCurrent(); }); } -} +}; diff --git a/database/migrations/2021_12_07_211411_set_unique_constrain_on_api_token_on_services.php b/database/migrations/2021_12_07_211411_set_unique_constrain_on_api_token_on_services.php index 229aa73..278ddf4 100644 --- a/database/migrations/2021_12_07_211411_set_unique_constrain_on_api_token_on_services.php +++ b/database/migrations/2021_12_07_211411_set_unique_constrain_on_api_token_on_services.php @@ -4,14 +4,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class SetUniqueConstrainOnApiTokenOnServices extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::table('services', function (Blueprint $table) { $table->unique('bearer_token'); @@ -23,10 +23,10 @@ class SetUniqueConstrainOnApiTokenOnServices extends Migration * * @return void */ - public function down() + public function down(): void { Schema::table('services', function (Blueprint $table) { $table->dropUnique(['bearer_token']); }); } -} +}; diff --git a/database/migrations/2021_12_08_000551_increase_bearer_pwd_on_services.php b/database/migrations/2021_12_08_000551_increase_bearer_pwd_on_services.php index c5404ce..3880d30 100644 --- a/database/migrations/2021_12_08_000551_increase_bearer_pwd_on_services.php +++ b/database/migrations/2021_12_08_000551_increase_bearer_pwd_on_services.php @@ -4,14 +4,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class IncreaseBearerPwdOnServices extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::table('services', function (Blueprint $table) { $table->string('bearer_pwd', 312)->change(); @@ -23,9 +23,9 @@ class IncreaseBearerPwdOnServices extends Migration * * @return void */ - public function down() + public function down(): void { // Dont revert this, could break things with truncated // columns, wont harm. } -} +}; diff --git a/database/migrations/2021_12_26_152449_parse_country_on_customer_infos.php b/database/migrations/2021_12_26_152449_parse_country_on_customer_infos.php index 1ef5564..06bc1ff 100644 --- a/database/migrations/2021_12_26_152449_parse_country_on_customer_infos.php +++ b/database/migrations/2021_12_26_152449_parse_country_on_customer_infos.php @@ -8,14 +8,14 @@ use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Schema; use Illuminate\Support\Str; -class ParseCountryOnCustomerInfos extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { $perPage = 10000; $currentPage = 0; @@ -56,8 +56,8 @@ class ParseCountryOnCustomerInfos extends Migration * * @return void */ - public function down() + public function down(): void { // Do nothing. } -} +}; diff --git a/database/migrations/2021_12_28_010744_set_customer_id_nullable_on_customer_answer.php b/database/migrations/2021_12_28_010744_set_customer_id_nullable_on_customer_answer.php index b21e272..8eb381a 100644 --- a/database/migrations/2021_12_28_010744_set_customer_id_nullable_on_customer_answer.php +++ b/database/migrations/2021_12_28_010744_set_customer_id_nullable_on_customer_answer.php @@ -4,14 +4,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class SetCustomerIdNullableOnCustomerAnswer extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::disableForeignKeyConstraints(); Schema::table('customer_answer', function (Blueprint $table) { @@ -28,7 +28,7 @@ class SetCustomerIdNullableOnCustomerAnswer extends Migration * * @return void */ - public function down() + public function down(): void { Schema::disableForeignKeyConstraints(); Schema::table('customer_answer', function (Blueprint $table) { @@ -39,4 +39,4 @@ class SetCustomerIdNullableOnCustomerAnswer extends Migration }); Schema::enableForeignKeyConstraints(); } -} +}; diff --git a/database/migrations/2022_12_01_173016_cascade_delete_question_answers.php b/database/migrations/2022_12_01_173016_cascade_delete_question_answers.php index 37e5431..9ff9ba0 100644 --- a/database/migrations/2022_12_01_173016_cascade_delete_question_answers.php +++ b/database/migrations/2022_12_01_173016_cascade_delete_question_answers.php @@ -4,14 +4,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CascadeDeleteQuestionAnswers extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { // * Add cascade delete Schema::table('answers', function (Blueprint $table) { @@ -25,7 +25,7 @@ class CascadeDeleteQuestionAnswers extends Migration * * @return void */ - public function down() + public function down(): void { // * Undo cascade delete (restrict as default) Schema::table('answers', function (Blueprint $table) { @@ -33,4 +33,4 @@ class CascadeDeleteQuestionAnswers extends Migration $table->foreign('question_id')->references('id')->on('questions'); }); } -} +}; diff --git a/database/migrations/2023_06_23_134010_cascade_delete_customer_answer.php b/database/migrations/2023_06_23_134010_cascade_delete_customer_answer.php index b048a0f..58ba982 100644 --- a/database/migrations/2023_06_23_134010_cascade_delete_customer_answer.php +++ b/database/migrations/2023_06_23_134010_cascade_delete_customer_answer.php @@ -4,14 +4,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class CascadeDeleteCustomerAnswer extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { // * Add cascade delete Schema::table('customer_answer', function (Blueprint $table) { @@ -25,7 +25,7 @@ class CascadeDeleteCustomerAnswer extends Migration * * @return void */ - public function down() + public function down(): void { // * Undo cascade delete (restrict as default) Schema::table('customer_answer', function (Blueprint $table) { @@ -33,4 +33,4 @@ class CascadeDeleteCustomerAnswer extends Migration $table->foreign('answer_id')->references('id')->on('answers'); }); } -} +}; diff --git a/database/migrations/2023_06_23_171318_add_change_single_optin_to_use_hashcode.php b/database/migrations/2023_06_23_171318_add_change_single_optin_to_use_hashcode.php index 9c174fc..e5edea2 100644 --- a/database/migrations/2023_06_23_171318_add_change_single_optin_to_use_hashcode.php +++ b/database/migrations/2023_06_23_171318_add_change_single_optin_to_use_hashcode.php @@ -6,14 +6,14 @@ use Illuminate\Support\Facades\DB; use Illuminate\Support\Facades\Schema; use Illuminate\Support\Str; -class AddChangeSingleOptinToUseHashcode extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::table('single_optins', function (Blueprint $table) { $table->uuid('hashcode')->comment('Single optin hashcode')->after('id'); @@ -37,7 +37,7 @@ class AddChangeSingleOptinToUseHashcode extends Migration * * @return void */ - public function down() + public function down(): void { Schema::table('single_optins', function (Blueprint $table) { $table->id()->after('hashcode'); @@ -46,4 +46,4 @@ class AddChangeSingleOptinToUseHashcode extends Migration $table->dropColumn('hashcode'); }); } -} +}; diff --git a/database/migrations/2023_06_23_172216_enhance_customer_infos_hashcode.php b/database/migrations/2023_06_23_172216_enhance_customer_infos_hashcode.php index 241b1a0..731e2fd 100644 --- a/database/migrations/2023_06_23_172216_enhance_customer_infos_hashcode.php +++ b/database/migrations/2023_06_23_172216_enhance_customer_infos_hashcode.php @@ -4,14 +4,14 @@ use Illuminate\Database\Migrations\Migration; use Illuminate\Database\Schema\Blueprint; use Illuminate\Support\Facades\Schema; -class EnhanceCustomerInfosHashcode extends Migration +return new class extends Migration { /** * Run the migrations. * * @return void */ - public function up() + public function up(): void { Schema::table('customer_infos', function (Blueprint $table) { $table->uuid('hashcode') @@ -24,8 +24,8 @@ class EnhanceCustomerInfosHashcode extends Migration * * @return void */ - public function down() + public function down(): void { // * No need to undo that. } -} +}; diff --git a/phpcs.xml b/phpcs.xml index 80914bd..9cca483 100644 --- a/phpcs.xml +++ b/phpcs.xml @@ -10,6 +10,7 @@ database/seeders routes/ tests/ + */vendor/* @@ -31,8 +32,7 @@ - - + @@ -46,9 +46,6 @@ - - - @@ -81,7 +78,7 @@ - + diff --git a/resources/ts/bo/pages/search-bar.ts b/resources/ts/bo/pages/search-bar.ts index ed8a760..4e9685c 100644 --- a/resources/ts/bo/pages/search-bar.ts +++ b/resources/ts/bo/pages/search-bar.ts @@ -13,6 +13,8 @@ function setupFilterListener(selectId: string, paramKey: FilterKey): void { if (value !== "0") { const url = new URL(location.href); url.searchParams.set(paramKey, value); + url.searchParams.set("page", "1"); + url.searchParams.delete("rstFltrs"); url.searchParams.delete("rstSrts"); location.assign(url.search); } diff --git a/resources/ts/bo/utilities/fontawesome.ts b/resources/ts/bo/utilities/fontawesome.ts index b9557e5..324f67a 100644 --- a/resources/ts/bo/utilities/fontawesome.ts +++ b/resources/ts/bo/utilities/fontawesome.ts @@ -44,6 +44,7 @@ import { faSyncAlt, faTimes, faTrash, + faTriangleExclamation, faUndoAlt, faWandMagic, } from "@fortawesome/free-solid-svg-icons"; @@ -92,6 +93,7 @@ library.add( faArrowUpRightFromSquare, faCommentSlash, faCommentDots, + faTriangleExclamation, ); // Front diff --git a/resources/views/bo/modules/pagination.blade.php b/resources/views/bo/modules/pagination/default.blade.php similarity index 73% rename from resources/views/bo/modules/pagination.blade.php rename to resources/views/bo/modules/pagination/default.blade.php index 13b22fe..52d77a3 100644 --- a/resources/views/bo/modules/pagination.blade.php +++ b/resources/views/bo/modules/pagination/default.blade.php @@ -2,26 +2,7 @@ @php $pagination = intval(Cache::get('pagination.' . str(request()->route()->getName())->slug())); @endphp @if ($paginator->items())