From a7881e42618dfc554094252d1b03dda8f72d854e Mon Sep 17 00:00:00 2001
From: Ludovic CANDELLIER <ludo@huma.net>
Date: Tue, 30 Mar 2021 23:06:12 +0200
Subject: [PATCH] fixes

---
 app/DataTables/Shop/UnitiesDataTable.php       |  3 ++-
 .../Shop/Admin/PackageController.php           |  2 +-
 app/Models/Shop/Unity.php                      | 10 ++++++++++
 .../views/Shop/Admin/Packages/form.blade.php   |  1 -
 .../views/components/button-save.blade.php     |  2 +-
 resources/views/load/form/save.blade.php       | 18 ++++++++++++++++++
 routes/Shop/Admin/Packages.php                 |  1 +
 routes/Shop/Admin/Unities.php                  |  1 +
 8 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 resources/views/load/form/save.blade.php

diff --git a/app/DataTables/Shop/UnitiesDataTable.php b/app/DataTables/Shop/UnitiesDataTable.php
index b954509a..cfa3bded 100644
--- a/app/DataTables/Shop/UnitiesDataTable.php
+++ b/app/DataTables/Shop/UnitiesDataTable.php
@@ -12,13 +12,14 @@ class UnitiesDataTable extends DataTable
 
 	public function query(Unity $model)
 	{
-		$model = $model::with(['package'])->select('shop_unities.*');
+		$model = $model::with(['package.article_family'])->select('shop_unities.*');
 		return self::buildQuery($model);
 	}
 
 	protected function getColumns()
 	{
 		return [
+			Column::make('package.article_family.name')->title('Famille'),
 			Column::make('package.value')->title('Package'),
 			Column::make('value')->title('Valeur'),
 			self::makeColumnButtons(),
diff --git a/app/Http/Controllers/Shop/Admin/PackageController.php b/app/Http/Controllers/Shop/Admin/PackageController.php
index 46e6a47f..f7f20c9c 100644
--- a/app/Http/Controllers/Shop/Admin/PackageController.php
+++ b/app/Http/Controllers/Shop/Admin/PackageController.php
@@ -31,7 +31,7 @@ class PackageController extends Controller
 	public function create()
 	{
 		$data['families'] = ArticleFamilies::getOptions();
-		return view('Shop.Admin.Packages.create');
+		return view('Shop.Admin.Packages.create', $data);
 	}
 
 	public function store(Request $request)
diff --git a/app/Models/Shop/Unity.php b/app/Models/Shop/Unity.php
index 5210270f..ad59d77a 100644
--- a/app/Models/Shop/Unity.php
+++ b/app/Models/Shop/Unity.php
@@ -3,9 +3,14 @@
 namespace App\Models\Shop;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+
+use Znck\Eloquent\Traits\BelongsToThrough;
 
 class Unity extends Model
 {
+	use BelongsToThrough, softDeletes;
+
 	protected $guarded = ['id']; 
 	protected $table = 'shop_unities';
 
@@ -14,6 +19,11 @@ class Unity extends Model
 		return $this->belongsTo('App\Models\Shop\Package');
 	}
 
+	public function article_family()
+	{
+		return $this->belongsToThrough('App\Models\Shop\ArticleFamily', 'App\Models\Shop\Package', null, '', ['App\Models\Shop\ArticleFamily' => 'article_family_id', 'App\Models\Shop\Package' => 'package_id']);
+	}
+
 	public function scopeByPackage($query, $id)
 	{
 		return $query->where('package_id', $id);
diff --git a/resources/views/Shop/Admin/Packages/form.blade.php b/resources/views/Shop/Admin/Packages/form.blade.php
index dd081fe7..300625f8 100644
--- a/resources/views/Shop/Admin/Packages/form.blade.php
+++ b/resources/views/Shop/Admin/Packages/form.blade.php
@@ -16,4 +16,3 @@
 		</div>
 	</div>
 </div>
-
diff --git a/resources/views/components/button-save.blade.php b/resources/views/components/button-save.blade.php
index deb88af5..ff14a02d 100644
--- a/resources/views/components/button-save.blade.php
+++ b/resources/views/components/button-save.blade.php
@@ -1 +1 @@
-@include('components.button', ['class' => 'btn-success save ' . ($class ?? ''), 'icon' => 'fa-save', 'txt' =>  __('save')])
+@include('components.button', ['type' => 'submit', 'class' => 'btn-success save ' . ($class ?? ''), 'icon' => 'fa-save', 'txt' =>  __('save')])
diff --git a/resources/views/load/form/save.blade.php b/resources/views/load/form/save.blade.php
new file mode 100644
index 00000000..46b11bc0
--- /dev/null
+++ b/resources/views/load/form/save.blade.php
@@ -0,0 +1,18 @@
+@if(!defined('LOAD_SAVE'))
+	@push('scripts')
+		<script>
+			function initSaveForm(sel, form) {
+				var selector = (typeof(sel) == 'undefined') ? '.save' : sel;
+				var form = (typeof(form) == 'undefined') ? '#form' : form;
+				console.log(selector);
+				console.log(form);
+				$(selector).off().click(function(e) {
+					console.log("ici");
+					e.preventDefault();
+					$(form).submit();
+				});
+			}
+		</script>
+	@endpush
+	@php(define('LOAD_SAVE', true))
+@endif
\ No newline at end of file
diff --git a/routes/Shop/Admin/Packages.php b/routes/Shop/Admin/Packages.php
index e533ca04..de9287ac 100644
--- a/routes/Shop/Admin/Packages.php
+++ b/routes/Shop/Admin/Packages.php
@@ -3,6 +3,7 @@
 Route::prefix('Packages')->name('Packages.')->group(function () { 
 	Route::any('getOptionsByFamily', 'PackageController@getOptionsByFamily')->name('getOptionsByFamily'); 
 	Route::get('edit/{id}', 'PackageController@edit')->name('edit');
+	Route::delete('destroy/{id?}', 'PackageController@destroy')->name('destroy'); 
 });
 
 Route::resource('Packages', 'PackageController');
diff --git a/routes/Shop/Admin/Unities.php b/routes/Shop/Admin/Unities.php
index c087ac03..c6d45840 100644
--- a/routes/Shop/Admin/Unities.php
+++ b/routes/Shop/Admin/Unities.php
@@ -3,6 +3,7 @@
 Route::prefix('Unities')->name('Unities.')->group(function () { 
 	Route::any('getOptionsByPackage', 'UnityController@getOptionsByPackage')->name('getOptionsByPackage'); 
 	Route::get('edit/{id}', 'UnityController@edit')->name('edit');
+	Route::delete('destroy/{id?}', 'UnityController@destroy')->name('destroy'); 
 });
 
 Route::resource('Unities', 'UnityController');