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

Fixes on new model

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2020-07-26 23:17:49 +02:00
parent 4de381db06
commit 71e27ce9c3
19 changed files with 116 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
resources/views/Shop/Admin/ArticleAttributeFamilies/index.blade.php
View File

@@ -10,10 +10,10 @@
<nav>
<div class="nav nav-tabs">
<a href="#families" data-toggle="tab" class="nav-item nav-link active" role="tab" aria-controls="families" aria-selected="true">
<a href="#families" data-toggle="tab" class="nav-item nav-link" role="tab" aria-controls="families" aria-selected="true">
{{ __('Shop.article_attribute_families.title') }}
</a>
<a href="#values" data-toggle="tab" class="nav-item nav-link" role="tab" aria-controls="values" aria-selected="false">
<a href="#values" data-toggle="tab" class="nav-item nav-link active" role="tab" aria-controls="values" aria-selected="false">
{{ __('Shop.article_attribute_values.title') }}
</a>
</div>
@@ -21,13 +21,13 @@
<div class="tab-content mb-0">
<div class="tab-pane fade show active" id="families">
<div class="tab-pane fade" id="families">
@component('components.card')
@include('components.datatable', ['route' => route('Shop.Admin.ArticleAttributeFamilies.index'), 'model' => 'ArticleAttributeFamilies'])
@endcomponent
</div>
<div class="tab-pane fade" id="values">
<div class="tab-pane fade show active" id="values">
@component('components.card')
@include('components.datatable', ['route' => route('Shop.Admin.ArticleAttributeValues.index'), 'model' => 'ArticleAttributeValues'])
@endcomponent

4
resources/views/Shop/Admin/ArticleAttributeFamilies/list.blade.php
View File

@@ -7,7 +7,3 @@
@section('content')
@include('components.datatable', ['route' => route('Shop.Admin.ArticleAttributeFamilies.index'), 'model' => 'ArticleAttributefamilies'])
@endsection
@push('scripts')
@include('components.js.datatable', ['route' => route('Shop.Admin.ArticleAttributeFamilies.index'), 'model' => 'ArticleAttributefamilies'])
@endpush

49
resources/views/Shop/Admin/ArticleAttributeValues/index.blade.php Normal file
View File

@@ -0,0 +1,49 @@
@extends('layout.index', [
'title' => __('Shop.article_attribute_families.title'),
'subtitle' => __('Shop.article_attribute_families.list'),
'breadcrumb' => [__('Shop.article_attribute_families.title')]
])
@include('boilerplate::load.select2')
@section('content')
<nav>
<div class="nav nav-tabs">
<a href="#families" data-toggle="tab" class="nav-item nav-link" role="tab" aria-controls="families" aria-selected="true">
{{ __('Shop.article_attribute_families.title') }}
</a>
<a href="#values" data-toggle="tab" class="nav-item nav-link active" role="tab" aria-controls="values" aria-selected="false">
{{ __('Shop.article_attribute_values.title') }}
</a>
</div>
</nav>
<div class="tab-content mb-0">
<div class="tab-pane fade" id="families">
@section('content')
@include('components.datatable', ['route' => route('Shop.Admin.ArticleAttributeFamilies.index'), 'model' => 'ArticleAttributefamilies'])
@endsection
</div>
<div class="tab-pane fade show active" id="values">
@section('content')
@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
</div>
</div>
@endsection
@push('scripts')
@include('components.js.datatable', ['route' => route('Shop.Admin.ArticleAttributeFamilies.index'), 'model' => 'ArticleAttributeFamilies'])
@include('components.js.datatable', ['route' => route('Shop.Admin.ArticleAttributeValues.index'), 'model' => 'ArticleAttributeValues'])
@endpush

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

@@ -6,7 +6,7 @@
@section('content')
@component('components.card')
@include('components.datatable', ['route' => route('Shop.Admin.ArticleAttributeValues.index'), 'model' => 'articleattributevalues'])
@include('components.datatable', ['route' => route('Shop.Admin.ArticleAttributeValues.index'), 'model' => 'ArticleAttributeValues'])
@endcomponent
@component('components.layout.modal', ['title' => 'Filtres', 'id' => 'modal-filters'])

6
resources/views/Shop/Admin/ArticleFamilies/list.blade.php
View File

@@ -5,9 +5,5 @@
])
@section('content')
@include('components.datatable', ['route' => route('Shop.Admin.ArticleFamilies.index'), 'model' => 'articlefamilies'])
@include('components.datatable', ['route' => route('Shop.Admin.ArticleFamilies.index'), 'model' => 'ArticleFamilies'])
@endsection
@push('scripts')
@include('components.js.datatable', ['route' => route('Shop.Admin.ArticleFamilies.index'), 'model' => 'articlefamilies'])
@endpush

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

@@ -9,6 +9,7 @@
@section('content')
{{ Form::open(['route' => 'Shop.Admin.Articles.store', 'id' => 'article-form', 'autocomplete' => 'off', 'files' => true]) }}
<input type="hidden" name="id" id="id" value="{{ $id }}">
<div class="row">
<div class="col-sm-12 mbl">
@@ -22,7 +23,6 @@
</div>
</div>
<input type="hidden" name="id" id="id" value="{{ $id }}">
@include('Shop.Admin.Articles.form')
</form>

4
resources/views/Shop/Admin/Articles/list.blade.php
View File

@@ -7,7 +7,3 @@
@section('content')
@include('components.datatable', ['route' => route('Shop.Admin.Articles.index'), 'model' => 'articles'])
@endsection
@push('scripts')
@include('components.js.datatable', ['route' => route('Shop.Admin.Articles.index'), 'model' => 'articles'])
@endpush

2
resources/views/Shop/Admin/Articles/partials/prices/block_price.blade.php
View File

@@ -13,7 +13,7 @@
</div>
<div class="col-lg-4">
@include('Shop.Admin.Articles.partials.prices.block_attribute', ['attribute' => $price['article_attributes'][0]])
@include('Shop.Admin.Articles.partials.prices.block_attribute', ['attribute' => $price['article_attribute']])
</div>
<div class="col-lg-6">

4
resources/views/Shop/Admin/TagGroups/list.blade.php
View File

@@ -7,7 +7,3 @@
@section('content')
@include('components.datatable', ['route' => route('Shop.Admin.TagGroups.index'), 'model' => 'TagGroups'])
@endsection
@push('scripts')
@include('components.js.datatable', ['route' => route('Shop.Admin.TagGroups.index'), 'model' => 'TagGroups'])
@endpush