[WIP] Refactor generic & normal price

app/Repositories/Shop/Articles.php

@@ -38,6 +38,7 @@ class Articles
     public static function getMeta(&$data = [])
     {
         $data['categories_options'] = Categories::getOptions();
+        $data['price_generics'] = PriceGenericCategories::getOptionsWithChildrens();
         $data['families_options'] = ArticleFamilies::getOptions();
         $data['taxes_options'] = Taxes::getOptions();
         $data['attribute_families_options'] = PriceFamilies::getOptions();
@@ -64,7 +65,7 @@ class Articles
 
     public static function getPricesByArticle($article)
     {
-        return Prices::getByArticle($article->id)->toArray();
+        return Prices::getByArticle($article->id);
     }
 
     public static function get($id)

app/Repositories/Shop/PriceGenericCategories.php

@@ -33,6 +33,21 @@ class PriceGenericCategories
         return PriceGenericCategory::get()->pluck('name','id')->toArray();
     }  
 
+    public static function getOptionsWithChildrens()
+    {
+        $prices = PriceGenericCategory::with('price_generics')->get();
+        $data = [];
+        foreach ($prices as $key => $price)
+        {
+        	$data[$key]['label'] = $price->name;
+        	foreach($price->price_generics as $generic)
+        	{
+        		$data[$key]['options'][$generic->id] = $generic->name;
+        	}
+        }
+        return $data;
+    }  
+
 	public static function store($data)
 	{
 		$id = isset($data['id']) ? $data['id'] : false;

app/Repositories/Shop/PriceGenerics.php

@@ -29,6 +29,13 @@ class PriceGenerics
 		return Datatables::of($model)->make(true);
 	}
 
+	public static function getOptions()
+	{
+		$model = PriceGeneric::with('category')->get()->toArray();
+		dump($model);
+		exit;
+	}
+
 	public static function getAll()
 	{
 		return PriceGeneric::orderBy('name','asc')->get();

app/Repositories/Shop/Prices.php

@@ -16,8 +16,7 @@ class Prices
 
     public static function getByArticle($id)
     {
-        $prices = Article::byArticle($id)->with('prices.price')->get()->pluck('prices')->toArray()[0];
+        $prices = Price::byArticle($id)->with('price')->get()->toArray();
-        // dump($prices);
         $data = [];
         foreach ($prices as $price)
         {
@@ -32,7 +31,7 @@ class Prices
                 }
             }
         }
-        dump($data);
+        return $data;
     }
 
     public static function getDatatable()

resources/views/Shop/Admin/Articles/partials/prices.blade.php

@@ -72,7 +72,7 @@
 
 		function load_attribute_values($selector, family_id) {
 			$.ajax({
-				url : "{{ route('Shop.Admin.ArticleAttributeValues.getOptionsByFamily') }}",
+				url : "{{ route('Shop.Admin.PriceFamilyValues.getOptionsByFamily') }}",
 				method : 'POST',
 				data: {	family_id: family_id },
 				success : function(data) {

resources/views/Shop/Admin/Articles/partials/prices/block_price.blade.php

@@ -7,35 +7,39 @@
 			
 			<div class="row">
 
-				<div class="col-lg-1">
+				<div class="col-lg-3">
-					{{ Form::label('quantity', 'Qté.') }}<br/>
+					{{ Form::label('price_generic_id', 'Générique') }}<br/>
-					@include('components.number', ['name' => "prices[$key][quantity]", 'value' => $price['quantity'] ?? 1, 'required' => true, 'class' => 'form-control-sm'])
+					@include('components.select-tree', ['name' => "prices[$key][article_price_generic_id]", 'value' => $price['article_price_generic_id'] ?? null, 'list' => $price_generics ?? null, 'required' => false, 'class' => 'form-control-sm'])
 				</div>
 
-				<div class="col-lg-4">
+				<div class="col-lg-8">
-					@include('Shop.Admin.Articles.partials.prices.block_attribute', ['attribute' => $price['article_attribute']])
-				</div>
-
-				<div class="col-lg-6">
 					<div class="row">
-						<div class="col-2">
+						<div class="col-lg-1">
-							{{ Form::label('tax_id', 'TVA') }}<br/>
+							{{ Form::label('quantity', 'Qté.') }}<br/>
-							@include('components.select', ['name' => "prices[$key][tax_id]", 'value' => $price['tax_id'] ?? null, 'list' => $taxes_options ?? null, 'required' => true, 'class' => 'form-control form-control-sm'])
+							@include('components.number', ['name' => "prices[$key][quantity]", 'value' => $price['quantity'] ?? 1, 'required' => true, 'class' => 'form-control-sm'])
 						</div>
 
-						<div class="col-4">
+						<div class="col-lg-6">
-							{{ Form::label('price_generic_id', 'Générique') }}<br/>
+							@include('Shop.Admin.Articles.partials.prices.block_attribute', ['attribute' => $price['article_attribute'] ?? null])
-							@include('components.select', ['name' => "prices[$key][article_price_generic_id]", 'value' => $price['article_price_generic_id'] ?? null, 'list' => $price_generics ?? null, 'required' => false, 'class' => 'form-control-sm'])
 						</div>
 
-						<div class="col-3">
+						<div class="col-lg-5">
-							{{ Form::label('price', 'Prix HT') }}
+							<div class="row">
-							@include('components.money', ['name' => "prices[$key][price]", 'value' => $price['price'] ?? 0, 'required' => true, 'class' => 'form-control-sm price-item'])
+								<div class="col-4">
-						</div>
+									{{ Form::label('tax_id', 'TVA') }}<br/>
+									@include('components.select', ['name' => "prices[$key][tax_id]", 'value' => $price['tax_id'] ?? null, 'list' => $taxes_options ?? null, 'required' => true, 'class' => 'form-control form-control-sm'])
+								</div>
 
-						<div class="col-3">
+								<div class="col-4">
-							{{ Form::label('price_taxed', 'Prix TTC') }}
+									{{ Form::label('price', 'Prix HT') }}
-							@include('components.money', ['name' => "prices[$key][price_taxed]", 'value' => $price['price_taxed'] ?? 0, 'required' => true, 'class' => 'form-control-sm price-taxed-item'])
+									@include('components.money', ['name' => "prices[$key][price]", 'value' => $price['price'] ?? 0, 'required' => true, 'class' => 'form-control-sm price-item'])
+								</div>
+
+								<div class="col-4">
+									{{ Form::label('price_taxed', 'Prix TTC') }}
+									@include('components.money', ['name' => "prices[$key][price_taxed]", 'value' => $price['price_taxed'] ?? 0, 'required' => true, 'class' => 'form-control-sm price-taxed-item'])
+								</div>
+							</div>
 						</div>
 					</div>
 				</div>

resources/views/Shop/Admin/Articles/partials/prices/block_price_new.blade.php

@@ -7,6 +7,11 @@
 			
 			<div class="row">
 
+				<div class="col-lg-3">
+					{{ Form::label('price_generic_id', 'Générique') }}<br/>
+					@include('components.select-tree', ['name' => "prices[0][article_price_generic_id]", 'value' => $price['article_price_generic_id'] ?? null, 'list' => $price_generics ?? null, 'required' => false, 'class' => 'form-control-sm'])
+				</div>
+
 				<div class="col-lg-1">
 					{{ Form::label('quantity', 'Quantité') }}<br/>
 					@include('components.number', ['name' => 'prices[0][quantity]', 'value' => $quantity ?? 1, 'required' => true, 'class' => 'form-control-sm'])
@@ -23,11 +28,6 @@
 						@include('components.select', ['name' => 'prices[0][tax_id]', 'value' => $tax_id ?? null, 'list' => $taxes_options ?? null, 'required' => true, 'class' => 'form-control form-control-sm'])
 					</div>
 
-					<div class="col-4">
-						{{ Form::label('price_generic_id', 'Générique') }}<br/>
-						@include('components.select', ['name' => "prices[0][article_price_generic_id]", 'value' => $price['article_price_generic_id'] ?? null, 'list' => $price_generics ?? null, 'required' => false, 'class' => 'form-control-sm'])
-					</div>
-
 					<div class="col-3">
 						{{ Form::label('price', 'Prix HT') }}
 						@include('components.money', ['name' => 'prices[0][price]', 'value' => $price ?? 0, 'required' => true, 'class' => 'form-control-sm price-item'])

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

@@ -0,0 +1,28 @@
+@extends('layout.index', [
+	'title' => __('article_attributes.title'),
+	'subtitle' => __('article_attributes.create.title'),
+	'breadcrumb' => [__('article_attributes.title'), __('article_attributes.create.title')]
+])
+
+@include('boilerplate::load.fileinput')
+
+@section('content')
+
+	{{ Form::open(['route' => 'Shop.Admin.ArticleAttributes.store', 'id' => 'article-attribute-form', 'autocomplete' => 'off', 'files' => true]) }}
+				
+		<div class="row">
+			<div class="col-sm-12 mbl">
+				<a href="{{ route("Shop.Admin.ArticleAttributes.index") }}" class="btn btn-default">
+					{{ __('article_attributes.list.title') }}
+				</a>
+
+				<span class="btn-group pull-right">
+					@include('components.button-save')
+				</span>
+			</div>
+		</div> 
+
+		@include('Shop.Admin.ArticleAttributeValues.form')
+	</form>
+
+@endsection

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

@@ -0,0 +1,29 @@
+@extends('layout.index', [
+	'title' => 'Attributs d\'articles',
+	'subtitle' => 'Edition d\'un attribut d\'article',
+	'breadcrumb' => ['Articles']
+])
+
+@include('boilerplate::load.fileinput')
+
+@section('content')
+
+	{{ Form::open(['route' => 'Shop.Admin.ArticleAttributeValues.update', 'id' => 'article-attribute-form', 'autocomplete' => 'off', 'files' => true]) }}
+
+		<div class="row">
+			<div class="col-sm-12 mbl">
+				<a href="{{ route("Shop.Admin.ArticleAttributeValues.index") }}" class="btn btn-default">
+					{{ __('article_attributes.list.title') }}
+				</a>
+
+				<span class="btn-group pull-right">
+					@include('components.button-save')
+				</span>
+			</div>
+		</div>
+
+		<input type="hidden" name="id" value="{{ $id }}">
+		@include('Shop.Admin.ArticleAttributeValues.form')
+	</form>
+
+@endsection

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

@@ -0,0 +1,29 @@
+@include('boilerplate::load.tinymce')
+
+
+<div class="row">
+	<div class="col-md-8">
+		{{ Form::label('name', 'Nom') }}
+		@include('components.input', ['name' => 'name', 'value' => (isset($family['name'])) ? $family['name'] : null, 'required' => true])
+
+		{{ Form::label('description', 'Description') }}
+		@include('components.textarea', ['name' => 'description', 'value' => isset($description) ? $description : null, 'class' => 'editor', 'required' => false])		
+
+	</div>
+</div>
+
+<div class="row">
+	<div class="col-md-8">
+		<div class="float-right mt-3">
+			@include('components.button-save')
+		</div>
+	</div>
+</div>
+
+@push('js')
+<script>
+    $(function() {
+        $('.editor').tinymce({});
+    });
+</script>
+@endpush

resources/views/Shop/Admin/PriceFamilies/index.blade.php

@@ -0,0 +1,49 @@
+@extends('layout.index', [
+	'title' => __('Shop.article_attribute_families.title'),
+	'subtitle' => __('Shop.article_attribute_families.list'),
+	'breadcrumb' => [__('Shop.article_attribute_families.title')]
+])
+
+@include('boilerplate::load.select2')
+
+@section('content')
+
+	<nav>
+		<div class="nav nav-tabs">
+			<a href="#families" data-toggle="tab" class="nav-item nav-link" role="tab" aria-controls="families" aria-selected="true">
+				{{ __('Shop.article_attribute_families.title') }}
+			</a>
+			<a href="#values" data-toggle="tab" class="nav-item nav-link active" role="tab" aria-controls="values" aria-selected="false">
+				{{ __('Shop.article_attribute_values.title') }}
+			</a>
+		</div>
+	</nav>
+
+	<div class="tab-content mb-0">
+
+		<div class="tab-pane fade" id="families">
+			@section('content')
+				@include('components.datatable', ['route' => route('Shop.Admin.ArticleAttributeFamilies.index'), 'model' => 'ArticleAttributefamilies'])
+			@endsection
+		</div>
+
+		<div class="tab-pane fade  show active" id="values">
+			@section('content')
+				@component('components.card')
+					@include('components.datatable', ['route' => route('Shop.Admin.ArticleAttributeValues.index'), 'model' => 'articleattributevalues'])
+				@endcomponent
+
+				@component('components.layout.modal', ['title' => 'Filtres', 'id' => 'modal-filters'])
+					@include('Shop.Admin.ArticleAttributeValues.partials.filters')
+				@endcomponent
+			@endsection
+		</div>
+
+	</div>
+
+@endsection
+
+@push('scripts')
+	@include('components.js.datatable', ['route' => route('Shop.Admin.ArticleAttributeFamilies.index'), 'model' => 'ArticleAttributeFamilies'])
+	@include('components.js.datatable', ['route' => route('Shop.Admin.ArticleAttributeValues.index'), 'model' => 'ArticleAttributeValues'])
+@endpush

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

@@ -0,0 +1,16 @@
+@extends('layout.index', [
+	'title' => __('Shop.article_attribute_values.title'),
+	'subtitle' => __('Shop.article_attribute_values.list'),
+	'breadcrumb' => [__('Shop.article_attribute_values.title')]
+])
+
+@section('content')
+	@component('components.card')
+		@include('components.datatable', ['route' => route('Shop.Admin.ArticleAttributeValues.index'), 'model' => 'ArticleAttributeValues'])
+	@endcomponent
+
+	@component('components.layout.modal', ['title' => 'Filtres', 'id' => 'modal-filters'])
+		@include('Shop.Admin.ArticleAttributeValues.partials.filters')
+	@endcomponent
+
+@endsection

resources/views/Shop/Admin/PriceFamilies/partials/filters.blade.php

@@ -0,0 +1,9 @@
+<form id="filters">
+	<div class="row">
+		<label class="col-4">Familles d'attributs</label>
+		<div class="col-8">
+			@include('components.select', ['name' => 'article_attribute_family_id', 'list' => (isset($families)) ? $families : [], 'value' => (isset($filters['article_attribute_family_id'])) ? $filters['article_attribute_family_id'] : null, 'class' => 'form-control-sm select2', 'with_empty' => ' '])
+		</div>
+	</div>
+
+</form>

resources/views/Shop/Admin/PriceFamilies/show.blade.php

@@ -0,0 +1,36 @@
+@extends('layout.index', [
+	'title' => __('products.title'),
+	'subtitle' => __('products.title'),
+	'breadcrumb' => [__('products.title')]
+])
+
+@section('content')
+	<form action="{{ route('Shop.Products') }}" method="GET">
+	
+		<div class="row">
+
+			<div class="col-md-offset-2 col-md-8">
+
+				<div class="box box-info">
+					<div class="box-body">
+						<div class="col-md-6">
+							<h3>{{ name }}</h3>
+							<h4>
+							{{ $product.section.name }}<br>
+							</h4>
+						</div>
+						<div class="col-md-6 text-right">
+							<h2>{{ $prix_total }} €</h2>
+							<h4>{{ $residence['type_produit']['name'] }}</h4>
+						</div>
+
+						<div class="col-md-12">
+							@include('Hestimmo.modules.Lot.partials.carousel')
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</form>
+
+@endsection

resources/views/components/options-tree.blade.php

@@ -1,7 +1,7 @@
 @if (isset($list) && count($list))
 	@foreach($list as $key => $optgroup)
 		<optgroup label="{{ $optgroup['label'] }}">
-			@include('components.options', ['list' => $optgroup['options']])
+			@include('components.options', ['list' => $optgroup['options'] ?? null])
 		</optgroup>
 	@endforeach
 @endif

routes/Shop/Admin/PriceFamilies.php

@@ -0,0 +1,4 @@
+<?php
+
+Route::resource('PriceFamilies', 'PriceFamilyController');
+

routes/Shop/Admin/PriceFamilyValues.php

@@ -0,0 +1,7 @@
+<?php
+
+Route::resource('PriceFamilyValues', 'PriceFamilyValueController');
+
+Route::prefix('PriceFamilyValues')->name('PriceFamilyValues.')->group(function () { 
+	Route::post('getOptionsByFamily', 'PriceFamilyValueController@getOptionsByFamily')->name('getOptionsByFamily'); 
+});

routes/Shop/Admin/route.php

@@ -16,6 +16,8 @@ Route::middleware('auth')->prefix('Admin')->namespace('Admin')->name('Admin.')->
 	include __DIR__ . '/Invoices.php';
 	include __DIR__ . '/OrderPayments.php';
 	include __DIR__ . '/Orders.php';
+	include __DIR__ . '/PriceFamilies.php';
+	include __DIR__ . '/PriceFamilyValues.php';
 	include __DIR__ . '/PriceGenerics.php';
 	include __DIR__ . '/Tags.php';
 	include __DIR__ . '/TagGroups.php';