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

fix on customer auth, fix filters on shelves, refactor for article_nature, add slug

Browse Source
This commit is contained in:
ludo
2023-10-17 17:20:30 +02:00
parent 002644cb97
commit e6b15e2438
30 changed files with 1205 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,7 +6,7 @@
src="{{ App\Repositories\Shop\Articles::getPreviewSrc($article['image'] ?? false) }}" alt="{{ $product_name }}">
<div class="content-details fadeIn-bottom">
<h3 class="content-title d-none"></h3>
<p class="content-text">{!! $article['description'] !!}</p>
<p class="content-text">{!! Str::limit($article['description'], 500) !!}</p>
</div>
</div>
</a>

41
resources/views/Shop/Articles/partials/article_botanic.blade.php
View File

@@ -1,38 +1,19 @@
@if ($article_nature ?? false)
<div class="row">
<div class="col-7">
@if ($article_nature == 'semences')
<strong>Semences</strong><br/>
<small>
{{ $article['semences']['variation'] ?? null }}
</small>
@endif
@if ($article_nature == 'plants')
<strong>Plants</strong><br/>
<small>
{{ $article['plants']['variation'] ?? null }}
</small>
@endif
<strong>{{ $article_nature }}</strong><br/>
<small>
{{ $article[$article_nature]['variation'] ?? null }}
</small>
</div>
<div class="col-5 text-right" style="font-weight: 700; font-size: 1.1em;">
@if ($article_nature == 'semences')
<span style="font-size: 1.4em">
@if ($article['semences'] ?? false)
{{ $article['semences']['price'] ?? null }}</span> €
@else
-
@endif
</span><br/>
@endif
@if ($article_nature == 'plants')
<span style="font-size: 1.4em">
@if ($article['plants'] ?? false)
{{ $article['plants']['price'] }}</span> €
@else
-
@endif
</span><br/>
@endif
<span style="font-size: 1.4em">
@if ($article[$article_nature] ?? false)
{{ $article[$article_nature]['price'] ?? null }}</span> €
@else
-
@endif
</span><br/>
</div>
</div>
@endif

29
resources/views/Shop/Articles/partials/article_merchandise.blade.php
View File

@@ -1,12 +1,19 @@
<div class="row">
<div class="col-12">
<span style="font-size: 1.4em">
@if ($article['merchandises'] ?? false)
{{ $article['merchandises']['price'] ?? null }}</span> €
@else
-
@endif
</span><br/>
<strong>Marchandise</strong>
@if ($article_nature ?? false)
<div class="row">
<div class="col-7">
<strong>{{ $article_nature }}</strong><br/>
<small>
{{ $article[$article_nature]['variation'] ?? null }}
</small>
</div>
<div class="col-5 text-right" style="font-weight: 700; font-size: 1.1em;">
<span style="font-size: 1.4em">
@if ($article[$article_nature] ?? false)
{{ $article[$article_nature]['price'] ?? null }}</span> €
@else
-
@endif
</span><br/>
</div>
</div>
</div>
@endif

41
resources/views/Shop/Orders/order.blade.php
View File

@@ -18,25 +18,30 @@
<x-layout.collapse id="personal_data" title="Informations personnelles" class="d-none personal_data rounded-lg" uncollapsed=true>
@include('Shop.auth.partials.register')
</x-layout.collapse>
@else
{{ Form::open(['route' => 'Shop.Orders.store', 'id' => 'order-form', 'autocomplete' => 'off']) }}
<div id="registred">
<x-layout.collapse id="adresses" title="Adresse de facturation" class="rounded-lg mb-3" uncollapsed=true>
@include('Shop.Orders.partials.addresses', ['addresses' => $customer['invoicing_addresses'] ?? false])
</x-layout.collapse>
<x-layout.collapse id="delivery_mode" title="Mode de livraison" class="rounded-lg mb-3" uncollapsed=true>
@include('Shop.Orders.partials.deliveries')
</x-layout.collapse>
<x-layout.collapse id="adresses" title="Adresse de livraison" class="rounded-lg mb-3 d-none" uncollapsed=true>
@include('Shop.Orders.partials.addresses', ['addresses' => $customer['delivery_addresses'] ?? false])
</x-layout.collapse>
<x-layout.collapse id="payment" title="Paiement" class="rounded-lg mb-3" uncollapsed=true>
@include('Shop.Orders.partials.payments')
</x-layout.collapse>
</div>
{!! Form::close() !!}
@endif
{{ Form::open(['route' => 'Shop.Orders.store', 'id' => 'order-form', 'autocomplete' => 'off']) }}
<div id="registred" @if (!App\Repositories\Shop\Customers::isConnected()) class="d-none" @endif>
<x-layout.collapse id="adresses" title="Adresses" class="rounded-lg mb-3" uncollapsed=true>
@include('Shop.Orders.partials.addresses', ['addresses' => $customer['addresses'] ?? false])
</x-layout.collapse>
<x-layout.collapse id="delivery_mode" title="Mode de livraison" class="rounded-lg mb-3" uncollapsed=true>
@include('Shop.Orders.partials.deliveries')
</x-layout.collapse>
<x-layout.collapse id="payment" title="Paiement" class="rounded-lg mb-3" uncollapsed=true>
@include('Shop.Orders.partials.payments')
</x-layout.collapse>
</div>
{!! Form::close() !!}
</div>
@if ($basket['count'])

9
resources/views/Shop/Orders/partials/addresses.blade.php
View File

@@ -2,7 +2,12 @@
@foreach ($addresses ?? [] as $address)
<div class="row mb-3">
<div class="col-1">
<x-form.radios.icheck name="address_id" val="{{ $address['id'] }}" id="address_{{ $address['id'] }}"/>
@include('components.form.radios.icheck', [
'name' => 'address_id',
'val' => $address['id'],
'id' => 'address_' . $address['id'],
'value' => (count($addresses) === 1) ? $address['id'] : false,
])
</div>
<div class="col-11">
{{ $address['name'] }}<br/>
@@ -14,4 +19,4 @@
</div>
</div>
@endforeach
@endif
@endif

11
resources/views/Shop/Orders/partials/deliveries.blade.php
View File

@@ -1,7 +1,12 @@
@foreach ($deliveries as $delivery)
<div class="row">
<div class="col-1">
<x-form.radios.icheck name="delivery_id" val="{{ $delivery['id'] }}" id="delivery_{{ $delivery['id'] }}"/>
@include('components.form.radios.icheck', [
'name' => 'delivery_id',
'val' => $delivery['id'],
'id' => 'delivery_' . $delivery['id'],
'class' => $delivery['at_house'] ? 'at_house' : '',
])
</div>
<div class="col-11">
<strong>{{ $delivery['name'] }} - Tarif appliqué {{ $delivery['sale_channel']['name'] }}</strong><br/>
@@ -12,4 +17,6 @@
Si vous voulez laisser un message à propos de votre commande, merci de bien vouloir le renseigner dans le champs ci-contre
<textarea name="comment" class="form-control"></textarea>
@include('components.form.textarea', [
'name' => 'content',
])

21
resources/views/Shop/Shelves/partials/category_add.blade.php
View File

@@ -1,15 +1,12 @@
<div class="row mb-3">
@foreach ($article_natures as $nature)
<div class="col text-center @if ($article_nature == $nature)shadow2 @endif">
<div class="row btn products" data-id="{{ $nature }}">
<div class="col-12">
<img src="{{ App\Repositories\Shop\ArticleNatures::getIconBySlug($nature) }}" class="img-fluid">
</div>
<div class="col-12 green-dark" style="font-size: 2rem;"> {{ $nature }} </div>
</div>
</div>
@endforeach
</div>
@foreach ($article_natures as $nature)
<div class="btn products" data-id="{{ $nature }}">
@if ($article_nature == $nature)
<img src="{{ App\Repositories\Shop\ArticleNatures::getIconBySlug($nature, 'normal', 'icon_selection') }}">
@else
<img src="{{ App\Repositories\Shop\ArticleNatures::getIconBySlug($nature, 'normal', 'icon') }}">
@endif
</div>
@endforeach
@push('js')
<script>

20
resources/views/Shop/Shelves/shelve.blade.php
View File

@@ -9,6 +9,12 @@
<input type="hidden" id="product_type" name="product_type" value="{{ $product_type ?? false }}">
<input type="hidden" id="article_nature" name="article_nature" value="{{ $article_nature ?? false }}">
<div class="row">
<div class="col-12">
@include('Shop.Shelves.partials.category_add')
</div>
</div>
<div class="row mb-3">
<div class="col-9">
@include('Shop.Shelves.partials.breadcrumb')
@@ -24,16 +30,12 @@
</div>
</div>
<div class="row">
<div class="col-12">
@include('Shop.Shelves.partials.category_add')
@if (count($tags))
<div class="mb-3">
@include('Shop._partials.display_filters')
</div>
</div>
<div class="mb-3">
@include('Shop._partials.display_filters')
</div>
@include('Shop.Tags.partials.filter')
@include('Shop.Tags.partials.filter')
@endif
@if ($display_by_rows ?? false)
@include('Shop.Shelves.partials.category_articles_rows')

9
resources/views/Shop/Tags/partials/filter.blade.php
View File

@@ -1,12 +1,5 @@
<aside class="main-sidebar float-left @if (!($filter_on ?? false)) d-none" @endif id="sidebar" style="width: 200px;">
<section class="sidebar shadow mr-2" style="height: auto;">
<div class="row">
<div class="col-12">
@include('components.form.button', ['id' => 'reset_filters', 'txt' => 'Annuler les filtres', 'class' => 'btn-success w-100'])
</div>
</div>
@if ($tags ?? false)
@foreach ($tags as $tag_group_id => $group)
@if ($group['tags'] ?? false)
@@ -41,7 +34,7 @@
$('#filters').click(function() {
$('#sidebar').toggleClass('d-none');
$('#filter-on').toggleClass('d-none');
$('#filter-off').toggleClass('d-none');
// $('#filter-off').toggleClass('d-none');
$('#filter-off-text').toggleClass('d-none');
$('#filters').toggleClass('filters-width');
});

14
resources/views/Shop/_partials/display_filters.blade.php
View File

@@ -1,12 +1,16 @@
@if (!($no_filter ?? false))
<button type="button" class="btn bg-green text-white" id="filters" title="Filtres" data-toggle="tooltip">
<span id="filter-on" class="fa fa-fw @if ($filter_on ?? false) d-none" @endif">
<span id="filter-on" class="fa fa-fw">
<i class="fa fa-filter"></i>
</span>
<span id="filter-off" class="fa-stack fa fa-fw @if (!($filter_on ?? false)) d-none" @endif" style="font-size: 0.75em;">
<i class="fa fa-stack-1x fa-filter"></i>
<i class="fa fa-stack-2x fa-ban" style="color:Tomato"></i>
</span>
<span id="filter-off-text" class="@if (!($filter_on ?? false)) d-none @endif"> Cacher les filtres</span>
</button>
<button type="button" class="btn bg-green text-white @if (!(count($tags_selected ?? []) ?? false)) d-none @endif" id="reset_filters" title="Annuler les filtres" data-toggle="tooltip">
<span id="filter-off" class="fa-stack fa fa-fw" style="font-size: 0.75em;">
<i class="fa fa-stack-1x fa-filter"></i>
<i class="fa fa-stack-2x fa-ban" style="color:Tomato"></i>
</span>
</button>
@endif