diff --git a/Gruntfile.js b/Gruntfile.js index 0393c25e..2682c8cb 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -4,17 +4,17 @@ var jsCompatibilty = [ ] var jsMain = [ - 'node_modules/sweetalert2/dist/sweetalert2.all.min.js', +// 'node_modules/sweetalert2/dist/sweetalert2.all.min.js', 'node_modules/inputmask/dist/min/jquery.inputmask.bundle.min.js', /* 'node_modules/summernote/dist/summernote.min.js', 'node_modules/summernote/dist/lang/summernote-fr-FR.min.js', */ - 'node_modules/@activix/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js', - 'node_modules/@activix/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.fr.js', +// 'node_modules/@activix/bootstrap-datetimepicker/js/bootstrap-datetimepicker.min.js', +// 'node_modules/@activix/bootstrap-datetimepicker/js/locales/bootstrap-datetimepicker.fr.js', 'node_modules/bootstrap-fileinput/js/plugins/piexif.min.js', - 'node_modules/bootstrap-slider/dist/bootstrap-slider.min.js', - 'node_modules/bootstrap-validate/dist/bootstrap-validate.js', - 'node_modules/jQuery-QueryBuilder/dist/js/jquery-builder.standalone.min.js', +// 'node_modules/bootstrap-slider/dist/bootstrap-slider.min.js', +// 'node_modules/bootstrap-validate/dist/bootstrap-validate.js', +// 'node_modules/jQuery-QueryBuilder/dist/js/jquery-builder.standalone.min.js', /* 'node_modules/jQuery-QueryBuilder/dist/i18n/query-builder.fr.js', */ /* 'node_modules/isotope-layout/dist/isotope.pkgd.min.js', */ 'node_modules/wew.js/dist/wew.min.js', @@ -24,27 +24,27 @@ var jsMain = [ 'node_modules/jqtree/tree.jquery.js', 'node_modules/numeral/min/numeral.min.js', 'node_modules/numeral/min/locales/fr.min.js', - 'build/js/url_on_tab.js', - 'build/js/set_options.js', - 'build/js/confirm.js', - 'build/js/appender.js', - 'build/js/app.js', + 'build/js/include/url_on_tab.js', + 'build/js/include/set_options.js', + // 'build/js/include/confirm.js', + 'build/js/include/appender.js', + // 'build/js/include/app.js', ] var cssMain = [ - 'node_modules/sweetalert2/dist/sweetalert2.min.css', +// 'node_modules/sweetalert2/dist/sweetalert2.min.css', 'node_modules/inputmask/css/inputmask.css', - 'node_modules/summernote/dist/summernote.css', +// 'node_modules/summernote/dist/summernote.css', 'node_modules/@activix/bootstrap-datetimepicker/css/bootstrap-datetimepicker.min.css', - 'node_modules/bootstrap-slider/dist/css/bootstrap-slider.min.css', - 'node_modules/jQuery-QueryBuilder/dist/css/query-builder.default.min.css', +// 'node_modules/bootstrap-slider/dist/css/bootstrap-slider.min.css', +// 'node_modules/jQuery-QueryBuilder/dist/css/query-builder.default.min.css', 'node_modules/animate.css/animate.min.css', 'node_modules/jqtree/jqtree.css', - 'build/css/modal-option.css', +// 'build/css/modal-option.css', 'build/css/shadow.css', - 'build/css/utility.css', - 'build/css/site.css', - 'build/css/admin.css' +// 'build/css/utility.css', +// 'build/css/site.css', +// 'build/css/admin.css' ] var jsDataTables = [ diff --git a/resources/views/Shop/Admin/Articles/partials/block_price.blade.php b/resources/views/Shop/Admin/Articles/partials/block_price.blade.php new file mode 100644 index 00000000..daf9af2f --- /dev/null +++ b/resources/views/Shop/Admin/Articles/partials/block_price.blade.php @@ -0,0 +1,11 @@ +
+ + + +

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

+ + +
\ No newline at end of file diff --git a/resources/views/Shop/Admin/Articles/partials/block_price_new.blade.php b/resources/views/Shop/Admin/Articles/partials/block_price_new.blade.php new file mode 100644 index 00000000..fbced1b4 --- /dev/null +++ b/resources/views/Shop/Admin/Articles/partials/block_price_new.blade.php @@ -0,0 +1,64 @@ +
+ + + +
+
+ +
+
+ {{ Form::label('tax_id', 'TVA') }} + @include('components.select', ['name' => 'prices[][tax_id]', 'value' => (isset($tax_id)) ? $tax_id : null, 'list' => isset($taxes) ? $taxes : null, 'required' => true]) +
+ +
+ {{ Form::label('price', 'Prix HT') }} + @include('components.money', ['name' => 'prices[][price}', 'value' => (isset($price)) ? $price : 0, 'required' => true]) +
+ +
+ {{ Form::label('price_taxed', 'Prix TTC') }} + @include('components.money', ['name' => 'prices[][price_taxed]', 'value' => (isset($price_ht)) ? $price_ht : 0, 'required' => true]) +
+ +
+
+ +
+ +
+ +
+ + +
+ +
+
+
+ +
+
+ {{ Form::label('quantity', 'Quantité') }} + @include('components.input', ['name' => 'prices[][quantity][]', 'value' => (isset($quantity)) ? $quantity : 1, 'required' => true]) +
+
+ {{ Form::label('attribute_family_id', 'Attributs') }} + @include('components.select', ['name' => 'prices[][attribute_family_id][]', 'value' => (isset($attribute_value['attribute_family_id'])) ? $attribute_value['attribute_family_id'] : null, 'list' => $attribute_families, 'required' => true]) +
+ +
+ {{ Form::label('attribute_value_id', 'Valeur') }} + @include('components.select', ['name' => 'prices[][attribute_value_id][]', 'value' => (isset($attribute_value['id'])) ? $attribute_value['id'] : null, 'list' => (isset($attribute_values)) ? $attribute_values : null, 'required' => true]) +
+
+ +
+
+
+
\ No newline at end of file diff --git a/resources/views/Shop/Admin/Articles/partials/list-prices.blade.php b/resources/views/Shop/Admin/Articles/partials/list-prices.blade.php new file mode 100644 index 00000000..54f4f971 --- /dev/null +++ b/resources/views/Shop/Admin/Articles/partials/list-prices.blade.php @@ -0,0 +1,23 @@ +@if (isset($prices) && (count($prices))) + @for ($i = 1; $i < count($prices); $i++) + @include('Shop.Admin.Articles.partials.block_price', ['key' => $i, 'price' => $prices[$i]]) + @endfor +@endif + +@push('js') + +@endpush + diff --git a/resources/views/Shop/Admin/Articles/partials/prices.blade.php b/resources/views/Shop/Admin/Articles/partials/prices.blade.php index 0ee86b18..6eb25536 100644 --- a/resources/views/Shop/Admin/Articles/partials/prices.blade.php +++ b/resources/views/Shop/Admin/Articles/partials/prices.blade.php @@ -1,31 +1,30 @@ -
-
- -
+@include('Shop.Admin.Articles.partials.block_price_new') + + +
+ @include('Shop.Admin.Articles.partials.list-prices')
-