diff --git a/app/Console/Commands/migrate.php b/app/Console/Commands/migrate.php index 8443eb5e..773a786c 100644 --- a/app/Console/Commands/migrate.php +++ b/app/Console/Commands/migrate.php @@ -3,10 +3,10 @@ namespace App\Console\Commands; use Illuminate\Console\Command; -use App\Models\Shop\Family; -use App\Models\Shop\Genre; -use App\Models\Shop\Specie; -use App\Models\Shop\Variety; +use App\Models\Botanic\Family; +use App\Models\Botanic\Genre; +use App\Models\Botanic\Specie; +use App\Models\Botanic\Variety; class migrate extends Command { @@ -41,6 +41,18 @@ class migrate extends Command */ public function handle() { + $species = Specie::all(); + foreach ($species as $specie) { + $specie->name = trim($specie->name); + $specie->save(); + } + + $varieties = Variety::all(); + foreach ($varieties as $variety) { + $variety->name = trim($variety->name); + $variety->save(); + } + /* $varieties = Variety::all(); foreach ($varieties as $variety) { @@ -61,6 +73,7 @@ class migrate extends Command } } */ +/* $species = Specie::all(); foreach ($species as $specie) { $genre_name = $specie->genre; @@ -79,7 +92,7 @@ class migrate extends Command dump("Aucun genre"); } } - +*/ /* $genres = Genre::all(); foreach ($genres as $genre) { diff --git a/app/DataTables/Shop/ArticleAttributeFamiliesDataTable.php b/app/DataTables/Shop/ArticleAttributeFamiliesDataTable.php new file mode 100644 index 00000000..8602fec6 --- /dev/null +++ b/app/DataTables/Shop/ArticleAttributeFamiliesDataTable.php @@ -0,0 +1,30 @@ +exportable(false) + ->printable(false) + ->width(120) + ->addClass('text-center'), + ]; + } + +} diff --git a/app/DataTables/Shop/ArticleAttributeValuesDataTable.php b/app/DataTables/Shop/ArticleAttributeValuesDataTable.php new file mode 100644 index 00000000..7ad0a8f4 --- /dev/null +++ b/app/DataTables/Shop/ArticleAttributeValuesDataTable.php @@ -0,0 +1,30 @@ +exportable(false) + ->printable(false) + ->width(120) + ->addClass('text-center'), + ]; + } + +} diff --git a/app/DataTables/Shop/ArticlesDataTable.php b/app/DataTables/Shop/ArticlesDataTable.php index e2dcfed1..41e195d2 100644 --- a/app/DataTables/Shop/ArticlesDataTable.php +++ b/app/DataTables/Shop/ArticlesDataTable.php @@ -19,8 +19,6 @@ class ArticlesDataTable extends DataTable { return [ Column::make('name'), - Column::make('alias'), - Column::make('latin'), Column::computed('action') ->exportable(false) ->printable(false) diff --git a/app/Http/Controllers/Botanic/Admin/VarietyController.php b/app/Http/Controllers/Botanic/Admin/VarietyController.php index 7b5d3f88..56a1f39c 100644 --- a/app/Http/Controllers/Botanic/Admin/VarietyController.php +++ b/app/Http/Controllers/Botanic/Admin/VarietyController.php @@ -21,6 +21,11 @@ class VarietyController extends Controller return Varieties::getDatatable($request->all()); } + public function getOptionsWithSpecie() + { + return response()->json(Varieties::getOptionsWithSpecie()); + } + public function create() { return view('Botanic.Admin.Varieties.create'); diff --git a/app/Http/Controllers/Shop/Admin/ArticleAttributeFamilyController.php b/app/Http/Controllers/Shop/Admin/ArticleAttributeFamilyController.php new file mode 100644 index 00000000..c5e3a35d --- /dev/null +++ b/app/Http/Controllers/Shop/Admin/ArticleAttributeFamilyController.php @@ -0,0 +1,55 @@ +render('Shop.Admin.ArticleAttributeFamilies.list'); + } + + public function getDatatable(Request $request) + { + return ArticleAttributeFamilies::getTables($request->all()); + } + + public function create() + { + return view('Shop.Admin.ArticleAttributeFamilies.create'); + } + + public function store(Request $request) + { + $ret = ArticleAttributeFamilies::store($request->all()); + return redirect()->route('Shop.Admin.ArticleAttributeFamilies.index'); + } + + public function show($id) + { + $data = ArticleAttributeFamilies::get($id); + return view('Shop.Admin.ArticleAttributeFamilies.view', $data); + } + + public function edit($id) + { + $data = ArticleAttributeFamilies::get($id); + return view('Shop.Admin.ArticleAttributeFamilies.edit', $data); + } + + public function update(Request $request) + { + // + } + + public function destroy($id) + { + return ArticleAttributeFamilies::destroy($id); + } + +} diff --git a/app/Http/Controllers/Shop/Admin/ArticleController.php b/app/Http/Controllers/Shop/Admin/ArticleController.php index b680cdf7..28b451e7 100644 --- a/app/Http/Controllers/Shop/Admin/ArticleController.php +++ b/app/Http/Controllers/Shop/Admin/ArticleController.php @@ -6,6 +6,8 @@ use Illuminate\Http\Request; use App\Http\Controllers\Controller; use App\Repositories\Shop\Articles; +use App\Repositories\Shop\ArticleFamilies; +use App\Repositories\Shop\Categories; use App\DataTables\Shop\ArticlesDataTable; class ArticleController extends Controller @@ -23,7 +25,9 @@ class ArticleController extends Controller public function create() { $data = []; - $data['categories'] = Articles::getOptions(); + $data['categories'] = Categories::getOptions(); + $data['families'] = ArticleFamilies::getOptions(); + $data['models'] = ['App\Models\Botanic\Specie' => 'Espèces', 'App\Models\Botanic\Variety' => 'Variétés']; return view('Shop.Admin.Articles.create', $data); } diff --git a/app/Repositories/Botanic/Species.php b/app/Repositories/Botanic/Species.php index 243ee5b7..b50f184a 100644 --- a/app/Repositories/Botanic/Species.php +++ b/app/Repositories/Botanic/Species.php @@ -22,7 +22,7 @@ class Species public static function getOptions() { return Specie::get()->SortBy('name')->pluck('name','id')->toArray(); - } + } public static function getAll() { diff --git a/app/Repositories/Botanic/Varieties.php b/app/Repositories/Botanic/Varieties.php index 28fd13d2..f7745a09 100644 --- a/app/Repositories/Botanic/Varieties.php +++ b/app/Repositories/Botanic/Varieties.php @@ -19,6 +19,22 @@ class Varieties return Datatables::of($model)->make(true); } + public static function getOptions() + { + return Variety::orderBy('name')->get()->pluck('name','id')->toArray(); + } + + public static function getOptionsWithSpecie() + { + $varieties = Variety::with('specie')->get(); + $data = []; + foreach ($varieties as $variety) + { + $data[] = ['id' => $variety->id, 'text' => (isset($variety->specie->name) ? $variety->specie->name . ' ' : '') . $variety->name]; + } + return collect($data)->sortBy('text')->values()->all(); + } + public static function getAll() { return Variety::orderBy('name','asc')->get(); diff --git a/app/Repositories/Shop/ArticleFamilies.php b/app/Repositories/Shop/ArticleFamilies.php index 00a42d6c..ca55a6aa 100644 --- a/app/Repositories/Shop/ArticleFamilies.php +++ b/app/Repositories/Shop/ArticleFamilies.php @@ -15,6 +15,11 @@ class ArticleFamilies return Datatables::of($model)->make(true); } + public static function getOptions() + { + return ArticleFamily::get()->pluck('name','id')->toArray(); + } + public static function getAll() { return ArticleFamily::orderBy('name','asc')->get(); diff --git a/build/js/include/set_options.js b/build/js/include/set_options.js index 581a2e9b..590e0b88 100644 --- a/build/js/include/set_options.js +++ b/build/js/include/set_options.js @@ -6,7 +6,7 @@ function setOptions(selector,data,selected,all) { $el.append($("").attr("value",'').text('Tous')); } $.each(data, function(key, name) { - // console.log(name); + console.log(name); if (key != null) { if (key == selected) { $el.append($("").attr("value", key).text(name)); diff --git a/package.json b/package.json index 5662fa8e..5e2e908c 100644 --- a/package.json +++ b/package.json @@ -72,7 +72,6 @@ "dropzone": "^5.5.1", "easy-pie-chart": "^2.1.7", "es6-promise": "^4.2.8", - "fancytree": "^0.0.0", "font-awesome": "^4.7.0", "formBuilder": "^3.2.3", "fullcalendar": "^3.10.1", @@ -103,6 +102,7 @@ "jquery.are-you-sure": "^1.9.0", "jquery.cookie": "^1.4.1", "jquery.documentsize": "^1.2.5", + "jquery.fancytree": "^2.35.0", "jquery.filer": "^1.3.0", "jquery.nicescroll": "^3.7.6", "jquery.quicksearch": "^2.4.0", diff --git a/resources/lang/fr/shop.php b/resources/lang/fr/shop.php index 9951e8aa..22ac9199 100644 --- a/resources/lang/fr/shop.php +++ b/resources/lang/fr/shop.php @@ -21,12 +21,26 @@ return [ ], 'articles' => [ 'title' => 'Articles', - 'list' => 'Liste des articles', 'description' => 'Gérer les articles', + 'add' => 'Ajouter un article', + 'edit' => 'Editer un article', + 'del' => 'Effacer u article', + 'list' => 'Liste des articles', + 'successadd' => 'L\'article été correctement ajouté', + 'successmod' => 'L\'article a été correctement modifié', + 'successdel' => 'L\'article a été correctement effacé', + 'confirmdelete' => 'Confirmez-vous la suppression de l\'article ?', ], 'customers' => [ 'title' => "Clients", - 'list' => 'Liste des clients', 'description' => 'Gérer les clients', + 'add' => 'Ajouter un client', + 'edit' => 'Editer un client', + 'del' => 'Effacer un client', + 'list' => 'Liste des articles', + 'successadd' => 'Le client a été correctement ajouté', + 'successmod' => 'Le client a été correctement modifié', + 'successdel' => 'Le client a été correctement effacé', + 'confirmdelete' => 'Confirmez-vous la suppression du client ?', ], ]; diff --git a/resources/views/Shop/Admin/ArticleAttributeFamilies/create.blade.php b/resources/views/Shop/Admin/ArticleAttributeFamilies/create.blade.php new file mode 100644 index 00000000..53d5e646 --- /dev/null +++ b/resources/views/Shop/Admin/ArticleAttributeFamilies/create.blade.php @@ -0,0 +1,28 @@ +@extends('layout.index', [ + 'title' => __('article_families.title'), + 'subtitle' => __('article_families.create.title'), + 'breadcrumb' => [__('article_families.title'), __('article_families.create.title')] +]) + +@include('boilerplate::load.fileinput') + +@section('content') + + {{ Form::open(['route' => 'Shop.Admin.ArticleFamilies.store', 'id' => 'article-family-form', 'autocomplete' => 'off', 'files' => true]) }} + +