diff --git a/app/Http/Controllers/Admin/Shop/TariffUnityController.php b/app/Http/Controllers/Admin/Shop/TariffUnityController.php index 07bd2c64..e7ec849e 100644 --- a/app/Http/Controllers/Admin/Shop/TariffUnityController.php +++ b/app/Http/Controllers/Admin/Shop/TariffUnityController.php @@ -14,20 +14,11 @@ class TariffUnityController extends Controller { public function index(TariffUnitiesDataTable $dataTable) { - $data['families'] = ArticleNatures::getOptions(); - $data['packages'] = Packages::getOptions(); - return $dataTable->render('Admin.Shop.TariffUnities.list', $data); - } - - public function getOptionsByPackage(Request $request) - { - $id = $request->input('package_id'); - return response()->json(TariffUnities::getOptionsByPackage($id)); + return $dataTable->render('Admin.Shop.TariffUnities.list', $data ?? []); } public function create() { - $data['packages'] = Packages::getOptions(); return view('Admin.Shop.TariffUnities.create'); } @@ -45,8 +36,7 @@ class TariffUnityController extends Controller public function edit($id) { - $data['packages'] = Packages::getOptions(); - $data['unity'] = TariffUnities::get($id)->toArray(); + $data['tariff_unity'] = TariffUnities::get($id)->toArray(); return view('Admin.Shop.TariffUnities.edit', $data); } diff --git a/app/Http/Controllers/Admin/Shop/UnityController.php b/app/Http/Controllers/Admin/Shop/UnityController.php index 9b1b5ed6..7053e962 100644 --- a/app/Http/Controllers/Admin/Shop/UnityController.php +++ b/app/Http/Controllers/Admin/Shop/UnityController.php @@ -14,20 +14,16 @@ class UnityController extends Controller { public function index(UnitiesDataTable $dataTable) { - $data['families'] = ArticleNatures::getOptions(); - $data['packages'] = Packages::getOptions(); - return $dataTable->render('Admin.Shop.Unities.list', $data); + return $dataTable->render('Admin.Shop.Unities.list', $data ?? []); } public function getOptionsByPackage(Request $request) { - $id = $request->input('package_id'); return response()->json(Unities::getOptionsByPackage($id)); } public function create() { - $data['packages'] = Packages::getOptions(); return view('Admin.Shop.Unities.create'); } @@ -45,7 +41,6 @@ class UnityController extends Controller public function edit($id) { - $data['packages'] = Packages::getOptions(); $data['unity'] = Unities::get($id)->toArray(); return view('Admin.Shop.Unities.edit', $data); } diff --git a/resources/views/Admin/Shop/TariffUnities/list.blade.php b/resources/views/Admin/Shop/TariffUnities/list.blade.php index e19509e9..071a13e3 100644 --- a/resources/views/Admin/Shop/TariffUnities/list.blade.php +++ b/resources/views/Admin/Shop/TariffUnities/list.blade.php @@ -6,11 +6,7 @@ @section('content') @component('components.card') - @include('components.datatable', ['route' => route('Admin.Shop.TariffUnities.index'), 'model' => 'tariff_unities','with_filters' => true]) - @endcomponent - - @component('components.layout.modal', ['title' => 'Filtres', 'id' => 'modal-tariff_unities-filters']) - @include('Admin.Shop.TariffUnities.partials.filters') + @include('components.datatable', ['route' => route('Admin.Shop.TariffUnities.index'), 'model' => 'tariff_unities', 'with_filters' => false]) @endcomponent @endsection diff --git a/resources/views/Admin/Shop/Unities/index.blade.php b/resources/views/Admin/Shop/Unities/index.blade.php deleted file mode 100644 index 53c0d9e7..00000000 --- a/resources/views/Admin/Shop/Unities/index.blade.php +++ /dev/null @@ -1,48 +0,0 @@ -@extends('layout.index', [ - 'title' => __('shop.unities.title'), - 'subtitle' => __('shop.unities.list'), - 'breadcrumb' => [__('shop.unities.title')] -]) - -@include('boilerplate::load.select2') - -@section('content') - - - -
- -
- @section('content') - @include('components.datatable', ['route' => route('Admin.Shop.Unities.index'), 'model' => 'ArticleAttributefamilies']) - @endsection -
- -
- @section('content') - @component('components.card') - @include('components.datatable', ['route' => route('Admin.Shop.ArticleAttributeValues.index'), 'model' => 'Unities', 'with_filters' => true]) - @endcomponent - - @component('components.layout.modal', ['title' => 'Filtres', 'id' => 'modal-filters']) - @include('Admin.Shop.Unities.partials.filters') - @endcomponent - @endsection -
- -
- -@endsection - -@push('scripts') - @include('components.js.datatable', ['route' => route('Admin.Shop.Unities.index'), 'model' => 'Unities']) -@endpush \ No newline at end of file diff --git a/resources/views/Admin/Shop/Unities/list.blade.php b/resources/views/Admin/Shop/Unities/list.blade.php index f74dcc98..df7035b4 100644 --- a/resources/views/Admin/Shop/Unities/list.blade.php +++ b/resources/views/Admin/Shop/Unities/list.blade.php @@ -6,11 +6,7 @@ @section('content') @component('components.card') - @include('components.datatable', ['route' => route('Admin.Shop.Unities.index'), 'model' => 'unities','with_filters' => true]) - @endcomponent - - @component('components.layout.modal', ['title' => 'Filtres', 'id' => 'modal-unities-filters']) - @include('Admin.Shop.Unities.partials.filters') + @include('components.datatable', ['route' => route('Admin.Shop.Unities.index'), 'model' => 'unities', 'with_filters' => false]) @endcomponent @endsection diff --git a/resources/views/Admin/Shop/Unities/partials/filters.blade.php b/resources/views/Admin/Shop/Unities/partials/filters.blade.php index 46459a48..d37bac4d 100644 --- a/resources/views/Admin/Shop/Unities/partials/filters.blade.php +++ b/resources/views/Admin/Shop/Unities/partials/filters.blade.php @@ -1,14 +1,2 @@
-
- -
- @include('components.form.select', ['name' => 'family_id', 'list' => (isset($families)) ? $families : [], 'value' => (isset($filters['family_id'])) ? $filters['family_id'] : null, 'class' => 'form-control-sm select2', 'with_empty' => ' ']) -
-
-
- -
- @include('components.form.select', ['name' => 'package_id', 'list' => (isset($packages)) ? $packages : [], 'value' => (isset($filters['package_id'])) ? $filters['package_id'] : null, 'class' => 'form-control-sm select2', 'with_empty' => ' ']) -
-