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

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

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2023-02-12 23:34:48 +01:00
parent 8313e25f2e
commit f2f4788ce1
71 changed files with 1486 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
resources/views/Shop/Articles/partials/ArticleAddBasket.blade.php
View File

@@ -3,7 +3,7 @@
'data' => $article['offers']['semences'],
'title' => 'Semence',
'model' => 'semences',
'bgClass' => 'bg-yellow',
'bgClass' => 'bg-green-light',
])
@endif
@@ -12,7 +12,7 @@
'data' => $article['offers']['plants'],
'title' => 'Plant',
'model' => 'plants',
'bgClass' => 'bg-green-dark',
'bgClass' => 'bg-green-light',
])
@endif
@@ -21,6 +21,7 @@
'data' => $article['offers']['legumes'],
'title' => 'Légume',
'model' => 'legumes',
'bgClass' => 'bg-green-light',
])
@endif

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

@@ -1,4 +1,4 @@
<a href="{{ route('Shop.Articles.show', ['id' => $article['semences']['article_id'] ?? false ]) }}" class="{{ ($product_type == 'botanic') ? 'green-dark' : 'green-dark' }}">
<a href="{{ route('Shop.Articles.show', ['id' => $article['id'] ?? false ]) }}" class="green-dark">
<div class="card">
<img src="{{ App\Repositories\Shop\Articles::getPreviewSrc($article['image'] ?? false) }}" class="card-img-top" alt="{{ $product_name }}">
<div class="card-body p-2 pb-1">
@@ -9,7 +9,7 @@
</div>
</div>
@include('Shop.Articles.partials.article_' . $product_type)
<button type="button" class="btn btn-link bg-green text-white w-100">
<button type="button" class="btn btn-link bg-green text-white w-100" data-id=="{{ $article['id'] }}">
Ajout rapide
</button>
</div>

8
resources/views/Shop/Articles/show.blade.php
View File

@@ -9,12 +9,12 @@
</div>
</div>
<div class="row">
<div class="col-4">
<div class="col-lg-4 col-xs-12">
<div style="max-width: 360px;">
@include('components.multi-images', ['images' => $article['images']])
@include('components.multi-images', ['image' => $article['image'], 'images' => $article['images']])
</div>
</div>
<div class="col-5 text-justify">
<div class="col-lg-5 col-xs-12 text-justify">
{!! $article['description']['semences'] ?? null !!}
{!! $article['description']['plants'] ?? null !!}
{!! $article['description']['variety'] ?? null !!}
@@ -44,7 +44,7 @@
@endif
</div>
<div class="col-3">
<div class="col-lg-3 col-xs-12">
@include('Shop.Articles.partials.ArticleAddBasket')
</div>
</div>

30
resources/views/Shop/Shelves/partials/category_add.blade.php
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>

8
resources/views/Shop/Shelves/partials/category_articles.blade.php
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>

19
resources/views/Shop/Shelves/shelve.blade.php
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

6
resources/views/Shop/layout/partials/header-basket.blade.php
View File

@@ -1,6 +1,8 @@
<a href="{{ route('Shop.Basket.basket') }}" class="text-white">
<button type="button" class="btn green p-0">
<i class="fa fa-2x fa-fw fa-shopping-basket mr-2"></i>
<button type="button" class="btn green-dark p-0">
<img src="/img/header/basket.svg" width="36px">
<span class="ml-2 badge bg-yellow green-dark">
<span id="count-basket">{{ \App\Repositories\Core\User\ShopCart::getTotalQuantity() }}</span>
Articles

4
resources/views/Shop/layout/partials/header-catalog.blade.php
View File

@@ -1,5 +1,5 @@
<a href="https://www.jardinenvie.com/boutique/commander">
<button type="button" class="btn bg-light green p-0">
<i class="fa fa-2x fa-fw fa-book-open"></i>
<button type="button" class="btn bg-light green-dark p-0">
<img src="/img/header/catalogue.svg" width="36px">
</button>
</a>

4
resources/views/Shop/layout/partials/header-profile.blade.php
View File

@@ -1,8 +1,8 @@
<button type="button" class="btn bg-light green p-0" data-toggle="dropdown">
<button type="button" class="btn bg-light green-dark p-0" data-toggle="dropdown">
@if (App\Repositories\Shop\Customers::isConnected())
<img src="{{ App\Repositories\Shop\Customers::getAvatar() }}" class="img-fluid" title="{{ App\Repositories\Shop\Customers::getName() }}">
@else
<i class="fa fa-2x fa-fw fa-user"></i>
<img src="/img/header/login.svg" width="36px">
@endif
</button>

8
resources/views/Shop/layout/partials/megamenu.blade.php
View File

@@ -5,11 +5,9 @@
<div class="container p-0">
<div class="row m-0 shadow bg-white p-2 w-100">
<div class="col mb-4">
<strong>
<a class="green-dark @if (($category['id'] ?? false) == $menu['id']) active @endif" href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}">
Tous les articles
</a>
</strong><br>
<a class="green-dark @if (($category['id'] ?? false) == $menu['id']) active @endif" href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}">
<div class="w-100"><strong>Tous les articles</strong></div>
</a>
@for ($i = 0; $i < count($submenu[0]); $i++)
@include('Shop.layout.partials.megamenu_leafs', ['menu_children' => $submenu[0][$i]])
@endfor

8
resources/views/Shop/layout/partials/megamenu_leafs.blade.php
View File

@@ -1,8 +1,6 @@
<strong>
<a class="green-dark @if (($category['id'] ?? false) == $menu_children['id']) active @endif" href="{{ route('Shop.Categories.show', ['id' => $menu_children['id']]) }}">
{{ $menu_children['name'] }}
</a>
</strong><br>
<a class="green-dark @if (($category['id'] ?? false) == $menu_children['id']) active @endif" href="{{ route('Shop.Categories.show', ['id' => $menu_children['id']]) }}">
<div class="w-100"><strong>{{ $menu_children['name'] }}</strong></div>
</a>
@foreach ($menu_children['children'] ?? [] as $leaf)
<a class="green-dark @if (($category['id'] ?? false) == $leaf['id']) active @endif" href="{{ route('Shop.Categories.show', ['id' => $leaf['id']]) }}">
<div class="w-100">{{ $leaf['name'] }}</div>