diff --git a/app/Http/Controllers/Bo/BrandController.php b/app/Http/Controllers/Bo/BrandController.php new file mode 100644 index 0000000..2efb73f --- /dev/null +++ b/app/Http/Controllers/Bo/BrandController.php @@ -0,0 +1,51 @@ +search) { + $this->searchQuery( + $query, + $request->search, + null, + 'id', + 'label', + ); + } + + $this->sortQuery($query); + $searchFields = trans('Arcadia id, Label'); + + $brandModels = $this->paginate($query, ItemsPerPaginationEnum::twentyfive); + + return view('bo.pages.brands.index', compact('brandModels', 'searchFields')); + } + + /** + * Display the specified resource. + * + * @param \App\Models\ArcadiaBrand $arcadiaBrand + * @return \Illuminate\Contracts\View\View|\Illuminate\Contracts\View\Factory + */ + public function show(ArcadiaBrand $arcadiaBrand) + { + return view('bo.pages.brands.show', ['brandModel' => $arcadiaBrand]); + } +} diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php index cedbec5..e82c86e 100644 --- a/app/Http/Controllers/Controller.php +++ b/app/Http/Controllers/Controller.php @@ -75,12 +75,12 @@ class Controller extends BaseController sprintf("UPPER(CONCAT(%s)) LIKE UPPER(?)", collect($f)->map(function ($q) use ($table) { return "`$table`.`$q`"; })->implode(', \' \', ')), - ['%' . filter_var($search, FILTER_SANITIZE_STRING) . '%'] + ['%' . preg_replace('/\x00|<[^>]*>?/', '', \strip_tags($search)) . '%'] ); } else { $query->orWhereRaw( "UPPER(`$table`.`$f`) LIKE UPPER(?)", - ['%' . filter_var($search, FILTER_SANITIZE_STRING) . '%'] + ['%' . preg_replace('/\x00|<[^>]*>?/', '', \strip_tags($search)) . '%'] ); } } diff --git a/app/Models/ArcadiaBrand.php b/app/Models/ArcadiaBrand.php index 7de3b9e..661f58b 100644 --- a/app/Models/ArcadiaBrand.php +++ b/app/Models/ArcadiaBrand.php @@ -4,6 +4,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\HasMany; use Rennokki\QueryCache\Traits\QueryCacheable; /** @@ -99,4 +100,14 @@ class ArcadiaBrand extends Model { return $this->belongsToMany(Service::class); } + + /** + * Get all of the xmlIncos for the ArcadiaBrand + * + * @return \Illuminate\Database\Eloquent\Relations\HasMany + */ + public function xmlIncos(): HasMany + { + return $this->hasMany(XmlInco::class); + } } diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 7c71b2f..09e2251 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,6 +2,7 @@ namespace App\Providers; +use Illuminate\Database\Eloquent\Model; use Illuminate\Pagination\Paginator; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\App; @@ -20,6 +21,9 @@ class AppServiceProvider extends ServiceProvider */ public function boot() { + // * Strict Mode + Model::shouldBeStrict(!$this->app->environment('production')); + // * HTTPS FIX URL::forceScheme('https'); diff --git a/resources/lang/en/models.php b/resources/lang/en/models.php index dc2eea9..2bb83a8 100644 --- a/resources/lang/en/models.php +++ b/resources/lang/en/models.php @@ -3,5 +3,6 @@ return [ 'classes' => [ 'users' => 'Users', + 'brands' => 'Brands', ] ]; diff --git a/resources/lang/en/validation.php b/resources/lang/en/validation.php index d3f2d04..8110fbb 100644 --- a/resources/lang/en/validation.php +++ b/resources/lang/en/validation.php @@ -125,5 +125,7 @@ return [ 'publication' => 'Publication', 'updated_at' => 'Updated_at', 'order' => 'Order', + 'label' => 'Label', + 'arcadia_id' => 'Arcadia Id', ], ]; diff --git a/resources/lang/fr/models.php b/resources/lang/fr/models.php index a028f96..65e6a1f 100644 --- a/resources/lang/fr/models.php +++ b/resources/lang/fr/models.php @@ -3,5 +3,6 @@ return [ 'classes' => [ 'users' => 'Utilisateurs', + 'brands' => 'Marques', ] ]; diff --git a/resources/lang/fr/validation.php b/resources/lang/fr/validation.php index f8cf269..abdd231 100644 --- a/resources/lang/fr/validation.php +++ b/resources/lang/fr/validation.php @@ -125,5 +125,7 @@ return [ 'publication' => 'Publication', 'updated_at' => 'Mis à jour le', 'order' => 'Order', + 'label' => 'Libellé', + 'arcadia_id' => 'Id Arcadia', ], ]; diff --git a/resources/views/bo/layouts/nav-list.blade.php b/resources/views/bo/layouts/nav-list.blade.php index ac304f2..2cb46ae 100644 --- a/resources/views/bo/layouts/nav-list.blade.php +++ b/resources/views/bo/layouts/nav-list.blade.php @@ -1,22 +1,28 @@ @auth('backend') -
+ @endauth diff --git a/resources/views/bo/pages/brands/form.blade.php b/resources/views/bo/pages/brands/form.blade.php new file mode 100644 index 0000000..0ca16c7 --- /dev/null +++ b/resources/views/bo/pages/brands/form.blade.php @@ -0,0 +1,51 @@ +| {{ $brandModel->id }} | +{{ $brandModel->label }} | +{{ $brandModel->updated_at }} | +
+
+
+
+
+
+ |
+
| {{ __('list.no_model_found', ['model' => __('models.classes.brands')]) }} | +