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

Fixes size of description on article, fix save form on Families and genres

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2022-01-22 17:53:24 +01:00
parent 2912dc6794
commit 6f04a8e7b7
5 changed files with 27 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/Datatables/Shop/TariffsDataTable.php
View File

@@ -13,7 +13,7 @@ class TariffsDataTable extends DataTable
public function query(Tariff $model) public function query(Tariff $model)
{ {
$model = $model->with(['sale_channels'])->select(['shop_tariffs.*']); $model = $model->with(['sale_channels'])->withCount(['price_lists', 'offers']);
return $this->buildQuery($model); return $this->buildQuery($model);
} }
@@ -42,6 +42,8 @@ class TariffsDataTable extends DataTable
Column::make('sale_channels2')->title('Canaux de vente'), Column::make('sale_channels2')->title('Canaux de vente'),
Column::make('code')->title('Code'), Column::make('code')->title('Code'),
Column::make('ref')->title('Référence'), Column::make('ref')->title('Référence'),
Column::make('price_lists_count')->title('#Lst prix'),
Column::make('offers_count')->title('#Offres'),
$this->makeColumnButtons(), $this->makeColumnButtons(),
]; ];
} }

2
database/migrations/2020_04_20_212813_create_shop_articles_table.php
View File

@@ -16,7 +16,7 @@ class CreateShopArticlesTable extends Migration {
{ {
$table->increments('id'); $table->increments('id');
$table->string('name')->nullable(); $table->string('name')->nullable();
$table->string('description')->nullable(); $table->text('description')->nullable();
$table->timestamps(); $table->timestamps();
$table->softDeletes(); $table->softDeletes();
}); });

11
resources/views/Admin/Botanic/Families/form.blade.php
View File

@@ -3,25 +3,25 @@
<div class="row mb-3"> <div class="row mb-3">
<div class="col-6"> <div class="col-6">
{{ Form::label('name', 'Nom') }} {{ Form::label('name', 'Nom') }}
@include('components.form.input', ['name' => 'name', 'value' => (isset($family['name'])) ? $family['name'] : null, 'required' => true]) @include('components.form.input', ['name' => 'name', 'value' => $family['name'] ?? null, 'required' => true])
</div> </div>
<div class="col-6"> <div class="col-6">
{{ Form::label('alias', 'Alias') }} {{ Form::label('alias', 'Alias') }}
@include('components.form.input', ['name' => 'alias', 'value' => (isset($family['alias'])) ? $family['alias'] : null]) @include('components.form.input', ['name' => 'alias', 'value' => $family['alias'] ?? null])
</div> </div>
</div> </div>
<div class="row mb-3"> <div class="row mb-3">
<div class="col-12"> <div class="col-12">
{{ Form::label('latin', 'Nom latin') }} {{ Form::label('latin', 'Nom latin') }}
@include('components.form.input', ['name' => 'latin', 'value' => (isset($family['latin'])) ? $family['latin'] : null, 'required' => true]) @include('components.form.input', ['name' => 'latin', 'value' => $family['latin'] ?? null, 'required' => true])
</div> </div>
</div> </div>
<div class="row mb-3"> <div class="row mb-3">
<div class="col-12"> <div class="col-12">
{{ Form::label('description', 'Description') }} {{ Form::label('description', 'Description') }}
@include('components.form.textarea', ['name' => 'description', 'value' => isset($family['description']) ? $family['description'] : null, 'class' => 'editor', 'required' => true]) @include('components.form.textarea', ['name' => 'description', 'value' => $family['description'] ?? null, 'class' => 'editor', 'required' => true])
</div> </div>
</div> </div>
@@ -31,11 +31,14 @@
@include('components.save') @include('components.save')
@include('load.form.editor') @include('load.form.editor')
@include('load.form.save')
@push('js') @push('js')
<script> <script>
$(function() { $(function() {
initEditor(); initEditor();
initSaveForm();
}); });
</script> </script>
@endpush @endpush

13
resources/views/Admin/Botanic/Genres/form.blade.php
View File

@@ -41,3 +41,16 @@
</div> </div>
@include('components.save') @include('components.save')
@include('load.form.editor')
@include('load.form.save')
@push('js')
<script>
$(function() {
initEditor();
initSaveForm();
});
</script>
@endpush

4
resources/views/components/form/textarea.blade.php
View File

@@ -1,6 +1,6 @@
<textarea <textarea
name="{{ $name }}" name="{{ $name }}"
@if (isset($id_name))id="{{ $id_name }}"@endif @if (isset($id_name))id="{{ $id_name }}"@endif
class="form-control @if (isset($class)){{ $class }}@endif" class="form-control {{ $class ?? null }}"
@if (isset($rows)) rows="{{ $rows }}"@endif @if (isset($rows)) rows="{{ $rows }}"@endif
>@if (isset($value)){{ $value }}@endif</textarea> >{{ $value ?? null }}</textarea>