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

Fixes on prices & add ArticlePriceGeneric

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2020-07-31 00:21:49 +02:00
parent ef791fbcf2
commit 1e685cfefb
18 changed files with 374 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -27,7 +27,7 @@
</li>
<li class="nav-item">
<a href="#stock" class="nav-link" data-toggle="tab" aria-expanded="true">
Quantités
Stock
@if(isset($stock_count))<span class="badge">{{ $stock_count }}</span>@endif
</a>
</li>

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

@@ -10,7 +10,7 @@
'value' => $attribute['attribute_value']['article_attribute_family_id'] ?? null,
'list' => $attribute_families_options,
'required' => true,
'class' => 'select2 form-control form-control-sm attributes-family'
'class' => 'select2 form-control-sm attributes-family'
])
</div>
@@ -21,7 +21,7 @@
'value' => $attribute['article_attribute_value_id'] ?? null,
'list' => $attribute_values ?? null,
'required' => true,
'class' => 'select2 form-control form-control-sm attributes-value',
'class' => 'select2 form-control-sm attributes-value',
'meta' => (isset($attribute['article_attribute_value_id'])) ? 'data-id="' . $attribute['article_attribute_value_id'] . '"' : ''
])
</div>

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

@@ -7,7 +7,7 @@
'value' => $attribute_value['article_attribute_family_id'] ?? null,
'list' => $attribute_families_options,
'required' => true,
'class' => 'select2 form-control form-control-sm attributes-family'
'class' => 'select2 form-control-sm attributes-family'
])
</div>
@@ -18,7 +18,7 @@
'value' => $attribute_value['id'] ?? null,
'list' => $attribute_values ?? null,
'required' => true,
'class' => 'select2 form-control form-control-sm attributes-value'
'class' => 'select2 form-control-sm attributes-value'
])
</div>
</div>

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

@@ -9,7 +9,7 @@
<div class="col-lg-1">
{{ Form::label('quantity', 'Qté.') }}<br/>
@include('components.number', ['name' => "prices[$key][quantity]", 'value' => (isset($price['quantity'])) ? $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 class="col-lg-4">
@@ -18,24 +18,24 @@
<div class="col-lg-6">
<div class="row">
<div class="col-3">
<div class="col-2">
{{ Form::label('tax_id', 'TVA') }}<br/>
@include('components.select', ['name' => "prices[$key][tax_id]", 'value' => (isset($price['tax_id'])) ? $price['tax_id'] : null, 'list' => isset($taxes_options) ? $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 class="col-3">
<div class="col-4">
{{ Form::label('generic_price_id', 'Générique') }}<br/>
@include('components.select', ['name' => "prices[$key][generic_price_id]", 'value' => (isset($price['generic_price_id'])) ? $price['generic_price_id'] : null, 'list' => ['Tarif barquette','Tarif semences'], 'required' => false, 'class' => 'form-control-sm'])
@include('components.select', ['name' => "prices[$key][article_generic_price_id]", 'value' => $price['article_generic_price_id'] ?? null, 'list' => ['Tarif barquette','Tarif semences'], 'required' => false, 'class' => 'form-control-sm'])
</div>
<div class="col-3">
{{ Form::label('price', 'Prix HT') }}
@include('components.money', ['name' => "prices[$key][price]", 'value' => (isset($price['price'])) ? $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 class="col-3">
{{ Form::label('price_taxed', 'Prix TTC') }}
@include('components.money', ['name' => "prices[$key][price_taxed]", 'value' => (isset($price['price_taxed'])) ? $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>

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

@@ -9,26 +9,34 @@
<div class="col-lg-1">
{{ Form::label('quantity', 'Quantité') }}<br/>
@include('components.number', ['name' => 'prices[0][quantity]', 'value' => (isset($quantity)) ? $quantity : 1, 'required' => true, 'class' => 'form-control-sm'])
@include('components.number', ['name' => 'prices[0][quantity]', 'value' => $quantity ?? 1, 'required' => true, 'class' => 'form-control-sm'])
</div>
<div class="col-lg-5">
<div class="col-lg-4">
@include('Shop.Admin.Articles.partials.prices.block_attribute_new')
</div>
<div class="col-lg-1">
{{ Form::label('tax_id', 'TVA') }}<br/>
@include('components.select', ['name' => 'prices[0][tax_id]', 'value' => (isset($tax_id)) ? $tax_id : null, 'list' => isset($taxes_options) ? $taxes_options : null, 'required' => true, 'class' => 'form-control form-control-sm'])
</div>
<div class="col-lg-6">
<div class="col-lg-2">
{{ Form::label('price', 'Prix HT') }}
@include('components.money', ['name' => 'prices[0][price]', 'value' => (isset($price)) ? $price : 0, 'required' => true, 'class' => 'form-control-sm price-item'])
</div>
<div class="col-2">
{{ Form::label('tax_id', 'TVA') }}<br/>
@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-lg-2">
{{ Form::label('price_taxed', 'Prix TTC') }}
@include('components.money', ['name' => 'prices[0][price_taxed]', 'value' => (isset($price_taxed)) ? $price_taxed : 0, 'required' => true, 'class' => 'form-control-sm price-taxed-item'])
<div class="col-4">
{{ Form::label('generic_price_id', 'Générique') }}<br/>
@include('components.select', ['name' => "prices[0][article_generic_price_id]", 'value' => $price['article_generic_price_id'] ?? null, 'list' => ['Tarif barquette','Tarif semences'], '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'])
</div>
<div class="col-3">
{{ Form::label('price_taxed', 'Prix TTC') }}
@include('components.money', ['name' => 'prices[0][price_taxed]', 'value' => $price_taxed ?? 0, 'required' => true, 'class' => 'form-control-sm price-taxed-item'])
</div>
</div>
<div class="col-lg-1 text-right">