diff --git a/app/DataTables/Shop/ArticleAttributeFamiliesDataTable.php b/app/DataTables/Shop/ArticleAttributeFamiliesDataTable.php
deleted file mode 100644
index 9f53114f..00000000
--- a/app/DataTables/Shop/ArticleAttributeFamiliesDataTable.php
+++ /dev/null
@@ -1,29 +0,0 @@
-title('Nom'),
- Column::make('values_count')->title('Nb attributs')->searchable(false)->addClass('text-right'),
- Column::make('articles_count')->title('Nb d\'articles')->searchable(false)->addClass('text-right'),
- self::makeColumnButtons(),
- ];
- }
-
-}
diff --git a/app/DataTables/Shop/PriceGenericCategoriesDataTable.php b/app/DataTables/Shop/PriceGenericCategoriesDataTable.php
index b96c9d90..826e5358 100644
--- a/app/DataTables/Shop/PriceGenericCategoriesDataTable.php
+++ b/app/DataTables/Shop/PriceGenericCategoriesDataTable.php
@@ -10,7 +10,7 @@ class PriceGenericCategoriesDataTable extends DataTable
{
public $model_name = 'price-generics';
- public function query(PriceGeneric $model)
+ public function query(PriceGenericCategory $model)
{
return self::buildQuery($model);
}
diff --git a/resources/views/Shop/Admin/ArticleFamilies/create.blade.php b/resources/views/Shop/Admin/ArticleFamilies/create.blade.php
index 53d5e646..d381a410 100644
--- a/resources/views/Shop/Admin/ArticleFamilies/create.blade.php
+++ b/resources/views/Shop/Admin/ArticleFamilies/create.blade.php
@@ -9,19 +9,6 @@
@section('content')
{{ Form::open(['route' => 'Shop.Admin.ArticleFamilies.store', 'id' => 'article-family-form', 'autocomplete' => 'off', 'files' => true]) }}
-
-
-
@include('Shop.Admin.ArticleFamilies.form')
diff --git a/resources/views/Shop/Admin/ArticleFamilies/edit.blade.php b/resources/views/Shop/Admin/ArticleFamilies/edit.blade.php
index ab132b06..efcc0d09 100644
--- a/resources/views/Shop/Admin/ArticleFamilies/edit.blade.php
+++ b/resources/views/Shop/Admin/ArticleFamilies/edit.blade.php
@@ -9,19 +9,6 @@
@section('content')
{{ Form::open(['route' => 'Shop.Admin.ArticleFamilies.update', 'id' => 'article-family-form', 'autocomplete' => 'off', 'files' => true]) }}
-
-
-
@include('Shop.Admin.ArticleFamilies.form')
diff --git a/resources/views/Shop/Admin/ArticleFamilies/form.blade.php b/resources/views/Shop/Admin/ArticleFamilies/form.blade.php
index d6a4b4c7..d6f1723e 100644
--- a/resources/views/Shop/Admin/ArticleFamilies/form.blade.php
+++ b/resources/views/Shop/Admin/ArticleFamilies/form.blade.php
@@ -1,29 +1,22 @@
@include('boilerplate::load.tinymce')
-
{{ Form::label('name', 'Nom') }}
@include('components.input', ['name' => 'name', 'value' => (isset($family['name'])) ? $family['name'] : null, 'required' => true])
{{ Form::label('description', 'Description') }}
- @include('components.textarea', ['name' => 'description', 'value' => isset($description) ? $description : null, 'class' => 'editor', 'required' => false])
+ @include('components.textarea', ['name' => 'description', 'value' => isset($family['description']) ? $family['description'] : null, 'class' => 'editor', 'required' => false])
-
-
-
- @include('components.button-save')
-
-
-
+@include('components.save')
@push('js')
-
+
@endpush
\ No newline at end of file
diff --git a/resources/views/Shop/Admin/Tags/list.blade.php b/resources/views/Shop/Admin/Tags/list.blade.php
index deaa18b8..9d73a82d 100644
--- a/resources/views/Shop/Admin/Tags/list.blade.php
+++ b/resources/views/Shop/Admin/Tags/list.blade.php
@@ -7,15 +7,3 @@
@section('content')
@include('components.datatable', ['route' => route('Shop.Admin.Tags.index'), 'model' => 'tags'])
@endsection
-
-
-@push('scripts')
-
-
-
- @include('components.js.datatable', ['route' => route('Shop.Admin.Tags.index'), 'model' => 'tags'])
-@endpush
\ No newline at end of file