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

little refactoring

Browse Source
This commit is contained in:
ludo
2023-11-14 00:11:31 +01:00
parent 5bcf265cda
commit 3cdb30a0dc
24 changed files with 421 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
resources/lang/fr/shop.php
View File

@@ -35,6 +35,7 @@ return [
'article_attribute_families' => [
'title' => 'Familles d\'attributs',
'description' => 'Gérer les familles d\'attributs',
'name' => 'Famille d\'attributs',
'add' => 'Ajouter une famille d\'attributs',
'edit' => 'Editer une famille d\'attributs',
'del' => 'Effacer une famille d\'attributs',
@@ -145,6 +146,19 @@ return [
'successdel' => 'Le colis a été correctement effacé',
'confirmdelete' => 'Confirmez-vous la suppression du colis ?',
],
'merchandises' => [
'title' => 'Marchandises',
'name' => 'Marchandise',
'description' => 'Gérer les marchandises',
'add' => 'Ajouter une marchandise',
'edit' => 'Editer une marchandise',
'del' => 'Effacer une marchandise',
'list' => 'Liste des marchandises',
'successadd' => 'La marchandise a été correctement ajoutée',
'successmod' => 'La marchandise a été correctement modifiée',
'successdel' => 'La marchandise a été correctement effacée',
'confirmdelete' => 'Confirmez-vous la suppression de la marchandise ?',
],
'offers' => [
'title' => 'Offres',
'name' => 'Offre',
@@ -171,9 +185,23 @@ return [
'successdel' => 'La déclinaison a été correctement effacée',
'confirmdelete' => 'Confirmez-vous la suppression de la déclinaison ?',
],
'producers' => [
'title' => 'Producteurs',
'description' => 'Gérer les producteurs',
'name' => 'Producteur',
'add' => 'Ajouter un producteur',
'edit' => 'Editer un producteur',
'del' => 'Effacer un producteur',
'list' => 'Liste des producteurs',
'successadd' => 'Le producteur été correctement ajouté',
'successmod' => 'Le producteur a été correctement modifié',
'successdel' => 'Le producteur a été correctement effacé',
'confirmdelete' => 'Confirmez-vous la suppression du producteur ?',
],
'prices' => [
'title' => 'Prix',
'description' => 'Gérer les prix',
'name' => 'Prix',
'add' => 'Ajouter un prix',
'edit' => 'Editer un prix',
'del' => 'Effacer un prix',

10
resources/views/Admin/Shop/Merchandises/create.blade.php
View File

@@ -1,11 +1,9 @@
@extends('layout.index', [
'title' => __('shop.merchandises.title'),
'subtitle' => __('shop.merchandises.add'),
'breadcrumb' => [__('shop.merchandises.title'), __('shop.merchandises.add')]
'title' => __('shop.merchandises.title'),
'subtitle' => __('shop.merchandises.add'),
'breadcrumb' => [__('shop.merchandises.title'), __('shop.merchandises.add')],
])
@section('content')
{{ Form::open(['route' => 'Admin.Shop.Merchandises.store', 'id' => 'form', 'autocomplete' => 'off', 'files' => true]) }}
@include('Admin.Shop.Merchandises.form')
</form>
@include('Admin.Shop.Merchandises.form')
@endsection

11
resources/views/Admin/Shop/Merchandises/edit.blade.php
View File

@@ -1,12 +1,9 @@
@extends('layout.index', [
'title' => __('Shop.merchandises.title'),
'subtitle' => __('Shop.merchandises.edit'),
'breadcrumb' => [__('Shop.merchandises.title'), __('Shop.merchandises.edit')]
'title' => __('Shop.merchandises.title'),
'subtitle' => __('Shop.merchandises.edit'),
'breadcrumb' => [__('Shop.merchandises.title'), __('Shop.merchandises.edit')],
])
@section('content')
{{ Form::open(['route' => 'Admin.Shop.Merchandises.store', 'id' => 'form', 'autocomplete' => 'off', 'files' => true]) }}
<input type="hidden" name="id" id="id" value="{{ $merchandise['id'] }}">
@include('Admin.Shop.Merchandises.form')
</form>
@include('Admin.Shop.Merchandises.form')
@endsection

157
resources/views/Admin/Shop/Merchandises/form.blade.php
View File

@@ -1,75 +1,88 @@
{{ Form::open([
'route' => 'Admin.Shop.Merchandises.store',
'id' => 'merchandise-form',
'autocomplete' => 'off',
'files' => true,
]) }}
<input type="hidden" name="id" id="id" value="{{ $merchandise['id'] ?? false }}">
<div class="row">
<div class="col-md-8">
<div class="row mb-3">
<div class="col-6">
{{ Form::label('name', 'Nom') }}
@include('components.form.input', ['name' => 'name', 'value' => $merchandise['name'] ?? null, 'required' => true])
</div>
<div class="col-6">
{{ Form::label('producers', 'Producteur') }}
@include('components.form.select', [
'name' => 'producer_id',
'list' => $producers_list ?? [],
'value' => $merchandise['provider_id'] ?? null,
'class' => 'select2 form-control',
'with_empty' => '',
])
</div>
</div>
<div class="col-md-8">
<div class="row mb-3">
<div class="col-6">
@include('components.form.input', [
'name' => 'name',
'value' => $merchandise['name'] ?? null,
'required' => true,
'label' => 'Nom',
])
</div>
<div class="col-6">
@include('components.form.select', [
'name' => 'producer_id',
'list' => $producers_list ?? [],
'value' => $merchandise['provider_id'] ?? null,
'class' => 'select2 form-control',
'with_empty' => '',
'required' => true,
'label' => __('Shop.producers.name'),
])
</div>
</div>
<div class="row mb-3">
<div class="col-12">
{{ Form::label('tags', 'Tags') }}
@include('components.form.selects.select-tree', [
'name' => 'tags[]',
'list' => $tags_list,
'values' => $merchandise['tags'] ?? null,
'class' => 'select2 form-control',
'multiple' => true
])
</div>
</div>
<div class="row mb-3">
<div class="col-12">
@include('components.form.selects.select-tree', [
'name' => 'tags[]',
'list' => $tags_list,
'values' => $merchandise['tags'] ?? null,
'class' => 'select2 form-control',
'multiple' => true,
'label' => 'Tags',
])
</div>
</div>
<div class="row mb-3">
<div class="col-12">
{{ Form::label('description', 'Description') }}
@include('components.form.textarea', [
'name' => 'description',
'value' => $merchandise['description'] ?? null,
'class' => 'editor',
'rows' => 5,
'required' => false,
])
</div>
</div>
<div class="row mb-3">
<div class="col-12">
@include('components.form.textarea', [
'name' => 'description',
'value' => $merchandise['description'] ?? null,
'class' => 'editor',
'rows' => 5,
'required' => false,
'description' => 'Description',
])
</div>
</div>
<div class="row mb-3">
<div class="col-12">
{{ Form::label('description', 'Son +') }}
@include('components.form.textarea', [
'name' => 'plus',
'value' => $merchandise['plus'] ?? null,
'class' => 'editor',
'rows' => 5,
'required' => false,
])
</div>
</div>
<div class="row mb-3">
<div class="col-12">
@include('components.form.textarea', [
'name' => 'plus',
'value' => $merchandise['plus'] ?? null,
'class' => 'editor',
'rows' => 5,
'required' => false,
'label' => 'Son +',
])
</div>
</div>
</div>
</div>
<div class="col-md-4">
@include('components.uploader.widget', [
'load_url' => route('Admin.Shop.Merchandises.getImages', ['id' => $merchandise['id'] ?? false]),
'delete_url' => route('Admin.Botanic.Varieties.deleteImage'),
'name' => 'images',
])
</div>
<div class="col-md-4">
@include('components.uploader.widget', [
'load_url' => route('Admin.Shop.Merchandises.getImages', ['id' => $merchandise['id'] ?? false]),
'delete_url' => route('Admin.Botanic.Varieties.deleteImage'),
'name' => 'images',
])
</div>
</div>
{{ Form::close() }}
@include('components.save')
<x-save />
@include('load.form.appender')
@include('load.form.editor')
@include('load.form.save')
@@ -79,12 +92,12 @@
@include('boilerplate::load.tinymce')
@push('js')
<script>
$(function() {
initSelect2();
initChevron();
initEditor();
initSaveForm();
});
</script>
@endpush
<script>
$(function() {
initSelect2();
initChevron();
initEditor();
initSaveForm('merchandise-form');
});
</script>
@endpush

2
resources/views/Admin/Shop/Offers/form.blade.php
View File

@@ -1,5 +1,5 @@
{{ Form::open(['route' => 'Admin.Shop.Offers.store', 'id' => 'offer-form', 'autocomplete' => 'off']) }}
<input type="hidden" name="id" value="{{ $offer['id'] }}">
<input type="hidden" name="id" value="{{ $offer['id'] ?? false }}">
<div class="row mb-3">
<div class="col-8">

10
resources/views/Admin/Shop/Producers/create.blade.php
View File

@@ -1,11 +1,9 @@
@extends('layout.index', [
'title' => __('shop.producers.title'),
'subtitle' => __('shop.producers.add'),
'breadcrumb' => [__('shop.producers.title'), __('shop.producers.add')]
'title' => __('shop.producers.title'),
'subtitle' => __('shop.producers.add'),
'breadcrumb' => [__('shop.producers.title'), __('shop.producers.add')],
])
@section('content')
{{ Form::open(['route' => 'Admin.Shop.Producers.store', 'id' => 'form', 'autocomplete' => 'off', 'files' => true]) }}
@include('Admin.Shop.Producers.form')
</form>
@include('Admin.Shop.Producers.form')
@endsection

11
resources/views/Admin/Shop/Producers/edit.blade.php
View File

@@ -1,12 +1,9 @@
@extends('layout.index', [
'title' => __('Shop.producers.title'),
'subtitle' => __('Shop.producers.edit'),
'breadcrumb' => [__('Shop.producers.title'), __('Shop.producers.edit')]
'title' => __('Shop.producers.title'),
'subtitle' => __('Shop.producers.edit'),
'breadcrumb' => [__('Shop.producers.title'), __('Shop.producers.edit')],
])
@section('content')
{{ Form::open(['route' => 'Admin.Shop.Producers.store', 'id' => 'form', 'autocomplete' => 'off', 'files' => true]) }}
<input type="hidden" name="id" id="id" value="{{ $producer['id'] }}">
@include('Admin.Shop.Producers.form')
</form>
@include('Admin.Shop.Producers.form')
@endsection

118
resources/views/Admin/Shop/Producers/form.blade.php
View File

@@ -1,55 +1,67 @@
{{ Form::open(['route' => 'Admin.Shop.Producers.store', 'id' => 'form', 'autocomplete' => 'off', 'files' => true]) }}
<input type="hidden" name="id" id="id" value="{{ $producer['id'] ?? false }}">
<div class="row">
<div class="col-md-8">
<div class="row mb-3">
<div class="col-6">
{{ Form::label('name', 'Nom') }}
@include('components.form.input', ['name' => 'name', 'value' => $producer['name'] ?? null, 'required' => true])
</div>
<div class="col-6">
{{ Form::label('name', 'Alias') }}
@include('components.form.input', ['name' => 'alias', 'value' => $producer['alias'] ?? null, 'required' => true])
</div>
</div>
<div class="col-md-8">
<div class="row mb-3">
<div class="col-6">
@include('components.form.input', [
'name' => 'name',
'value' => $producer['name'] ?? null,
'required' => true,
'label' => 'Nom',
])
</div>
<div class="col-6">
@include('components.form.input', [
'name' => 'alias',
'value' => $producer['alias'] ?? null,
'required' => true,
'label' => 'Alias',
])
</div>
</div>
<div class="row mb-3">
<div class="col-12">
{{ Form::label('tags', 'Tags') }}
@include('components.form.selects.select-tree', [
'name' => 'tags[]',
'list' => $tags_list,
'values' => $producer['tags'] ?? null,
'class' => 'select2 form-control',
'multiple' => true
])
</div>
</div>
<div class="row mb-3">
<div class="col-12">
@include('components.form.selects.select-tree', [
'name' => 'tags[]',
'list' => $tags_list,
'values' => $producer['tags'] ?? null,
'class' => 'select2 form-control',
'multiple' => true,
'label' => 'Tags',
])
</div>
</div>
<div class="row mb-3">
<div class="col-12">
{{ Form::label('description', 'Description') }}
@include('components.form.textarea', [
'name' => 'description',
'value' => $producer['description'] ?? null,
'class' => 'editor',
'rows' => 5,
'required' => false,
])
</div>
</div>
<div class="row mb-3">
<div class="col-12">
@include('components.form.textarea', [
'name' => 'description',
'value' => $producer['description'] ?? null,
'class' => 'editor',
'rows' => 5,
'required' => false,
'label' => 'Description',
])
</div>
</div>
</div>
</div>
<div class="col-md-4">
@include('components.uploader.widget', [
'load_url' => route('Admin.Shop.Merchandises.getImages', ['id' => $producer['id'] ?? false]),
'delete_url' => route('Admin.Botanic.Varieties.deleteImage'),
'name' => 'images',
])
</div>
<div class="col-md-4">
@include('components.uploader.widget', [
'load_url' => route('Admin.Shop.Merchandises.getImages', ['id' => $producer['id'] ?? false]),
'delete_url' => route('Admin.Botanic.Varieties.deleteImage'),
'name' => 'images',
])
</div>
</div>
{{ form::close() }}
@include('components.save')
<x-save />
@include('load.form.appender')
@include('load.form.editor')
@@ -60,12 +72,12 @@
@include('boilerplate::load.tinymce')
@push('js')
<script>
$(function() {
initSelect2();
initChevron();
initEditor();
initSaveForm();
});
</script>
@endpush
<script>
$(function() {
initSelect2();
initChevron();
initEditor();
initSaveForm();
});
</script>
@endpush

16
resources/views/Admin/Shop/Producers/list.blade.php
View File

@@ -1,12 +1,14 @@
@extends('layout.index', [
'title' => __('shop.producers.title'),
'subtitle' => __('shop.producers.list'),
'breadcrumb' => [__('Shop.producers.title')]
'title' => __('shop.producers.title'),
'subtitle' => __('shop.producers.list'),
'breadcrumb' => [__('Shop.producers.title')],
])
@section('content')
@component('components.card')
@include('components.datatable', ['route' => route('Admin.Shop.Producers.index'), 'model' => 'producers'])
@endcomponent
@component('components.card')
@include('components.datatable', [
'route' => route('Admin.Shop.Producers.index'),
'model' => 'producers',
])
@endcomponent
@endsection

14
resources/views/Admin/Shop/Variations/create.blade.php
View File

@@ -1,15 +1,9 @@
@extends('layout.index', [
'title' => __('shop.variations.title'),
'subtitle' => __('shop.variations.add'),
'breadcrumb' => [__('shop.variations.title'), __('shop.variations.index')]
'title' => __('shop.variations.title'),
'subtitle' => __('shop.variations.add'),
'breadcrumb' => [__('shop.variations.title'), __('shop.variations.index')],
])
@include('boilerplate::load.fileinput')
@section('content')
{{ Form::open(['route' => 'Admin.Shop.Variations.store', 'id' => 'variation-form', 'autocomplete' => 'off']) }}
@include('Admin.Shop.Variations.form')
</form>
@include('Admin.Shop.Variations.form')
@endsection

11
resources/views/Admin/Shop/Variations/edit.blade.php
View File

@@ -1,12 +1,9 @@
@extends('layout.index', [
'title' => __('shop.variations.title'),
'subtitle' => __('shop.variations.edit'),
'breadcrumb' => [__('shop.variations.title'), __('shop.variations.index')]
'title' => __('shop.variations.title'),
'subtitle' => __('shop.variations.edit'),
'breadcrumb' => [__('shop.variations.title'), __('shop.variations.index')],
])
@section('content')
{{ Form::open(['route' => 'Admin.Shop.Variations.store', 'id' => 'variation-form', 'autocomplete' => 'off']) }}
<input type="hidden" name="id" value="{{ $variation['id'] }}">
@include('Admin.Shop.Variations.form')
</form>
@include('Admin.Shop.Variations.form')
@endsection

94
resources/views/Admin/Shop/Variations/form.blade.php
View File

@@ -1,43 +1,73 @@
{{ Form::open(['route' => 'Admin.Shop.Variations.store', 'id' => 'variation-form', 'autocomplete' => 'off']) }}
<input type="hidden" name="id" value="{{ $variation['id'] ?? false }}">
<div class="row mb-3">
<div class="col-6">
<div class="row">
<div class="col-6">
{{ Form::label('package_id', 'Package') }}
@include('components.form.select', ['name' => 'package_id', 'list' => $packages ?? [], 'value' => $variation['package_id'] ?? false, 'required' => true, 'with_empty' => ''])
</div>
<div class="col-2">
{{ Form::label('quantity', 'Quantité') }}
@include('components.form.input', ['name' => 'quantity', 'value' => $variation['quantity'] ?? false, 'required' => true])
</div>
<div class="col-4">
{{ Form::label('unity_id', 'Unité') }}
@include('components.form.select', ['name' => 'unity_id', 'list' => $unities ?? [], 'value' => $variation['unity_id'] ?? false, 'required' => false, 'with_empty' => ''])
</div>
</div>
</div>
<div class="col-1">
{{ Form::label('weight', 'Poids') }}
@include('components.form.input', ['name' => 'weight', 'value' => $variation['weight'] ?? false, 'required' => true])
</div>
<div class="col-6">
<div class="row">
<div class="col-6">
@include('components.form.select', [
'name' => 'package_id',
'list' => $packages ?? [],
'value' => $variation['package_id'] ?? false,
'required' => true,
'with_empty' => '',
'label' => 'Package',
])
</div>
<div class="col-2">
@include('components.form.input', [
'name' => 'quantity',
'value' => $variation['quantity'] ?? false,
'required' => true,
'label' => 'Quantité',
])
</div>
<div class="col-4">
@include('components.form.select', [
'name' => 'unity_id',
'list' => $unities ?? [],
'value' => $variation['unity_id'] ?? false,
'required' => true,
'with_empty' => '',
'label' => 'Unité',
])
</div>
</div>
</div>
<div class="col-1">
@include('components.form.input', [
'name' => 'weight',
'value' => $variation['weight'] ?? false,
'required' => true,
'label' => 'Poids',
])
</div>
</div>
<div class="row mb-3">
<div class="col-12">
{{ Form::label('description', 'Description') }}
@include('components.form.textarea', ['name' => 'description', 'value' => isset($variation['description']) ? $variation['description'] : null, 'class' => 'editor', 'required' => false])
</div>
<div class="col-12">
@include('components.form.textarea', [
'name' => 'description',
'value' => $variation['description'] ?? null,
'class' => 'editor',
'required' => false,
'label' => 'Description',
])
</div>
</div>
{{ form::close() }}
@include('components.save')
<x-save />>
@include('load.form.editor')
@include('load.form.save')
@push('js')
<script>
$(function() {
initEditor();
initSaveForm('#variation-form')
});
</script>
@endpush
{!! JsValidator::formRequest('App\Http\Requests\Admin\Shop\StoreVariationPost', '#variation-form') !!}
<script>
$(function() {
initEditor();
initSaveForm('#variation-form')
});
</script>
@endpush