Add plus on products

resources/views/Admin/Botanic/Species/form.blade.php

@@ -14,7 +14,14 @@
 		<div class="row mb-3">
 			<div class="col-6">
 				{{ Form::label('genre', 'Genre') }}
-				@include('components.form.select', ['name' => 'genre_id', 'list' => $genres, 'value' => $specie['genre_id'] ?? null, 'class' => 'select2', 'with_empty' => '', 'required' => false])
+				@include('components.form.select', [
+					'name' => 'genre_id',
+					'list' => $genres,
+					'value' => $specie['genre_id'] ?? null,
+					'class' => 'select2',
+					'with_empty' => '',
+					'required' => false
+				])
 			</div>
 			<div class="col-6">
 				{{ Form::label('alias', 'Alias') }}
@@ -25,21 +32,49 @@
 		<div class="row mb-3">
 			<div class="col-12">
 				{{ Form::label('tags', 'Tags') }}
-				@include('components.form.selects.select-tree', ['name' => 'tags[]', 'list' => $tags_list, 'values' => $specie['tags'] ?? null, 'class' => 'select2 form-control', 'multiple' => true])
+				@include('components.form.selects.select-tree', [
+					'name' => 'tags[]',
+					'list' => $tags_list,
+					'values' => $specie['tags'] ?? null,
+					'class' => 'select2 form-control',
+					'multiple' => true
+				])
 			</div>
 		</div>
 
 		<div class="row mb-3">
 			<div class="col-12">
 				{{ Form::label('description', 'Description') }}
-				@include('components.form.textarea', ['name' => 'description', 'value' => $specie['description'] ?? null, 'class' => 'editor', 'required' => false])
+				@include('components.form.textarea', [
+					'name' => 'description',
+					'value' => $specie['description'] ?? null,
+					'class' => 'editor',
+					'required' => false
+				])
+			</div>
+		</div>
+
+		<div class="row mb-3">
+			<div class="col-12">
+				{{ Form::label('description', 'Son +') }}
+				@include('components.form.textarea', [
+					'name' => 'plus',
+					'value' => $specie['plus'] ?? null,
+					'class' => 'editor',
+					'rows' => 5,
+					'required' => false,
+				])		
 			</div>
 		</div>
 		
 	</div>
 
 	<div class="col-md-4">
-		@include('components.uploader.widget', ['load_url' => ($specie['id'] ?? false) ? route('Admin.Botanic.Species.getImages', ['id' => $specie['id']]) : null, 'delete_url' => route('Admin.Botanic.Species.deleteImage'), 'name' => 'images'])
+		@include('components.uploader.widget', [
+			'load_url' => ($specie['id'] ?? false) ? route('Admin.Botanic.Species.getImages', ['id' => $specie['id']]) : null,
+			'delete_url' => route('Admin.Botanic.Species.deleteImage'),
+			'name' => 'images'
+		])
 	</div>
 </div>
 

resources/views/Admin/Botanic/Varieties/form.blade.php

@@ -7,35 +7,77 @@
 			</div>
 			<div class="col-6">
 				{{ Form::label('genre', 'Espèce') }}
-				@include('components.form.select', ['name' => 'specie_id', 'list' => $species, 'value' => $variety['specie_id'] ?? null, 'class' => 'select2 form-control', 'with_empty' => '', 'required' => false])
+				@include('components.form.select', [
+					'name' => 'specie_id',
+					'list' => $species,
+					'value' => $variety['specie_id'] ?? null,
+					'class' => 'select2 form-control',
+					'with_empty' => '',
+					'required' => false
+				])
 			</div>
 		</div>
 
 		<div class="row mb-3">
 			<div class="col-12">
 				{{ Form::label('tags', 'Tags') }}
-				@include('components.form.selects.select-tree', ['name' => 'tags[]', 'list' => $tags_list, 'values' => $variety['tags'] ?? null, 'class' => 'select2 form-control', 'multiple' => true])
+				@include('components.form.selects.select-tree', [
+					'name' => 'tags[]',
+					'list' => $tags_list,
+					'values' => $variety['tags'] ?? null,
+					'class' => 'select2 form-control',
+					'multiple' => true
+				])
 			</div>
 		</div>
 
 		<div class="row mb-3">
 			<div class="col-12">
 				{{ Form::label('description', 'Description') }}
-				@include('components.form.textarea', ['name' => 'description', 'value' => $variety['description'] ?? null, 'class' => 'editor', 'rows' => 5, 'required' => false])		
+				@include('components.form.textarea', [
+					'name' => 'description',
+					'value' => $variety['description'] ?? null,
+					'class' => 'editor',
+					'rows' => 5,
+					'required' => false
+				])		
 			</div>
 		</div>
 
 		<div class="row mb-3">
 			<div class="col-12">
 				{{ Form::label('memo', 'Descriptif sachet') }}
-				@include('components.form.textarea', ['name' => 'memo', 'value' => $variety['memo'] ?? null, 'class' => 'editor', 'rows' => 5, 'required' => false])		
+				@include('components.form.textarea', [
+					'name' => 'memo',
+					'value' => $variety['memo'] ?? null,
+					'class' => 'editor',
+					'rows' => 5,
+					'required' => false
+				])		
+			</div>
+		</div>
+
+		<div class="row mb-3">
+			<div class="col-12">
+				{{ Form::label('description', 'Son +') }}
+				@include('components.form.textarea', [
+					'name' => 'plus',
+					'value' => $variety['plus'] ?? null,
+					'class' => 'editor',
+					'rows' => 5,
+					'required' => false,
+				])		
 			</div>
 		</div>
 
 	</div>
 
 	<div class="col-md-4">
-		@include('components.uploader.widget', ['load_url' => route('Admin.Botanic.Varieties.getImages', ['id' => $variety['id'] ?? false]), 'delete_url' => route('Admin.Botanic.Varieties.deleteImage'), 'name' => 'images'])
+		@include('components.uploader.widget', [
+			'load_url' => route('Admin.Botanic.Varieties.getImages', ['id' => $variety['id'] ?? false]),
+			'delete_url' => route('Admin.Botanic.Varieties.deleteImage'),
+			'name' => 'images'
+		])
 	</div>
 
 </div>

resources/views/Admin/Shop/Merchandises/form.blade.php

@@ -5,6 +5,16 @@
 				{{ Form::label('name', 'Nom') }}
 				@include('components.form.input', ['name' => 'name', 'value' => $merchandise['name'] ?? null, 'required' => true])
 			</div>
+			<div class="col-6">
+				{{ Form::label('producers', 'Producteur') }}
+				@include('components.form.select', [
+					'name' => 'producer_id',
+					'list' => $producers_list ?? [],
+					'value' => $merchandise['provider_id'] ?? null,
+					'class' => 'select2 form-control',
+					'with_empty' => '',
+				])
+			</div>
 		</div>
 
 		<div class="row mb-3">
@@ -33,6 +43,19 @@
 			</div>
 		</div>
 
+		<div class="row mb-3">
+			<div class="col-12">
+				{{ Form::label('description', 'Son +') }}
+				@include('components.form.textarea', [
+					'name' => 'plus',
+					'value' => $merchandise['plus'] ?? null,
+					'class' => 'editor',
+					'rows' => 5,
+					'required' => false,
+				])		
+			</div>
+		</div>
+
 	</div>
 
 	<div class="col-md-4">

resources/views/Admin/Shop/Producers/create.blade.php

@@ -1,11 +1,11 @@
 @extends('layout.index', [
-	'title' => __('shop.merchandises.title'),
-	'subtitle' => __('shop.merchandises.add'),
-	'breadcrumb' => [__('shop.merchandises.title'), __('shop.merchandises.add')]
+	'title' => __('shop.producers.title'),
+	'subtitle' => __('shop.producers.add'),
+	'breadcrumb' => [__('shop.producers.title'), __('shop.producers.add')]
 ])
 
 @section('content')
-	{{ Form::open(['route' => 'Admin.Shop.Merchandises.store', 'id' => 'form', 'autocomplete' => 'off', 'files' => true]) }}
-		@include('Admin.Shop.Merchandises.form')
+	{{ Form::open(['route' => 'Admin.Shop.Producers.store', 'id' => 'form', 'autocomplete' => 'off', 'files' => true]) }}
+		@include('Admin.Shop.Producers.form')
 	</form>
 @endsection

resources/views/Admin/Shop/Producers/edit.blade.php

@@ -1,12 +1,12 @@
 @extends('layout.index', [
-	'title' => __('Shop.merchandises.title'),
-	'subtitle' => __('Shop.merchandises.edit'),
-	'breadcrumb' => [__('Shop.merchandises.title'), __('Shop.merchandises.edit')]
+	'title' => __('Shop.producers.title'),
+	'subtitle' => __('Shop.producers.edit'),
+	'breadcrumb' => [__('Shop.producers.title'), __('Shop.producers.edit')]
 ])
 
 @section('content')
-	{{ Form::open(['route' => 'Admin.Shop.Merchandises.store', 'id' => 'form', 'autocomplete' => 'off', 'files' => true]) }}
-		<input type="hidden" name="id" id="id" value="{{ $merchandise['id'] }}">
-		@include('Admin.Shop.Merchandises.form')
+	{{ Form::open(['route' => 'Admin.Shop.Producers.store', 'id' => 'form', 'autocomplete' => 'off', 'files' => true]) }}
+		<input type="hidden" name="id" id="id" value="{{ $producer['id'] }}">
+		@include('Admin.Shop.Producers.form')
 	</form>
 @endsection

resources/views/Admin/Shop/Producers/form.blade.php

@@ -3,7 +3,11 @@
 		<div class="row mb-3">
 			<div class="col-6">
 				{{ Form::label('name', 'Nom') }}
-				@include('components.form.input', ['name' => 'name', 'value' => $merchandise['name'] ?? null, 'required' => true])
+				@include('components.form.input', ['name' => 'name', 'value' => $producer['name'] ?? null, 'required' => true])
+			</div>
+			<div class="col-6">
+				{{ Form::label('name', 'Alias') }}
+				@include('components.form.input', ['name' => 'alias', 'value' => $producer['alias'] ?? null, 'required' => true])
 			</div>
 		</div>
 
@@ -13,7 +17,7 @@
 				@include('components.form.selects.select-tree', [
 					'name' => 'tags[]',
 					'list' => $tags_list,
-					'values' => $merchandise['tags'] ?? null,
+					'values' => $producer['tags'] ?? null,
 					'class' => 'select2 form-control',
 					'multiple' => true
 				])
@@ -25,7 +29,7 @@
 				{{ Form::label('description', 'Description') }}
 				@include('components.form.textarea', [
 					'name' => 'description',
-					'value' => $merchandise['description'] ?? null,
+					'value' => $producer['description'] ?? null,
 					'class' => 'editor',
 					'rows' => 5,
 					'required' => false,
@@ -37,7 +41,7 @@
 
 	<div class="col-md-4">
 		@include('components.uploader.widget', [
-			'load_url' => route('Admin.Shop.Merchandises.getImages', ['id' => $merchandise['id'] ?? false]),
+			'load_url' => route('Admin.Shop.Merchandises.getImages', ['id' => $producer['id'] ?? false]),
 			'delete_url' => route('Admin.Botanic.Varieties.deleteImage'),
 			'name' => 'images',
 		])

resources/views/Admin/Shop/Producers/list.blade.php

@@ -1,12 +1,12 @@
 @extends('layout.index', [
-	'title' => __('Marchandises'),
-	'subtitle' => __('Liste de marchandises'),
-	'breadcrumb' => [__('Shop.merchandises.title')]
+	'title' => __('shop.producers.title'),
+	'subtitle' => __('shop.producers.list'),
+	'breadcrumb' => [__('Shop.producers.title')]
 ])
 
 @section('content')
 	@component('components.card')
-		@include('components.datatable', ['route' => route('Admin.Shop.Merchandises.index'), 'model' => 'merchandises'])
+		@include('components.datatable', ['route' => route('Admin.Shop.Producers.index'), 'model' => 'producers'])
 	@endcomponent
 @endsection