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

Fixes

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2021-04-02 20:26:13 +02:00
parent e50bcffdd7
commit e6e86767d3
6 changed files with 8 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/DataTables/Shop/ArticleAttributeFamiliesDataTable.php
View File

@@ -1,29 +0,0 @@
<?php
namespace App\Datatables\Shop;
use Yajra\DataTables\Html\Column;
use App\Datatables\ParentDataTable as DataTable;
use App\Models\Shop\ArticleAttributeFamily;
class ArticleAttributeFamiliesDataTable extends DataTable
{
public $model_name = 'ArticleAttributeFamilies';
public function query(ArticleAttributeFamily $model)
{
$model = $model::withCount(['values','articles']);
return self::buildQuery($model);
}
protected function getColumns()
{
return [
Column::make('name')->title('Nom'),
Column::make('values_count')->title('Nb attributs')->searchable(false)->addClass('text-right'),
Column::make('articles_count')->title('Nb d\'articles')->searchable(false)->addClass('text-right'),
self::makeColumnButtons(),
];
}
}

2
app/DataTables/Shop/PriceGenericCategoriesDataTable.php
View File

@@ -10,7 +10,7 @@ class PriceGenericCategoriesDataTable extends DataTable
{ {
public $model_name = 'price-generics'; public $model_name = 'price-generics';
public function query(PriceGeneric $model) public function query(PriceGenericCategory $model)
{ {
return self::buildQuery($model); return self::buildQuery($model);
} }

13
resources/views/Shop/Admin/ArticleFamilies/create.blade.php
View File

@@ -9,19 +9,6 @@
@section('content') @section('content')
{{ Form::open(['route' => 'Shop.Admin.ArticleFamilies.store', 'id' => 'article-family-form', 'autocomplete' => 'off', 'files' => true]) }} {{ Form::open(['route' => 'Shop.Admin.ArticleFamilies.store', 'id' => 'article-family-form', 'autocomplete' => 'off', 'files' => true]) }}
<div class="row">
<div class="col-sm-12 mbl">
<a href="{{ route("Shop.Admin.Articles.index") }}" class="btn btn-default">
{{ __('article_families.list.title') }}
</a>
<span class="btn-group pull-right">
@include('components.button-save')
</span>
</div>
</div>
@include('Shop.Admin.ArticleFamilies.form') @include('Shop.Admin.ArticleFamilies.form')
</form> </form>

13
resources/views/Shop/Admin/ArticleFamilies/edit.blade.php
View File

@@ -9,19 +9,6 @@
@section('content') @section('content')
{{ Form::open(['route' => 'Shop.Admin.ArticleFamilies.update', 'id' => 'article-family-form', 'autocomplete' => 'off', 'files' => true]) }} {{ Form::open(['route' => 'Shop.Admin.ArticleFamilies.update', 'id' => 'article-family-form', 'autocomplete' => 'off', 'files' => true]) }}
<div class="row">
<div class="col-sm-12 mbl">
<a href="{{ route("Shop.Admin.ArticleFamilies.index") }}" class="btn btn-default">
{{ __('article_families.list.title') }}
</a>
<span class="btn-group pull-right">
@include('components.button-save')
</span>
</div>
</div>
<input type="hidden" name="id" value="{{ $id }}"> <input type="hidden" name="id" value="{{ $id }}">
@include('Shop.Admin.ArticleFamilies.form') @include('Shop.Admin.ArticleFamilies.form')
</form> </form>

21
resources/views/Shop/Admin/ArticleFamilies/form.blade.php
View File

@@ -1,29 +1,22 @@
@include('boilerplate::load.tinymce') @include('boilerplate::load.tinymce')
<div class="row"> <div class="row">
<div class="col-md-8"> <div class="col-md-8">
{{ Form::label('name', 'Nom') }} {{ Form::label('name', 'Nom') }}
@include('components.input', ['name' => 'name', 'value' => (isset($family['name'])) ? $family['name'] : null, 'required' => true]) @include('components.input', ['name' => 'name', 'value' => (isset($family['name'])) ? $family['name'] : null, 'required' => true])
{{ Form::label('description', 'Description') }} {{ Form::label('description', 'Description') }}
@include('components.textarea', ['name' => 'description', 'value' => isset($description) ? $description : null, 'class' => 'editor', 'required' => false]) @include('components.textarea', ['name' => 'description', 'value' => isset($family['description']) ? $family['description'] : null, 'class' => 'editor', 'required' => false])
</div> </div>
</div> </div>
<div class="row"> @include('components.save')
<div class="col-md-8">
<div class="float-right mt-3">
@include('components.button-save')
</div>
</div>
</div>
@push('js') @push('js')
<script> <script>
$(function() { $(function() {
$('.editor').tinymce({}); $('.editor').tinymce({});
}); });
</script> </script>
@endpush @endpush

12
resources/views/Shop/Admin/Tags/list.blade.php
View File

@@ -7,15 +7,3 @@
@section('content') @section('content')
@include('components.datatable', ['route' => route('Shop.Admin.Tags.index'), 'model' => 'tags']) @include('components.datatable', ['route' => route('Shop.Admin.Tags.index'), 'model' => 'tags'])
@endsection @endsection
@push('scripts')
<script>
$.extend( true, $.fn.dataTable.defaults, {
rowReorder: true
} );
</script>
@include('components.js.datatable', ['route' => route('Shop.Admin.Tags.index'), 'model' => 'tags'])
@endpush