change registration or connection in order page, change filter on shelve page, add new api to get article_nature by product_type, css fixes
This commit is contained in:
@@ -38,6 +38,13 @@
|
||||
</x-card>
|
||||
</div>
|
||||
</div>
|
||||
@else
|
||||
<div class="row">
|
||||
<div class="col-8">
|
||||
<h1>Panier</h1>
|
||||
Votre panier est vide
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
@endsection
|
||||
|
||||
|
||||
@@ -15,16 +15,14 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="col-6">
|
||||
@include('components.form.input', [
|
||||
'name' => 'company',
|
||||
'value' => $customer['company'] ?? '',
|
||||
'label' => 'Société',
|
||||
])
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="col-6">
|
||||
@include('components.form.input', [
|
||||
'name' => 'tva',
|
||||
'value' => $customer['tva'] ?? '',
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
|
||||
@section('content')
|
||||
<div class="row">
|
||||
<div class="col-8">
|
||||
<div class="@if ($basket['count']) col-8 @else col-12 @endif">
|
||||
@if (!App\Repositories\Shop\Customers::isConnected())
|
||||
<p>
|
||||
<a href="#" id="customer" class="pr-5">Déja client ?</a>
|
||||
@@ -39,11 +39,13 @@
|
||||
{!! Form::close() !!}
|
||||
|
||||
</div>
|
||||
<div class="col-4">
|
||||
<x-card class='shadow'>
|
||||
@include('Shop.Baskets.partials.basketTotal')
|
||||
</x-card>
|
||||
</div>
|
||||
@if ($basket['count'])
|
||||
<div class="col-4">
|
||||
<x-card class='shadow'>
|
||||
@include('Shop.Baskets.partials.basketTotal')
|
||||
</x-card>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
@endsection
|
||||
|
||||
|
||||
@@ -1,7 +1,11 @@
|
||||
@if ($articles ?? false)
|
||||
@foreach ($articles as $product_name => $article)
|
||||
@include('Shop.Articles.partials.article_rows')
|
||||
@endforeach
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
@foreach ($articles as $product_name => $article)
|
||||
@include('Shop.Articles.partials.article_rows')
|
||||
@endforeach
|
||||
</div>
|
||||
</div>
|
||||
@endif
|
||||
|
||||
@push('js')
|
||||
|
||||
@@ -42,7 +42,7 @@
|
||||
|
||||
<div class="row mbm">
|
||||
<div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 text-center">
|
||||
<button type="submit" class="btn btn-primary">
|
||||
<button type="submit" class="btn btn-green-dark">
|
||||
{{ __('boilerplate::auth.register.register_button') }}
|
||||
</button>
|
||||
</div>
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
</li>
|
||||
@else
|
||||
<li class="dropdown-item">
|
||||
<a href="{{ route('Shop.login') }}" title="Identifiez-vous" rel="nofollow">
|
||||
<a href="{{ route('Shop.Orders.order') }}" title="Identifiez-vous" rel="nofollow">
|
||||
<span>Connexion</span>
|
||||
</a>
|
||||
</li>
|
||||
@@ -34,5 +34,11 @@
|
||||
<span>Creer votre compte</span>
|
||||
</a>
|
||||
</li>
|
||||
<li class="dropdown-item">
|
||||
<a href="https://www.jardinenvie.com/boutique/commander" title="Télécharger le catalogue" rel="nofollow">
|
||||
<span>Télécharger le catalogue</span>
|
||||
</a>
|
||||
</li>
|
||||
|
||||
@endif
|
||||
</ul>
|
||||
|
||||
Reference in New Issue
Block a user