From 0f23d5cd5632a41faf4ac4d5013044d62f0b2ebb Mon Sep 17 00:00:00 2001 From: Ludovic CANDELLIER Date: Mon, 4 Oct 2021 13:49:45 +0200 Subject: [PATCH] fixes --- app/Datatables/Shop/ArticlesDataTable.php | 4 ++-- .../Admin/Botanic/SpecieController.php | 2 +- .../Controllers/Admin/Shop/OfferController.php | 4 ++-- app/Repositories/Botanic/Species.php | 14 ++++++++++++++ app/Repositories/Shop/Articles.php | 10 ++++++++++ .../views/Admin/Botanic/Species/form.blade.php | 2 +- resources/views/Admin/Shop/Offers/form.blade.php | 2 +- .../views/Admin/Shop/Tariffs/form.blade.php | 2 +- resources/views/load/form/select2.blade.php | 16 ++++++++++------ 9 files changed, 42 insertions(+), 14 deletions(-) diff --git a/app/Datatables/Shop/ArticlesDataTable.php b/app/Datatables/Shop/ArticlesDataTable.php index 4c94e23a..93b0a85c 100644 --- a/app/Datatables/Shop/ArticlesDataTable.php +++ b/app/Datatables/Shop/ArticlesDataTable.php @@ -30,8 +30,8 @@ class ArticlesDataTable extends DataTable return [ Column::make('article_nature.name')->title('Nature'), Column::make('name')->title('Nom'), - Column::make('tags_count')->title('Tags')->class('text-right'), - Column::make('categories_count')->title('Rayons')->class('text-right'), + Column::make('tags_count')->title('Tags')->class('text-right')->searchable(false), + Column::make('categories_count')->title('Rayons')->class('text-right')->searchable(false), self::makeColumnButtons(), ]; } diff --git a/app/Http/Controllers/Admin/Botanic/SpecieController.php b/app/Http/Controllers/Admin/Botanic/SpecieController.php index 1ea4de42..f24eea11 100644 --- a/app/Http/Controllers/Admin/Botanic/SpecieController.php +++ b/app/Http/Controllers/Admin/Botanic/SpecieController.php @@ -48,7 +48,7 @@ class SpecieController extends Controller public function edit($id) { - $data['specie'] = Species::get($id); + $data['specie'] = Species::getFull($id); $data['genres'] = Genres::getOptions(); $data['tags_list'] = TagGroups::getTreeTags(); return view('Admin.Botanic.Species.edit', $data); diff --git a/app/Http/Controllers/Admin/Shop/OfferController.php b/app/Http/Controllers/Admin/Shop/OfferController.php index 44bd1abf..cf872950 100644 --- a/app/Http/Controllers/Admin/Shop/OfferController.php +++ b/app/Http/Controllers/Admin/Shop/OfferController.php @@ -20,7 +20,7 @@ class OfferController extends Controller public function create() { - $data['articles'] = Articles::getOptions(); + $data['articles'] = Articles::getOptionsWithNature(); $data['tariffs'] = Tariffs::getOptions(); $data['variations'] = Variations::getOptions(); return view('Admin.Shop.Offers.create', $data); @@ -29,7 +29,7 @@ class OfferController extends Controller public function edit($id) { $data['offer'] = Offers::get($id)->toArray(); - $data['articles'] = Articles::getOptions(); + $data['articles'] = Articles::getOptionsWithNature(); $data['tariffs'] = Tariffs::getOptions(); $data['variations'] = Variations::getOptions(); return view('Admin.Shop.Offers.edit', $data); diff --git a/app/Repositories/Botanic/Species.php b/app/Repositories/Botanic/Species.php index 3c976aa7..d9526132 100644 --- a/app/Repositories/Botanic/Species.php +++ b/app/Repositories/Botanic/Species.php @@ -36,6 +36,20 @@ class Species return self::get($id)->tags->toArray(); } + public static function getFull($id) + { + $specie = self::get($id); + $data = $specie->toArray(); + $data['tags'] = self::getTagsBySpecie($specie); + return $data; + } + + public static function getTagsBySpecie($specie) + { + return Tag::getTagsByModel($specie); + } + + public static function get($id) { return Specie::findOrFail($id); diff --git a/app/Repositories/Shop/Articles.php b/app/Repositories/Shop/Articles.php index 05898d1f..0343e140 100644 --- a/app/Repositories/Shop/Articles.php +++ b/app/Repositories/Shop/Articles.php @@ -28,6 +28,16 @@ class Articles return Article::orderBy('name','asc')->pluck('name','id')->toArray(); } + public static function getOptionsWithNature() + { + $articles = Article::with(['article_nature'])->get(); + foreach ($articles as $article) { + $data[$article->id] = $article->article_nature->name . ' - ' . $article->name; + } + asort($data, SORT_NATURAL); + return $data; + } + public static function getAll() { return Article::orderBy('name', 'asc')->get(); diff --git a/resources/views/Admin/Botanic/Species/form.blade.php b/resources/views/Admin/Botanic/Species/form.blade.php index 5e8a29ae..9be36c89 100644 --- a/resources/views/Admin/Botanic/Species/form.blade.php +++ b/resources/views/Admin/Botanic/Species/form.blade.php @@ -29,7 +29,7 @@
{{ Form::label('tags', 'Tags') }} - @include('components.select-tree', ['name' => 'tags[]', 'list' => $tags_list, 'values' => $tags ?? null, 'class' => 'select2 form-control', 'multiple' => true]) + @include('components.select-tree', ['name' => 'tags[]', 'list' => $tags_list, 'values' => $specie['tags'] ?? null, 'class' => 'select2 form-control', 'multiple' => true])
diff --git a/resources/views/Admin/Shop/Offers/form.blade.php b/resources/views/Admin/Shop/Offers/form.blade.php index 1a8d38bc..0cf72450 100644 --- a/resources/views/Admin/Shop/Offers/form.blade.php +++ b/resources/views/Admin/Shop/Offers/form.blade.php @@ -31,7 +31,7 @@
@component('components.card', ['title' => 'Disponibilité'])
-
+
{{ Form::label('stock_current', 'Appro immédiate') }} @include('components.money', ['name' => 'stock_current', 'value' => $offer['stock_current'] ?? 0])
diff --git a/resources/views/Admin/Shop/Tariffs/form.blade.php b/resources/views/Admin/Shop/Tariffs/form.blade.php index ff1bdfa9..687e69eb 100644 --- a/resources/views/Admin/Shop/Tariffs/form.blade.php +++ b/resources/views/Admin/Shop/Tariffs/form.blade.php @@ -2,7 +2,7 @@
{{ Form::open(['route' => 'Admin.Shop.Tariffs.store', 'id' => 'tariffs-form', 'autocomplete' => 'off']) }} - +
diff --git a/resources/views/load/form/select2.blade.php b/resources/views/load/form/select2.blade.php index c7641ee7..9a3898c1 100644 --- a/resources/views/load/form/select2.blade.php +++ b/resources/views/load/form/select2.blade.php @@ -1,23 +1,27 @@ @if(!defined('LOAD_SELECT2')) @push('scripts') - - + + @endpush @push('css') - + @endpush @php(define('LOAD_SELECT2', true)) @endif \ No newline at end of file