change icons, css, add routing to merchandise, add mail templater, fixes

This commit is contained in:
Ludovic CANDELLIER
2023-02-12 23:34:48 +01:00
parent c5ae71544a
commit 7449229ff7
71 changed files with 1486 additions and 154 deletions

View File

@@ -1,4 +1,31 @@
<div class="row">
<div class="row mb-3">
<div class="col-4">
<div class="row h-100 products @if($article_nature == 1) shadow2 @endif" data-id="semences">
<div class="col-lg-6 col-xs-12">
<img src="/img/article_natures/semences.png" class="img-fluid">
</div>
<div class="col-lg-6 col-xs-12 green-dark" style="font-size: 2rem;"> Semences </div>
</div>
</div>
<div class="col-4">
<div class="row h-100 products @if($article_nature == 2) shadow2 @endif" data-id="plants">
<div class="col-lg-6 col-xs-12">
<img src="/img/article_natures/plants.png" class="img-fluid" class="img-fluid">
</div>
<div class="col-lg-6 col-xs-12 green-dark" style="font-size: 2rem;"> Plants </div>
</div>
</div>
<div class="col-4">
<div class="row h-100 products @if($article_nature == 3) shadow2 @endif" data-id="legumes">
<div class="col-lg-6 col-xs-12">
<img src="/img/article_natures/legumes.png" class="img-fluid" class="img-fluid">
</div>
<div class="col-lg-6 col-xs-12 green-dark" style="font-size: 2rem;"> Légumes </div>
</div>
</div>
</div>
<div class="row d-none">
<div class="col-12 text-right">
@include('components.form.button', [
'data_id' => 'semences',
@@ -12,7 +39,6 @@
'class' => 'products bg-green text-white' . (($article_nature == 'plants') ? ' d-none' : ''),
'title' => 'Par plants',
])
</div>
</div>

View File

@@ -1,11 +1,9 @@
<div class="row">
@if ($articles ?? false)
@foreach ($articles as $product_name => $article)
@if ((($product_type == 'botanic') && (($article['semences'] ?? false) || ($article['plants'] ?? false))) || (($product_type == 'merchandise') &&($article['mercchandises'] ?? false)))
<div class="col-3 mb-3">
@include('Shop.Articles.partials.article')
</div>
@endif
<div class="col-lg-3 col-xs-12 mb-3">
@include('Shop.Articles.partials.article')
</div>
@endforeach
@endif
</div>

View File

@@ -17,14 +17,6 @@
@include('Shop.Shelves.partials.display-type')
</div>
</div>
<div class="row">
<div class="col-3">
@include('Shop._partials.display_filters')
</div>
<div class="col-9">
@include('Shop.Shelves.partials.category_add')
</div>
</div>
<div class="row">
<div class="col-12">
@@ -32,8 +24,17 @@
</div>
</div>
<div class="row">
<div class="col-12">
@include('Shop.Shelves.partials.category_add')
</div>
</div>
<div class="mb-3">
@include('Shop._partials.display_filters')
</div>
@include('Shop.Tags.partials.filter')
@if ($display_by_rows ?? false)
@include('Shop.Shelves.partials.category_articles_rows')
@else