From e370174f94157dbd5a02e28590d7b80cbc3a3989 Mon Sep 17 00:00:00 2001
From: Ludovic CANDELLIER <ludo@huma.net>
Date: Tue, 21 Apr 2020 19:52:11 +0200
Subject: [PATCH] Botanic release

---
 app/Datatables/{ => Botanic}/FamiliesDataTable.php   |  4 ++--
 app/Datatables/{ => Botanic}/GenresDataTable.php     |  4 ++--
 app/Datatables/{ => Botanic}/SpeciesDataTable.php    |  4 ++--
 app/Datatables/{ => Botanic}/VarietiesDataTable.php  |  4 ++--
 .../Controllers/Botanic/Admin/FamilyController.php   |  2 +-
 .../Controllers/Botanic/Admin/GenreController.php    |  2 +-
 .../Controllers/Botanic/Admin/SpecieController.php   |  2 +-
 .../Controllers/Botanic/Admin/VarietyController.php  |  2 +-
 app/Menu/Botanic.php                                 | 10 +++++-----
 app/Menu/Shop.php                                    | 12 ++++++------
 10 files changed, 23 insertions(+), 23 deletions(-)
 rename app/Datatables/{ => Botanic}/FamiliesDataTable.php (92%)
 rename app/Datatables/{ => Botanic}/GenresDataTable.php (92%)
 rename app/Datatables/{ => Botanic}/SpeciesDataTable.php (92%)
 rename app/Datatables/{ => Botanic}/VarietiesDataTable.php (90%)

diff --git a/app/Datatables/FamiliesDataTable.php b/app/Datatables/Botanic/FamiliesDataTable.php
similarity index 92%
rename from app/Datatables/FamiliesDataTable.php
rename to app/Datatables/Botanic/FamiliesDataTable.php
index fe8a50aa..e1984886 100644
--- a/app/Datatables/FamiliesDataTable.php
+++ b/app/Datatables/Botanic/FamiliesDataTable.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\DataTables;
+namespace App\DataTables\Botanic;
 
 use Yajra\DataTables\Html\Column;
 use App\DataTables\ParentDataTable as DataTable;
-use App\Models\Shop\Family;
+use App\Models\Botanic\Family;
 
 class FamiliesDataTable extends DataTable
 {
diff --git a/app/Datatables/GenresDataTable.php b/app/Datatables/Botanic/GenresDataTable.php
similarity index 92%
rename from app/Datatables/GenresDataTable.php
rename to app/Datatables/Botanic/GenresDataTable.php
index 5cdf5faa..4cb5b511 100644
--- a/app/Datatables/GenresDataTable.php
+++ b/app/Datatables/Botanic/GenresDataTable.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\DataTables;
+namespace App\DataTables\Botanic;
 
 use Yajra\DataTables\Html\Column;
 use App\DataTables\ParentDataTable as DataTable;
-use App\Models\Shop\Genre;
+use App\Models\Botanic\Genre;
 
 class GenresDataTable extends DataTable
 {
diff --git a/app/Datatables/SpeciesDataTable.php b/app/Datatables/Botanic/SpeciesDataTable.php
similarity index 92%
rename from app/Datatables/SpeciesDataTable.php
rename to app/Datatables/Botanic/SpeciesDataTable.php
index 87ba1910..308ba84f 100644
--- a/app/Datatables/SpeciesDataTable.php
+++ b/app/Datatables/Botanic/SpeciesDataTable.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\DataTables;
+namespace App\DataTables\Botanic;
 
 use Yajra\DataTables\Html\Column;
 use App\DataTables\ParentDataTable as DataTable;
-use App\Models\Shop\Specie;
+use App\Models\Botanic\Specie;
 
 class SpeciesDataTable extends DataTable
 {
diff --git a/app/Datatables/VarietiesDataTable.php b/app/Datatables/Botanic/VarietiesDataTable.php
similarity index 90%
rename from app/Datatables/VarietiesDataTable.php
rename to app/Datatables/Botanic/VarietiesDataTable.php
index c5bf873d..50e6d5ba 100644
--- a/app/Datatables/VarietiesDataTable.php
+++ b/app/Datatables/Botanic/VarietiesDataTable.php
@@ -1,10 +1,10 @@
 <?php
 
-namespace App\DataTables;
+namespace App\DataTables\Botanic;
 
 use Yajra\DataTables\Html\Column;
 use App\DataTables\ParentDataTable as DataTable;
-use App\Models\Shop\Variety;
+use App\Models\Botanic\Variety;
 
 class VarietiesDataTable extends DataTable
 {
diff --git a/app/Http/Controllers/Botanic/Admin/FamilyController.php b/app/Http/Controllers/Botanic/Admin/FamilyController.php
index b729a6e0..0caf4590 100644
--- a/app/Http/Controllers/Botanic/Admin/FamilyController.php
+++ b/app/Http/Controllers/Botanic/Admin/FamilyController.php
@@ -6,7 +6,7 @@ use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 
 use App\Repositories\Botanic\Families;
-use App\DataTables\FamiliesDataTable;
+use App\DataTables\Botanic\FamiliesDataTable;
 
 class FamilyController extends Controller
 {
diff --git a/app/Http/Controllers/Botanic/Admin/GenreController.php b/app/Http/Controllers/Botanic/Admin/GenreController.php
index 3ca3808b..a935c1cd 100644
--- a/app/Http/Controllers/Botanic/Admin/GenreController.php
+++ b/app/Http/Controllers/Botanic/Admin/GenreController.php
@@ -7,7 +7,7 @@ use App\Http\Controllers\Controller;
 
 use App\Repositories\Botanic\Genres;
 use App\Repositories\Botanic\Families;
-use App\DataTables\GenresDataTable;
+use App\DataTables\Botanic\GenresDataTable;
 
 class GenreController extends Controller
 {
diff --git a/app/Http/Controllers/Botanic/Admin/SpecieController.php b/app/Http/Controllers/Botanic/Admin/SpecieController.php
index 899769ad..7b85d33a 100644
--- a/app/Http/Controllers/Botanic/Admin/SpecieController.php
+++ b/app/Http/Controllers/Botanic/Admin/SpecieController.php
@@ -7,7 +7,7 @@ use App\Http\Controllers\Controller;
 
 use App\Repositories\Botanic\Species;
 use App\Repositories\Botanic\Genres;
-use App\DataTables\SpeciesDataTable;
+use App\DataTables\Botanic\SpeciesDataTable;
 
 class SpecieController extends Controller
 {
diff --git a/app/Http/Controllers/Botanic/Admin/VarietyController.php b/app/Http/Controllers/Botanic/Admin/VarietyController.php
index 6054c386..7b5d3f88 100644
--- a/app/Http/Controllers/Botanic/Admin/VarietyController.php
+++ b/app/Http/Controllers/Botanic/Admin/VarietyController.php
@@ -7,7 +7,7 @@ use App\Http\Controllers\Controller;
 
 use App\Repositories\Botanic\Varieties;
 use App\Repositories\Botanic\Species;
-use App\DataTables\VarietiesDataTable;
+use App\DataTables\Botanic\VarietiesDataTable;
 
 class VarietyController extends Controller
 {
diff --git a/app/Menu/Botanic.php b/app/Menu/Botanic.php
index 43fca2a6..4bef437b 100644
--- a/app/Menu/Botanic.php
+++ b/app/Menu/Botanic.php
@@ -9,18 +9,18 @@ class Botanic
 {
     public function make(Builder $menu)
     {
-        $menu->add('Botanique', [ 'permission' => 'backend', 'icon' => 'envira' ])
+        $menu->add('Botanique', [ 'permission' => 'backend', 'icon' => 'leaf' ])
             ->id('botanic')
             ->activeIfRoute('botanic')
             ->order(2);
 
-        $menu->addTo('Botanic', 'Familles', [ 'route' => 'Botanic.Admin.Families.index', 'permission' => 'backend' ])
+        $menu->addTo('botanic', 'Familles', [ 'route' => 'Botanic.Admin.Families.index', 'permission' => 'backend' ])
             ->activeIfRoute(['Botanic.Admin.Families.index'])->order(1);
-        $menu->addTo('Botanic', 'Genres', [ 'route' => 'Botanic.Admin.Genres.index', 'permission' => 'backend' ])
+        $menu->addTo('botanic', 'Genres', [ 'route' => 'Botanic.Admin.Genres.index', 'permission' => 'backend' ])
             ->activeIfRoute(['Botanic.Admin.Genres.index'])->order(2);
-        $menu->addTo('Botanic', 'Espèces', [ 'route' => 'Botanic.Admin.Species.index', 'permission' => 'backend' ])
+        $menu->addTo('botanic', 'Espèces', [ 'route' => 'Botanic.Admin.Species.index', 'permission' => 'backend' ])
             ->activeIfRoute(['Botanic.Admin.Species.index'])->order(3);
-        $menu->addTo('Botanic', 'Variétés', [ 'route' => 'Botanic.Admin.Varieties.index', 'permission' => 'backend' ])
+        $menu->addTo('botanic', 'Variétés', [ 'route' => 'Botanic.Admin.Varieties.index', 'permission' => 'backend' ])
             ->activeIfRoute(['Botanic.Admin.Varieties.index'])->order(4);
 
     }
diff --git a/app/Menu/Shop.php b/app/Menu/Shop.php
index 7e815188..8346285d 100644
--- a/app/Menu/Shop.php
+++ b/app/Menu/Shop.php
@@ -14,14 +14,14 @@ class Shop
             ->activeIfRoute('shop')
             ->order(1);
 
-        $menu->addTo('shop', 'Categories', [ 'route' => 'Shop.Admin.Sections.index', 'permission' => 'backend' ])
-            ->activeIfRoute(['Shop.Admin.Sections.index'])->order(5);
-        $menu->addTo('shop', 'Produits', [ 'route' => 'Shop.Admin.Products.index', 'permission' => 'backend' ])
-            ->activeIfRoute(['Shop.Admin.Products.index'])->order(6);
+        $menu->addTo('shop', 'Categories', [ 'route' => 'Shop.Admin.Categories.index', 'permission' => 'backend' ])
+            ->activeIfRoute(['Shop.Admin.Categories.index'])->order(1);
+        $menu->addTo('shop', 'Articles', [ 'route' => 'Shop.Admin.Articles.index', 'permission' => 'backend' ])
+            ->activeIfRoute(['Shop.Admin.Articles.index'])->order(2);
         $menu->addTo('shop', 'Commandes', [ 'route' => 'Shop.Admin.Orders.index', 'permission' => 'backend' ])
-            ->activeIfRoute(['Shop.Admin.Orders.index'])->order(7);
+            ->activeIfRoute(['Shop.Admin.Orders.index'])->order(3);
         $menu->addTo('shop', 'Factures', [ 'route' => 'Shop.Admin.Invoices.index', 'permission' => 'backend' ])
-            ->activeIfRoute(['Shop.Admin.Invoices.index'])->order(8);
+            ->activeIfRoute(['Shop.Admin.Invoices.index'])->order(4);
 
     }
 }