jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2021-10-04 13:49:45 +02:00
parent 9d21f28d9e
commit a7f661ab10
9 changed files with 42 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Datatables/Shop/ArticlesDataTable.php
View File

@@ -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(),
];
}

2
app/Http/Controllers/Admin/Botanic/SpecieController.php
View File

@@ -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);

4
app/Http/Controllers/Admin/Shop/OfferController.php
View File

@@ -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);

14
app/Repositories/Botanic/Species.php
View File

@@ -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);

10
app/Repositories/Shop/Articles.php
View File

@@ -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();