From 556f78d0af1441c14227206e538c3d961be02350 Mon Sep 17 00:00:00 2001 From: Ludovic CANDELLIER Date: Fri, 2 Apr 2021 17:42:26 +0200 Subject: [PATCH] Add filters --- app/Http/Controllers/Shop/Admin/ArticleController.php | 4 +++- .../Controllers/Shop/Admin/PriceGenericController.php | 3 ++- resources/views/Shop/Admin/Articles/list.blade.php | 8 +++++++- .../views/Shop/Admin/Articles/partials/filters.blade.php | 8 ++++++++ resources/views/Shop/Admin/PriceGenerics/list.blade.php | 7 ++++++- .../Shop/Admin/PriceGenerics/partials/filters.blade.php | 8 ++++++++ 6 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 resources/views/Shop/Admin/Articles/partials/filters.blade.php create mode 100644 resources/views/Shop/Admin/PriceGenerics/partials/filters.blade.php diff --git a/app/Http/Controllers/Shop/Admin/ArticleController.php b/app/Http/Controllers/Shop/Admin/ArticleController.php index 4c9cb55b..c8297f50 100644 --- a/app/Http/Controllers/Shop/Admin/ArticleController.php +++ b/app/Http/Controllers/Shop/Admin/ArticleController.php @@ -6,13 +6,15 @@ use Illuminate\Http\Request; use App\Http\Controllers\Controller; use App\Repositories\Shop\Articles; +use App\Repositories\Shop\ArticleFamilies; use App\DataTables\Shop\ArticlesDataTable; class ArticleController extends Controller { public function index(ArticlesDataTable $dataTable) { - return $dataTable->render('Shop.Admin.Articles.list'); + $data['families'] = ArticleFamilies::getOptions(); + return $dataTable->render('Shop.Admin.Articles.list', $data); } public function getDatatable(Request $request) diff --git a/app/Http/Controllers/Shop/Admin/PriceGenericController.php b/app/Http/Controllers/Shop/Admin/PriceGenericController.php index 87fe1d8e..a27bd7ac 100644 --- a/app/Http/Controllers/Shop/Admin/PriceGenericController.php +++ b/app/Http/Controllers/Shop/Admin/PriceGenericController.php @@ -17,7 +17,8 @@ class PriceGenericController extends Controller { public function index(PriceGenericsDataTable $dataTable) { - return $dataTable->render('Shop.Admin.PriceGenerics.list'); + $data['categories'] = PriceGenericCategories::getOptions(); + return $dataTable->render('Shop.Admin.PriceGenerics.list', $data); } public function getDatatable(Request $request) diff --git a/resources/views/Shop/Admin/Articles/list.blade.php b/resources/views/Shop/Admin/Articles/list.blade.php index 3644d2af..0964e221 100644 --- a/resources/views/Shop/Admin/Articles/list.blade.php +++ b/resources/views/Shop/Admin/Articles/list.blade.php @@ -5,5 +5,11 @@ ]) @section('content') - @include('components.datatable', ['route' => route('Shop.Admin.Articles.index'), 'model' => 'articles']) + @include('components.datatable', ['route' => route('Shop.Admin.Articles.index'), 'model' => 'articles', 'with_filters' => true]) + + @component('components.layout.modal', ['title' => 'Filtres', 'id' => 'modal-articles-filters']) + @include('Shop.Admin.Articles.partials.filters') + @endcomponent + @endsection + diff --git a/resources/views/Shop/Admin/Articles/partials/filters.blade.php b/resources/views/Shop/Admin/Articles/partials/filters.blade.php new file mode 100644 index 00000000..13d2310d --- /dev/null +++ b/resources/views/Shop/Admin/Articles/partials/filters.blade.php @@ -0,0 +1,8 @@ +
+
+ +
+ @include('components.select', ['name' => 'family_id', 'list' => (isset($families)) ? $families : [], 'value' => (isset($filters['family_id'])) ? $filters['family_id'] : null, 'class' => 'form-control-sm select2', 'with_empty' => ' ']) +
+
+
diff --git a/resources/views/Shop/Admin/PriceGenerics/list.blade.php b/resources/views/Shop/Admin/PriceGenerics/list.blade.php index 32689abc..4b3033be 100644 --- a/resources/views/Shop/Admin/PriceGenerics/list.blade.php +++ b/resources/views/Shop/Admin/PriceGenerics/list.blade.php @@ -4,5 +4,10 @@ 'breadcrumb' => [__('price_generics.title')] ]) @section('content') - @include('components.datatable', ['route' => route('Shop.Admin.PriceGenerics.index'), 'model' => 'price-generics']) + @include('components.datatable', ['route' => route('Shop.Admin.PriceGenerics.index'), 'model' => 'price-generics', 'with_filters' => true]) + + @component('components.layout.modal', ['title' => 'Filtres', 'id' => 'modal-price-generics-filters']) + @include('Shop.Admin.PriceGenerics.partials.filters') + @endcomponent + @endsection diff --git a/resources/views/Shop/Admin/PriceGenerics/partials/filters.blade.php b/resources/views/Shop/Admin/PriceGenerics/partials/filters.blade.php new file mode 100644 index 00000000..c4fd3bab --- /dev/null +++ b/resources/views/Shop/Admin/PriceGenerics/partials/filters.blade.php @@ -0,0 +1,8 @@ +
+
+ +
+ @include('components.select', ['name' => 'category_id', 'list' => (isset($categories)) ? $categories : [], 'value' => (isset($filters['category_id'])) ? $filters['category_id'] : null, 'class' => 'form-control-sm select2', 'with_empty' => ' ']) +
+
+