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

[WIP] Add thumb on offers, refactor categories, try to fix counter on relations polymorphic with eage loader, bad pattern !

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2021-12-17 00:30:07 +01:00
parent 2be07ce72c
commit a3c6fc6ebe
26 changed files with 171 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,7 @@
@include('components.form.select', ['name' => 'deliveries[]', 'list' => $deliveries ?? [], 'values' => $customer['deliveries'] ?? null, 'with_empty' => '', 'class' => 'select2', 'multiple' => true])
</div>
</div>
@include('components.address', ['with_country' => false, 'prefix' => 'addresses[0]', 'with_tab' => true])
@include('components.address', ['with_country' => false, 'prefix' => 'addresses[0]', 'with_tab' => true, 'item' => $customer['addresses'][0]])
</div>
</div>

2
resources/views/Shop/layout/partials/article.blade.php
View File

@@ -1,5 +1,5 @@
<div class="card">
<img src="{{ App\Repositories\Shop\Articles::getPreviewSrc($offer['article']['image']) }}" class="card-img-top" alt="...">
<img src="{{ App\Repositories\Shop\Articles::getPreviewSrc($offer['article']['image'] ?? false) }}" class="card-img-top" alt="...">
<div class="card-body">
<span class="card-title">{{ $offer['article']['name'] }}</span>
<span class="pull-right">

2
resources/views/Shop/layout/partials/category_articles.blade.php
View File

@@ -1,6 +1,6 @@
<div class="row">
@foreach ($offers as $offer)
<div class="col-sm-6 col-md-3 col-lg-2">
<div class="col-sm-3 col-lg-2">
@include('Shop.layout.partials.article')
</div>
@endforeach

3
resources/views/Shop/layout/partials/category_filters.blade.php Normal file
View File

@@ -0,0 +1,3 @@
<div class="w-100 h-100 bg-secondary">
Filtres
</div>

22
resources/views/Shop/shelve.blade.php
View File

@@ -4,17 +4,19 @@
@section('content')
<div class="row">
<div class="col-8">
<h1 style="font-size: 2em;">{{ $category['name'] }}</h1>
<h3 style="font-size: 1.2em;">{!! $category['description'] !!}</h3>
<div class="col-3 col-lg-2">
@include('Shop.layout.partials.category_filters')
</div>
<div class="col-4">
@include('Shop.layout.partials.category_add')
</div>
</div>
<div class="row">
<div class="col-12">
<div class="col-9 col-lg-10">
<div class="row">
<div class="col-8">
<h1 style="font-size: 2em;">{{ $category['name'] }}</h1>
<h3 style="font-size: 1.2em;">{!! $category['description'] !!}</h3>
</div>
<div class="col-4">
@include('Shop.layout.partials.category_add')
</div>
</div>
@include('Shop.layout.partials.category_articles')
</div>
</div>

12
resources/views/components/address.blade.php
View File

@@ -25,32 +25,32 @@
<div class="row mb-3">
<div class="col-12 col-lg-6 form-group">
<label class="light" for="{{ $prefix ?? null }}address">{{ __('street') }}</label><br/>
@include('components.form.input', ['name' => ($prefix ?? null) . (($with_tab ?? false) ? '[address]' : 'address'), 'value' => $item[($prefix ?? null) . 'address'] ?? null, 'disabled' => $disabled ?? false ])
@include('components.form.input', ['name' => ($prefix ?? null) . (($with_tab ?? false) ? '[address]' : 'address'), 'value' => ($with_tab ?? false) ? $item['address'] : ($item[($prefix ?? null) . 'address'] ?? null), 'disabled' => $disabled ?? false ])
</div>
<div class="col-12 col-lg-6 form-group">
<label class="light" for="{{ $prefix ?? null }}address2">{{ __('street_complement') }}</label><br/>
@include('components.form.input', ['name' => ($prefix ?? null) . (($with_tab ?? false) ? '[address2]' : 'address2'), 'value' => $item[($prefix ?? null) . 'address2'] ?? null, 'disabled' => $disabled ?? false ])
@include('components.form.input', ['name' => ($prefix ?? null) . (($with_tab ?? false) ? '[address2]' : 'address2'), 'value' => ($with_tab ?? false) ? $item['address2'] : ($item[($prefix ?? null) . 'address2'] ?? null), 'disabled' => $disabled ?? false ])
</div>
</div>
<div class="row mb-3">
<div class="col-6 form-group">
<label class="light" for="{{ $prefix ?? null }}zipcode">{{ __('zipcode') }}</label><br/>
@include('components.form.input', ['name' => ($prefix ?? null) . (($with_tab ?? false) ? '[zipcode]' : 'zipcode'), 'value' => $item[($prefix ?? null) . 'zipcode'] ?? null, 'disabled' => $disabled ?? false ])
@include('components.form.input', ['name' => ($prefix ?? null) . (($with_tab ?? false) ? '[zipcode]' : 'zipcode'), 'value' => ($with_tab ?? false) ? $item['zipcode'] : ($item[($prefix ?? null) . 'zipcode'] ?? null), 'disabled' => $disabled ?? false ])
</div>
<div class="col-6 form-group">
<label class="light" for="{{ $prefix ?? null }}city">{{ __('city') }}</label><br/>
@include('components.form.input', ['name' => ($prefix ?? null) . (($with_tab ?? false) ? '[city]' : 'city'), 'value' => $item[($prefix ?? null) . 'city'] ?? null, 'disabled' => $disabled ?? false ])
@include('components.form.input', ['name' => ($prefix ?? null) . (($with_tab ?? false) ? '[city]' : 'city'), 'value' => ($with_tab ?? false) ? $item['city'] : ($item[($prefix ?? null) . 'city'] ?? null), 'disabled' => $disabled ?? false ])
</div>
</div>
@if ($with_country ?? true)
<div class="row mb-3">
<div class="col-12 col-lg-6 form-group">
<label class="light" for="{{ $prefix ?? null }}country">{{ __('country') }}</label><br/>
@include('components.form.select', ['name' => ($prefix ?? null) . (($with_tab ?? false) ? '[country_id]' : 'country_id'), 'list' => $countries ?? null, 'value' => $item[($prefix ?? null) . 'country_id'] ?? null, 'with_empty' => '', 'required' => true, 'disabled' => $disabled ?? false ])
@include('components.form.select', ['name' => ($prefix ?? null) . (($with_tab ?? false) ? '[country_id]' : 'country_id'), 'list' => $countries ?? null, 'value' => ($with_tab ?? false) ? $item['country_id'] : ($item[($prefix ?? null) . 'country_id'] ?? null), 'with_empty' => '', 'required' => true, 'disabled' => $disabled ?? false ])
</div>
<div class="col-12 col-lg-6 form-group">
<label class="light" for="{{ $prefix ?? null }}state">{{ __('state') }}</label><br/>
@include('components.form.input', ['name' => ($prefix ?? null) . (($with_tab ?? false) ? '[state]' : 'state'), 'value' => $item[($prefix ?? null) . 'state'] ?? null, 'disabled' => $disabled ?? false ])
@include('components.form.input', ['name' => ($prefix ?? null) . (($with_tab ?? false) ? '[state]' : 'state'), 'value' => ($with_tab ?? false) ? $item['state'] : ($item[($prefix ?? null) . 'state'] ?? null), 'disabled' => $disabled ?? false ])
</div>
</div>
@endif

18
resources/views/components/form/toggle.blade.php
View File

@@ -1,4 +1,16 @@
<input type="hidden" name="{{ $name ?? ''}}" value="0">
<input type="checkbox" name="{{ $name ?? ''}}" id="{{ $id_name ?? $name ?? '' }}" class="{{ $class ?? 'toggle'}}" value="{{ $val ?? 1}}" data-toggle="toggle" data-on="{{ $on ?? __('yes') }}" data-off="{{ $off ?? __('no') }}" data-onstyle="{{ $onstyle ?? 'outline-success'}}" data-offstyle="{{ $offstyle ?? 'outline-danger'}}" data-size="{{ $size ?? '' }}" @if ( (isset($value) && isset($val) && ($value == $val)) || (!isset($val) && isset($value) && $value)) checked @endif {{ $disabled ?? ''}} {{ $meta ?? ''}} >
<input type="checkbox" name="{{ $name ?? ''}}" id="{{ $id_name ?? $name ?? '' }}"
class="{{ $class ?? 'toggle'}}"
value="{{ $val ?? 1}}"
data-name="{{ $id_name ?? $name ?? '' }}"
data-toggle="toggle"
data-on="{{ $on ?? __('yes') }}"
data-off="{{ $off ?? __('no') }}"
data-onstyle="{{ $onstyle ?? 'outline-success'}}"
data-offstyle="{{ $offstyle ?? 'outline-danger'}}"
data-size="{{ $size ?? '' }}"
@if ( (isset($value) && isset($val) && ($value == $val)) || (!isset($val) && isset($value) && $value)) checked @endif
@if (isset($disabled) && $disabled) disabled="disabled" @endif
{{ $meta ?? ''}}
>
@include('load.form.toggle')
@include('load.form.toggle')

3
resources/views/load/form/toggle.blade.php
View File

@@ -12,7 +12,8 @@
$('input' + selector).change(function() {
data['id'] = $(this).data('id');
data['active'] = $(this).is(':checked');
var name = (typeof($(this).data('name')) == 'undefined') ? 'active' : $(this).data('name');
data[name] = $(this).is(':checked');
if (data['id'] && (typeof(url) != 'undefined') && (url != '')) {
var dataJson = Object.assign({}, data);
$.post(url, dataJson);