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
2020-07-16 14:32:18 +02:00
parent d8bd1a1713
commit cc6edb2480
13 changed files with 80 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Http/Controllers/Shop/Admin/ArticleAttributeValueController.php
View File

@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Shop\Admin;
use Illuminate\Http\Request; use Illuminate\Http\Request;
use App\Http\Controllers\Controller; use App\Http\Controllers\Controller;
use App\Repositories\Shop\ArticleAttributeFamilies;
use App\Repositories\Shop\ArticleAttributeValues; use App\Repositories\Shop\ArticleAttributeValues;
use App\DataTables\Shop\ArticleAttributeValuesDataTable; use App\DataTables\Shop\ArticleAttributeValuesDataTable;
@@ -12,7 +13,8 @@ class ArticleAttributeValueController extends Controller
{ {
public function index(ArticleAttributeValuesDataTable $dataTable) public function index(ArticleAttributeValuesDataTable $dataTable)
{ {
return $dataTable->render('Shop.Admin.ArticleAttributeValues.list'); $data['families'] = ArticleAttributeFamilies::getOptions();
return $dataTable->render('Shop.Admin.ArticleAttributeValues.list', $data);
} }
public function getDatatable(Request $request) public function getDatatable(Request $request)
@@ -26,7 +28,6 @@ class ArticleAttributeValueController extends Controller
return response()->json(ArticleAttributeValues::getSelectByFamily($id)); return response()->json(ArticleAttributeValues::getSelectByFamily($id));
} }
public function create() public function create()
{ {
return view('Shop.Admin.ArticleAttributeValues.create'); return view('Shop.Admin.ArticleAttributeValues.create');

2
app/Repositories/Shop/ArticleAttributes.php
View File

@@ -54,8 +54,6 @@ class ArticleAttributes
public static function update($data, $id = false) public static function update($data, $id = false)
{ {
dump($data);
exit;
$id = isset($data['id']) ? $id : $data['id']; $id = isset($data['id']) ? $id : $data['id'];
return ArticleAttribute::find($id)->update($data); return ArticleAttribute::find($id)->update($data);
} }

2
resources/views/Shop/Admin/ArticleAttributeValues/create.blade.php
View File

@@ -22,7 +22,7 @@
</div> </div>
</div> </div>
@include('Shop.Admin.ArticleAttributes.form') @include('Shop.Admin.ArticleAttributeValues.form')
</form> </form>
@endsection @endsection

6
resources/views/Shop/Admin/ArticleAttributeValues/edit.blade.php
View File

@@ -8,11 +8,11 @@
@section('content') @section('content')
{{ Form::open(['route' => 'Shop.Admin.ArticleAttributes.update', 'id' => 'article-attribute-form', 'autocomplete' => 'off', 'files' => true]) }} {{ Form::open(['route' => 'Shop.Admin.ArticleAttributeValues.update', 'id' => 'article-attribute-form', 'autocomplete' => 'off', 'files' => true]) }}
<div class="row"> <div class="row">
<div class="col-sm-12 mbl"> <div class="col-sm-12 mbl">
<a href="{{ route("Shop.Admin.ArticleAttributes.index") }}" class="btn btn-default"> <a href="{{ route("Shop.Admin.ArticleAttributeValues.index") }}" class="btn btn-default">
{{ __('article_attributes.list.title') }} {{ __('article_attributes.list.title') }}
</a> </a>
@@ -23,7 +23,7 @@
</div> </div>
<input type="hidden" name="id" value="{{ $id }}"> <input type="hidden" name="id" value="{{ $id }}">
@include('Shop.Admin.ArticleAttributes.form') @include('Shop.Admin.ArticleAttributeValues.form')
</form> </form>
@endsection @endsection

11
resources/views/Shop/Admin/ArticleAttributeValues/list.blade.php
View File

@@ -5,9 +5,16 @@
]) ])
@section('content') @section('content')
@include('components.datatable', ['route' => route('Shop.Admin.ArticleAttributeValues.index'), 'model' => 'articleattributes']) @component('components.card')
@include('components.datatable', ['route' => route('Shop.Admin.ArticleAttributeValues.index'), 'model' => 'articleattributevalues'])
@endcomponent
@component('components.layout.modal', ['title' => 'Filtres', 'id' => 'modal-filters'])
@include('Shop.Admin.ArticleAttributeValues.partials.filters')
@endcomponent
@endsection @endsection
@push('scripts') @push('scripts')
@include('components.js.datatable', ['route' => route('Shop.Admin.ArticleAttributeValues.index'), 'model' => 'articleattributes']) @include('components.js.datatable', ['route' => route('Shop.Admin.ArticleAttributeValues.index'), 'model' => 'articleattributevalues'])
@endpush @endpush

9
resources/views/Shop/Admin/ArticleAttributeValues/partials/filters.blade.php Normal file
View File

@@ -0,0 +1,9 @@
<form id="filters">
<div class="row">
<label class="col-4">Familles d'attributs</label>
<div class="col-8">
@include('components.select', ['name' => 'article_attribute_family_id', 'list' => (isset($families)) ? $families : [], 'value' => (isset($filters['article_attribute_family_id'])) ? $filters['article_attribute_family_id'] : null, 'class' => 'form-control-sm select2', 'with_empty' => ' '])
</div>
</div>
</form>

2
resources/views/components/datatables/buttons/exports.blade.php
View File

@@ -1,4 +1,4 @@
<div class="text-right datatable-export-buttons"> <div class="datatable-export-buttons">
<button type="button" class="btn bg-gradient-secondary btn-print" data-placement="top" data-original-title="Imprimer le tableau"> <button type="button" class="btn bg-gradient-secondary btn-print" data-placement="top" data-original-title="Imprimer le tableau">
<i class="fa fa-print"></i> <i class="fa fa-print"></i>

18
resources/views/components/datatables/buttons/filters.blade.php
View File

@@ -1,4 +1,20 @@
<button type="button" class="btn bg-gradient-secondary btn-filter"> <button type="button" class="btn bg-gradient-secondary btn-filter" data-toggle="modal" data-target="#modal-filters">
<i class="fa fa-filter"></i> <i class="fa fa-filter"></i>
<span class="badge badge-info"></span>
</button> </button>
@push('js')
<script>
var $filter = $('#{{ $model }}-table-header .btn-filter');
$('#modal-filters').on('shown.bs.modal', function () {
// initSelect2();
});
$('#modal-filters .apply').click(function() {
$('#modal-filters').modal('hide');
var table = window.LaravelDataTables["{{ $model }}-table"];
table.draw();
})
</script>
@endpush

2
resources/views/components/datatables/buttons/pageLength.blade.php Normal file
View File

@@ -0,0 +1,2 @@
@include('components.select', ['name' => 'pager', 'list' => ['5', '10','25', '50', '100']])
&nbsp;&nbsp;

6
resources/views/components/datatables/header.blade.php
View File

@@ -1,11 +1,11 @@
<div class="row table-header" id="{{ $model }}-table-header"> <div class="row table-header" id="{{ $model }}-table-header">
<div class="col-lg-6 col-md-10 col-sm-8 mb-2"> <div class="col-lg-6 col-md-8 col-12 mb-2">
@include('components.datatables.search') @include('components.datatables.search')
</div> </div>
<div class="col-lg-4 col-md-6 col-sm-6"> <div class="col-lg-4 col-md-3 col-6">
@include('components.datatables.buttons.exports') @include('components.datatables.buttons.exports')
</div> </div>
<div class="col-lg-2 col-md-2 col-sm-4 text-right"> <div class="col-lg-2 col-md-1 col-6 text-right">
@include('components.datatables.buttons.add') @include('components.datatables.buttons.add')
</div> </div>
</div> </div>

2
resources/views/components/js/datatable.blade.php
View File

@@ -1,4 +1,4 @@
<script> <script>
$.extend( true, $.fn.dataTable.defaults, { $.extend( true, $.fn.dataTable.defaults, {
language: { language: {
url: "/assets/vendor/boilerplate/js/datatables/i18n/French.json" url: "/assets/vendor/boilerplate/js/datatables/i18n/French.json"

12
resources/views/components/layout/box-collapse.blade.php Normal file
View File

@@ -0,0 +1,12 @@
<div class="card">
<div class="card-header p-0">
<button class="btn btn-link pull-right collapsed" type="button" data-toggle="collapse" data-target="#{{ $id }}" aria-expanded="true" aria-controls="collapseOne">
<i class="fa fa-plus"></i>
</button>
{{ $title }} @if(isset($required) && $required)<sup>*</sup>@endif
<span class="check ml-5 error"></span>
</div>
<div id="{{ $id }}" class="card-body collapse">
{{ $slot }}
</div>
</div>

19
resources/views/components/layout/modal.blade.php Normal file
View File

@@ -0,0 +1,19 @@
<div class="modal fade" id="{{ $id }}" tabindex="-1" role="dialog" aria-labelledby="{{ $id }}" aria-hidden="true">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<h5 class="modal-title">{{ $title }}</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
{{ $slot }}
</div>
<div class="modal-footer">
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
<button type="button" class="btn btn-info apply">Apply</button>
</div>
</div>
</div>
</div>