From e29832011952497e804f8ec160d720834a7de61d Mon Sep 17 00:00:00 2001 From: Ludovic CANDELLIER Date: Thu, 15 Apr 2021 23:58:51 +0200 Subject: [PATCH] Fixes on widget uploder --- .../Botanic/Admin/VarietyController.php | 3 +- app/Repositories/Shop/Articles.php | 2 +- .../Botanic/Admin/Varieties/form.blade.php | 10 +-- .../views/Shop/Admin/Articles/form.blade.php | 3 + .../partials/characteristics.blade.php | 10 ++- .../partials/product/description.blade.php | 5 ++ .../partials/product/images.blade.php | 1 + .../Articles/partials/product/tags.blade.php | 7 +++ .../components/layout/box-collapse.blade.php | 6 +- .../uploader/mini-gallery-items.blade.php | 24 +++---- .../uploader/mini-gallery.blade.php | 43 +++++++------ .../components/uploader/widget.blade.php | 63 +++++++++---------- resources/views/load/layout/chevron.blade.php | 6 +- routes/Botanic/Admin/Varieties.php | 2 +- 14 files changed, 102 insertions(+), 83 deletions(-) create mode 100644 resources/views/Shop/Admin/Articles/partials/product/description.blade.php create mode 100644 resources/views/Shop/Admin/Articles/partials/product/images.blade.php create mode 100644 resources/views/Shop/Admin/Articles/partials/product/tags.blade.php diff --git a/app/Http/Controllers/Botanic/Admin/VarietyController.php b/app/Http/Controllers/Botanic/Admin/VarietyController.php index 4c57a3ad..a43500fa 100644 --- a/app/Http/Controllers/Botanic/Admin/VarietyController.php +++ b/app/Http/Controllers/Botanic/Admin/VarietyController.php @@ -55,10 +55,11 @@ class VarietyController extends Controller return Varieties::destroy($id); } - public function getImages(Request $request, $id = false) + public function getImages(Request $request, $id = false, $can_edit = true) { $id = $id ? $id : $request->input('id'); $data['images'] = Varieties::getImages($id); + $data['can_edit'] = $can_edit; return view('components.uploader.mini-gallery-items', $data); } diff --git a/app/Repositories/Shop/Articles.php b/app/Repositories/Shop/Articles.php index f13a840b..87ccb064 100644 --- a/app/Repositories/Shop/Articles.php +++ b/app/Repositories/Shop/Articles.php @@ -31,7 +31,7 @@ class Articles public static function getMeta(&$data = []) { - $data['products'] = ( ($data['product_type'] ?? false) == 'App\Models\Botanic\Variety') ? Varieties::getOptionsWithSpecie() : Species::getOptions(); + $data['products'] = ( ($data['article']['product_type'] ?? false) == 'App\Models\Botanic\Variety') ? Varieties::getOptionsWithSpecie() : Species::getOptions(); $data['categories_options'] = Categories::getOptions(); $data['price_generics'] = PriceGenericCategories::getOptionsWithChildrens(); $data['families_options'] = ArticleFamilies::getOptions(); diff --git a/resources/views/Botanic/Admin/Varieties/form.blade.php b/resources/views/Botanic/Admin/Varieties/form.blade.php index 2ab01ea3..6ecab2ad 100644 --- a/resources/views/Botanic/Admin/Varieties/form.blade.php +++ b/resources/views/Botanic/Admin/Varieties/form.blade.php @@ -7,25 +7,25 @@
{{ Form::label('name', 'Nom') }} - @include('components.input', ['name' => 'name', 'value' => isset($name) ? $name : null, 'required' => true]) + @include('components.input', ['name' => 'name', 'value' => $name ?? null, 'required' => true])
{{ Form::label('genre', 'Espèce') }} - @include('components.select', ['name' => 'specie_id', 'list' => $species, 'value' => isset($specie_id) ? $specie_id : null, 'class' => 'select2 form-control', 'required' => false]) + @include('components.select', ['name' => 'specie_id', 'list' => $species, 'value' => $specie_id ?? null, 'class' => 'select2 form-control', 'required' => false])
{{ Form::label('tags', 'Tags') }} - @include('components.select-tree', ['name' => 'tags[]', 'list' => $tags_list, 'values' => isset($tags) ? $tags : null, 'class' => 'select2 form-control', 'multiple' => true]) + @include('components.select-tree', ['name' => 'tags[]', 'list' => $tags_list, 'values' => $tags ?? null, 'class' => 'select2 form-control', 'multiple' => true]) {{ Form::label('description', 'Description') }} - @include('components.textarea', ['name' => 'description', 'value' => isset($description) ? $description : null, 'class' => 'editor', 'rows' => 5, 'required' => false]) + @include('components.textarea', ['name' => 'description', 'value' => $description ?? null, 'class' => 'editor', 'rows' => 5, 'required' => false])
- @include('components.uploader.widget', ['load_url' => route('Botanic.Admin.Varieties.getImages', ['id' => (isset($id)) ? $id : false]), 'delete_url' => route('Botanic.Admin.Varieties.deleteImage') ]) + @include('components.uploader.widget', ['load_url' => route('Botanic.Admin.Varieties.getImages', ['id' => $id ?? false]), 'delete_url' => route('Botanic.Admin.Varieties.deleteImage'), 'name' => 'images'])
diff --git a/resources/views/Shop/Admin/Articles/form.blade.php b/resources/views/Shop/Admin/Articles/form.blade.php index 85543e6e..e08e1a18 100644 --- a/resources/views/Shop/Admin/Articles/form.blade.php +++ b/resources/views/Shop/Admin/Articles/form.blade.php @@ -78,6 +78,7 @@ @include('boilerplate::load.tinymce') @include('load.appender') @include('load.toggle') +@include('load.form.save') @push('js') @endpush \ No newline at end of file diff --git a/resources/views/Shop/Admin/Articles/partials/characteristics.blade.php b/resources/views/Shop/Admin/Articles/partials/characteristics.blade.php index 79ef2709..3d5a528a 100644 --- a/resources/views/Shop/Admin/Articles/partials/characteristics.blade.php +++ b/resources/views/Shop/Admin/Articles/partials/characteristics.blade.php @@ -37,6 +37,7 @@
{{ Form::label('tags', 'Tags') }}
+ @include('Shop.Admin.Articles.partials.product.tags') @include('components.select-tree', ['name' => 'tags[]', 'list' => $tags_list, 'values' => $article['tags'] ?? null, 'class' => 'select2 form-control', 'multiple' => true])
@@ -44,18 +45,15 @@
{{ Form::label('description', 'Description') }} - @if (!empty($article['product']['description'])) - @component('components.layout.box-collapse', ['id' => 'product_description', 'title' => 'Description produit']) - {{ $article['product']['description'] }} - @endcomponent - @endif + @include('Shop.Admin.Articles.partials.product.description') @include('components.textarea', ['name' => 'description', 'value' => $article['description'] ?? null, 'class' => 'editor', 'required' => true])
- @include('components.uploader.widget', ['load_url' => route('Shop.Admin.Articles.getImages', ['id' => $article['id'] ?? false]), 'delete_url' => route('Shop.Admin.Articles.deleteImage'), 'title' => 'Photos' ]) + @include('Shop.Admin.Articles.partials.product.images', ['name' => 'product_images']) + @include('components.uploader.widget', ['load_url' => route('Shop.Admin.Articles.getImages', ['id' => $article['id'] ?? false]), 'delete_url' => route('Shop.Admin.Articles.deleteImage'), 'title' => 'Photos', 'name' => 'images' ])
diff --git a/resources/views/Shop/Admin/Articles/partials/product/description.blade.php b/resources/views/Shop/Admin/Articles/partials/product/description.blade.php new file mode 100644 index 00000000..a69076ef --- /dev/null +++ b/resources/views/Shop/Admin/Articles/partials/product/description.blade.php @@ -0,0 +1,5 @@ +@if (!empty($article['product']['description'])) + @component('components.layout.box-collapse', ['id' => 'product_description', 'title' => 'Description produit']) + {{ $article['product']['description'] }} + @endcomponent +@endif \ No newline at end of file diff --git a/resources/views/Shop/Admin/Articles/partials/product/images.blade.php b/resources/views/Shop/Admin/Articles/partials/product/images.blade.php new file mode 100644 index 00000000..70cf15d6 --- /dev/null +++ b/resources/views/Shop/Admin/Articles/partials/product/images.blade.php @@ -0,0 +1 @@ +@include('components.uploader.widget', ['load_url' => route('Botanic.Admin.Varieties.getImages', ['id' => $article['product_id'] ?? false]), 'title' => 'Photos produits', 'prefix' => 'product_', 'can_edit' => false ]) diff --git a/resources/views/Shop/Admin/Articles/partials/product/tags.blade.php b/resources/views/Shop/Admin/Articles/partials/product/tags.blade.php new file mode 100644 index 00000000..291eca02 --- /dev/null +++ b/resources/views/Shop/Admin/Articles/partials/product/tags.blade.php @@ -0,0 +1,7 @@ +@if (!empty($article['product']['tags'])) + @component('components.layout.box-collapse', ['id' => 'product_tags', 'title' => 'Tags produit']) + @foreach ($article['product']['tags'] as $tag) + {{ $tag->name }} + @endforeach + @endcomponent +@endif \ No newline at end of file diff --git a/resources/views/components/layout/box-collapse.blade.php b/resources/views/components/layout/box-collapse.blade.php index 1abc518f..e7bbd930 100644 --- a/resources/views/components/layout/box-collapse.blade.php +++ b/resources/views/components/layout/box-collapse.blade.php @@ -3,7 +3,7 @@
{!! $title ?? null !!} @if (isset($required) && $required) @@ -19,7 +19,9 @@
-
+
{{ $slot }}
+ +@include('load.layout.chevron') diff --git a/resources/views/components/uploader/mini-gallery-items.blade.php b/resources/views/components/uploader/mini-gallery-items.blade.php index 6a52e64e..1fbb8cd0 100644 --- a/resources/views/components/uploader/mini-gallery-items.blade.php +++ b/resources/views/components/uploader/mini-gallery-items.blade.php @@ -2,23 +2,23 @@ @foreach($images as $key => $image)
- @if ($can_edit ?? true) -
- +
+ + @if ($can_edit ?? true) -
- @endif + @endif +
@endforeach @endif -@if ($can_edit ?? true) - -@endif \ No newline at end of file + @endif + {{ $prefix ?? '' }}handleEnlargeImages(); + diff --git a/resources/views/components/uploader/mini-gallery.blade.php b/resources/views/components/uploader/mini-gallery.blade.php index 599cfd96..b7cfe711 100644 --- a/resources/views/components/uploader/mini-gallery.blade.php +++ b/resources/views/components/uploader/mini-gallery.blade.php @@ -16,33 +16,36 @@ @push('js') @endpush \ No newline at end of file diff --git a/resources/views/components/uploader/widget.blade.php b/resources/views/components/uploader/widget.blade.php index 84c032c9..78db77f8 100644 --- a/resources/views/components/uploader/widget.blade.php +++ b/resources/views/components/uploader/widget.blade.php @@ -1,49 +1,44 @@ @include('boilerplate::load.fileinput') -
-
-

{{ $title }}

-
- -
-
-
- @if (isset($article['id'])) - @include('components.uploader.mini-gallery') - @endif +@component('components.layout.box-collapse', ['id' => ($prefix ?? '') . $name ?? 'images', 'title' => $title ?? 'Photos', 'collapsed' => $collapsed ?? false]) + + @include('components.uploader.mini-gallery') + + @if ($can_edit ?? true) +
+ @include('components.uploader.block_image_new', ['name' => ($name ?? 'images') . '[]']) + @endif - @if ($can_edit ?? true) -
- @include('components.uploader.block_image_new', ['name' => 'images[]', 'required' => true]) - @endif -
@if ($can_edit ?? true)
@endif -
+ +@endcomponent @push('js') @endpush diff --git a/resources/views/load/layout/chevron.blade.php b/resources/views/load/layout/chevron.blade.php index 9142c8b0..bb2face2 100644 --- a/resources/views/load/layout/chevron.blade.php +++ b/resources/views/load/layout/chevron.blade.php @@ -8,8 +8,12 @@ $(this).find('i').toggleClass('fa-chevron-right fa-chevron-down') }); } - + $(function() { + initChevron(); + }); + + @endpush @php(define('LOAD_CHEVRON', true)) diff --git a/routes/Botanic/Admin/Varieties.php b/routes/Botanic/Admin/Varieties.php index a1dc8cb4..8f001170 100644 --- a/routes/Botanic/Admin/Varieties.php +++ b/routes/Botanic/Admin/Varieties.php @@ -10,7 +10,7 @@ Route::prefix('Varieties')->name('Varieties.')->group(function () { Route::get('edit/{id}', 'VarietyController@edit')->name('edit'); Route::post('getSelect', 'VarietyController@getOptionsWithSpecie')->name('getSelect'); Route::post('deleteImage', 'VarietyController@deleteImage')->name('deleteImage'); - Route::any('getImages/{id?}', 'VarietyController@getImages')->name('getImages'); + Route::any('getImages/{id?}/{can_edit?}', 'VarietyController@getImages')->name('getImages'); Route::any('exportExcel', 'VarietyController@exportExcel')->name('exportExcel');