fixes

app/DataTables/Shop/PackagesDataTable.php

@@ -0,0 +1,28 @@
+<?php
+
+namespace App\DataTables\Shop;
+
+use Yajra\DataTables\Html\Column;
+use App\DataTables\ParentDataTable as DataTable;
+use App\Models\Shop\Package;
+
+class PackagesDataTable extends DataTable
+{
+	public $model_name = 'packages';
+
+	public function query(Package $model)
+	{
+		$model = $model::with(['article_family'])->select('shop_packages.*');
+		return self::buildQuery($model);
+	}
+
+	protected function getColumns()
+	{
+		return [
+			Column::make('article_family.name')->title('Famille d\'articles'),
+			Column::make('value')->title('Valeur'),
+			self::makeColumnButtons(),
+		];
+	}
+
+}

app/DataTables/Shop/UnitiesDataTable.php

@@ -8,19 +8,19 @@ use App\Models\Shop\Unity;
 
 class UnitiesDataTable extends DataTable
 {
-	public $model_name = 'Unity';
+	public $model_name = 'unities';
 
 	public function query(Unity $model)
 	{
-		$model = $model::with(['price_family']);
+		$model = $model::with(['package'])->select('shop_unities.*');
 		return self::buildQuery($model);
 	}
 
 	protected function getColumns()
 	{
 		return [
-			Column::make('value')->title('Attributs'),
-			Column::make('price_family.name')->title('Famille')->orderable(false),
+			Column::make('package.value')->title('Package'),
+			Column::make('value')->title('Valeur'),
 			self::makeColumnButtons(),
 		];
 	}

app/Http/Controllers/Shop/Admin/PackageController.php

@@ -30,6 +30,7 @@ class PackageController extends Controller
 
 	public function create()
 	{
+		$data['families'] = ArticleFamilies::getOptions();
 		return view('Shop.Admin.Packages.create');
 	}
 
@@ -47,7 +48,8 @@ class PackageController extends Controller
 
 	public function edit($id)
 	{
-		$data = Packages::get($id);
+		$data['package'] = Packages::get($id);
+		$data['families'] = ArticleFamilies::getOptions();
 		return view('Shop.Admin.Packages.edit', $data);
 	}
 

app/Http/Controllers/Shop/Admin/UnityController.php

@@ -5,7 +5,7 @@ namespace App\Http\Controllers\Shop\Admin;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 
-use App\Repositories\Shop\ArticleFamilies;
+use App\Repositories\Shop\Packages;
 use App\Repositories\Shop\Unities;
 use App\DataTables\Shop\UnitiesDataTable;  
 
@@ -13,7 +13,7 @@ class UnityController extends Controller
 {
 	public function index(UnitiesDataTable $dataTable)
 	{
-		$data['families'] = ArticleFamilies::getOptions();
+		$data['packages'] = Packages::getOptions();
 		return $dataTable->render('Shop.Admin.Unities.list', $data);
 	}
 
@@ -30,6 +30,7 @@ class UnityController extends Controller
 
 	public function create()
 	{
+		$data['packages'] = Packages::getOptions();
 		return view('Shop.Admin.Unities.create');
 	}
 
@@ -47,7 +48,8 @@ class UnityController extends Controller
 
 	public function edit($id)
 	{
-		$data = Unities::get($id);
+		$data['packages'] = Packages::getOptions();
+		$data['unity'] = Unities::get($id)->toArray();
 		return view('Shop.Admin.Unities.edit', $data);
 	}
 

app/Menu/Shop.php

@@ -36,6 +36,12 @@ class Shop
   */
         $menu->addTo('shop', 'Prix génériques', [ 'route' => 'Shop.Admin.PriceGenerics.index', 'permission' => 'backend_access' ])
             ->activeIfRoute(['Shop.Admin.PriceGenerics.*'])->order(10);
+
+        $menu->addTo('shop', 'Packages', [ 'route' => 'Shop.Admin.Packages.index', 'permission' => 'backend_access' ])
+            ->activeIfRoute(['Shop.Admin.Packages.*'])->order(12);
+
+        $menu->addTo('shop', 'Unités', [ 'route' => 'Shop.Admin.Unities.index', 'permission' => 'backend_access' ])
+            ->activeIfRoute(['Shop.Admin.Unities.*'])->order(14);
         
 
     }

app/Models/Shop/Package.php

@@ -14,6 +14,11 @@ class Package extends Model
 		return $this->belongsTo('App\Models\Shop\ArticleFamily');
 	}
 
+	public function unities()
+	{
+		return $this->hasMany('App\Models\Shop\Unity');
+	}
+
 	public function scopeByFamily($query, $id)
 	{
 		return $query->where('article_family_id', $id);