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

Fix

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2021-11-04 16:37:42 +01:00
parent eb0c9444bc
commit 4761656405
12 changed files with 59 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/Datatables/ParentDataTable.php
View File

@@ -97,6 +97,7 @@ class ParentDataTable extends DataTable
*/ */
public function buildQuery($model) public function buildQuery($model)
{ {
// $model = $model->select($model->getTable() . '.*');
return $model->newQuery(); return $model->newQuery();
} }

2
app/Datatables/Shop/OffersDataTable.php
View File

@@ -12,7 +12,7 @@ class OffersDataTable extends DataTable
public function query(Offer $model) public function query(Offer $model)
{ {
$model = $model->with(['article.article_nature', 'variation', 'tariff']); $model = $model->with(['article.article_nature', 'variation', 'tariff'])->select($model->getTable() . '.*');
$model = self::filterByArticleNature($model); $model = self::filterByArticleNature($model);
$model = self::filterByPackage($model); $model = self::filterByPackage($model);
return $this->buildQuery($model); return $this->buildQuery($model);

8
app/Datatables/Shop/VariationsDataTable.php
View File

@@ -16,6 +16,14 @@ class VariationsDataTable extends DataTable
return $this->buildQuery($model); return $this->buildQuery($model);
} }
public function modifier($datatables)
{
$datatables
->rawColumns(['description','action'])
;
return parent::modifier($datatables);
}
protected function getColumns() protected function getColumns()
{ {
return [ return [

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

@@ -8,7 +8,7 @@
@section('content') @section('content')
{{ Form::open(['route' => 'Admin.Shop.ArticleNatures.store', 'id' => 'article-nature-form', 'autocomplete' => 'off', 'files' => true]) }} {{ Form::open(['route' => 'Admin.Shop.ArticleNatures.store', 'id' => 'article_nature-form', 'autocomplete' => 'off', 'files' => true]) }}
@include('Admin.Shop.ArticleNatures.form') @include('Admin.Shop.ArticleNatures.form')
</form> </form>

2
resources/views/Admin/Shop/ArticleNatures/edit.blade.php
View File

@@ -8,7 +8,7 @@
@section('content') @section('content')
{{ Form::open(['route' => 'Admin.Shop.ArticleNatures.update', 'id' => 'article-nature-form', 'autocomplete' => 'off', 'files' => true]) }} {{ Form::open(['route' => 'Admin.Shop.ArticleNatures.update', 'id' => 'article_nature-form', 'autocomplete' => 'off', 'files' => true]) }}
<input type="hidden" name="id" value="{{ $article_nature['id'] }}"> <input type="hidden" name="id" value="{{ $article_nature['id'] }}">
@include('Admin.Shop.ArticleNatures.form') @include('Admin.Shop.ArticleNatures.form')
</form> </form>

25
resources/views/Admin/Shop/ArticleNatures/form.blade.php
View File

@@ -1,22 +1,31 @@
@include('boilerplate::load.tinymce')
<div class="row"> <div class="row">
<div class="col-md-8"> <div class="col-md-8">
{{ Form::label('name', 'Nom') }} <div class="row mb-3">
@include('components.form.input', ['name' => 'name', 'value' => $article_nature['name'] ?? null, 'required' => true]) <div class="col-12">
{{ Form::label('name', 'Nom') }}
{{ Form::label('description', 'Description') }} @include('components.form.input', ['name' => 'name', 'value' => $article_nature['name'] ?? null, 'required' => true])
@include('components.form.textarea', ['name' => 'description', 'value' => $article_nature['description'] ?? null, 'class' => 'editor', 'required' => false]) </div>
</div>
<div class="row mb-3">
<div class="col-12">
{{ Form::label('description', 'Description') }}
@include('components.form.textarea', ['name' => 'description', 'value' => $article_nature['description'] ?? null, 'class' => 'editor', 'required' => false])
</div>
</div>
</div> </div>
</div> </div>
@include('components.save') @include('components.save')
@include('load.form.editor')
@include('load.form.save')
@push('js') @push('js')
<script> <script>
$(function() { $(function() {
$('.editor').tinymce({}); initEditor();
initSaveForm('#article_nature-form');
}); });
</script> </script>
@endpush @endpush

10
resources/views/Admin/Shop/Packages/form.blade.php
View File

@@ -7,3 +7,13 @@
</div> </div>
@include('components.save') @include('components.save')
@include('load.form.save')
@push('js')
<script>
$(function() {
initSaveForm('#package-form');
});
</script>
@endpush

2
resources/views/Admin/Shop/PriceLists/partials/filters.blade.php
View File

@@ -1,3 +1,3 @@
<form id="{{ $model }}-filters"> <form id="{{ $model }}-filters">
<input type="text" name="tariff_id" value="{{ $tariff['id'] ?? false }}"> <input type="hidden" name="tariff_id" value="{{ $tariff['id'] ?? false }}">
</form> </form>

18
resources/views/Admin/Shop/Unities/form.blade.php
View File

@@ -5,10 +5,14 @@
</div> </div>
</div> </div>
<div class="row"> @include('components.save')
<div class="col-md-8">
<div class="float-right mt-3"> @include('load.form.save')
@include('components.form.buttons.button-save')
</div> @push('js')
</div> <script>
</div> $(function() {
initSaveForm('#unity-form');
});
</script>
@endpush

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

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

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

@@ -1,11 +1,11 @@
@extends('layout.index', [ @extends('layout.index', [
'title' => 'Famille d\'articles', 'title' => __('shop.variations.title'),
'subtitle' => 'Edition d\'une famille d\'article', 'subtitle' => __('shop.variations.edit'),
'breadcrumb' => ['Articles'] 'breadcrumb' => [__('shop.variations.title'), __('shop.variations.index')]
]) ])
@section('content') @section('content')
{{ Form::open(['route' => 'Admin.Shop.Variations.store', 'id' => 'article-family-form', 'autocomplete' => 'off']) }} {{ Form::open(['route' => 'Admin.Shop.Variations.store', 'id' => 'variation-form', 'autocomplete' => 'off']) }}
<input type="hidden" name="id" value="{{ $variation['id'] }}"> <input type="hidden" name="id" value="{{ $variation['id'] }}">
@include('Admin.Shop.Variations.form') @include('Admin.Shop.Variations.form')
</form> </form>

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

@@ -27,11 +27,13 @@
@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('#variation-form')
}); });
</script> </script>
@endpush @endpush