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

fixes

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2022-12-22 01:09:11 +01:00
parent ae39681cb0
commit 9698ba54d0
25 changed files with 298 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/Http/Controllers/Shop/CustomerController.php
View File

@@ -14,4 +14,18 @@ class CustomerController extends Controller
$data = Customers::editProfile($id); $data = Customers::editProfile($id);
return view('Shop.Customers.profile', $data); return view('Shop.Customers.profile', $data);
} }
public function modalProfile($id = false)
{
$data['old'] = Customers::get($id);
return view('Shop.Customers.partials.registration', $data);
}
public function storeProfileAjax(Request $request)
{
$data = $request->all();
$customer = Customers::store($data);
return response()->json(['error' => 0]);
}
} }

46
build/css/site.css
View File

@@ -1,6 +1,27 @@
body { body {
font-family: 'noto_sanscondensed', sans-serif; font-family: 'noto_sanscondensed', sans-serif;
/* line-height: 1em!important; */ /* line-height: 1em!important; */
/*
background-image: linear-gradient(to right top, #1d382e, #234236, #2a4d3d, #315745, #39624c, #3a634d, #3a654d, #3b664e, #355e48, #2f5543, #2a4d3d, #254537);
*/
background: rgb(52,91,71);
background: linear-gradient(180deg, rgba(52,91,71,1) 0%, rgba(45,81,63,1) 10%, rgba(24,48,39,1) 90%, rgba(28,54,45,1) 100%);
background-size: cover;
background-attachment: fixed;
}
.gradient-green1 {
background: linear-gradient(to right top, #395339, #3c573a, #3f5b3c, #425f3d, #45633e);
}
.gradient-green2 {
background: linear-gradient(to right top, #2c5f45, #25503c, #1e4233, #19342a, #142620);
}
.gradient-yellow1 {
background-image: linear-gradient(to left top, #efeac9, #e3dcb8, #d7cea6, #cbc196, #bfb385);
} }
.content-wrapper { .content-wrapper {
@@ -15,6 +36,19 @@ body {
background-color: #335012; background-color: #335012;
} }
.bg-green-ultra-dark {
background: linear-gradient(to left top, #102723, #112723, #122724, #122724, #132724);
color: #a5b94f;
}
.bg-green-ultra-dark a {
color: #a5b94f;
}
.green-fluo {
color: #a5b94f!important;
}
.bg-green-light { .bg-green-light {
background-color: #F1F7EE; background-color: #F1F7EE;
} }
@@ -52,7 +86,12 @@ a.green-dark:hover {
} }
.bg-yellow { .bg-yellow {
background-color: #F2B90F; background-color: #f4c234;
color: #19342a;
}
.bg-yellow-light {
background-color: #f9e7b4;
} }
.bg-grey { .bg-grey {
@@ -60,9 +99,14 @@ a.green-dark:hover {
} }
.yellow { .yellow {
color: #e5c551;
}
.yellow2 {
color: #F2B90F; color: #F2B90F;
} }
.light { .light {
color: #F5F5F5; color: #F5F5F5;
} }

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

@@ -12,7 +12,7 @@
'data' => $article['offers']['plants'], 'data' => $article['offers']['plants'],
'title' => 'Plant', 'title' => 'Plant',
'model' => 'plants', 'model' => 'plants',
'bgClass' => 'bg-green', 'bgClass' => 'bg-green-dark',
]) ])
@endif @endif
@@ -44,7 +44,6 @@
label: '{{ __('Commander') }}', label: '{{ __('Commander') }}',
className: 'btn-success', className: 'btn-success',
callback: function() { callback: function() {
console.log('ici');
window.location = "{{ route('Shop.Basket.basket') }}"; window.location = "{{ route('Shop.Basket.basket') }}";
} }
}, },

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

@@ -1,5 +1,5 @@
<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['semences']['article_id'] ?? false ]) }}" class="{{ ($product_type == 'botanic') ? 'green-dark' : 'green-dark' }}">
<div class="card {{ ($article_nature == 'semences') ? 'bg-yellow' : 'bg-green-light' }}"> <div class="card {{ (($article_nature ?? false) == 'semences') ? 'bg-yellow' : 'bg-green-dark' }}">
<img src="{{ App\Repositories\Shop\Articles::getPreviewSrc($article['image'] ?? false) }}" class="card-img-top" alt="{{ $product_name }}"> <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"> <div class="card-body p-2 pb-1">
<div class="row card-title"> <div class="row card-title">

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

@@ -1,4 +1,5 @@
<div class="row"> @if ($article_nature ?? false)
<div class="row">
<div class="col-7"> <div class="col-7">
@if ($article_nature == 'semences') @if ($article_nature == 'semences')
<strong>Semences</strong><br/> <strong>Semences</strong><br/>
@@ -33,4 +34,5 @@
</span><br/> </span><br/>
@endif @endif
</div> </div>
</div> </div>
@endif

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

@@ -1,4 +1,4 @@
<div class="row pb-3 bg-light"> <div class="row pb-3">
<div class="col-9"> <div class="col-9">
<div class="row pt-2"> <div class="row pt-2">
<div class="col-10"> <div class="col-10">

4
resources/views/Shop/Baskets/basket.blade.php
View File

@@ -17,7 +17,7 @@
</div> </div>
</div> </div>
@foreach ($basket as $nature => $items) @foreach ($basket as $nature => $items)
<div class="row ml-1 mb-3 p-2 bg-green-light border"> <div class="row ml-1 mb-3 p-2 @if ($nature == 'semences') bg-yellow @else bg-green-dark @endif border rounded-lg">
<div class="col-12"> <div class="col-12">
<h2 style="font-size: 1.6em;" class="text-uppercase">{{ $nature }}</h2> <h2 style="font-size: 1.6em;" class="text-uppercase">{{ $nature }}</h2>
@foreach ($items as $item) @foreach ($items as $item)
@@ -28,7 +28,7 @@
@endforeach @endforeach
</div> </div>
<div class="col-4"> <div class="col-4">
<x-card class='shadow bg-light'> <x-card class='shadow gradient-green1'>
@include('Shop.Baskets.partials.basketTotal') @include('Shop.Baskets.partials.basketTotal')
<div class="row m-3"> <div class="row m-3">
<div class="col-12 text-center"> <div class="col-12 text-center">

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

@@ -1,6 +1,6 @@
<div class="row basket-row mb-3" id="basket_offer-{{ $item['id'] }}" data-id={{ $item['id'] }}> <div class="row basket-row mb-3" id="basket_offer-{{ $item['id'] }}" data-id={{ $item['id'] }}>
<div class="col-2 text-center"> <div class="col-2 text-center">
<img src="{{ $item['image'] }}" class="img-fluid border border-success"> <img src="{{ $item['image'] }}" class="img-fluid rounded">
</div> </div>
<div class="col-10"> <div class="col-10">
<h3 style="font-size: 1.4em;">{{ $item['name'] }}</h3> <h3 style="font-size: 1.4em;">{{ $item['name'] }}</h3>

5
resources/views/Shop/Customers/partials/deliveries.blade.php
View File

@@ -1,13 +1,14 @@
@foreach ($deliveries as $delivery) @foreach ($deliveries as $delivery)
<div class="row mt-3 mb-3"> <div class="row mt-3 mb-3">
<div class="col-1"> <div class="col-1 text-right">
@include('components.form.radios.icheck', [ @include('components.form.radios.icheck', [
'name' => 'delivery_id', 'name' => 'delivery_id',
'id_name' => 'delivery_id_' . $delivery['id'],
'value' => $delivery['id'], 'value' => $delivery['id'],
'checked' => $customer['sale_delivery_id'] ?? false, 'checked' => $customer['sale_delivery_id'] ?? false,
]) ])
</div> </div>
<div class="col-11"> <div class="col-11 pt-1">
<strong>{{ $delivery['name'] }} - {{ $delivery['sale_channel']['name'] }}</strong><br/> <strong>{{ $delivery['name'] }} - {{ $delivery['sale_channel']['name'] }}</strong><br/>
<p>{{ $delivery['description'] }}</p> <p>{{ $delivery['description'] }}</p>
</div> </div>

40
resources/views/Shop/Customers/partials/invoices.blade.php
View File

@@ -1,20 +1,26 @@
<div class="mt-3"> @if ($customer['orders'] ?? false)
@if ($customer['orders'] ?? false) <table class="table table-striped gradient-green1 green-fluo">
@foreach ($customer['orders'] as $order) @foreach ($customer['orders'] as $order)
<div class="row mb-3"> <tr>
<div class="col-1"> <td>
</div> {{ Carbon\Carbon::parse($order['created_at'])->format('d-m-Y') }}
<div class="col-4"> </td>
<td>
Numero facture Numero facture
</div> </td>
<div class="col-4"> <td class="text-right">
Date facture {{ $order['total_shipped'] }} €
</div> </td>
<div class="col-3"> <td class="text-right">
<a href="">Imprimer</a> <button class="btn btn-sm btn-secondary" data-id="{{ $order['id'] }}">
<a href="">Télécharger</a> <i class="fa fa-fw fa-print" title="Imprimer"></i>
</div> </button>
</div>
<button class="btn btn-sm btn-secondary" data-id="{{ $order['id'] }}">
<i class="fa fa-fw fa-file-pdf" title="Télécharger"></i>
</button>
</td>
</tr>
@endforeach @endforeach
@endif </table>
</div> @endif

78
resources/views/Shop/Customers/partials/registration.blade.php Normal file
View File

@@ -0,0 +1,78 @@
<div class="row">
<div class="col-6">
<div class="form-group {{ $errors->has('first_name') ? 'has-error' : '' }}">
{{ Form::text('first_name', old('first_name'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.first_name'), 'required', 'autofocus']) }}
{!! $errors->first('first_name','<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
<div class="col-6">
<div class="form-group {{ $errors->has('last_name') ? 'has-error' : '' }}">
{{ Form::text('last_name', old('last_name'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.last_name'), 'required']) }}
{!! $errors->first('last_name','<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="form-group {{ $errors->has('company') ? 'has-error' : '' }}">
{{ Form::text('company', old('company'), ['class' => 'form-control', 'placeholder' => __('Société'), 'autofocus']) }}
{!! $errors->first('company','<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="form-group {{ $errors->has('tva') ? 'has-error' : '' }}">
{{ Form::text('tva', old('tva'), ['class' => 'form-control', 'placeholder' => __('N° de TVA'), 'autofocus']) }}
{!! $errors->first('tva','<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
</div>
<div class="row">
<div class="col-6">
<div class="form-group {{ $errors->has('email') ? 'has-error' : '' }}">
{{ Form::email('email', old('email'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.email'), 'required']) }}
{!! $errors->first('email','<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
<div class="col-6">
<div class="form-group {{ $errors->has('phone') ? 'has-error' : '' }}">
{{ Form::text('phone', old('phone'), ['class' => 'form-control', 'placeholder' => __('phone')]) }}
{!! $errors->first('phone','<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="form-group {{ $errors->has('address') ? 'has-error' : '' }}">
{{ Form::text('address', old('address'), ['class' => 'form-control', 'placeholder' => __('Adresse de facturation'), 'required']) }}
{!! $errors->first('address','<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="form-group {{ $errors->has('address2') ? 'has-error' : '' }}">
{{ Form::text('address2', old('address2'), ['class' => 'form-control', 'placeholder' => __('Complément d\'adresse')]) }}
{!! $errors->first('address2','<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
</div>
<div class="row">
<div class="col-4">
<div class="form-group {{ $errors->has('zipcode') ? 'has-error' : '' }}">
{{ Form::text('zipcode', old('zipcode'), ['class' => 'form-control', 'placeholder' => __('zipcode'), 'required']) }}
{!! $errors->first('zipcode','<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
<div class="col-8">
<div class="form-group {{ $errors->has('city') ? 'has-error' : '' }}">
{{ Form::text('city', old('city'), ['class' => 'form-control', 'placeholder' => __('city'), 'required']) }}
{!! $errors->first('city','<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
</div>

4
resources/views/Shop/Customers/partials/sale.blade.php
View File

@@ -10,10 +10,10 @@
</nav> </nav>
<div class="tab-content"> <div class="tab-content">
<div class="tab-pane fade show active pt-0 pb-0 pl-2 pr-2" id="deliveries"> <div class="tab-pane fade show active pt-0 pb-0" id="deliveries">
@include('Shop.Customers.partials.deliveries') @include('Shop.Customers.partials.deliveries')
</div> </div>
<div class="tab-pane fade show pt-0 pb-0 pl-2 pr-2" id="invoices"> <div class="tab-pane fade show pt-0 pb-0" id="invoices">
@include('Shop.Customers.partials.invoices') @include('Shop.Customers.partials.invoices')
</div> </div>
</div> </div>

45
resources/views/Shop/Customers/partials/user.blade.php
View File

@@ -1,10 +1,37 @@
<hr> <x-card title="Mes coordonnées" class="mb-3 gradient-green1" outline=false classBody="pt-3" tools="<button id='profile_edit' class='btn btn-outline-warning'><i class='fa fa-fw fa-edit'></i></button>">
<strong>Mes coordonnées</strong><br>
<i class="fa fa-home pr-2"></i> {{ $customer['first_name'] }} {{ $customer['first_name'] }} {{ $customer['company'] }}
<i class="fa fa-home pr-2"></i> {{ $customer['address'] }}<br>
<i class="pr-5"></i> {{ $customer['address2'] }}<br>
<i class="fa fa-phone pr-2"></i> {{ $customer['phone'] }}<br> @if ($customer['company'])
<i class="fa fa-envelope pr-2"></i> {{ $customer['email'] }}<br> <i class="fa fa-building pr-2"></i>
<hr> {{ $customer['company'] }}
<strong>Compte créé le {{ Carbon\Carbon::parse($customer['created_at'])->format('d-m-Y') }}</strong> @endif
<i class="fa fa-fw fa-user pr-2"></i>
{{ $customer['first_name'] }} {{ $customer['last_name'] }}
<hr>
<i class="fa fa-fw fa-home pr-2"></i>
{{ $customer['address'] }}<br>
@if ($customer['address2'])
<i class="fa fa-fw pr-2"></i> {{ $customer['address2'] }}<br>
@endif
<i class="fa fa-fw pr-2"></i> {{ $customer['zipcode'] }} {{ $customer['city'] }}<br>
<hr>
<i class="fa fa-fw fa-phone pr-2"></i> {{ $customer['phone'] }}<br>
<i class="fa fa-fw fa-envelope pr-2"></i> {{ $customer['email'] }}<br>
<hr>
<strong>Compte créé le {{ Carbon\Carbon::parse($customer['created_at'])->format('d-m-Y') }}</strong>
</x-card>
@push('js')
<script>
$('#profile_edit').click(function() {
openModal('Modification de vos coordonnées',
'profile-form',
"{{ route('Shop.Customers.modalProfile') }}/",
"{{ route('Shop.Customers.storeProfile') }}",
);
});
</script>
@endpush

5
resources/views/Shop/Customers/profile.blade.php
View File

@@ -3,11 +3,14 @@
]) ])
@section('content') @section('content')
<div class="row"> <div class="row">
<div class="col-3"> <div class="col-3">
@include('Shop.Customers.partials.user') @include('Shop.Customers.partials.user')
</div> </div>
<div class="col-9"> <div class="col-9">
@include('Shop.Customers.partials.sale') @include('Shop.Customers.partials.sale')
</div> </div>
</div>
@endsection @endsection
@include('load.layout.modal')

8
resources/views/Shop/Homepage/partials/sliderByShelve.blade.php
View File

@@ -1,8 +1,8 @@
@if ($shelve['articles']) @if ($shelve['articles'])
<div class="mb-3 bg-green-light"> <div class="mb-3 bg-green-ultra-dark rounded-lg">
<div class="row"> <div class="row">
<div class="col-6"> <div class="col-6">
<h1 class="green p-2" style="font-size: 2em;">{{ $shelve['name'] }}</h1> <h1 class="p-2" style="font-size: 2em;">{{ $shelve['name'] }}</h1>
</div> </div>
<div class="col-6 text-right"> <div class="col-6 text-right">
<a class="mt-2 btn btn-green-dark" href="{{ route('Shop.Categories.show', ['id' => $shelve['id']]) }}">Découvrir la sélection</a> <a class="mt-2 btn btn-green-dark" href="{{ route('Shop.Categories.show', ['id' => $shelve['id']]) }}">Découvrir la sélection</a>
@@ -13,8 +13,8 @@
<div class="col-11 mx-auto shelve_slider_{{ $shelve['id'] }} slider"> <div class="col-11 mx-auto shelve_slider_{{ $shelve['id'] }} slider">
@foreach ($shelve['articles'] as $name => $article) @foreach ($shelve['articles'] as $name => $article)
<div class="text-center pr-2 pl-2"> <div class="text-center pr-2 pl-2">
<a class="green-dark" href="{{ route('Shop.Articles.show', ['id' => $article['id']]) }}"> <a class="green-fluo" href="{{ route('Shop.Articles.show', ['id' => $article['id']]) }}">
<img data-lazy="{{ App\Repositories\Shop\Articles::getPreviewSrc($article['image'] ?? false) }}" class="d-block w-100" alt="{{ $name }}"/> <img data-lazy="{{ App\Repositories\Shop\Articles::getPreviewSrc($article['image'] ?? false) }}" class="d-block w-100 rounded" alt="{{ $name }}"/>
{{ $name }} {{ $name }}
</a> </a>
</div> </div>

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

@@ -11,11 +11,11 @@
<button class="btn btn-secondary" id="register">Créez mon compte</button> <button class="btn btn-secondary" id="register">Créez mon compte</button>
</p> </p>
<x-layout.collapse id="identification" title="Déjà client" class="d-none identification"> <x-layout.collapse id="identification" title="Déjà client" class="d-none identification gradient-green1 rounded-lg">
@include('Shop.auth.partials.login') @include('Shop.auth.partials.login')
</x-layout.collapse> </x-layout.collapse>
<x-layout.collapse id="personal_data" title="Informations personnelles" class="d-none personal_data"> <x-layout.collapse id="personal_data" title="Informations personnelles" class="d-none personal_data gradient-green1 rounded-lg">
@include('Shop.auth.partials.register') @include('Shop.auth.partials.register')
</x-layout.collapse> </x-layout.collapse>
@endif @endif
@@ -23,15 +23,15 @@
{{ Form::open(['route' => 'Shop.Orders.store', 'id' => 'order-form', 'autocomplete' => 'off']) }} {{ Form::open(['route' => 'Shop.Orders.store', 'id' => 'order-form', 'autocomplete' => 'off']) }}
<div id="registred" @if (!App\Repositories\Shop\Customers::isConnected()) class="d-none" @endif> <div id="registred" @if (!App\Repositories\Shop\Customers::isConnected()) class="d-none" @endif>
<x-layout.collapse id="adresses" title="Adresses"> <x-layout.collapse id="adresses" title="Adresses" class="gradient-green1 rounded-lg">
@include('Shop.Orders.partials.addresses') @include('Shop.Orders.partials.addresses')
</x-layout.collapse> </x-layout.collapse>
<x-layout.collapse id="delivery_mode" title="Mode de livraison"> <x-layout.collapse id="delivery_mode" title="Mode de livraison" class="gradient-green1 rounded-lg">
@include('Shop.Orders.partials.deliveries') @include('Shop.Orders.partials.deliveries')
</x-layout.collapse> </x-layout.collapse>
<x-layout.collapse id="payment" title="Paiement"> <x-layout.collapse id="payment" title="Paiement" class="gradient-green1 rounded-lg">
@include('Shop.Orders.partials.payments') @include('Shop.Orders.partials.payments')
</x-layout.collapse> </x-layout.collapse>
</div> </div>
@@ -40,24 +40,29 @@
</div> </div>
<div class="col-4"> <div class="col-4">
<x-card class='shadow bg-light'> <x-card class='shadow gradient-green1'>
@include('Shop.Baskets.partials.basketTotal') @include('Shop.Baskets.partials.basketTotal')
</x-card> </x-card>
</div> </div>
</div> </div>
@endsection @endsection
@include('load.layout.chevron')
@push('js') @push('js')
<script> <script>
$('#customer').click(function() { $('#customer').click(function() {
$(".personal_data").addClass('d-none'); $(".personal_data").addClass('d-none');
$('.identification').removeClass('d-none'); $('.identification').removeClass('d-none');
$('#identification').collapse('show'); $('#identification').collapse('show');
}) });
$('#register').click(function() { $('#register').click(function() {
$('.identification').addClass('d-none'); $('.identification').addClass('d-none');
$(".personal_data").removeClass('d-none'); $(".personal_data").removeClass('d-none');
$('#personal_data').collapse('show'); $('#personal_data').collapse('show');
}) });
initChevron();
</script> </script>
@endpush @endpush

81
resources/views/Shop/auth/partials/register.blade.php
View File

@@ -2,83 +2,8 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
<x-card title='Créez votre compte' class='mt-3 mb-3'> <x-card title='Créez votre compte' class='mt-3 mb-3'>
<div class="row">
<div class="col-6">
<div class="form-group {{ $errors->has('first_name') ? 'has-error' : '' }}">
{{ Form::text('first_name', old('first_name'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.first_name'), 'required', 'autofocus']) }}
{!! $errors->first('first_name','<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
<div class="col-6">
<div class="form-group {{ $errors->has('last_name') ? 'has-error' : '' }}">
{{ Form::text('last_name', old('last_name'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.last_name'), 'required']) }}
{!! $errors->first('last_name','<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="form-group {{ $errors->has('company') ? 'has-error' : '' }}">
{{ Form::text('company', old('company'), ['class' => 'form-control', 'placeholder' => __('Société'), 'autofocus']) }}
{!! $errors->first('company','<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="form-group {{ $errors->has('tva') ? 'has-error' : '' }}">
{{ Form::text('tva', old('tva'), ['class' => 'form-control', 'placeholder' => __('N° de TVA'), 'autofocus']) }}
{!! $errors->first('tva','<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
</div>
<div class="row">
<div class="col-6">
<div class="form-group {{ $errors->has('email') ? 'has-error' : '' }}">
{{ Form::email('email', old('email'), ['class' => 'form-control', 'placeholder' => __('boilerplate::auth.fields.email'), 'required']) }}
{!! $errors->first('email','<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
<div class="col-6">
<div class="form-group {{ $errors->has('phone') ? 'has-error' : '' }}">
{{ Form::text('phone', old('phone'), ['class' => 'form-control', 'placeholder' => __('phone')]) }}
{!! $errors->first('phone','<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
</div>
<div class="row"> @include('Shop.Customers.partials.registration')
<div class="col-12">
<div class="form-group {{ $errors->has('address') ? 'has-error' : '' }}">
{{ Form::text('address', old('address'), ['class' => 'form-control', 'placeholder' => __('Adresse de livraison'), 'required']) }}
{!! $errors->first('address','<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
</div>
<div class="row">
<div class="col-12">
<div class="form-group {{ $errors->has('address2') ? 'has-error' : '' }}">
{{ Form::text('address2', old('address2'), ['class' => 'form-control', 'placeholder' => __('Complément d\'adresse')]) }}
{!! $errors->first('address2','<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
</div>
<div class="row">
<div class="col-4">
<div class="form-group {{ $errors->has('zipcode') ? 'has-error' : '' }}">
{{ Form::text('zipcode', old('zipcode'), ['class' => 'form-control', 'placeholder' => __('zipcode'), 'required']) }}
{!! $errors->first('zipcode','<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
<div class="col-8">
<div class="form-group {{ $errors->has('city') ? 'has-error' : '' }}">
{{ Form::text('city', old('city'), ['class' => 'form-control', 'placeholder' => __('city'), 'required']) }}
{!! $errors->first('city','<p class="text-danger"><strong>:message</strong></p>') !!}
</div>
</div>
</div>
<div class="row"> <div class="row">
<div class="col-6"> <div class="col-6">
@@ -97,8 +22,8 @@
<div class="row"> <div class="row">
<div class="col-12"> <div class="col-12">
@include('components.form.checkbox', ['name' => 'use_for_invoice', 'value' => false]) @include('components.form.checkbox', ['name' => 'use_for_delivery', 'value' => false])
Utiliser aussi cette adresse pour la facturation Utiliser une autre adresse pour la livraison
</div> </div>
</div> </div>

4
resources/views/Shop/home.blade.php
View File

@@ -7,7 +7,7 @@
@if (!empty($text)) @if (!empty($text))
<div class="row m-0 mb-3"> <div class="row m-0 mb-3">
<div class="col-12 p-3 green-dark bg-yellow rounded drop-shadow" style="font-size: 1.2em;">{!! $text !!}</div> <div class="col-12 p-3 green-dark bg-yellow-light rounded-lg drop-shadow" style="font-size: 1.2em;">{!! $text !!}</div>
</div> </div>
@endif @endif
@@ -27,7 +27,7 @@
$(document).ready(function() { $(document).ready(function() {
$('.slider').slick({ $('.slider').slick({
lazyLoad: 'ondemand', lazyLoad: 'ondemand',
slidesToShow: 6, slidesToShow: 5,
slidesToScroll: 1, slidesToScroll: 1,
dots: false, dots: false,
autoplay: true, autoplay: true,

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

@@ -23,7 +23,7 @@
<body class="bg-green-dark"> <body class="bg-green-dark">
<div class="container bg-white" style="min-height: 100vh;"> <div class="container bg-green-ultra-dark" style="min-height: 100vh;">
<main> <main>
@include("Shop.layout.partials.header") @include("Shop.layout.partials.header")
<div class="content-wrapper"> <div class="content-wrapper">

4
resources/views/Shop/layout/partials/sections.blade.php
View File

@@ -1,6 +1,6 @@
<div class="row shadow mb-3"> <div class="row shadow mb-3">
<div class="col-12 pl-0"> <div class="col-12 pl-0 pr-0">
<nav class="navbar navbar-expand-lg navbar-light bg-light "> <nav class="navbar navbar-expand-lg navbar-light gradient-green1">
<div class="collapse navbar-collapse" id="navbarContent"> <div class="collapse navbar-collapse" id="navbarContent">
<ul class="navbar-nav"> <ul class="navbar-nav">
@foreach ($categories as $menu) @foreach ($categories as $menu)

6
resources/views/components/card.blade.php
View File

@@ -4,16 +4,16 @@
@isset($header) @isset($header)
{{ $header }} {{ $header }}
@else @else
<h3 class="card-title">{{ $title ?? false }}</h3>
@isset($tools) @isset($tools)
<div class="card-tools"> <div class="card-tools float-right">
{!! $tools !!} {!! $tools !!}
</div> </div>
@endisset @endisset
<h3 class="card-title">{{ $title ?? false }}</h3>
@endisset @endisset
</div> </div>
@endif @endif
<div class="card-body {{ $title ?? false ? ($outline ?? config('boilerplate.theme.card.outline', false)) ? 'pt-0' : '' : '' }} {{ $class_body ?? '' }}"> <div class="card-body {{ $title ?? false ? ($outline ?? config('boilerplate.theme.card.outline', false)) ? 'pt-0' : '' : '' }} {{ $class_body ?? '' }} {{ $classBody ?? '' }}">
{{ $slot }} {{ $slot }}
</div> </div>
@isset($footer) @isset($footer)

16
resources/views/paybox/aborted.blade.php
View File

@@ -1,9 +1,7 @@
<!DOCTYPE html> @extends('Shop.layout.layout', [
<html lang="en"> 'title' => __('Paiement annulé'),
<head> ])
<meta charset="UTF-8">
</head> @section('content')
<body> Le paiement a été annulé.
You canceled the payment. @endsection
</body>
</html>

16
resources/views/paybox/refused.blade.php
View File

@@ -1,9 +1,7 @@
<!DOCTYPE html> @extends('Shop.layout.layout', [
<html lang="en"> 'title' => __('Paiement refusé'),
<head> ])
<meta charset="UTF-8">
</head> @section('content')
<body> Le paiement a été refusé.
It seems your payment has been refused. @endsection
</body>
</html>

2
routes/Shop/Customers.php
View File

@@ -3,4 +3,6 @@
Route::prefix('Clients')->name('Customers.')->group(function () { Route::prefix('Clients')->name('Customers.')->group(function () {
Route::get('show/{id}', 'CustomerController@show')->name('show'); Route::get('show/{id}', 'CustomerController@show')->name('show');
Route::get('profile/{id?}', 'CustomerController@profile')->name('profile'); Route::get('profile/{id?}', 'CustomerController@profile')->name('profile');
Route::get('modalProfile/{id?}', 'CustomerController@modalProfile')->name('modalProfile');
Route::post('storeProfileAjax', 'CustomerController@storeProfileAjax')->name('storeProfile');
}); });

1
routes/web.php
View File

@@ -13,6 +13,7 @@
// Auth::routes(); // Auth::routes();
Route::get('login2', 'Shop\Auth\LoginController@showLoginForm')->name('login');
Route::get('', 'Shop\HomeController@index')->name('welcome'); Route::get('', 'Shop\HomeController@index')->name('welcome');
Route::get('home', 'Shop\HomeController@index')->name('home'); Route::get('home', 'Shop\HomeController@index')->name('home');