diff --git a/app/Http/Controllers/Shop/Admin/ArticleController.php b/app/Http/Controllers/Shop/Admin/ArticleController.php index 168fef21..b39e929f 100644 --- a/app/Http/Controllers/Shop/Admin/ArticleController.php +++ b/app/Http/Controllers/Shop/Admin/ArticleController.php @@ -29,6 +29,8 @@ class ArticleController extends Controller public function store(Request $request) { $data = $request->all(); +// dump($data); + // exit; Articles::storeFull($data); return redirect()->route('Shop.Admin.Articles.index'); } diff --git a/app/Models/Shop/ArticleAttribute.php b/app/Models/Shop/ArticleAttribute.php index a4c3938e..67fceee5 100644 --- a/app/Models/Shop/ArticleAttribute.php +++ b/app/Models/Shop/ArticleAttribute.php @@ -7,16 +7,16 @@ use Illuminate\Database\Eloquent\Model; class ArticleAttribute extends Model { protected $guarded = ['id']; - protected $table = 'shop_article_attribute_attributes'; + protected $table = 'shop_article_attributes'; public function Price() { - return $this->belongsTo('App\Models\Shop\ArticlePrice'); + return $this->belongsTo('App\Models\Shop\ArticlePrice','article_price_id'); } public function Value() { - return $this->belongsTo('App\Models\Shop\ArticleAttribute'); + return $this->belongsTo('App\Models\Shop\ArticleAttributeValue','attribute_value_id'); } public function scopeByPrice($query, $article_price_id) diff --git a/app/Repositories/Shop/ArticlePrices.php b/app/Repositories/Shop/ArticlePrices.php index 99091644..3ce00e22 100644 --- a/app/Repositories/Shop/ArticlePrices.php +++ b/app/Repositories/Shop/ArticlePrices.php @@ -13,6 +13,11 @@ use App\Models\Shop\ArticlePrice; class ArticlePrices { + public static function getPricesByArticle($id) + { + return ArticlePrice::with('ArticleAttributes.Value')->byArticle($id)->get()->toArray(); + } + public static function getDatatable() { $model = ArticlePrice::orderBy('name'); @@ -65,9 +70,12 @@ class ArticlePrices return ArticlePrice::create($data); } - public static function update($data) + public static function update($data, $id = false) { - return ArticlePrice::find($id)->update($data); + $id = isset($data['id']) ? $data['id'] : false; + $article = ArticlePrice::find($id); + $article->update($data); + return $article; } public static function destroy($id) diff --git a/app/Repositories/Shop/Articles.php b/app/Repositories/Shop/Articles.php index 1ef05500..7094df5f 100644 --- a/app/Repositories/Shop/Articles.php +++ b/app/Repositories/Shop/Articles.php @@ -30,11 +30,12 @@ class Articles $data = $article->toArray(); $data['categories'] = self::getCategoriesByArticle($article); $data['tags'] = self::getTagsByArticle($article); - $data = self::getMeta($data); + $data['prices'] = self::getPricesByArticle($article); + self::getMeta($data); return $data; } - public static function getMeta($data = []) + public static function getMeta(&$data = []) { $data['categories_options'] = Categories::getOptions(); $data['families_options'] = ArticleFamilies::getOptions(); @@ -55,6 +56,11 @@ class Articles return $article->tags->pluck('id')->toArray(); } + public static function getPricesByArticle($article) + { + return ArticlePrices::getPricesByArticle($article->id); + } + public static function get($id) { return Article::find($id); diff --git a/resources/views/Shop/Admin/Articles/partials/prices.blade.php b/resources/views/Shop/Admin/Articles/partials/prices.blade.php index 0317b676..2f8a1e6f 100644 --- a/resources/views/Shop/Admin/Articles/partials/prices.blade.php +++ b/resources/views/Shop/Admin/Articles/partials/prices.blade.php @@ -58,6 +58,18 @@ }); } + function init_attribute_values() { + $('.attributes-family').each( function() { + var family_id = $(this).val(); + var $family = $(this); + var $parent = $family.parent().parent(); + var $selector = $parent.find('.attributes-value'); + load_attribute_values($selector, family_id); + value_id = $selector.data('id'); + $selector.val(value_id).trigger('change'); + }); + } + function load_attribute_values($selector, family_id) { $.ajax({ url : "{{ route('Shop.Admin.ArticleAttributeValues.getOptionsByFamily') }}", @@ -69,5 +81,35 @@ }); } + function handle_delete_price() { + $('.delete-price-btn').click(function() { + var $selector = $(this).parents('.row-price'); + var id = $selector.find('.price_id').val(); + + confirm_delete(id, laroute.route('Shop.Admin.ArticlePrices.destroy', {id : id}), function() { + $selector.remove(); + }); + }); + } + + function handle_prices() { + $('.price-item').change(function() { + tax_selected = $(this).parent().prev().find('select option:selected').text(); + price_taxed = $(this).val() * (1 + (tax_selected / 100)); + $(this).parent().parent().find('.price-taxed-item').val(price_taxed); + }) + } + + function handle_prices_taxed() { + $('.price-taxed-item').change(function() { + tax_selected = $(this).parent().prev().find('select option:selected').text(); + console.log($(this).parent().prev()); + price = $(this).val() / (1 + (tax_selected / 100)); + $(this).parent().parent().find('.price-item').val(price); + }) + } + + + @endpush 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 new file mode 100644 index 00000000..8b5f2725 --- /dev/null +++ b/resources/views/Shop/Admin/Articles/partials/prices/block_attribute.blade.php @@ -0,0 +1,28 @@ +
+ + + + +
+ {{ Form::label('attribute_family_id', 'Attributs') }}
+ @include('components.select', [ + 'name' => "prices[$key][attributes][attribute_family_id]", + 'value' => (isset($attribute['value']['attribute_family_id'])) ? $attribute['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[$key][attributes][attribute_value_id]", + 'value' => (isset($attribute['attribute_value_id'])) ? $attribute['attribute_value_id'] : null, + 'list' => (isset($attribute_values)) ? $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'] . '"' : '' + ]) +
+
diff --git a/resources/views/Shop/Admin/Articles/partials/prices/block_price.blade.php b/resources/views/Shop/Admin/Articles/partials/prices/block_price.blade.php index daf9af2f..86e0a284 100644 --- a/resources/views/Shop/Admin/Articles/partials/prices/block_price.blade.php +++ b/resources/views/Shop/Admin/Articles/partials/prices/block_price.blade.php @@ -1,11 +1,46 @@ -
+
-

- @include('components.button-delete', ['class' => 'delete-price-btn']) - Autre tarif -

- +
+
+ +
+
+ {{ Form::label('quantity', 'Quantité') }}
+ @include('components.number', ['name' => "prices[$key][quantity]", 'value' => (isset($price['quantity'])) ? $price['quantity'] : 1, 'required' => true, 'class' => 'form-control-sm']) +
+ +
+ @include('Shop.Admin.Articles.partials.prices.block_attribute', ['attribute' => $price['article_attributes'][0]]) +
+ +
+ {{ Form::label('tax_id', 'TVA') }}
+ @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']) +
+ +
+ {{ 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']) +
+ +
+ {{ 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']) +
+ +
+
+ +
+ +
+ +
+ +
\ No newline at end of file diff --git a/resources/views/Shop/Admin/Articles/partials/prices/list-prices.blade.php b/resources/views/Shop/Admin/Articles/partials/prices/list-prices.blade.php index 54f4f971..7f35171a 100644 --- a/resources/views/Shop/Admin/Articles/partials/prices/list-prices.blade.php +++ b/resources/views/Shop/Admin/Articles/partials/prices/list-prices.blade.php @@ -1,22 +1,17 @@ @if (isset($prices) && (count($prices))) - @for ($i = 1; $i < count($prices); $i++) - @include('Shop.Admin.Articles.partials.block_price', ['key' => $i, 'price' => $prices[$i]]) + @for ($i = 0; $i < count($prices); $i++) + @include('Shop.Admin.Articles.partials.prices.block_price', ['key' => $i, 'price' => $prices[$i]]) @endfor @endif @push('js') @endpush diff --git a/resources/views/components/money.blade.php b/resources/views/components/money.blade.php index edebe294..c9232106 100644 --- a/resources/views/components/money.blade.php +++ b/resources/views/components/money.blade.php @@ -1 +1 @@ -@include('components.input', ['type' => 'number', 'meta' => "step = '.01'"]) \ No newline at end of file +@include('components.input', ['type' => 'number', 'meta' => "step=0.01"]) \ No newline at end of file diff --git a/resources/views/components/person.blade.php b/resources/views/components/person.blade.php index 2c4a8754..ce7dc039 100644 --- a/resources/views/components/person.blade.php +++ b/resources/views/components/person.blade.php @@ -3,7 +3,7 @@
{{ Form::label('civilite', 'Civilité') }} - @@ -12,12 +12,12 @@
{{ Form::label('prenom', 'Prénom') }} - +
{{ Form::label('nom', 'Nom') }} - +
diff --git a/resources/views/components/select.blade.php b/resources/views/components/select.blade.php index bc6d0875..9d87b9e9 100644 --- a/resources/views/components/select.blade.php +++ b/resources/views/components/select.blade.php @@ -5,6 +5,7 @@ @if (isset($style))style="{{ $style }}" @endif @if (isset($required))required="required"@endif @if (isset($multiple))multiple="multiple"@endif + @if (isset($meta)){{ $meta }}@endif > @if (isset($with_empty))