diff --git a/app/Models/Shop/ArticleAttribute.php b/app/Models/Shop/ArticleAttribute.php index ec8b93f8..6e785463 100644 --- a/app/Models/Shop/ArticleAttribute.php +++ b/app/Models/Shop/ArticleAttribute.php @@ -16,7 +16,7 @@ class ArticleAttribute extends Model 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() diff --git a/app/Repositories/Shop/ArticlePrices.php b/app/Repositories/Shop/ArticlePrices.php index 42a6b0e9..cebc2eae 100644 --- a/app/Repositories/Shop/ArticlePrices.php +++ b/app/Repositories/Shop/ArticlePrices.php @@ -20,7 +20,7 @@ class ArticlePrices 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() diff --git a/resources/views/Shop/Admin/Articles/partials/prices/block_attribute.blade.php b/resources/views/Shop/Admin/Articles/partials/prices/block_attribute.blade.php index d156e1e4..a45dfd95 100644 --- a/resources/views/Shop/Admin/Articles/partials/prices/block_attribute.blade.php +++ b/resources/views/Shop/Admin/Articles/partials/prices/block_attribute.blade.php @@ -1,13 +1,13 @@
- - + +
{{ Form::label('attribute_family_id', 'Attributs') }}
@include('components.select', [ - 'name' => "prices[$key][attributes][attribute_family_id]", - 'value' => (isset($attribute['value']['article_attribute_family_id'])) ? $attribute['value']['article_attribute_family_id'] : null, + 'name' => "prices[$key][attribute][attribute_family_id]", + 'value' => $attribute['attribute_value']['article_attribute_family_id'] ?? null, 'list' => $attribute_families_options, 'required' => true, 'class' => 'select2 form-control form-control-sm attributes-family' @@ -17,12 +17,12 @@
{{ Form::label('attribute_value_id', 'Valeur') }}
@include('components.select', [ - 'name' => "prices[$key][attributes][attribute_value_id]", - 'value' => (isset($attribute['attribute_value_id'])) ? $attribute['attribute_value_id'] : null, - 'list' => (isset($attribute_values)) ? $attribute_values : null, + 'name' => "prices[$key][attribute][attribute_value_id]", + 'value' => $attribute['article_attribute_value_id'] ?? null, + 'list' => $attribute_values ?? null, 'required' => true, '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'] . '"' : '' ])
diff --git a/resources/views/Shop/Admin/Articles/partials/prices/block_attribute_new.blade.php b/resources/views/Shop/Admin/Articles/partials/prices/block_attribute_new.blade.php index 13b51db0..b951dba0 100644 --- a/resources/views/Shop/Admin/Articles/partials/prices/block_attribute_new.blade.php +++ b/resources/views/Shop/Admin/Articles/partials/prices/block_attribute_new.blade.php @@ -1,12 +1,24 @@
- +
{{ Form::label('attribute_family_id', 'Attributs') }}
- @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' + ])
{{ Form::label('attribute_value_id', 'Valeur') }}
- @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' + ])