From 476165640584f713bc4f3aad9c87aee495a0b63d Mon Sep 17 00:00:00 2001
From: Ludovic CANDELLIER <ludovic.candellier@fundglobam.com>
Date: Thu, 4 Nov 2021 16:37:42 +0100
Subject: [PATCH] Fix

---
 app/Datatables/ParentDataTable.php            |  1 +
 app/Datatables/Shop/OffersDataTable.php       |  2 +-
 app/Datatables/Shop/VariationsDataTable.php   |  8 ++++++
 .../Shop/ArticleNatures/create.blade.php      |  2 +-
 .../Admin/Shop/ArticleNatures/edit.blade.php  |  2 +-
 .../Admin/Shop/ArticleNatures/form.blade.php  | 25 +++++++++++++------
 .../views/Admin/Shop/Packages/form.blade.php  | 10 ++++++++
 .../PriceLists/partials/filters.blade.php     |  2 +-
 .../views/Admin/Shop/Unities/form.blade.php   | 18 +++++++------
 .../Admin/Shop/Variations/create.blade.php    |  4 +--
 .../Admin/Shop/Variations/edit.blade.php      |  8 +++---
 .../Admin/Shop/Variations/form.blade.php      |  2 ++
 12 files changed, 59 insertions(+), 25 deletions(-)

diff --git a/app/Datatables/ParentDataTable.php b/app/Datatables/ParentDataTable.php
index 629bdd87..a3424e9b 100644
--- a/app/Datatables/ParentDataTable.php
+++ b/app/Datatables/ParentDataTable.php
@@ -97,6 +97,7 @@ class ParentDataTable extends DataTable
      */
     public function buildQuery($model)
     {
+        // $model = $model->select($model->getTable() . '.*');
         return $model->newQuery();
     }
     
diff --git a/app/Datatables/Shop/OffersDataTable.php b/app/Datatables/Shop/OffersDataTable.php
index d3216dc5..15ccd27e 100644
--- a/app/Datatables/Shop/OffersDataTable.php
+++ b/app/Datatables/Shop/OffersDataTable.php
@@ -12,7 +12,7 @@ class OffersDataTable extends DataTable
 
     public function query(Offer $model)
     {
-        $model = $model->with(['article.article_nature', 'variation', 'tariff']);
+        $model = $model->with(['article.article_nature', 'variation', 'tariff'])->select($model->getTable() . '.*');
         $model = self::filterByArticleNature($model);
         $model = self::filterByPackage($model);
         return $this->buildQuery($model);
diff --git a/app/Datatables/Shop/VariationsDataTable.php b/app/Datatables/Shop/VariationsDataTable.php
index adf3c6c5..45d977a0 100644
--- a/app/Datatables/Shop/VariationsDataTable.php
+++ b/app/Datatables/Shop/VariationsDataTable.php
@@ -16,6 +16,14 @@ class VariationsDataTable extends DataTable
         return $this->buildQuery($model);
     }
 
+    public function modifier($datatables)
+    {
+        $datatables
+            ->rawColumns(['description','action'])
+        ;
+        return parent::modifier($datatables);
+    } 
+
     protected function getColumns()
     {
         return [
diff --git a/resources/views/Admin/Shop/ArticleNatures/create.blade.php b/resources/views/Admin/Shop/ArticleNatures/create.blade.php
index 6bfaa2af..56bc28f1 100644
--- a/resources/views/Admin/Shop/ArticleNatures/create.blade.php
+++ b/resources/views/Admin/Shop/ArticleNatures/create.blade.php
@@ -8,7 +8,7 @@
 
 @section('content')
 
-	{{ Form::open(['route' => 'Admin.Shop.ArticleNatures.store', 'id' => 'article-nature-form', 'autocomplete' => 'off', 'files' => true]) }}
+	{{ Form::open(['route' => 'Admin.Shop.ArticleNatures.store', 'id' => 'article_nature-form', 'autocomplete' => 'off', 'files' => true]) }}
 		@include('Admin.Shop.ArticleNatures.form')
 	</form>
 
diff --git a/resources/views/Admin/Shop/ArticleNatures/edit.blade.php b/resources/views/Admin/Shop/ArticleNatures/edit.blade.php
index 4cb152db..63059b3d 100644
--- a/resources/views/Admin/Shop/ArticleNatures/edit.blade.php
+++ b/resources/views/Admin/Shop/ArticleNatures/edit.blade.php
@@ -8,7 +8,7 @@
 
 @section('content')
 
-	{{ Form::open(['route' => 'Admin.Shop.ArticleNatures.update', 'id' => 'article-nature-form', 'autocomplete' => 'off', 'files' => true]) }}
+	{{ Form::open(['route' => 'Admin.Shop.ArticleNatures.update', 'id' => 'article_nature-form', 'autocomplete' => 'off', 'files' => true]) }}
 		<input type="hidden" name="id" value="{{ $article_nature['id'] }}">
 		@include('Admin.Shop.ArticleNatures.form')
 	</form>
diff --git a/resources/views/Admin/Shop/ArticleNatures/form.blade.php b/resources/views/Admin/Shop/ArticleNatures/form.blade.php
index 743f8191..2574d410 100644
--- a/resources/views/Admin/Shop/ArticleNatures/form.blade.php
+++ b/resources/views/Admin/Shop/ArticleNatures/form.blade.php
@@ -1,22 +1,31 @@
-@include('boilerplate::load.tinymce')
-
 <div class="row">
 	<div class="col-md-8">
-		{{ Form::label('name', 'Nom') }}
-		@include('components.form.input', ['name' => 'name', 'value' => $article_nature['name'] ?? null, 'required' => true])
-
-		{{ Form::label('description', 'Description') }}
-		@include('components.form.textarea', ['name' => 'description', 'value' => $article_nature['description'] ?? null, 'class' => 'editor', 'required' => false])		
+		<div class="row mb-3">
+			<div class="col-12">
+				{{ Form::label('name', 'Nom') }}
+				@include('components.form.input', ['name' => 'name', 'value' => $article_nature['name'] ?? null, 'required' => true])
+			</div>
+		</div>
 
+		<div class="row mb-3">
+			<div class="col-12">
+				{{ Form::label('description', 'Description') }}
+				@include('components.form.textarea', ['name' => 'description', 'value' => $article_nature['description'] ?? null, 'class' => 'editor', 'required' => false])		
+			</div>
+		</div>
 	</div>
 </div>
 
 @include('components.save')
 
+@include('load.form.editor')
+@include('load.form.save')
+
 @push('js')
 	<script>
 		$(function() {
-			$('.editor').tinymce({});
+			initEditor();
+			initSaveForm('#article_nature-form');
 		});
 	</script>
 @endpush
\ No newline at end of file
diff --git a/resources/views/Admin/Shop/Packages/form.blade.php b/resources/views/Admin/Shop/Packages/form.blade.php
index 690f39ca..b1f01c78 100644
--- a/resources/views/Admin/Shop/Packages/form.blade.php
+++ b/resources/views/Admin/Shop/Packages/form.blade.php
@@ -7,3 +7,13 @@
 </div>
 
 @include('components.save')
+
+@include('load.form.save')
+
+@push('js')
+	<script>
+		$(function() {
+			initSaveForm('#package-form');
+		});
+	</script>
+@endpush
\ No newline at end of file
diff --git a/resources/views/Admin/Shop/PriceLists/partials/filters.blade.php b/resources/views/Admin/Shop/PriceLists/partials/filters.blade.php
index 13f66a55..14e13557 100644
--- a/resources/views/Admin/Shop/PriceLists/partials/filters.blade.php
+++ b/resources/views/Admin/Shop/PriceLists/partials/filters.blade.php
@@ -1,3 +1,3 @@
 <form id="{{ $model }}-filters">
-	<input type="text" name="tariff_id" value="{{ $tariff['id'] ?? false }}">
+	<input type="hidden" name="tariff_id" value="{{ $tariff['id'] ?? false }}">
 </form>
diff --git a/resources/views/Admin/Shop/Unities/form.blade.php b/resources/views/Admin/Shop/Unities/form.blade.php
index 648b54d6..256ad3b6 100644
--- a/resources/views/Admin/Shop/Unities/form.blade.php
+++ b/resources/views/Admin/Shop/Unities/form.blade.php
@@ -5,10 +5,14 @@
 	</div>
 </div>
 
-<div class="row">
-	<div class="col-md-8">
-		<div class="float-right mt-3">
-			@include('components.form.buttons.button-save')
-		</div>
-	</div>
-</div>
+@include('components.save')
+
+@include('load.form.save')
+
+@push('js')
+	<script>
+		$(function() {
+			initSaveForm('#unity-form');
+		});
+	</script>
+@endpush
\ No newline at end of file
diff --git a/resources/views/Admin/Shop/Variations/create.blade.php b/resources/views/Admin/Shop/Variations/create.blade.php
index 9d1aad7a..afdf67b8 100644
--- a/resources/views/Admin/Shop/Variations/create.blade.php
+++ b/resources/views/Admin/Shop/Variations/create.blade.php
@@ -1,14 +1,14 @@
 @extends('layout.index', [
 	'title' => __('shop.variations.title'),
 	'subtitle' => __('shop.variations.add'),
-	'breadcrumb' => [__('shop.variations.title'), __('shop.variations.add')]
+	'breadcrumb' => [__('shop.variations.title'), __('shop.variations.index')]
 ])
 
 @include('boilerplate::load.fileinput')
 
 @section('content')
 
-	{{ Form::open(['route' => 'Admin.Shop.Variations.store', 'id' => 'article-family-form', 'autocomplete' => 'off']) }}
+	{{ Form::open(['route' => 'Admin.Shop.Variations.store', 'id' => 'variation-form', 'autocomplete' => 'off']) }}
 		@include('Admin.Shop.Variations.form')
 	</form>
 
diff --git a/resources/views/Admin/Shop/Variations/edit.blade.php b/resources/views/Admin/Shop/Variations/edit.blade.php
index 9ef19430..b9f88a39 100644
--- a/resources/views/Admin/Shop/Variations/edit.blade.php
+++ b/resources/views/Admin/Shop/Variations/edit.blade.php
@@ -1,11 +1,11 @@
 @extends('layout.index', [
-	'title' => 'Famille d\'articles',
-	'subtitle' => 'Edition d\'une famille d\'article',
-	'breadcrumb' => ['Articles']
+	'title' => __('shop.variations.title'),
+	'subtitle' => __('shop.variations.edit'),
+	'breadcrumb' => [__('shop.variations.title'), __('shop.variations.index')]
 ])
 
 @section('content')
-	{{ Form::open(['route' => 'Admin.Shop.Variations.store', 'id' => 'article-family-form', 'autocomplete' => 'off']) }}
+	{{ Form::open(['route' => 'Admin.Shop.Variations.store', 'id' => 'variation-form', 'autocomplete' => 'off']) }}
 		<input type="hidden" name="id" value="{{ $variation['id'] }}">
 		@include('Admin.Shop.Variations.form')
 	</form>
diff --git a/resources/views/Admin/Shop/Variations/form.blade.php b/resources/views/Admin/Shop/Variations/form.blade.php
index 79f8e96b..0335ace1 100644
--- a/resources/views/Admin/Shop/Variations/form.blade.php
+++ b/resources/views/Admin/Shop/Variations/form.blade.php
@@ -27,11 +27,13 @@
 @include('components.save')
 
 @include('load.form.editor')
+@include('load.form.save')
 
 @push('js')
 	<script>
 		$(function() {
 			initEditor();
+			initSaveForm('#variation-form')
 		});
 	</script>
 @endpush
\ No newline at end of file