jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[WIP] Refactor generic & normal price

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2020-08-31 23:23:55 +02:00
parent c9198de890
commit c025dbb385
18 changed files with 267 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/Repositories/Shop/Articles.php
View File

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

15
app/Repositories/Shop/PriceGenericCategories.php
View File

@@ -33,6 +33,21 @@ class PriceGenericCategories
return PriceGenericCategory::get()->pluck('name','id')->toArray(); 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) public static function store($data)
{ {
$id = isset($data['id']) ? $data['id'] : false; $id = isset($data['id']) ? $data['id'] : false;

7
app/Repositories/Shop/PriceGenerics.php
View File

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

5
app/Repositories/Shop/Prices.php
View File

@@ -16,8 +16,7 @@ class Prices
public static function getByArticle($id) 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 = []; $data = [];
foreach ($prices as $price) foreach ($prices as $price)
{ {
@@ -32,7 +31,7 @@ class Prices
} }
} }
} }
dump($data); return $data;
} }
public static function getDatatable() public static function getDatatable()

2
resources/views/Shop/Admin/Articles/partials/prices.blade.php
View File

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

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

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

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

@@ -7,6 +7,11 @@
<div class="row"> <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"> <div class="col-lg-1">
{{ Form::label('quantity', 'Quantité') }}<br/> {{ Form::label('quantity', 'Quantité') }}<br/>
@include('components.number', ['name' => 'prices[0][quantity]', 'value' => $quantity ?? 1, 'required' => true, 'class' => 'form-control-sm']) @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']) @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>
<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"> <div class="col-3">
{{ Form::label('price', 'Prix HT') }} {{ Form::label('price', 'Prix HT') }}
@include('components.money', ['name' => 'prices[0][price]', 'value' => $price ?? 0, 'required' => true, 'class' => 'form-control-sm price-item']) @include('components.money', ['name' => 'prices[0][price]', 'value' => $price ?? 0, 'required' => true, 'class' => 'form-control-sm price-item'])

28
resources/views/Shop/Admin/PriceFamilies/create.blade.php Normal file
View File

@@ -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

29
resources/views/Shop/Admin/PriceFamilies/edit.blade.php Normal file
View File

@@ -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

29
resources/views/Shop/Admin/PriceFamilies/form.blade.php Normal file
View File

@@ -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

49
resources/views/Shop/Admin/PriceFamilies/index.blade.php Normal file
View File

@@ -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

16
resources/views/Shop/Admin/PriceFamilies/list.blade.php Normal file
View File

@@ -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

9
resources/views/Shop/Admin/PriceFamilies/partials/filters.blade.php Normal file
View File

@@ -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>

36
resources/views/Shop/Admin/PriceFamilies/show.blade.php Normal file
View File

@@ -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

2
resources/views/components/options-tree.blade.php
View File

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

4
routes/Shop/Admin/PriceFamilies.php Normal file
View File

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

7
routes/Shop/Admin/PriceFamilyValues.php Normal file
View File

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

2
routes/Shop/Admin/route.php
View File

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