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

Fix on new model

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2020-07-26 23:48:12 +02:00
parent 71e27ce9c3
commit ef791fbcf2
4 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Models/Shop/ArticleAttribute.php
View File

@@ -16,7 +16,7 @@ class ArticleAttribute extends Model
public function attribute_value() public function attribute_value()
{ {
return $this->belongsTo('App\Models\Shop\ArticleAttributeValue'); return $this->belongsTo('App\Models\Shop\ArticleAttributeValue', 'article_attribute_value_id');
} }
public function prices() public function prices()

2
app/Repositories/Shop/ArticlePrices.php
View File

@@ -20,7 +20,7 @@ class ArticlePrices
public static function getByArticleWithAttribute($id) public static function getByArticleWithAttribute($id)
{ {
return ArticlePrice::with('article_attribute')->byArticle($id)->get(); return ArticlePrice::with('article_attribute.attribute_value')->byArticle($id)->get();
} }
public static function getDatatable() public static function getDatatable()

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

@@ -1,13 +1,13 @@
<div class="row row-attribute"> <div class="row row-attribute">
<input type="hidden" name="prices[{{ $key }}][attributes][quantity]" value="1"> <input type="hidden" name="prices[{{ $key }}][article_attribute][quantity]" value="1">
<input type="hidden" name="prices[{{ $key }}][attributes][id]" value="{{ (isset($attribute['id'])) ? $attribute['id'] : null }}"> <input type="hidden" name="prices[{{ $key }}][article_attribute][id]" value="{{ (isset($attribute['id'])) ? $attribute['id'] : null }}">
<div class="col-12 col-lg-7"> <div class="col-12 col-lg-7">
{{ Form::label('attribute_family_id', 'Attributs') }}<br/> {{ Form::label('attribute_family_id', 'Attributs') }}<br/>
@include('components.select', [ @include('components.select', [
'name' => "prices[$key][attributes][attribute_family_id]", 'name' => "prices[$key][attribute][attribute_family_id]",
'value' => (isset($attribute['value']['article_attribute_family_id'])) ? $attribute['value']['article_attribute_family_id'] : null, 'value' => $attribute['attribute_value']['article_attribute_family_id'] ?? null,
'list' => $attribute_families_options, 'list' => $attribute_families_options,
'required' => true, 'required' => true,
'class' => 'select2 form-control form-control-sm attributes-family' 'class' => 'select2 form-control form-control-sm attributes-family'
@@ -17,12 +17,12 @@
<div class="col-12 col-lg-5"> <div class="col-12 col-lg-5">
{{ Form::label('attribute_value_id', 'Valeur') }}<br/> {{ Form::label('attribute_value_id', 'Valeur') }}<br/>
@include('components.select', [ @include('components.select', [
'name' => "prices[$key][attributes][attribute_value_id]", 'name' => "prices[$key][attribute][attribute_value_id]",
'value' => (isset($attribute['attribute_value_id'])) ? $attribute['attribute_value_id'] : null, 'value' => $attribute['article_attribute_value_id'] ?? null,
'list' => (isset($attribute_values)) ? $attribute_values : null, 'list' => $attribute_values ?? null,
'required' => true, 'required' => true,
'class' => 'select2 form-control form-control-sm attributes-value', 'class' => 'select2 form-control form-control-sm attributes-value',
'meta' => (isset($attribute['attribute_value_id'])) ? 'data-id="' . $attribute['attribute_value_id'] . '"' : '' 'meta' => (isset($attribute['article_attribute_value_id'])) ? 'data-id="' . $attribute['article_attribute_value_id'] . '"' : ''
]) ])
</div> </div>
</div> </div>

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

@@ -1,12 +1,24 @@
<div class="row row-new-attribute row-attribute"> <div class="row row-new-attribute row-attribute">
<input type="hidden" name="prices[][attributes][quantity]" value="1"> <input type="hidden" name="prices[][attribute][quantity]" value="1">
<div class="col-12 col-lg-6 1"> <div class="col-12 col-lg-6 1">
{{ Form::label('attribute_family_id', 'Attributs') }}<br/> {{ Form::label('attribute_family_id', 'Attributs') }}<br/>
@include('components.select', ['name' => 'prices[][attributes][attribute_family_id]', 'value' => (isset($attribute_value['attribute_family_id'])) ? $attribute_value['attribute_family_id'] : null, 'list' => $attribute_families_options, 'required' => true, 'class' => 'select2 form-control form-control-sm attributes-family']) @include('components.select', [
'name' => 'prices[][attribute][attribute_family_id]',
'value' => $attribute_value['article_attribute_family_id'] ?? null,
'list' => $attribute_families_options,
'required' => true,
'class' => 'select2 form-control form-control-sm attributes-family'
])
</div> </div>
<div class="col-12 col-lg-6 2"> <div class="col-12 col-lg-6 2">
{{ Form::label('attribute_value_id', 'Valeur') }}<br/> {{ Form::label('attribute_value_id', 'Valeur') }}<br/>
@include('components.select', ['name' => 'prices[][attributes][attribute_value_id]', 'value' => (isset($attribute_value['id'])) ? $attribute_value['id'] : null, 'list' => (isset($attribute_values)) ? $attribute_values : null, 'required' => true, 'class' => 'select2 form-control form-control-sm attributes-value']) @include('components.select', [
'name' => 'prices[][attribute][attribute_value_id]',
'value' => $attribute_value['id'] ?? null,
'list' => $attribute_values ?? null,
'required' => true,
'class' => 'select2 form-control form-control-sm attributes-value'
])
</div> </div>
</div> </div>