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

Fixes for deliveries vs sale_channels

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2021-11-23 23:37:47 +01:00
parent 323330b1a1
commit 5b84ff74e3
36 changed files with 279 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,6 @@
<form id="{{ $model }}-filters">
<div class="row">
<label class="col-4">{{ __('article_natures.title') }}</label>
<label class="col-4">{{ __('shop.article_natures.title') }}</label>
<div class="col-8">
@include('components.form.select', ['name' => 'article_nature_id', 'list' => $article_natures ?? [], 'value' => $filters['article_nature_id'] ?? null, 'class' => 'form-control-sm select2', 'with_empty' => ' '])
</div>

2
resources/views/Admin/Shop/Articles/partials/product/description.blade.php
View File

@@ -7,7 +7,7 @@
@if ($inherited['tags'])
<h6> Tags</h6>
@foreach ($inherited['tags'] as $tag)
<button type="button" class="btn btn-secondary btn-xs">{{ $tag['group']['name'] }}-{{ $tag['name'] }}</button>
<button type="button" class="btn btn-secondary btn-xs">{{ $tag['group']['name'] }}-{{ $tag['name']['fr'] }}</button>
@endforeach
@endif
@endcomponent

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

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

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

@@ -6,7 +6,7 @@
@section('content')
{{ Form::open(['route' => 'Admin.Shop.Categories.store', 'id' => 'form', 'autocomplete' => 'off']) }}
{{ Form::open(['route' => 'Admin.Shop.Categories.store', 'id' => 'category-form', 'autocomplete' => 'off']) }}
<input type="hidden" name="id" value="{{ $category['id'] }}">
@include('Admin.Shop.Categories.form')
</form>

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

@@ -39,10 +39,12 @@
@include('load.form.select2')
@include('load.form.editor')
@include('load.form.save')
@push('js')
<script>
$(function() {
initSaveForm('#category-form');
initSelect2();
initEditor();
});

18
resources/views/Admin/Shop/Categories/list.blade.php
View File

@@ -5,17 +5,29 @@
])
@section('content')
<div class="row">
<div class="col-8">
@component('components.card')
@include('components.datatable', ['route' => route('Admin.Shop.Categories.index'), 'model' => 'categories'])
@include('components.datatable', ['route' => route('Admin.Shop.Categories.index'), 'model' => 'categories', 'callback' => 'handleCategory();'])
@endcomponent
</div>
<div class="col-4">
@include('Admin.Shop.Categories.partials.tree')
</div>
</div>
@endsection
@include('load.form.select2')
@include('load.form.toggle')
@push('js')
<script>
function handleCategory() {
initToggle("{{ route('Admin.Shop.Categories.toggleVisible') }}");
}
$(document).ready(function () {
initSelect2();
});
</script>
@endpush

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

@@ -4,8 +4,6 @@
'breadcrumb' => [__('shop.customers.title')]
])
@include('boilerplate::load.fileinput')
@section('content')
{{ Form::open(['route' => 'Admin.Shop.Customers.update', 'id' => 'customer-form', 'autocomplete' => 'off']) }}

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

@@ -17,7 +17,7 @@
</div>
<div class="col-6">
{{ Form::label('sale_delivery_id', __('shop.deliveries.name')) }}
@include('components.form.select', ['name' => 'sale_delivery_id', 'list' => $sale_deliveries ?? [], 'value' => $customer['sale_delivery_id'] ?? null, 'with_empty' => '', 'class' => 'select2'])
@include('components.form.select', ['name' => 'sale_delivery_id', 'list' => $deliveries ?? [], 'values' => $customer['deliveries'] ?? null, 'with_empty' => '', 'class' => 'select2', 'multiple' => true])
</div>
</div>
@include('components.address', ['with_country' => false])

4
resources/views/Admin/Shop/PriceLists/partials/table-prices.blade.php
View File

@@ -1,9 +1,9 @@
@if (count($prices ?? []))
<table class="table table-bordered table-hover table-striped w-100 mb-0 dataTable">
<table class="table table-bordered table-hover table-striped w-100 mb-0">
<tr>
@foreach ($prices as $price)
<td>
{{ $price['code'] ?? null }} - {{ $price['quantity'] ?? null }} : {{ $price['price_taxed'] ?? null }} €
{{ "{" . ($price['code'] ?? null) . "}" }} - {{ $price['quantity'] ?? null }} : {{ $price['price_taxed'] ?? null }} € TTC
</td>
@endforeach
</tr>

6
resources/views/components/form/select.blade.php
View File

@@ -11,10 +11,6 @@
<option value=''>{{ $with_empty }}</option>
@endif
@if (isset($multiple))
@include('components.form.options.options-multiple')
@else
@include('components.form.options')
@endif
@include('components.form.options')
</select>